From c186997015587fd2bae39ed07d87e882ba20c600 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 17 Jan 2025 14:14:04 +0800
Subject: [PATCH] =?UTF-8?q?1/17=20=E4=B8=8A=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=88=A0=E9=99=A41.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/IoCreateOrder.vue       | 31 ++++++----
 src/views/collect/newCreateCodeDetail.vue | 75 +++++++++++++++++++++--
 2 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 0d8ca165..abb6adb1 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -250,18 +250,18 @@
     <!--      @getCount="getCount"-->
     <!--    ></codeDetailPanel>-->
     <!--  </el-tab-pane>-->
-      <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">
-        <codesPanel
-          @getCodeArray="handleCodeArray"
-          :idQuery="orderFormData"
-          :refreshPanel="refreshCodesPanel"
-          v-if="isCodeAlive"
-          :viewType="viewType"
-          :selectRlTitle="selectRlTitle"
-          :editTitle="editTitle"
-          :selectUnitTitle="selectUnitTitle"
-        ></codesPanel>
-      </el-tab-pane>
+    <!--  <el-tab-pane label="扫码明细" v-if="viewCodeDetailVisible">-->
+    <!--    <codesPanel-->
+    <!--      @getCodeArray="handleCodeArray"-->
+    <!--      :idQuery="orderFormData"-->
+    <!--      :refreshPanel="refreshCodesPanel"-->
+    <!--      v-if="isCodeAlive"-->
+    <!--      :viewType="viewType"-->
+    <!--      :selectRlTitle="selectRlTitle"-->
+    <!--      :editTitle="editTitle"-->
+    <!--      :selectUnitTitle="selectUnitTitle"-->
+    <!--    ></codesPanel>-->
+    <!--  </el-tab-pane>-->
     <!--</el-tabs>-->
 
     <el-dialog
@@ -1324,7 +1324,12 @@ export default {
       this.orderStatus = true
     },
     getCount(count){
-      this.scanReCount = count
+      if (count == 0){
+        this.scanReCount = 0
+      }else{
+        this.scanReCount = count
+      }
+
     },
 
     refreshOrder(orderQuery) {
diff --git a/src/views/collect/newCreateCodeDetail.vue b/src/views/collect/newCreateCodeDetail.vue
index 879bd189..e45371a6 100644
--- a/src/views/collect/newCreateCodeDetail.vue
+++ b/src/views/collect/newCreateCodeDetail.vue
@@ -41,20 +41,53 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="操作" width="100" fixed="right">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="deleteCode(scope.$index, scope.row)"
+                >减一
+                </el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="editCode(scope.row)"
+                >编辑
+                </el-button
+                >
+              </template>
+            </el-table-column>
           </el-table>
 
         </div>
 
       </el-col>
     </el-row>
+
+    <el-dialog
+      title="编辑条码"
+      :visible.sync="editCodeVisible"
+      append-to-body width="70%"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="editCodeVisible"
+    >
+      <editCodeDialog
+        editType="2"
+        :closeCodeDialog="closeCodeDialog"
+        :codeDetail="codeDetail">
+      </editCodeDialog>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {convertDate} from "@/utils/date";
 import { getCheckDetailCodes, getDetailCodes, updateBizProduct, updateCodeProduct } from '@/api/inout/orderDetailCode'
-import { errorCodeList } from '@/api/inout/order'
-
+import { deleteCodesTempById, errorCodeList } from '@/api/inout/order'
+import editCodeDialog from "@/views/inout/DialogEditCode";
 
 export default {
   name: "newCreateCodeDetail",
@@ -77,6 +110,7 @@ export default {
     },
 
   },
+  components: {editCodeDialog},
   data() {
     return {
       convertDateFun: convertDate,
@@ -94,7 +128,7 @@ export default {
       orderDetail:null,
       codeArray:[],
       codeCount: 0,
-
+      codeDetail: null,
     }
   },
 
@@ -127,6 +161,8 @@ export default {
               count += item.reCount;
             });
             this.$emit('getCount', count);
+          }else {
+            this.$emit('getCount', count);
           }
         })
         .catch(() => {
@@ -186,10 +222,37 @@ export default {
             this.loading = false;
 
           });
-
-
     },
-
+    deleteCode(index, row) {
+      this.$confirm("是否确定移除一个条码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let tQuery = {
+          id: row.id
+        }
+        deleteCodesTempById(tQuery)
+          .then((response) => {
+            if (response.code === 20000) {
+              this.getOrderDetails();
+              this.getCodeList()
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+      }).catch(() => {
+      });
+    },
+    editCode(row){
+      this.codeDetail = row;
+      this.editCodeVisible = true;
+    },
+    closeCodeDialog() {
+      this.editCodeVisible = false;
+      this.getOrderDetails();
+      this.getCodeList()
+    },
   },
   created() {
     if (this.idQuery.billNo != null)