联调合并客户

海运出口联调存为模板

src/api/iosBasicData/bcorps.js

@@ -167,4 +167,13 @@ export const createUser = (data) => {
     method: 'post',
     data:data
   })
+}
+
+// 合并
+export const mergeCorps = (data) => {
+  return request({
+    url: '/api/blade-los/bcorps/mergeCorps',
+    method: 'get',
+    params:data
+  })
 }

src/api/iosBasicData/feecenter.js

@@ -116,4 +116,12 @@ export const fininvoicesGetAccBillIdList = (params) => {
     method: 'get',
     params:params
   })
+}
+// 保存模板
+export const saveTemplate = (data) => {
+  return request({
+    url: '/api/blade-los/feecenter/saveTemplate ',
+    method: 'post',
+    data:data
+  })
 }

src/views/iosBasicData/SeafreightExportF/bills/assembly/components/costTemplate.vue

@@ -43,14 +43,15 @@
 </template>
 
 <script>
+import { saveTemplate } from "@/api/iosBasicData/feecenter";
 import dicSelect from "@/components/dicSelect/main";
 export default {
-   components: { dicSelect},
+  components: { dicSelect },
   props: {},
   data() {
     return {
-      data: [],
       form: {},
+      selectionList: [],
       dialogVisible: false,
       loading: false,
       optionForm: {
@@ -127,10 +128,21 @@ export default {
   },
   async created() {},
   methods: {
-    openDialog(val, type) {
+    openDialog(val, type, list) {
       this.dialogVisible = true;
-      this.form = {};
-      this.data = [];
+      this.form = {
+        branchId: val.branchId,
+        branchName: val.branchName,
+        code: null,
+        cnName: null,
+        enName: null,
+        dc: type,
+        shippingCompanyId: val.carrierId,
+        shippingCompanyCname: val.carrierCnName,
+        shippingCompanyCode: val.carrierCode,
+        businessTypeCode: "HYCK",
+        feeCenterList: list
+      };
     },
     dicChange(name, row) {
       if (name == "shippingCompanyCname") {
@@ -162,20 +174,20 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
-          // const loading = this.$loading({
-          //   lock: true,
-          //   text: "加载中",
-          //   spinner: "el-icon-loading",
-          //   background: "rgba(255,255,255,0.7)"
-          // });
-          // submit(this.form)
-          //   .then(res => {
-          //     this.$message.success("保存成功");
-          //     this.getDetail(res.data.data.id);
-          //   })
-          //   .finally(() => {
-          //     loading.close();
-          //   });
+          const loading = this.$loading({
+            lock: true,
+            text: "加载中",
+            spinner: "el-icon-loading",
+            background: "rgba(255,255,255,0.7)"
+          });
+          saveTemplate(this.form)
+            .then(res => {
+              this.$message.success("保存成功");
+              this.dialogVisible = false;
+            })
+            .finally(() => {
+              loading.close();
+            });
         } else {
           return false;
         }

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -180,7 +180,7 @@
             type="success"
             plain
             size="small"
-            :disabled="assemblyForm.feeCenterListD.filter(item => item.id).length == 0"
+            :disabled="assemblyForm.feeCenterListD.filter(item => item.id).length == 0||selectionDList.length == 0"
             @click="allClick('存为模板', 'D')"
             >存为模板</el-button
           >
@@ -534,7 +534,7 @@
             type="success"
             plain
             size="small"
-            :disabled="assemblyForm.feeCenterListC.filter(item => item.id).length == 0"
+            :disabled="assemblyForm.feeCenterListC.filter(item => item.id).length == 0||selectionCList.length == 0"
             @click="allClick('存为模板', 'C')"
             >存为模板</el-button
           >
@@ -3941,64 +3941,12 @@ export default {
     },
     allClick(name, type) {
       if (name == "存为模板") {
-        this.$refs.costTemplate.openDialog(this.assemblyForm, type);
-        // this.$DialogForm.show({
-        //   title: "费用模板",
-        //   width: "30%",
-        //   menuPosition: "right",
-        //   submitText: "保存",
-        //   option: {
-        //     submitText: "确定",
-        //     emptyText: "取消",
-        //     labelWidth: 130,
-        //     column: [
-        //       {
-        //         label: "模版编号",
-        //         span: 24,
-        //         prop: "code",
-        //         rules: [
-        //           {
-        //             required: true,
-        //             message: "请选择日期",
-        //             trigger: "blur"
-        //           }
-        //         ]
-        //       },
-        //       {
-        //         label: "模版中文名称",
-        //         span: 24,
-        //         prop: "cnName",
-        //         rules: [
-        //           {
-        //             required: true,
-        //             message: "请输入模版中文名称",
-        //             trigger: "blur"
-        //           }
-        //         ]
-        //       },
-        //       {
-        //         label: "模版英文名称",
-        //         span: 24,
-        //         prop: "enName",
-        //         rules: [
-        //           {
-        //             required: true,
-        //             message: "请输入模版英文名称",
-        //             trigger: "blur"
-        //           }
-        //         ]
-        //       }
-        //     ]
-        //   },
-        //   beforeClose: done => {
-        //     done();
-        //   },
-        //   callback: res => {
-        //     res.done();
-        //     let obj = {};
-        //     res.close();
-        //   }
-        // });
+        if (type == "D") {
+          this.$refs.costTemplate.openDialog(this.assemblyForm, type, this.selectionDList);
+        }
+        if (type == "C") {
+          this.$refs.costTemplate.openDialog(this.assemblyForm, type, this.selectionCList);
+        }
       }
       if (name == "同步结算单位") {
         this.$refs.sysnCorpName.openDialog(this.assemblyForm.id, type);
@@ -4358,7 +4306,7 @@ export default {
           if (row.automaticGenerated == 1 && row.feeCnName == "改单费") {
             return this.$message.error("系统生成的费用不允许申请");
           }
-          
+
           if (row.automaticGenerated == 1 && row.feeCnName == "超期箱使费") {
             return this.$message.error("系统生成的超期箱使费不允许申请");
           }

src/views/iosBasicData/bcorps/components/mergeCustomers.vue

@@ -28,13 +28,13 @@
 </template>
 
 <script>
-import { BcorpsList } from "@/api/iosBasicData/bcorps";
-import { status } from "nprogress";
+import { BcorpsList, mergeCorps } from "@/api/iosBasicData/bcorps";
 export default {
   props: {},
   data() {
     return {
       quotationObj: null,
+      form: {},
       ids: null,
       data: [],
       query: {},
@@ -94,20 +94,12 @@ export default {
     openDialog(val) {
       this.dialogVisible = true;
       this.quotationObj = null;
-      this.page.pageSize = 1;
-      this.page.currentPage = 20;
+      this.page.pageSize = 20;
+      this.page.currentPage = 1;
       this.page.total = 0;
       this.query = {};
-      // this.ids = ids
-      // let obj = {
-      //     ...val
-      // }
-      // this.loading = true
-      // MktSlotQuotation(obj).then(res => {
-      //     this.data = res.data.data
-      // }).finally(() => {
-      //     this.loading = false
-      // })
+      this.form = {};
+      this.form = val;
     },
     handleCurrentRowChange(val) {
       this.quotationObj = val;
@@ -116,8 +108,32 @@ export default {
       if (!this.quotationObj) {
         return this.$message.error("请选择数据");
       }
-      this.$emit("importData", this.quotationObj);
-      this.dialogVisible = false;
+      this.$confirm(`确定要将${this.quotationObj.cnName}合并到${this.form.cnName}?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        let obj = {
+          id: this.form.id,
+          mergeId: this.quotationObj.id
+        };
+
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
+        });
+        mergeCorps(obj)
+          .then(res => {
+            this.$message.success("操作成功");
+            this.$emit("importData");
+            this.dialogVisible = false;
+          })
+          .finally(() => {
+            loading.close();
+          });
+      });
     },
     searchReset() {
       this.query = {};
@@ -136,12 +152,12 @@ export default {
       this.page.pageSize = pageSize;
     },
     onLoad(page, params = {}) {
-        let obj={
-            ...Object.assign(params, this.query),
-            status:0
-        }
+      let obj = {
+        ...Object.assign(params, this.query),
+        status: 0
+      };
       this.loading = true;
-      BcorpsList(page.currentPage, page.pageSize,obj)
+      BcorpsList(page.currentPage,page.pageSize, obj)
         .then(res => {
           this.page.total = res.data.data.total;
           this.data = res.data.data.records;

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -8,7 +8,7 @@
           </el-button>
           <h4 style="margin: 0">往来单位</h4>
           <dev>
-            <!-- <el-button v-if="formData.id" type="warning" @click="merge">合并客户</el-button> -->
+            <el-button v-if="formData.id" type="warning" @click="merge">合并客户</el-button>
             <el-button v-if="formData.id" type="success" @click="fix">修改资料</el-button>
             <el-button type="primary" @click="submitForm">保存</el-button>
           </dev>
@@ -868,7 +868,7 @@
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'客户联系人')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '客户联系人')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                     <el-button v-if="scope.row.userId == 0" type="text" size="small" @click="createUser(scope)">创建用户</el-button>
                   </template>
@@ -903,7 +903,7 @@
                 <el-table-column prop="remarks" label="备注" width="180" />
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'银行信息')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '银行信息')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
                 </el-table-column>
@@ -938,7 +938,7 @@
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
                     <el-button type="text" size="small" @click="openPreview(scope.row)">查看</el-button>
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'附件')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '附件')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
                 </el-table-column>
@@ -962,7 +962,7 @@
                 <el-table-column prop="remarks" label="备注" />
                 <el-table-column fixed="right" label="操作">
                   <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'更名记录')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '更名记录')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
                 </el-table-column>
@@ -1003,7 +1003,7 @@
                 <el-table-column prop="remarks" label="备注" width="180" />
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'发票抬头')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '发票抬头')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
                 </el-table-column>
@@ -1030,7 +1030,7 @@
                 <el-table-column prop="remarks" label="备注" />
                 <el-table-column fixed="right" label="操作" width="180">
                   <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="corpsAttnHandle(scope,'不良记录')">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope, '不良记录')">编辑</el-button>
                     <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
                   </template>
                 </el-table-column>
@@ -1348,7 +1348,7 @@
       </span>
     </el-dialog>
     <dictbiz-dialog ref="dictbiz" title="添加客户来源" code="corp_Source" parentId="1866359762266894337" @closed="getAllWorkDicts"> </dictbiz-dialog>
-    <merge-customers ref="merge"></merge-customers>
+    <merge-customers ref="merge" @importData="getBcorpsDetailfun(formData.id)"></merge-customers>
   </dev>
 </template>
 <script>
@@ -1385,7 +1385,7 @@ import blines from "@/views/iosBasicData/blines/index.vue";
 import { selectListLos, selectListLos2 } from "@/api/approval/processConfig";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 import dicSelect from "@/components/dicSelect/main";
-import mergeCustomers from "./components/mergeCustomers.vue"
+import mergeCustomers from "./components/mergeCustomers.vue";
 export default {
   components: {
     SearchQuery,
@@ -1738,8 +1738,8 @@ export default {
   },
   mounted() {},
   methods: {
-    merge(){
-      this.$refs.merge.openDialog()
+    merge() {
+      this.$refs.merge.openDialog(this.formData);
     },
     fix() {
       this.$DialogForm.show({
@@ -1945,11 +1945,21 @@ export default {
     },
     // 详情
     getBcorpsDetailfun(id) {
-      getBcorpsDetail(id).then(res => {
-        this.formData = res.data.data;
-        this.formData.corpTypeList = res.data.data.corpType.split(",");
-        this.$set(this.formData, "adminProfilesList", res.data.data.adminProfiles.split(","));
+      const loading = this.$loading({
+        lock: true,
+        text: "加载中",
+        spinner: "el-icon-loading",
+        background: "rgba(255,255,255,0.7)"
       });
+      getBcorpsDetail(id)
+        .then(res => {
+          this.formData = res.data.data;
+          this.formData.corpTypeList = res.data.data.corpType.split(",");
+          this.$set(this.formData, "adminProfilesList", res.data.data.adminProfiles.split(","));
+        })
+        .finally(() => {
+          loading.close();
+        });
     },
     // ps 规则下拉
     psRateChange(value, name) {
@@ -2303,8 +2313,8 @@ export default {
       }
     },
     // 编辑
-    corpsAttnHandle(scope,name) {
-      this.dialogTitle=name?name:'窗口'
+    corpsAttnHandle(scope, name) {
+      this.dialogTitle = name ? name : "窗口";
       this.corpsAttnDialogIndex = scope.$index;
       this.corpsAttnForm = scope.row;
       this.corpsAttnDialogVisible = true;

src/views/iosBasicData/containerReminder/index.vue

@@ -90,7 +90,9 @@ export default {
       },
       firstPage: false,
       form: {},
-      query: {},
+      query: {
+        boxSrcType:'OW(拿)'
+      },
       loading: false,
       page: {
         pageSize: 20,
@@ -210,6 +212,7 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
+            searchValue:'OW(拿)',
             hide: true,
             overHidden: true
           }

src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue

@@ -27,6 +27,7 @@
         @size-change="sizeChange"
         @refresh-change="refreshChange"
         :header-cell-class-name="headerClassName"
+        :row-style="rowStyle"
         @resetColumn="resetColumnTwo('applyCrud', 'applyOption', 'applyOptionBack', 319)"
         :search.sync="query"
         @saveColumn="saveColumnTwo('applyCrud', 'applyOption', 'applyOptionBack', 319)"
@@ -202,7 +203,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
-        stripe: true,
+        // stripe: true,
         column: [
           {
             label: "所属公司",