From 966c0ae05b7bfb75977ba9237e86e5478f7962f7 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 14 May 2025 16:30:03 +0800
Subject: [PATCH] dev

---
 src/components/charge/ChargeQueue.vue         |  2 +-
 .../inventory/purchase/AddOrder.vue           |  3 +-
 .../inventory/purchase/EditOrder.vue          |  5 +-
 src/views/inventory/goods.vue                 |  8 +-
 src/views/inventory/inventory.vue             | 80 ++++++++++++-------
 5 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/src/components/charge/ChargeQueue.vue b/src/components/charge/ChargeQueue.vue
index a860d57..7c786cb 100644
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@@ -20,7 +20,7 @@
       <div class="container">
         <div class="tabs">
           <span v-for="(item,index) in statusList " :key="index" :class="query.status == item.value ? 'tabs-item' : ''"
-                @click="tab(item)">{{ item.label }}&nbsp;{{ item.num }}
+                @click="tab(item)">{{ item.label }}&nbsp;({{ item.num }})
           </span>
         </div>
         <div class="search">
diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue
index 3e8b3dc..61b28c3 100644
--- a/src/components/inventory/purchase/AddOrder.vue
+++ b/src/components/inventory/purchase/AddOrder.vue
@@ -54,7 +54,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item prop="supplierId" label="供应商" :rules="formRules.supplierId">
-                <el-select style="width: 150px;" v-model="inventory_order_data.supplierId" placeholder="请选择供应商">
+                <el-select style="width: 130px;margin-right: 10px" v-model="inventory_order_data.supplierId" placeholder="请选择供应商">
                   <el-option
                       v-for="item in supplier_list"
                       :key="item.id"
@@ -386,7 +386,6 @@ const init = () => {
   isShow.value = true
   getSupplierList()
   getManagerUserList()
-
   getUserInfo()
 
 }
diff --git a/src/components/inventory/purchase/EditOrder.vue b/src/components/inventory/purchase/EditOrder.vue
index a214027..1b00b30 100644
--- a/src/components/inventory/purchase/EditOrder.vue
+++ b/src/components/inventory/purchase/EditOrder.vue
@@ -66,7 +66,7 @@
                     v-model="inventory_order_data.supplierId"
                     placeholder="请选择供应商"
                     v-if="orderInfoIsEdit"
-                    style="width: 234px;"
+                    style="width: 130px;margin-right: 10px"
                 >
                   <el-option
                       v-for="item in supplier_list"
@@ -75,7 +75,8 @@
                       :value="item.id"
                   />
                 </el-select>
-                <span style="width: 234px;" class="order-info" v-else>{{ inventory_order_data.supplierName }}</span>
+                <el-button v-if="orderInfoIsEdit" type="primary" @click="addSupplier">添加供应商</el-button>
+                <span style="width: 234px;" class="order-info" v-if="!orderInfoIsEdit">{{ inventory_order_data.supplierName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index a46d763..92ee08b 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -5,7 +5,7 @@
         <div class="left">
           <el-form :inline="true" :model="searchModel">
             <el-form-item>
-              <el-input placeholder="请输入名称"
+              <el-input placeholder="名称/首字母/批准文号/条形码/标识码"
                         clearable
                         v-model="searchModel.keyword"
                         style="width: 290px;height: 42px"
@@ -168,11 +168,6 @@
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remark" width="100" show-overflow-tooltip/>
-        <el-table-column label="医保类别">
-          <template #default="scope">
-            {{ getTypeName(scope.row.type) }}
-          </template>
-        </el-table-column>
       </el-table>
     </div>
     <div class="bottom">
@@ -485,6 +480,7 @@ const getStatisticsData = () => {
         color: #4D6DE4;
         text-align: center;
         line-height: 42px;
+        cursor: pointer;
         &:hover {
           background: #4D6DE4;
           color: #fff;
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index 915dcc5..59effc8 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -25,36 +25,32 @@
             </el-form-item>
             <el-form-item>
               <el-select
-                  v-model="searchModel.cateId"
+                  v-model="searchModel.supplierIds"
                   placeholder="供应商"
                   style="width: 200px;height: 42px"
                   multiple
-                  clearable
-                  collapse-tags
               >
                 <el-option
-                    v-for="item in 10"
+                    v-for="item in supplier_list"
                     :key="item"
-                    :label="item"
-                    :value="item"
+                    :label="item.name"
+                    :value="item.id"
                 >
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
               <el-select
-                  v-model="searchModel.cateId"
+                  v-model="searchModel.managerUserIds"
                   placeholder="采购人"
                   style="width: 200px;height: 42px"
                   multiple
-                  clearable
-                  collapse-tags
               >
                 <el-option
-                    v-for="item in 10"
+                    v-for="item in managerUserList"
                     :key="item"
-                    :label="item"
-                    :value="item"
+                    :label="item.name"
+                    :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -83,11 +79,13 @@
     <div class="content_list">
       <el-scrollbar>
         <el-table :data="tableData" style="width: 100%" @row-click="open_edit" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
-          <el-table-column fixed label="进货单号" show-overflow-tooltip>
+          <el-table-column fixed label="采购单号" show-overflow-tooltip>
             <template #default="scope">
               <div class="link">{{ scope.row.code }}</div>
             </template>
           </el-table-column>
+          <el-table-column label="货单号" prop="shippingCode">
+          </el-table-column>
           <el-table-column label="品种" prop="kindCount">
           </el-table-column>
           <el-table-column label="入库金额">
@@ -102,10 +100,12 @@
               {{ formatDate(scope.row.purchaseDate) }}
             </template>
           </el-table-column>
-          <el-table-column prop="createDatetime" label="创建时间">
-            <template #default="scope">
-              {{ formatDate(scope.row.createDatetime) }}
-            </template>
+<!--          <el-table-column prop="createDatetime" label="入库时间">-->
+<!--            <template #default="scope">-->
+<!--              {{ formatDate(scope.row.purchaseDate) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column label="备注" prop="remark">
           </el-table-column>
         </el-table>
       </el-scrollbar>
@@ -143,6 +143,8 @@ const route = useRoute()
 let open_code = ref(null)
 onMounted(() => {
   init()
+  getSupplierList()
+  getManagerUserList()
 })
 const addOrderRef = ref<any>('')
 const openAdd = () => {
@@ -162,8 +164,9 @@ let init = () => {
   const query = {
     page: page.value,
     pageSize: 20,
+    ...searchModel.value
   }
-  post("inventory/order/list", {query: query,...searchModel.value}).then((res: any) => {
+  post("inventory/order/list", {query: query}).then((res: any) => {
     tableData.value = res.list
     total.value = res.total_count
   })
@@ -197,24 +200,39 @@ const handleDateChange = (date: any[]) => {
   if (selectedDate.value[0] == selectedDate.value[1]) {
     selectedDate.value[1] = getEndOfDay(selectedDate.value[1]); // 输出今天 23:59
   }
+  searchModel.value.beginTime = selectedDate.value[0]
+  searchModel.value.endTime = selectedDate.value[1]
+}
+const supplier_list = ref<any>([])
+const getSupplierList = () => {
+  const query = {
+    turn: 1
+  }
+  post("inventory/supplier/list", {query: query}).then((res: any) => {
+    supplier_list.value = res.list
+  })
+}
+const managerUserList: any = ref([])
+const getManagerUserList = () => {
+  post("manager/user/list", {
+  }).then((res: any) => {
+    managerUserList.value = res
+  })
 }
-
 const searchModel = ref({
-  purchaseDate:"",
   code: "",
-  cateId: [],
-  minInterestRate: "",
-  maxInterestRate: "",
-  curProfitCate: []
+  managerUserIds:  [],
+  supplierIds: [],
+  beginTime: null,
+  endTime:null
 })
 const resetSearch = () => {
   searchModel.value = {
-    purchaseDate:"",
     code: "",
-    cateId: [],
-    minInterestRate: "",
-    maxInterestRate: "",
-    curProfitCate: []
+    managerUserIds:  [],
+    supplierIds: [],
+    beginTime: null,
+    endTime:null
   }
   init()
 }
@@ -360,6 +378,7 @@ const resetSearch = () => {
       color: #4D6DE4;
       text-align: center;
       line-height: 42px;
+      cursor: pointer;
       &:hover {
         background: #4D6DE4;
         color: #fff;
@@ -368,6 +387,9 @@ const resetSearch = () => {
     }
   }
 }
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 42px;
+}
 :deep(.el-select__wrapper) {
   height: 42px;
 }