去掉单据类型与第三方单据类型关联，更改为在第三方接口设置关联

src/views/basic/busType/bussinessTypeModify.vue

@@ -111,30 +111,30 @@
         </el-col>
       </el-row>
 
-      <el-row type="flex">
+<!--      <el-row type="flex">-->
-        <el-col :span="11">
+      <!--        <el-col :span="11">-->
-          <el-form-item label="第三方单据类型" prop="prefix">
+      <!--          <el-form-item label="第三方单据类型" prop="prefix">-->
-            <el-select v-model="inputQuery.originAction"
+      <!--            <el-select v-model="inputQuery.originAction"-->
-                       size="small"
+      <!--                       size="small"-->
-                       clearable
+      <!--                       clearable-->
-                       style="width: 90%"
+      <!--                       style="width: 90%"-->
-                       filterable
+      <!--                       filterable-->
-                       placeholder="请选择第三方系统单据类型"
+      <!--                       placeholder="请选择第三方系统单据类型"-->
-            >
+      <!--            >-->
-              <el-option
+      <!--              <el-option-->
-                v-for="item in originTypes"
+      <!--                v-for="item in originTypes"-->
-                :key="item.id"
+      <!--                :key="item.id"-->
-                :label="item.name"
+      <!--                :label="item.name"-->
-                :value="item.action">
+      <!--                :value="item.action">-->
-                <span style="float: left;font-size: 13px">{{ item.name }}</span>
+      <!--                <span style="float: left;font-size: 13px">{{ item.name }}</span>-->
-                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
+      <!--                <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
-                    item.thirdSysName
+      <!--                    item.thirdSysName-->
-                  }}</span>
+      <!--                  }}</span>-->
-              </el-option>
+      <!--              </el-option>-->
-            </el-select>
+      <!--            </el-select>-->
-          </el-form-item>
+      <!--          </el-form-item>-->
-        </el-col>
+      <!--        </el-col>-->
-      </el-row>
+      <!--      </el-row>-->
 
       <el-row type="flex">
         <el-col :span="23" type="flex">

src/views/inout/DialogSelectThrOrder.vue

@@ -16,14 +16,20 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item class="query-form-item" label="往来单位:">
+              <el-form-item label="外部系统:">
-                <el-input
+                <el-select v-model="listQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
-                    v-model="listQuery.corpName"
+                           clearable="true" @change="thirdSysChange">
-                    placeholder="往来单位"
+                  <el-option
-                    clearable
+                    v-for="item in thirdSys"
-                ></el-input>
+                    :key="item.thirdId"
+                    :label="item.thirdName"
+                    :value="item.thirdId">
+                    <span style="float: left;font-size: 13px">{{ item.thirdName }}</span>
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
+
             <el-col :span="6">
               <el-form-item class="query-form-item" label="单据类型:">
                 <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" filterable clearable="true">
@@ -142,6 +148,7 @@ import store from "../../store";
 import {getOriginBusType} from "@/api/basic/busOriginType";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import selectInvDialog from "./DialogSelectInv";
+import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
 
 export default {
   name: "closeDialog",
@@ -348,6 +355,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        thirdSys: this.listQuery.thirdSysFk,
       };
       getOriginBusType(query)
         .then((response) => {
@@ -374,15 +382,41 @@ export default {
       this.storageVisible = false;
     },
 
+    thirdSysChange() {
+      this.listQuery.billAction = "";
+      this.getBusType();
+    },
+
     closeSubmitDialog() {
       this.storageVisible = false;
       this.combine();
     },
+
+
+    getBasicThirdSys() {
+      let query = {
+        enabled: true,
+      };
+      getBasicThirdSys(query)
+        .then((response) => {
+          this.thirdSys = response.data.list || [];
+          this.listQuery.thirdSysFk = this.thirdSys[0].thirdId;
+          this.uploadData.thirdSys = this.listQuery.thirdSysFk;
+          this.selectSysParam();
+          this.getBusType();
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+        });
+    },
+
+
   },
   created() {
-    this.getBusType();
+
+    this.getBasicThirdSys();
     this.getStorage();
-    this.getList();
   },
   components: {selectInvDialog}
 

src/views/thirdSys/order/thrOrder.vue

@@ -9,12 +9,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="往来单位:">
+            <el-form-item label="外部系统:">
-              <el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
+              <el-select v-model="filterQuery.thirdSysFk" style="width: 90%" placeholder="请选择第三方系统"
+                         clearable="true" @change="thirdSysChange">
+                <el-option
+                  v-for="item in thirdSys"
+                  :key="item.thirdId"
+                  :label="item.thirdName"
+                  :value="item.thirdId">
+                  <span style="float: left;font-size: 13px">{{ item.thirdName }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="外部系统:">
+            <el-form-item label="单据类型:">
               <el-select v-model="filterQuery.billAction" style="width: 90%" placeholder="请选择第三方系统单据类型"
                          clearable="true">
                 <el-option
@@ -30,12 +39,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="单据日期:">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
-                style="width: 90%"
                 type="daterange"
                 format="yyyy 年 MM 月 dd 日"
                 value-format="yyyy-MM-dd"
@@ -316,6 +328,8 @@ export default {
     thirdSysChange() {
       this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
       this.getThirdSysDetail();
+      this.filterQuery.billAction = "";
+      this.getBusType();
     },
     getThirdSysDetail() {
       let query = {
@@ -363,6 +377,7 @@ export default {
     getBusType() {
       let query = {
         enabled: true,
+        thirdSys: this.filterQuery.thirdSysFk,
       };
       getBussinessType(query)
         .then((response) => {