From 5924599d1e4897d0773176785f6866de5716dd88 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Wed, 21 Aug 2024 20:24:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=83=E7=A2=BC=E5=95=8F=E9=A1=8C=E8=99=95?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/collectPoint/gatherOrderType.vue    | 44 ++++++++-----------
 src/views/collect/DealOrder.vue               |  4 ++
 src/views/collect/IoCreateOrder.vue           |  1 -
 .../collect/selectCollectOrderDialog.vue      |  1 -
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 8fee7fb5..4c3b3a52 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column label="来源系统" prop="fromType"></el-table-column>
         <el-table-column label="来源单据类型" prop="fromDocumentType"></el-table-column>
-        <el-table-column label="来源接口地址" prop="fromInterAddress"></el-table-column>
+        <el-table-column label="来源单据编号" prop="fromInterAddress"></el-table-column>
         <el-table-column label="排序" prop="sortNumber" width="50"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作" fixed="right" width="100">
@@ -97,8 +97,6 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="el-row">
             <el-col :span="12" class="el-col">
               <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">
                 <el-select v-model="formData.mainAction" style="width: 80%" placeholder="请选择出入库类型" clearable>
@@ -107,15 +105,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" class="el-col">
-              <el-form-item label="是否内单据:" prop="innerOrder" class="query-form-item">
-                <el-select v-model="formData.innerOrder" style="width: 80%" placeholder="请选择" clearable>
-                  <el-option label="否" :value="0"></el-option>
-                  <el-option label="是" :value="1"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--            <el-col :span="12" class="el-col">-->
+<!--              <el-form-item label="是否内部单据:" prop="innerOrder" class="query-form-item">-->
+<!--                <el-select v-model="formData.innerOrder" style="width: 80%" placeholder="请选择" clearable>-->
+<!--                  <el-option label="否" :value="0"></el-option>-->
+<!--                  <el-option label="是" :value="1"></el-option>-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           <!--<el-row :gutter="24" class="el-row">-->
           <!--  <el-col :span="12" class="el-col">-->
           <!--    <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">-->
@@ -134,7 +131,6 @@
           <!--    </el-form-item>-->
           <!--  </el-col>-->
           <!--</el-row>-->
-          <el-row :gutter="24" class="el-row">
             <el-col :span="12" class="el-col">
               <el-form-item label="来源系统:" prop="name" class="query-form-item">
                 <el-input
@@ -154,17 +150,15 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="24" class="el-row">
-            <el-col :span="12" class="el-col">
-              <el-form-item label="来源接口地址:" prop="fromInterAddress" class="query-form-item">
-                <el-input
-                  placeholder="请输入来源接口地址"
-                  v-model="formData.fromInterAddress" style="width: 80%"
-                  auto-complete="off"
-                ></el-input>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="12" class="el-col">-->
+<!--              <el-form-item label="来源接口地址:" prop="fromInterAddress" class="query-form-item">-->
+<!--                <el-input-->
+<!--                  placeholder="请输入来源接口地址"-->
+<!--                  v-model="formData.fromInterAddress" style="width: 80%"-->
+<!--                  auto-complete="off"-->
+<!--                ></el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12" class="el-col">
               <el-form-item label="排序:" prop="sortNumber" class="query-form-item">
                 <el-input-number
@@ -177,8 +171,6 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-          </el-row>
-            <el-row :gutter="24" class="el-row">
             <el-col :span="22" class="el-col">
               <el-form-item label="备注:" prop="remark" class="query-form-item">
                 <el-input
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index b0a56185..6963d2f9 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -538,6 +538,8 @@ export default {
           this.loading = false
           if (res.code == 20000) {
             this.formData = {tagStatus: -1};
+            this.curRow =null
+            this.refreshCodesPanel(this)
           }
         }).catch(() => {
           this.loading = false
@@ -556,6 +558,8 @@ export default {
           this.loading = false
           if (res.code == 20000) {
             this.formData = {tagStatus: -1};
+            this.curRow =null
+            this.refreshCodesPanel(this)
           }
         }).catch(() => {
           this.loading = false
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 56a5a1e9..afc3752c 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -945,7 +945,6 @@ export default {
       }
       this.originCode = "";
       this.sictomText = "";
-      this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
       this.codeFormData.batchNo = "";
       this.codeFormData.produceDate = "";
       this.codeFormData.expireDate = "";
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index e61958eb..d208f9c5 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -332,7 +332,6 @@ export default {
       this.filterQuery.workPlaceCode = this.workPlaceCode
       console.log(this.filterQuery.workPlaceCode)
       console.log(this.workPlaceCode)
-      debugger
       orderPage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []