From af40695ede3347374c206d7a87f2fc66d0e1ef7c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 1 Nov 2022 14:33:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E6=96=B0=E5=A2=9E=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inventory/invCountOrder.js      |  2 +-
 src/views/inventory/addCountOrder.vue   | 25 ++++++++-----
 src/views/inventory/countOrderCodes.vue | 49 +++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/src/api/inventory/invCountOrder.js b/src/api/inventory/invCountOrder.js
index 95859b1..71adf5e 100644
--- a/src/api/inventory/invCountOrder.js
+++ b/src/api/inventory/invCountOrder.js
@@ -42,7 +42,7 @@ export function submitAudit(params) {
 
 export function deleteCountOrderDetail(data) {
     return axios({
-        url: "/invCount/codes/deleteCode",
+        url: "/invCount/order/detail/deleteOrderDetail",
         method: "post",
         data: data
     });
diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index 17d1816..b55bd56 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -287,6 +287,7 @@
         >
             <countOrderCodes
                 :codeQuery="codeQuery"
+                :getCountOrderDetail="getCountOrderDetail"
             ></countOrderCodes>
         </el-dialog>
     </div>
@@ -371,7 +372,8 @@ export default {
             codesNum: 0,
             codeQuery: {
                 productId: null,
-                orderIdFk: null
+                orderIdFk: null,
+                edit: true
             },
             codesVisible: false
         };
@@ -399,6 +401,7 @@ export default {
                                 let detailData = {
                                     orderIdFk: this.formData.orderId,
                                     productId: product.relIdFk,
+                                    nameCode: product.nameCode,
                                     batchNo: product.batchNo,
                                     produceDate: product.productionDate,
                                     expireDate: product.expireDate
@@ -512,10 +515,11 @@ export default {
             this.selectInvProductVisible = false;
         },
         deleteOrderDetail(index, row) {
-            if (isBlank(row.id)) {
-                //未添加到数据库中，页面移除即可
-                this.codeArray.splice(index, 1);
-            } else {
+            this.$confirm('此操作将删除单据详情, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
                 //此单据详情已经添加到数据库中，需要在数据库中
                 let params = {id: row.id}
                 deleteCountOrderDetail(params).then((res) => {
@@ -528,16 +532,18 @@ export default {
                             this.codeArray = result.data.list || [];
                         });
                     } else {
-                        this.$message.error(res.data);
+                        this.$message.error(res.data.message);
                     }
                 })
-            }
+            }).catch(() => {
+            });
         },
         showCodes(row) {
             this.codesVisible = true;
             this.codeQuery = {
                 orderIdFk: this.formData.orderId,
-                productId: row.productId
+                productId: row.productId,
+                edit: true
             }
         },
         getInputFocus(event) {
@@ -559,7 +565,8 @@ export default {
                     this.codeArray = res.data.list || [];
                     this.detailTotal = res.data.total || 0;
                 }
-            })
+            });
+            this.getCountOrderCodesNum();
         },
         addCode() {
             this.formData.code.trim();
diff --git a/src/views/inventory/countOrderCodes.vue b/src/views/inventory/countOrderCodes.vue
index 5e58525..7f50f2c 100644
--- a/src/views/inventory/countOrderCodes.vue
+++ b/src/views/inventory/countOrderCodes.vue
@@ -22,6 +22,24 @@
                 width="500"
                 show-overflow-tooltip
             ></el-table-column>
+            <el-table-column
+                label="操作"
+                width="120"
+                fixed="right"
+                v-if="codeQuery.edit"
+                show-overflow-tooltip
+            >
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click.stop="true"
+                        @click.native="deleteCountCode(scope.row)"
+                    >减一
+                    </el-button
+                    >
+                </template>
+            </el-table-column>
         </el-table>
 
         <el-pagination
@@ -37,7 +55,7 @@
 
 <script>
 
-import {getCountCodesList} from "@/api/inventory/invCountCodes";
+import {getCountCodesList, deleteCode} from "@/api/inventory/invCountCodes";
 
 export default {
     name: "codeQuery",
@@ -46,6 +64,10 @@ export default {
             type: Object,
             required: true,
         },
+        getCountOrderDetail: {
+            type: Function,
+            required: true
+        }
     },
     data() {
         return {
@@ -111,9 +133,28 @@ export default {
                 this.total = 0;
             })
         },
-
-        intentBack() {
-            this.$router.go(-1);
+        deleteCountCode(row) {
+            this.$confirm('是否删除此条码?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let params = {
+                    orderIdFk: row.orderIdFk,
+                    productId: row.productId,
+                    code: row.code
+                };
+                deleteCode(params).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("删除成功！");
+                        this.getCodeList();
+                        this.getCountOrderDetail();
+                    } else {
+                        this.$message.error(res.data.message);
+                    }
+                })
+            }).catch(() => {
+            });
         },
     },
     created() {