From 132c6f0a69619ca0d25a0c007956dd44952f3ec7 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 18 May 2022 15:32:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BB=91=E5=AE=9A=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E7=B3=BB=E7=BB=9F=E7=B1=BB=E5=9E=8B=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicThirdSys.vue          | 84 +++++++++++++++++++---
 src/views/business/stockOrderDelSearch.vue |  2 -
 2 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue
index 0fb4fc7..9fdd8cb 100644
--- a/src/views/basic/BasicThirdSys.vue
+++ b/src/views/basic/BasicThirdSys.vue
@@ -155,21 +155,19 @@
             <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%">
                 <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
                 <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
-                <el-table-column label="单据类型代码" prop="code">
-                </el-table-column>
-
+                <el-table-column label="单据类型代码" prop="code"></el-table-column>
+                <el-table-column v-if="addBussinessTypeBtnVisible" label="第三方单据类型" prop="thirdBuyName"></el-table-column>
+                <el-table-column v-if="addBussinessTypeBtnVisible" label="第三方单据类型" prop="thirdBuyCode"></el-table-column>
                 <el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip>
-
                     <template slot-scope="scope">
                         <el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.url"
                                   placeholder="请输入"></el-input>
                     </template>
-
                 </el-table-column>
                 <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
 
 
-                <el-table-column label="操作" width="150" prop="price" fixed="right">
+                <el-table-column label="操作" width="200" prop="price" fixed="right">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
@@ -177,6 +175,13 @@
                             @click="handleEdit(scope.$index, scope.row)"
                         >编辑
                         </el-button>
+                        <el-button
+                            v-if="addBussinessTypeBtnVisible"
+                            type="text"
+                            size="small"
+                            @click="bindThirdBuyType(scope.$index, scope.row)"
+                        >绑定
+                        </el-button>
                         <el-button
                             type="text"
                             size="small"
@@ -205,6 +210,7 @@
             :close-on-click-modal="false"
             :close-on-press-escape="false"
             :visible.sync="bussinessTypeFormVisible"
+            style="width: 80%"
         >
             <el-table v-loading="loading" :data="bussinessTypeList" ref="typeList"
                       @selection-change="handleBussinessTypeSelectionChange"
@@ -233,6 +239,33 @@
         </el-dialog>
 
 
+        <!--绑定第三方单据类型弹窗-->
+        <el-dialog
+            title="第三方系统单据类型"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="bindBuyTypeFormVisible"
+            style="width: 80%"
+        >
+            <el-table v-loading="loading" :data="thirdBuyList" ref="typeList"
+                      @selection-change="handleBussinessTypeSelectionChange"
+                      style="width: 100%">
+                <el-table-column label="单据类型编码" prop="code" fixed></el-table-column>
+                <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
+
+                <el-table-column label="操作" width="200" prop="price" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click="bindThirdBuyTypeData(scope.$index, scope.row)"
+                        >绑定
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-dialog>
+
     </div>
 
 
@@ -286,7 +319,10 @@ export default {
             addBussinessTypeBtnVisible: false,
             selectBussinessTypeList: [],
             thirdSysFk: null,
-            submitOrderRow: null
+            submitOrderRow: null,
+            thirdBuyList: [], //第三方系统单据类型,
+            bindBuyTypeFormVisible: false,
+            submitTypeRowId: null //业务单据提交绑定修改行的ID
         };
     },
 
@@ -381,8 +417,6 @@ export default {
                     this.busTypeList = [];
                 });
         },
-
-
         onModifySubmit() {
             updateBasicThirdSys(this.inputQuery)
                 .then((response) => {
@@ -419,8 +453,6 @@ export default {
                     this.cancelDialog();
                 });
         },
-
-
         handleModifyClick(row) {
             this.modifyDialogVisible = true;
             this.inputQuery = row;
@@ -482,6 +514,36 @@ export default {
             }).catch((error) => {
                 this.$message.error(error.message);
             })
+        },
+        bindThirdBuyType(index,row) {
+            this.bindBuyTypeFormVisible = true;
+            let query = {
+                thirdSysFk: row.thirdSysFk,
+                type: 1,
+            }
+            this.submitTypeRowId = row.id;
+            //查询第三方系统的单据类型
+            filterBusTypeDetail(query).then((res)=> {
+                this.thirdBuyList = res.data.list;
+            });
+        },
+        bindThirdBuyTypeData(index, row){
+            let params = {
+                "id": this.submitTypeRowId,
+                "thirdBuyName": row.name,
+                "thirdBuyCode": row.code
+            };
+            saveBusTypeDetail(params).then((res) => {
+                if (res.code == 20000) {
+                    this.$message.success("绑定成功");
+                    this.bindBuyTypeFormVisible = false;
+                    this.handleBustypeChange(this.submitOrderRow);
+                } else {
+                    this.$message.error("绑定失败");
+                }
+            }).catch((error) => {
+                this.$message.error(error.message);
+            })
         }
     },
     components: {
diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue
index fb3cc67..bcb435e 100644
--- a/src/views/business/stockOrderDelSearch.vue
+++ b/src/views/business/stockOrderDelSearch.vue
@@ -492,7 +492,6 @@ export default {
     },
     handleEdit(index, row) {
       this.currentCheckIndex = index;
-      console.log(this.currentCheckIndex)
     },
     handleSave(index, row) {
       this.currentCheckIndex = -1;
@@ -872,7 +871,6 @@ export default {
       });
     },
     submitOrder(row){
-        console.log(row.exportStatus)
         if (row.exportStatus == 1) {
             this.$confirm("单据已经提交，是否重复提交？","提示",{
                 confirmButtonText: "确定",