wcp

src/api/wcpOrder.js

@@ -81,7 +81,7 @@ export function delWcpOrder(businessId) {
 }
 export function wcpOrderEndPd(businessId) {
   return request({
-    url: '/wcporderlistpd/delete/' + businessId,
+    url: '/wcporderlistpd/deleteLogical/' + businessId,
     method: 'delete'
   })
 }
@@ -107,3 +107,10 @@ export function importExcel(data) {
     data
   })
 }
+export function listUser(query) {
+  return request({
+    url: '/system/user/list',
+    method: 'GET',
+    params: query
+  })
+}

src/views/template/wcporder.vue

@@ -234,9 +234,9 @@
             {{ scope.row.m3 || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="orderCode" prop="orderCode" :show-overflow-tooltip="true">
+        <el-table-column label="pdCode" prop="pdCode" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span>{{ scope.row.orderCode || '-' }}</span>
+            <span>{{ scope.row.pdCode || '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column label="orderListId" prop="orderListId" width="100" :show-overflow-tooltip="true">
@@ -422,7 +422,7 @@
     <el-dialog class="dispenseDialog" :title="title" :visible.sync="dispenseOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="formDetails" :model="dispense" size="small" label-width="90px">
         <el-form-item label="ordersn:" prop="orderSn">
-          {{ orderSn }}
+          {{ dispense.orderSn }}
         </el-form-item>
         <el-form-item label="人员">
           <el-select
@@ -430,12 +430,12 @@
             placeholder="请选择人员"
             multiple
             size="small"
-            style="width: 200px;position: center"
+            style="width: 200px;"
           >
             <el-option
-              v-for="item in userList"
+              v-for="item in dispense.userList"
               :key="item.value"
-              :label="formatLabel(item.label)"
+              :label="item.label"
               :value="item.value"
             />
           </el-select>
@@ -469,7 +469,7 @@ import {
   exportWcpOrder,
   getWcpOrder,
   getWcpOrderId,
-  importExcel,
+  importExcel, listUser,
   listWcpOrder,
   listWcpOrderPd,
   updateWcpOrder,
@@ -505,24 +505,7 @@ export default {
           label: '20240829  老六'
         }
       ],
-      userList: [
-        {
-          value: '选项1',
-          label: '20240809      张三'
-        },
-        {
-          value: '选项2',
-          label: '20240819      李四'
-        },
-        {
-          value: '选项3',
-          label: '20240825      王五'
-        },
-        {
-          value: '选项4',
-          label: '20240829      老六'
-        }
-      ],
+      // userList: [],
       addIcon: 'el-icon-plus',
       currentPage: 1,
       pageSize: 10,
@@ -561,7 +544,8 @@ export default {
         url: process.env.VUE_APP_BASE_API + '/system/user/importExcel'
       },
       dispense: {
-        valuePd: '选项1'
+        Value: [],
+        userList: []
       },
       // 遮罩层
       loading: true,
@@ -890,24 +874,39 @@ export default {
       this.open = true
     },
     handleDispense(row) {
-      // const id = row.businessId
-      this.orderSn = row.orderSn
+      this.dispense.Value = ''
+      this.businessId = row.businessId
+      this.dispense.orderSn = row.orderSn
+      listUser().then(response => {
+        this.dispense.userList = response.rows.map(item => ({
+          value: item.businessId,
+          label: `${item.username}   ${item.name}`
+        }))
+      })
       this.title = '分配'
-      this.dispenseOpen = !this.dispenseOpen
+      this.dispenseOpen = true
     },
     handleStart() {
+      this.dispense.userList = []
       const data = {
-        businessId: this.businessId
+        businessId: this.businessId,
+        ...this.dispense
       }
-      console.log(this.businessId)
       this.$confirm('确认要开始盘点吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         wcpOrderPd(data).then(response => {
-          this.PdList = response.data
-          this.$message({ message: '开始盘点...', type: 'success' })
+          if (response.code === null) {
+            this.$message({ message: '已经开始盘点...', type: 'error' })
+            this.dispenseOpen = false
+          } else {
+            this.PdList = response.data
+            this.$message({ message: '开始盘点...', type: 'success' })
+            this.dispenseOpen = false
+            this.getList()
+          }
         })
       }).catch(() => {
         this.message({ message: '取消开始盘点', type: 'info' })
@@ -922,8 +921,11 @@ export default {
       }).then(response => {
         wcpOrderEndPd(id).then(response => {
           this.$message({ message: '盘点结束', type: 'success' })
+          this.dispenseOpen = false
+          this.getList()
         }).catch(error => {
           console.error('Error:', error)
+          this.dispenseOpen = false
         })
       })
     },