所有财务

修改业务类型 多选的绑定值改为字符串
修改费用名称 多选的绑定值改为字符串
去掉检索 保存 确认 撤销等数据转换的方法

src/components/dicSelect/main.vue

@@ -326,7 +326,7 @@ export default {
                             this.value = val.split(',')
                         }
                     } else {
-                        this.value = []
+                        this.value = null
                     }
                 }
             },
@@ -349,7 +349,7 @@ export default {
                 if (this.value && this.value.length) {
                     this.$emit('selectedValue', this.value.join(','))
                 } else {
-                    this.$emit('selectedValue', [])
+                    this.$emit('selectedValue',null)
                 }
             } else {
                 this.$emit('selectedValue', this.value)

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -150,6 +150,7 @@
                     :multiple="true"
                     :collapseTags="true"
                     :disabled="editSave"
+                    dataType="string"
                   ></dic-select>
                 </el-form-item>
               </el-col>
@@ -326,17 +327,20 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="业务类型" prop="businessTypes">
-                  <search-query
-                    :datalist="businessTypesData"
-                    :selectValue="form.businessTypes"
-                    :clearable="true"
-                    :disabled="editSave || tableData.length > 0"
-                    :buttonIf="false"
+                  <dic-select
+                    v-model="form.businessTypes"
+                    placeholder="业务类型"
+                    key="id"
+                    label="label"
+                    keyValue="value"
+                    :activateCreated="false"
+                    :mockData="businessTypesData"
+                    :filterable="true"
                     :multiple="true"
-                    placeholder="请选择业务类型"
-                    @corpChange="corpChange($event, 'businessTypes')"
-                  >
-                  </search-query>
+                    :collapseTags="true"
+                    :disabled="editSave"
+                    dataType="string"
+                  ></dic-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -408,7 +412,9 @@
             >
               <template slot="menuLeft">
                 <div>
-                  <el-button size="small" type="success" :disabled="editSave||generateStatus" :loading="saveLoading" @click="SelectedRows">确认选定行 </el-button>
+                  <el-button size="small" type="success" :disabled="editSave || generateStatus" :loading="saveLoading" @click="SelectedRows"
+                    >确认选定行
+                  </el-button>
                   <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
                     <span style="color: #67C23A;margin-right: 10px;"> CNY:￥{{ Number(amountSubSum).toFixed(2) }}元 </span>
                     <span style="color: #E6A23C;"> USD:${{ Number(amountSubUsdSum).toFixed(2) }}元 </span>
@@ -1042,8 +1048,6 @@ export default {
         this.form.billNoFormat = "STL";
         this.form.businessTypeCode = "STL";
         this.form.businessType = "STL"; // 结算单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : this.form.businessTypes; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;
@@ -1181,7 +1185,7 @@ export default {
     },
     // 详情接口
     finstlbillsDetailfun(id, type) {
-       this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       finstlbillsDetail(id)
         .then(res => {
@@ -1197,8 +1201,6 @@ export default {
           } else {
             this.editPower = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finStlBillsItemsList.map(item => {
             item.stlTtlAmountNet = Number(item.stlTtlAmount) - Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate));
             item.currentStlAmountNet =
@@ -1244,7 +1246,7 @@ export default {
     },
     // 结算按钮
     generateFinStlBillsfun(id, dc, type) {
-       this.activeName="2"
+      this.activeName = "2";
       let typeName = null;
       this.generateStatus = true;
       this.pageLoading = true;
@@ -1265,8 +1267,6 @@ export default {
       })
         .then(res => {
           this.form = res.data.data;
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finStlBillsItemsList.map(item => {
             item.stlTtlAmountNet = Number(item.stlTtlAmount) - Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate));
             item.currentStlAmountNet =
@@ -1346,8 +1346,8 @@ export default {
       obj.mblno = this.form.mblno; // MB/L NO
       obj.hblno = this.form.hblno; // HB/L NO
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.receivableAdvance = this.form.receivableAdvance; // 预收帐款
       obj.voyageNo = this.form.voyageNo; // 航次
@@ -1376,8 +1376,8 @@ export default {
       obj.mblno = this.form.mblno; // MB/L NO
       obj.hblno = this.form.hblno; // HB/L NO
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.receivableAdvance = this.form.receivableAdvance; // 预收帐款
       obj.voyageNo = this.form.voyageNo; // 航次
@@ -1556,8 +1556,6 @@ export default {
     // 结算确认
     finstlbillsConfirmSettlementfun() {
       this.pageLoading = true;
-      this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(",") : this.form.businessTypes; // 业务类型
-      // this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
       this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;
@@ -1584,8 +1582,6 @@ export default {
         type: "warning"
       }).then(() => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;
@@ -1608,8 +1604,6 @@ export default {
         type: "warning"
       }).then(() => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;

src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -141,6 +141,7 @@
                     :multiple="true"
                     :collapseTags="true"
                     :disabled="editSave"
+                    dataType="string"
                   ></dic-select>
                 </el-form-item>
               </el-col>
@@ -315,17 +316,20 @@
               <el-row>
                 <el-col :span="5">
                   <el-form-item label="业务类型" prop="businessTypes">
-                    <search-query
-                      :datalist="businessTypesData"
-                      :selectValue="form.businessTypes"
-                      :clearable="true"
-                      :disabled="editSave"
-                      :buttonIf="false"
+                    <dic-select
+                      v-model="form.businessTypes"
+                      placeholder="业务类型"
+                      key="id"
+                      label="label"
+                      keyValue="value"
+                      :activateCreated="false"
+                      :mockData="businessTypesData"
+                      :filterable="true"
                       :multiple="true"
-                      placeholder="请选择业务类型"
-                      @corpChange="corpChange($event, 'businessTypes')"
-                    >
-                    </search-query>
+                      :collapseTags="true"
+                      :disabled="editSave"
+                      dataType="string"
+                    ></dic-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5">
@@ -1034,8 +1038,6 @@ export default {
         this.form.billNoFormat = "FFSQ";
         this.form.businessTypeCode = "FFSQ";
         this.form.businessType = "FFSQ"; // 结算单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.saveLoading = true; // 打开按钮动画
         if (this.form.id) {
           if (type == "选定行") {
@@ -1112,7 +1114,7 @@ export default {
     },
     // 详情接口
     finstlbillsDetailfun(id, type) {
-       this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       finstlbillsDetail(id)
         .then(res => {
@@ -1128,8 +1130,6 @@ export default {
           } else {
             this.editPower = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finStlBillsItemsList.map(item => {
             item.stlTtlAmountNet = Number(item.stlTtlAmount) - Number(item.stlTtlAmount) * (Number(item.taxRate) + Number(item.surchargeRate));
             item.currentStlAmountNet =
@@ -1216,8 +1216,8 @@ export default {
       obj.mblno = this.form.mblno; // MB/L NO
       obj.hblno = this.form.hblno; // HB/L NO
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.receivableAdvance = this.form.receivableAdvance; // 预收帐款
       obj.voyageNo = this.form.voyageNo; // 航次
@@ -1240,8 +1240,8 @@ export default {
       obj.mblno = this.form.mblno; // MB/L NO
       obj.hblno = this.form.hblno; // HB/L NO
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.receivableAdvance = this.form.receivableAdvance; // 预收帐款
       obj.voyageNo = this.form.voyageNo; // 航次
@@ -1396,7 +1396,6 @@ export default {
     },
     // 结算确认
     settlementApprovefun() {
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
       this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.estimatedTime = this.form.estimatedTime ? this.form.estimatedTime.slice(0, 10) + " 00:00:00" : null;
@@ -1419,16 +1418,14 @@ export default {
     // 结算撤销
     revokeSettlementApprovefun() {
       if (this.roleName.includes("admin")) {
-        if(this.form.billStatus==1){
-          return  this.$message.error("已结算，不允许撤销审核");
+        if (this.form.billStatus == 1) {
+          return this.$message.error("已结算，不允许撤销审核");
         }
         this.$confirm("确定进行撤销申请操作?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
           this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
           this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
           this.form.estimatedTime = this.form.estimatedTime ? this.form.estimatedTime.slice(0, 10) + " 00:00:00" : null;

src/views/iosBasicData/dcOffset/finstlbillsDetails.vue

@@ -162,6 +162,7 @@
                     :multiple="true"
                     :collapseTags="true"
                     :disabled="editSave"
+                    dataType="string"
                   ></dic-select>
                 </el-form-item>
               </el-col>
@@ -396,17 +397,20 @@
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="业务类型" prop="businessTypes">
-                    <search-query
-                      :datalist="businessTypesData"
-                      :selectValue="form.businessTypes"
-                      :clearable="true"
-                      :disabled="editSave"
-                      :buttonIf="false"
-                      :multiple="true"
-                      placeholder="请选择业务类型"
-                      @corpChange="corpChange($event, 'businessTypes')"
-                    >
-                    </search-query>
+                     <dic-select
+                        v-model="form.businessTypes"
+                        placeholder="业务类型"
+                        key="id"
+                        label="label"
+                        keyValue="value"
+                        :activateCreated="false"
+                        :mockData="businessTypesData"
+                        :filterable="true"
+                        :multiple="true"
+                        :collapseTags="true"
+                        :disabled="editSave"
+                        dataType="string"
+                      ></dic-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
@@ -1068,7 +1072,6 @@ export default {
       this.form.billNoFormat = "DCDD";
       this.form.businessTypeCode = "DCDD";
       this.form.businessType = "DCDD"; // 对抵单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1076,7 +1079,6 @@ export default {
       this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null;
       this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null;
       this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       let addList = this.addData.map((item, index) => {
         item.lineNo = Number(index) + 1;
         item.pType = item.businessType;
@@ -1209,8 +1211,6 @@ export default {
           } else {
             this.submitType = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : []; // 业务类型转换成数组显示
           this.tableData = this.form.finStlBillsItemsList.map(item => {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
@@ -1297,7 +1297,7 @@ export default {
       obj.hblno = this.form.hblno; // HB/L NO
       obj.isChecked = this.form.isChecked; // 是否对抵（0 未对抵 1 已对抵）
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
+      obj.businessType = this.form.businessTypes; // 业务类型
       obj.invoiceStatus = this.form.isInvoice; // 发票状态 0 = 未开 9=已开 2 待开 3 不开
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.invoiceNo = this.form.invoiceNo; // 发票号
@@ -1331,8 +1331,8 @@ export default {
       obj.mblno = this.form.mblno; // MB/L NO
       obj.hblno = this.form.hblno; // HB/L NO
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.receivableAdvance = this.form.receivableAdvance; // 预收帐款
       obj.voyageNo = this.form.voyageNo; // 航次
@@ -1458,8 +1458,6 @@ export default {
       this.form.billNoFormat = "DCDD";
       this.form.businessTypeCode = "DCDD";
       this.form.businessType = "DCDD"; //对抵单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1488,8 +1486,6 @@ export default {
       this.form.billNoFormat = "DCDD";
       this.form.businessTypeCode = "DCDD";
       this.form.businessType = "DCDD"; // 对抵单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1513,8 +1509,6 @@ export default {
     finstlbillsConfirmReconciliationfun() {
       this.pageLoading = true;
       this.saveLoading = true;
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1545,8 +1539,6 @@ export default {
         this.pageLoading = true;
         let obj = {
           ...this.form,
-          businessTypes: this.form.businessTypes ? this.form.businessTypes.join(",") : "", // 业务类型
-          feeCnName: this.form.feeCnName ? this.form.feeCnName.join(",") : "",
           accountDateFrom: this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null, // 财务开始日期
           accountDateTo: this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null, // 财务开始日期
           auditDateFrom: this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null,
@@ -1627,8 +1619,6 @@ export default {
         this.form.billNoFormat = "DCDD";
         this.form.businessTypeCode = "DCDD";
         this.form.businessType = "DCDD"; //对抵单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1667,8 +1657,6 @@ export default {
         this.form.billNoFormat = "DCDD";
         this.form.businessTypeCode = "DCDD";
         this.form.businessType = "DCDD"; // 对抵单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1770,8 +1758,6 @@ export default {
       this.form.billNoFormat = "DCDD";
       this.form.businessTypeCode = "DCDD";
       this.form.businessType = "DCDD"; //对抵单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1796,8 +1782,6 @@ export default {
       this.form.billNoFormat = "DCDD";
       this.form.businessTypeCode = "DCDD";
       this.form.businessType = "DCDD"; // 对抵单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -558,18 +558,20 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="业务类型" prop="businessTypes">
-                      <search-query
-                        :datalist="businessTypesData"
-                        :selectValue="form.businessTypes"
-                        :clearable="true"
-                        :disabled="editSave"
-                        :buttonIf="false"
+                      <dic-select
+                        v-model="form.businessTypes"
+                        placeholder="业务类型"
+                        key="id"
+                        label="label"
+                        keyValue="value"
+                        :activateCreated="false"
+                        :mockData="businessTypesData"
+                        :filterable="true"
                         :multiple="true"
                         :collapseTags="true"
-                        placeholder="请输入业务类型"
-                        @corpChange="corpChange($event, 'businessTypes')"
-                      >
-                      </search-query>
+                        :disabled="editSave"
+                        dataType="string"
+                      ></dic-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -618,6 +620,7 @@
                         :multiple="true"
                         :collapseTags="true"
                         :disabled="editSave"
+                        dataType="string"
                       ></dic-select>
                     </el-form-item>
                   </el-col>
@@ -660,7 +663,6 @@
                 :editSave="editSave"
                 :form="form"
                 @handleSelectionChange="addSelectionChange"
-                @deletefun="detailsdeletionfun"
               >
                 <template slot="menuLeft">
                   <div style="display: flex;">
@@ -1027,8 +1029,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1070,8 +1070,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1193,9 +1191,9 @@ export default {
         if (id) {
           fininvoicesitemsRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.tableData.splice(index, 1);
           });
         }
-        this.tableData.splice(index, 1);
       });
     },
     // 开票一键删除
@@ -1237,9 +1235,9 @@ export default {
         if (id) {
           fininvoiceitemdetailRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.InvoicingList.splice(index, 1);
           });
         }
-        this.InvoicingList.splice(index, 1);
       });
     },
     // 下拉框的回调
@@ -1368,8 +1366,6 @@ export default {
         this.form.type = "进项";
         this.form.billNoFormat = "JXFP";
         this.form.businessTypeCode = "JXFP";
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         //开票日期
         if (this.form.invoiceDate) {
           this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1465,8 +1461,8 @@ export default {
       obj.hblno = this.form.hblno; // 分单编号
       obj.bookingNo = this.form.bookingNo; // 订舱号(BOOK NO)
       obj.curCode = this.form.curCode; // 币种
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.dc = this.form.dc;
       // 判断是否有对账单号
       if (this.form.checkNo) {
@@ -1597,7 +1593,7 @@ export default {
     },
     // 详情接口
     fininvoicesDetailfun(id, type) {
-      this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       fininvoicesDetail(id)
         .then(res => {
@@ -1613,8 +1609,6 @@ export default {
           } else {
             this.editPower = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finInvoicesItemsList.map(item => {
             // if (item.currentCurCode == 'CNY') {
             //     item.currentAmountCNY = item.currentAmount
@@ -1648,8 +1642,6 @@ export default {
       fininvoicesGenerateFinInvoices({ billId })
         .then(res => {
           this.form = res.data.data;
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           // 判断是否是数组
           if (Array.isArray(this.form.finInvoicesItemsList)) {
             this.tableData = this.form.finInvoicesItemsList.map(item => {
@@ -1678,8 +1670,6 @@ export default {
     // 确认申请
     fininvoicesConfirmFinInvoicesfun() {
       this.pageLoading = true;
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       fininvoicesConfirmFinInvoices(this.form)
         .then(res => {
           this.pageLoading = false;
@@ -1699,8 +1689,6 @@ export default {
         type: "warning"
       }).then(res => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         fininvoicesRevokeFinInvoices(this.form)
           .then(res => {
             this.$message.success("操作成功");

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -549,18 +549,20 @@
                 </el-col>
                 <el-col :span="16">
                   <el-form-item label="业务类型" prop="businessTypes">
-                    <search-query
-                      :datalist="businessTypesData"
-                      :selectValue="form.businessTypes"
-                      :clearable="true"
-                      :disabled="editSave"
-                      :buttonIf="false"
+                    <dic-select
+                      v-model="form.businessTypes"
+                      placeholder="业务类型"
+                      key="id"
+                      label="label"
+                      keyValue="value"
+                      :activateCreated="false"
+                      :mockData="businessTypesData"
+                      :filterable="true"
                       :multiple="true"
                       :collapseTags="true"
-                      placeholder="请输入业务类型"
-                      @corpChange="corpChange($event, 'businessTypes')"
-                    >
-                    </search-query>
+                      :disabled="editSave"
+                      dataType="string"
+                    ></dic-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -613,6 +615,7 @@
                       :multiple="true"
                       :collapseTags="true"
                       :disabled="editSave"
+                      dataType="string"
                     ></dic-select>
                   </el-form-item>
                 </el-col>
@@ -654,7 +657,6 @@
                 :editSave="editSave"
                 :form="form"
                 @handleSelectionChange="addSelectionChange"
-                @deletefun="detailsdeletionfun"
               >
                 <template slot="menuLeft">
                   <div style="display: flex;">
@@ -1229,8 +1231,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1272,8 +1272,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1395,10 +1393,9 @@ export default {
         if (id) {
           fininvoicesitemsRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.tableData.splice(index, 1);
           });
         }
-        console.log(index, 794);
-        this.tableData.splice(index, 1);
       });
     },
     // 开票一键删除
@@ -1440,9 +1437,9 @@ export default {
         if (id) {
           fininvoiceitemdetailRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.InvoicingList.splice(index, 1);
           });
         }
-        this.InvoicingList.splice(index, 1);
       });
     },
     // 下拉框的回调
@@ -1594,8 +1591,6 @@ export default {
         this.form.type = "申请";
         this.form.billNoFormat = "FPSQ";
         this.form.businessTypeCode = "FPSQ";
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         //开票日期
         if (this.form.invoiceDate) {
           this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1640,8 +1635,6 @@ export default {
         this.saveLoading = true;
         if (type == "提交") {
           fininvoicesSubmit(this.form).then(res => {
-            res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(",") : [];
-            res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(",") : [];
             this.form = res.data.data;
             this.finInvoicesApprovefun();
           });
@@ -1701,8 +1694,8 @@ export default {
       obj.hblno = this.form.hblno; // 分单编号
       obj.bookingNo = this.form.bookingNo; // 订舱号(BOOK NO)
       obj.curCode = this.form.curCode; // 币种
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       finstlbillslistAccBillByCorp(obj).then(res => {
         this.retrievePopupsType = true;
         this.retrievePopupsData = res.data.data;
@@ -1741,8 +1734,8 @@ export default {
       obj.hblno = this.form.hblno; // 分单编号
       obj.bookingNo = this.form.bookingNo; // 订舱号(BOOK NO)
       obj.curCode = this.form.curCode; // 币种
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.dc = this.form.dc;
       // 判断是否有对账单号
       if (this.form.checkNo) {
@@ -1878,7 +1871,7 @@ export default {
     },
     // 详情接口
     fininvoicesDetailfun(id, type) {
-       this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       fininvoicesDetail(id)
         .then(res => {
@@ -1894,8 +1887,6 @@ export default {
           } else {
             this.editPower = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finInvoicesItemsList.map(item => {
             if (item.currentCurCode == "CNY") {
               this.$set(item, "currentAmountCNY", Number(item.currentAmount ? item.currentAmount : 0));
@@ -1924,8 +1915,6 @@ export default {
     // 确认申请
     finInvoicesApprovefun() {
       this.pageLoading = true;
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       finInvoicesApprove(this.form)
         .then(res => {
           this.$message.success("操作成功");
@@ -1944,8 +1933,6 @@ export default {
         type: "warning"
       }).then(res => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         revokeFinInvoicesApprove(this.form)
           .then(res => {
             this.$message.success("操作成功");

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -592,18 +592,20 @@
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="业务类型" prop="businessTypes">
-                      <search-query
-                        :datalist="businessTypesData"
-                        :selectValue="form.businessTypes"
-                        :clearable="true"
-                        :disabled="editSave"
-                        :buttonIf="false"
+                      <dic-select
+                        v-model="form.businessTypes"
+                        placeholder="业务类型"
+                        key="id"
+                        label="label"
+                        keyValue="value"
+                        :activateCreated="false"
+                        :mockData="businessTypesData"
+                        :filterable="true"
                         :multiple="true"
                         :collapseTags="true"
-                        placeholder="请输入业务类型"
-                        @corpChange="corpChange($event, 'businessTypes')"
-                      >
-                      </search-query>
+                        :disabled="editSave"
+                        dataType="string"
+                      ></dic-select>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
@@ -655,6 +657,7 @@
                         :multiple="true"
                         :collapseTags="true"
                         :disabled="editSave"
+                        dataType="string"
                       ></dic-select>
                     </el-form-item>
                   </el-col>
@@ -697,7 +700,6 @@
                 :editSave="editSave"
                 :form="form"
                 @handleSelectionChange="addSelectionChange"
-                @deletefun="detailsdeletionfun"
               >
                 <template slot="menuLeft">
                   <div style="display: flex;">
@@ -1199,8 +1201,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1242,8 +1242,6 @@ export default {
       }
       let obj = this.form;
       obj.finInvoicesItemsList = [];
-      obj.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       //开票日期
       if (this.form.invoiceDate) {
         obj.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1365,9 +1363,9 @@ export default {
         if (id) {
           fininvoicesitemsRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.tableData.splice(index, 1);
           });
         }
-        this.tableData.splice(index, 1);
       });
     },
     // 开票批量删除
@@ -1409,9 +1407,9 @@ export default {
         if (id) {
           fininvoiceitemdetailRemove(id).then(res => {
             this.$message.success("操作成功");
+            this.InvoicingList.splice(index, 1);
           });
         }
-        this.InvoicingList.splice(index, 1);
       });
     },
     // 下拉框的回调
@@ -1512,7 +1510,7 @@ export default {
     },
     // 费用明细表格多选
     handleSelectionChange(list) {
-           this.amountSubSum = 0;
+      this.amountSubSum = 0;
       this.amountDSubSum = 0;
       this.amountCSubSum = 0;
       this.amountSubUsdSum = 0;
@@ -1532,7 +1530,7 @@ export default {
       }
       this.amountSubSum = Number(this.amountDSubSum - this.amountCSubSum);
       this.amountSubUsdSum = Number(this.amountDSubUsdSum - this.amountCSubUsdSum);
-      console.log(111,this.amountSubSum,this.amountSubUsdSum)
+      console.log(111, this.amountSubSum, this.amountSubUsdSum);
       this.handleSelectionData = list;
     },
     // 开票明细表格多选
@@ -1596,8 +1594,6 @@ export default {
         this.form.type = "销项";
         this.form.billNoFormat = "XXFP";
         this.form.businessTypeCode = "XXFP";
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         //开票日期
         if (this.form.invoiceDate) {
           this.form.invoiceDate = this.form.invoiceDate.slice(0, 10) + " 00:00:00";
@@ -1643,8 +1639,6 @@ export default {
         if (type == "开票") {
           fininvoicesSubmit(this.form)
             .then(res => {
-              res.data.data.businessTypes = res.data.data.businessTypes ? res.data.data.businessTypes.split(",") : [];
-              res.data.data.feeCnName = res.data.data.feeCnName ? res.data.data.feeCnName.split(",") : [];
               this.form = res.data.data;
               this.fininvoicesConfirmFinInvoicesfun();
             })
@@ -1720,8 +1714,8 @@ export default {
       obj.hblno = this.form.hblno; // 分单编号
       obj.bookingNo = this.form.bookingNo; // 订舱号(BOOK NO)
       obj.curCode = this.form.curCode; // 币种
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       finstlbillslistAccBillByCorp(obj).then(res => {
         this.retrievePopupsType = true;
         this.retrievePopupsData = res.data.data;
@@ -1760,8 +1754,8 @@ export default {
       obj.hblno = this.form.hblno; // 分单编号
       obj.bookingNo = this.form.bookingNo; // 订舱号(BOOK NO)
       obj.curCode = this.form.curCode; // 币种
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.businessType = this.form.businessTypes; // 业务类型
+      obj.feeCnName = this.form.feeCnName;
       obj.dc = this.form.dc;
       // 判断是否有对账单号
       if (this.form.checkNo) {
@@ -1896,7 +1890,7 @@ export default {
     },
     // 详情接口
     fininvoicesDetailfun(id, type) {
-       this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       fininvoicesDetail(id)
         .then(res => {
@@ -1912,8 +1906,6 @@ export default {
           } else {
             this.editPower = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           this.tableData = this.form.finInvoicesItemsList.map(item => {
             if (item.currentCurCode == "CNY") {
               this.$set(item, "currentAmountCNY", Number(item.currentAmount ? item.currentAmount : 0));
@@ -1941,14 +1933,12 @@ export default {
     },
     // 开票获取数据
     fininvoicesGenerateFinInvoicesfun(billId) {
-      this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       fininvoicesGenerateFinInvoices({ billId })
         .then(res => {
           this.generateStatus = true;
           this.form = res.data.data;
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : [];
           // 判断是否是数组
           if (Array.isArray(this.form.finInvoicesItemsList)) {
             this.tableData = this.form.finInvoicesItemsList.map(item => {
@@ -1978,8 +1968,6 @@ export default {
     // 确认申请
     fininvoicesConfirmFinInvoicesfun() {
       this.pageLoading = true;
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       fininvoicesConfirmFinInvoices(this.form)
         .then(res => {
           this.$message.success("操作成功");
@@ -1997,8 +1985,6 @@ export default {
         type: "warning"
       }).then(res => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : "";
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         fininvoicesRevokeFinInvoices(this.form)
           .then(res => {
             this.$message.success("操作成功");

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -162,6 +162,7 @@
                     :multiple="true"
                     :collapseTags="true"
                     :disabled="editSave"
+                    dataType="string"
                   ></dic-select>
                 </el-form-item>
               </el-col>
@@ -396,17 +397,20 @@
                 </el-col>
                 <el-col :span="5">
                   <el-form-item label="业务类型" prop="businessTypes">
-                    <search-query
-                      :datalist="businessTypesData"
-                      :selectValue="form.businessTypes"
-                      :clearable="true"
-                      :disabled="editSave"
-                      :buttonIf="false"
+                    <dic-select
+                      v-model="form.businessTypes"
+                      placeholder="业务类型"
+                      key="id"
+                      label="label"
+                      keyValue="value"
+                      :activateCreated="false"
+                      :mockData="businessTypesData"
+                      :filterable="true"
                       :multiple="true"
-                      placeholder="请选择业务类型"
-                      @corpChange="corpChange($event, 'businessTypes')"
-                    >
-                    </search-query>
+                      :collapseTags="true"
+                      :disabled="editSave"
+                      dataType="string"
+                    ></dic-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="4">
@@ -816,10 +820,10 @@ export default {
   },
   data() {
     return {
-      amountDSubSum:0,
-      amountDSubUsdSum:0,
-      amountCSubSum:0,
-      amountCSubUsdSum:0,
+      amountDSubSum: 0,
+      amountDSubUsdSum: 0,
+      amountCSubSum: 0,
+      amountCSubUsdSum: 0,
       activeName: "1",
       retrievePopupsType: false, // 弹窗开启关闭
       retrievePopupsData: [], // 选择弹窗数据
@@ -1114,7 +1118,6 @@ export default {
       this.form.billNoFormat = "HYDZ";
       this.form.businessTypeCode = "HYDZ";
       this.form.businessType = "CHK"; // 对账单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1122,7 +1125,6 @@ export default {
       this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + " 00:00:00" : null;
       this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + " 00:00:00" : null;
       this.form.billDate = this.form.billDate ? this.form.billDate.slice(0, 10) + " 00:00:00" : null;
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       let addList = this.addData.map((item, index) => {
         item.lineNo = Number(index) + 1;
         item.pType = item.businessType;
@@ -1219,7 +1221,7 @@ export default {
     },
     // 详情接口
     finstlbillsDetailfun(id, type) {
-       this.activeName="2"
+      this.activeName = "2";
       this.pageLoading = true;
       finstlbillsDetail(id)
         .then(res => {
@@ -1244,8 +1246,6 @@ export default {
           } else {
             this.submitType = false;
           }
-          this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.split(",") : []; // 业务类型转换成数组显示
-          this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.split(",") : []; // 业务类型转换成数组显示
           this.tableData = this.form.finStlBillsItemsList.map(item => {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
@@ -1331,7 +1331,7 @@ export default {
       obj.hblno = this.form.hblno; // HB/L NO
       obj.isChecked = this.form.isChecked; // 是否对账（0 未对账 1 已对账）
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
+      obj.businessType = this.form.businessTypes; // 业务类型
       obj.invoiceStatus = this.form.isInvoice; // 发票状态 0 = 未开 9=已开 2 待开 3 不开
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.invoiceNo = this.form.invoiceNo; // 发票号
@@ -1372,7 +1372,7 @@ export default {
       obj.hblno = this.form.hblno; // HB/L NO
       obj.isChecked = this.form.isChecked; // 是否对账（0 未对账 1 已对账）
       obj.queryAmount = this.form.queryAmount; // 查询金额
-      obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
+      obj.businessType = this.form.businessTypes; // 业务类型
       obj.invoiceStatus = this.form.isInvoice; // 发票状态 0 = 未开 9=已开 2 待开 3 不开
       obj.vesselCnName = this.form.vesselCnName; // 中文船名
       obj.invoiceNo = this.form.invoiceNo; // 发票号
@@ -1387,7 +1387,7 @@ export default {
       obj.billDateEnd = this.form.accountDateTo; // 财务开始日期
       obj.approveTimeStart = this.form.auditDateFrom; // 审核开始日期
       obj.approveTimeEnd = this.form.auditDateTo; // 审核结束日期
-      obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
+      obj.feeCnName = this.form.feeCnName;
       finstlbillslistAccBillV1(obj).then(res => {
         res.data.data.forEach((item, index) => {
           item.accBillId = item.id;
@@ -1492,8 +1492,6 @@ export default {
       this.form.billNoFormat = "HYDZ";
       this.form.businessTypeCode = "HYDZ";
       this.form.businessType = "CHK"; //对账单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1522,8 +1520,6 @@ export default {
       this.form.billNoFormat = "HYDZ";
       this.form.businessTypeCode = "HYDZ";
       this.form.businessType = "CHK"; // 对账单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1547,8 +1543,6 @@ export default {
     finstlbillsConfirmReconciliationfun() {
       this.pageLoading = true;
       this.saveLoading = true;
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1577,8 +1571,6 @@ export default {
         type: "warning"
       }).then(() => {
         this.pageLoading = true;
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1657,8 +1649,6 @@ export default {
         this.form.billNoFormat = "HYDZ";
         this.form.businessTypeCode = "HYDZ";
         this.form.businessType = "CHK"; //对账单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1697,8 +1687,6 @@ export default {
         this.form.billNoFormat = "HYDZ";
         this.form.businessTypeCode = "HYDZ";
         this.form.businessType = "CHK"; // 对账单
-        this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-        this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
         this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
         this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1800,8 +1788,6 @@ export default {
       this.form.billNoFormat = "HYDZ";
       this.form.businessTypeCode = "HYDZ";
       this.form.businessType = "CHK"; //对账单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;
@@ -1826,8 +1812,6 @@ export default {
       this.form.billNoFormat = "HYDZ";
       this.form.businessTypeCode = "HYDZ";
       this.form.businessType = "CHK"; // 对账单
-      this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(",") : ""; // 业务类型
-      this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(",") : "";
       this.form.accountDateFrom = this.form.accountDateFrom ? this.form.accountDateFrom.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.accountDateTo = this.form.accountDateTo ? this.form.accountDateTo.slice(0, 10) + " 00:00:00" : null; // 财务开始日期
       this.form.auditDateFrom = this.form.auditDateFrom ? this.form.auditDateFrom.slice(0, 10) + " 00:00:00" : null;