Browse Source

1.海运进出口 费用明细新加登陆人判断
2.审批数据 营业费用 跳转查看详情
3.决策分析 修改账龄分析 新加导出和新增检索条件
4.海运进出口 客户订舱 托书 新加港口判断是否覆盖

Qukatie 5 months ago
parent
commit
49d19e0680

+ 1 - 1
src/components/iosbasic-data/searchquery.vue

@@ -3,7 +3,7 @@
         <div style="display:flex">
         <div style="display:flex">
             <!--<slot v-if="slot" name="slot"></slot>-->
             <!--<slot v-if="slot" name="slot"></slot>-->
             <div style="width: 100%;">
             <div style="width: 100%;">
-                <el-select style="width: 100%" v-model="selectValue" :size="size" :placeholder="placeholder"
+                <el-select ref="mySelect" style="width: 100%" v-model="selectValue" :size="size" :placeholder="placeholder"
                     :filterable="filterable" :clearable="clearable" :remote="remote" :remote-method="remoteMethod"
                     :filterable="filterable" :clearable="clearable" :remote="remote" :remote-method="remoteMethod"
                     :multiple="multiple" :collapse-tags="collapseTags" :disabled="disabled" :allow-create="allowCreate"
                     :multiple="multiple" :collapse-tags="collapseTags" :disabled="disabled" :allow-create="allowCreate"
                     @change="corpChange" @focus="corpFocus" @clear="corpClear">
                     @change="corpChange" @focus="corpFocus" @clear="corpClear">

File diff suppressed because it is too large
+ 902 - 597
src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue


+ 14 - 14
src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -100,7 +100,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="!selectionDList.length || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="!selectionDList.length || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="batchDelete('D')"
             @click="batchDelete('D')"
           >
           >
             {{ $t("btn118n.deleted") }}
             {{ $t("btn118n.deleted") }}
@@ -139,7 +139,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D费用申请')"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
             >{{ $t("btn118n.applyFee") }}</el-button
           >
           >
@@ -147,7 +147,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D撤销请核')"
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
           >
@@ -155,7 +155,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D申请修改')"
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
             >{{ $t("btn118n.applyModify") }}</el-button
           >
           >
@@ -163,7 +163,7 @@
             type="success"
             type="success"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D申请删除')"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
           >
@@ -171,7 +171,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D取消申请')"
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           >
@@ -409,7 +409,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="!selectionCList.length || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="!selectionCList.length || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="batchDelete('C')"
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
             >{{ $t("btn118n.deleted") }}
           </el-button>
           </el-button>
@@ -447,7 +447,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C费用申请')"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
             >{{ $t("btn118n.applyFee") }}</el-button
           >
           >
@@ -455,7 +455,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C撤销请核')"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
           >
@@ -465,7 +465,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C申请修改')"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
             >{{ $t("btn118n.applyModify") }}</el-button
           >
           >
@@ -473,7 +473,7 @@
             type="success"
             type="success"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C申请删除')"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
           >
@@ -481,7 +481,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C取消申请')"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           >
@@ -3448,7 +3448,7 @@ export default {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
-            if (item.id && item.createUser == this.userId) {
+            if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
@@ -3461,7 +3461,7 @@ export default {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
-            if (item.id && item.createUser == this.userId) {
+            if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }

+ 54 - 8
src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -21,7 +21,9 @@
                       @change="textareaBlur('hshipperDetails')"
                       @change="textareaBlur('hshipperDetails')"
                     ></el-input>
                     ></el-input>
                   </div>
                   </div>
-                  <span style="font-size: 12px;color: #1e9fff; text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.shipper") }}</span>
+                  <span style="font-size: 12px;color: #1e9fff; text-decoration: underline;cursor: pointer;" slot="reference">{{
+                    $t("sea118n.shipper")
+                  }}</span>
                 </el-popover>
                 </el-popover>
               </span>
               </span>
               <div>
               <div>
@@ -92,7 +94,9 @@
                       @change="textareaBlur('hconsigneeDetails')"
                       @change="textareaBlur('hconsigneeDetails')"
                     ></el-input>
                     ></el-input>
                   </div>
                   </div>
-                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.cnee") }}</span>
+                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{
+                    $t("sea118n.cnee")
+                  }}</span>
                 </el-popover>
                 </el-popover>
               </span>
               </span>
               <div>
               <div>
@@ -172,7 +176,9 @@
                       @change="textareaBlur('hnotifyDetails')"
                       @change="textareaBlur('hnotifyDetails')"
                     ></el-input>
                     ></el-input>
                   </div>
                   </div>
-                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.notify") }}</span>
+                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{
+                    $t("sea118n.notify")
+                  }}</span>
                 </el-popover>
                 </el-popover>
               </span>
               </span>
               <div>
               <div>
@@ -260,7 +266,9 @@
                         @change="textareaBlur('foreignAgencyDetails')"
                         @change="textareaBlur('foreignAgencyDetails')"
                       ></el-input>
                       ></el-input>
                     </div>
                     </div>
-                    <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.agent") }}</span>
+                    <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{
+                      $t("sea118n.agent")
+                    }}</span>
                   </el-popover>
                   </el-popover>
                 </span>
                 </span>
                 <div>
                 <div>
@@ -398,7 +406,9 @@
                       @change="textareaBlur('marks')"
                       @change="textareaBlur('marks')"
                     ></el-input>
                     ></el-input>
                   </div>
                   </div>
-                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.marks") }}</span>
+                  <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{
+                    $t("sea118n.marks")
+                  }}</span>
                 </el-popover>
                 </el-popover>
               </div>
               </div>
               <div style="margin-top: 4px">
               <div style="margin-top: 4px">
@@ -471,7 +481,9 @@
                           @change="textareaBlur('commodityDescr')"
                           @change="textareaBlur('commodityDescr')"
                         ></el-input>
                         ></el-input>
                       </div>
                       </div>
-                      <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{ $t("sea118n.descOfGoods") }}</span>
+                      <span style="font-size: 12px;color: #1e9fff;text-decoration: underline;cursor: pointer;" slot="reference">{{
+                        $t("sea118n.descOfGoods")
+                      }}</span>
                     </el-popover>
                     </el-popover>
                   </span>
                   </span>
                   <!--<el-col :span="5">-->
                   <!--<el-col :span="5">-->
@@ -523,6 +535,7 @@
                 <el-row>
                 <el-row>
                   <el-col :span="24">
                   <el-col :span="24">
                     <search-query
                     <search-query
+                      ref="pol"
                       :datalist="polData"
                       :datalist="polData"
                       :selectValue="assemblyForm.polEnName"
                       :selectValue="assemblyForm.polEnName"
                       :filterable="true"
                       :filterable="true"
@@ -577,6 +590,7 @@
                 <el-row>
                 <el-row>
                   <el-col :span="24">
                   <el-col :span="24">
                     <search-query
                     <search-query
+                      ref="pod"
                       :datalist="podData"
                       :datalist="podData"
                       :selectValue="assemblyForm.podEnName"
                       :selectValue="assemblyForm.podEnName"
                       :filterable="true"
                       :filterable="true"
@@ -629,6 +643,7 @@
                 <el-row>
                 <el-row>
                   <el-col :span="24">
                   <el-col :span="24">
                     <search-query
                     <search-query
+                      ref="placeDelivery"
                       :datalist="placeDeliveryData"
                       :datalist="placeDeliveryData"
                       :joinData="true"
                       :joinData="true"
                       :selectValue="assemblyForm.placeDeliveryName"
                       :selectValue="assemblyForm.placeDeliveryName"
@@ -2549,7 +2564,22 @@ export default {
             this.$set(this.assemblyForm, name + "CnName", item.cnName);
             this.$set(this.assemblyForm, name + "CnName", item.cnName);
             this.$set(this.assemblyForm, name + "EnName", item.enName);
             this.$set(this.assemblyForm, name + "EnName", item.enName);
             this.$set(this.assemblyForm, name + "Code", item.code);
             this.$set(this.assemblyForm, name + "Code", item.code);
-            this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+            if (this.assemblyForm[name + "NamePrint"]) {
+              this.$confirm("是否覆盖内容?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+              })
+                .then(() => {
+                  this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+                  this.$refs[name].$refs.mySelect.blur();
+                })
+                .catch(() => {
+                  this.$refs[name].$refs.mySelect.blur();
+                });
+            } else {
+              this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+            }
             // 签单地点 默认 装货港
             // 签单地点 默认 装货港
             if (name == "pol") {
             if (name == "pol") {
               this.$set(this.assemblyForm, "issueAt", this.assemblyForm.polEnName);
               this.$set(this.assemblyForm, "issueAt", this.assemblyForm.polEnName);
@@ -2605,7 +2635,23 @@ export default {
             this.$set(this.assemblyForm, name + "Id", item.id);
             this.$set(this.assemblyForm, name + "Id", item.id);
             this.$set(this.assemblyForm, name + "Name", item.enName);
             this.$set(this.assemblyForm, name + "Name", item.enName);
             this.$set(this.assemblyForm, name + "Code", item.code);
             this.$set(this.assemblyForm, name + "Code", item.code);
-            this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+            // this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+            if (this.assemblyForm[name + "NamePrint"]) {
+              this.$confirm("是否覆盖内容?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+              })
+                .then(() => {
+                  this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+                  this.$refs[name].$refs.mySelect.blur();
+                })
+                .catch(() => {
+                  this.$refs[name].$refs.mySelect.blur();
+                });
+            } else {
+              this.$set(this.assemblyForm, name + "NamePrint", item.enName);
+            }
           }
           }
         }
         }
       }
       }

+ 14 - 14
src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -100,7 +100,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="!selectionDList.length || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="!selectionDList.length || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="batchDelete('D')"
             @click="batchDelete('D')"
             >{{ $t("btn118n.deleted") }}
             >{{ $t("btn118n.deleted") }}
           </el-button>
           </el-button>
@@ -138,7 +138,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D费用申请')"
             @click="allClick('D费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
             >{{ $t("btn118n.applyFee") }}</el-button
           >
           >
@@ -146,7 +146,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionDList.length == 0 || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D撤销请核')"
             @click="allClick('D撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
           >
@@ -154,7 +154,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D申请修改')"
             @click="allClick('D申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
             >{{ $t("btn118n.applyModify") }}</el-button
           >
           >
@@ -162,7 +162,7 @@
             type="success"
             type="success"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D申请删除')"
             @click="allClick('D申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
           >
@@ -170,7 +170,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && selectionDList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionDList.length != 1 || disabled || (assemblyForm.id && !selectionDList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('D取消申请')"
             @click="allClick('D取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           >
@@ -418,7 +418,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="!selectionCList.length || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="!selectionCList.length || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="batchDelete('C')"
             @click="batchDelete('C')"
             >{{ $t("btn118n.deleted") }}
             >{{ $t("btn118n.deleted") }}
           </el-button>
           </el-button>
@@ -462,7 +462,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C费用申请')"
             @click="allClick('C费用申请')"
             >{{ $t("btn118n.applyFee") }}</el-button
             >{{ $t("btn118n.applyFee") }}</el-button
           >
           >
@@ -470,7 +470,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="disabled || selectionCList.length == 0 || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C撤销请核')"
             @click="allClick('C撤销请核')"
             >{{ $t("btn118n.unApplyFee") }}</el-button
             >{{ $t("btn118n.unApplyFee") }}</el-button
           >
           >
@@ -480,7 +480,7 @@
             type="primary"
             type="primary"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C申请修改')"
             @click="allClick('C申请修改')"
             >{{ $t("btn118n.applyModify") }}</el-button
             >{{ $t("btn118n.applyModify") }}</el-button
           >
           >
@@ -488,7 +488,7 @@
             type="success"
             type="success"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C申请删除')"
             @click="allClick('C申请删除')"
             >{{ $t("btn118n.applyDelete") }}</el-button
             >{{ $t("btn118n.applyDelete") }}</el-button
           >
           >
@@ -496,7 +496,7 @@
             type="danger"
             type="danger"
             plain
             plain
             size="small"
             size="small"
-            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && selectionCList.filter(e => e.createUser != userId).length > 0)"
+            :disabled="selectionCList.length != 1 || disabled || (assemblyForm.id && !selectionCList.filter(e => e.createUser==0||e.createUser == userId).length>0)"
             @click="allClick('C取消申请')"
             @click="allClick('C取消申请')"
             >{{ $t("btn118n.unAplly") }}</el-button
             >{{ $t("btn118n.unAplly") }}</el-button
           >
           >
@@ -3479,7 +3479,7 @@ export default {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
-            if (item.id && item.createUser == this.userId) {
+           if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
@@ -3492,7 +3492,7 @@ export default {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }
-            if (item.id && item.createUser == this.userId) {
+            if (item.id && (item.createUser == this.userId||item.createUser ==0)) {
               this.$delete(item, "edit");
               this.$delete(item, "edit");
               this.$set(item, "edit", true);
               this.$set(item, "edit", true);
             }
             }

+ 729 - 685
src/views/iosBasicData/agingAnalysis/index.vue

@@ -1,708 +1,752 @@
 <template>
 <template>
-    <basic-container>
-        <avue-crud :option="option"
-                   :table-loading="loading"
-                   :data="data"
-                   :page.sync="page"
-                   :search.sync="query"
-                   v-model="form"
-                   ref="crud"
-                   id="out-table"
-                   :header-cell-class-name="headerClassName"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 335)"
-                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 335)"
-                   @on-load="onLoad" >
-            <template slot="menuLeft">
-                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
-            </template>
-            <template slot-scope="{disabled,size}" slot="dcSearch">
-                <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
-            </template>
-            <template slot-scope="{disabled,size}" slot="typeSearch">
-                <search-query :datalist="typeData"
-                              :selectValue="query.type"
-                              :buttonIf="false"
-                              @corpChange="corpChange($event,'type')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="businessTypeSearch">
-                <search-query :datalist="businessTypeData"
-                              :selectValue="query.businessType"
-                              :clearable="true"
-                              :buttonIf="false"
-                              @corpChange="corpChange($event,'businessType')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="clientIdSearch">
-                <search-query :datalist="clientIdData"
-                              :selectValue="query.clientName"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :disabled="query.type != 2"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="clientIdListfun"
-                              @corpFocus="clientIdListfun"
-                              @corpChange="corpChange($event,'clientName')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="corpIdSearch">
-                <search-query :datalist="corpIdData"
-                              :selectValue="query.corpName"
-                              :disabled="query.type != 1"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="getBcorpsListfun"
-                              @corpFocus="getBcorpsListfun"
-                              @corpChange="corpChange($event,'corpName')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="srcTypeSearch">
-                <search-query :datalist="srcTypeData"
-                              :selectValue="query.srcType"
-                              :disabled="query.type != 3"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                              @corpFocus="srcTypeWorkDictsfun"
-                              @corpChange="corpChange($event,'srcType')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="srcIdSearch">
-                <search-query :datalist="srcIdData"
-                              :selectValue="query.srcName"
-                              :disabled="query.type != 3"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="srcforParameter"
-                              @remoteMethod="srcCorpFocus"
-                              @corpFocus="srcCorpFocus"
-                              @corpChange="corpChange($event,'srcName')">
-                </search-query>
-            </template>
-            <template slot-scope="{disabled,size}" slot="isBusinessDateSearch">
-                <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')" >按业务日期</el-checkbox>
-             </template>
-        </avue-crud>
-    </basic-container>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      :search.sync="query"
+      v-model="form"
+      ref="crud"
+      id="out-table"
+      :header-cell-class-name="headerClassName"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 335)"
+      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 335)"
+      @on-load="onLoad"
+    >
+      <template slot="menuLeft">
+        <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
+        <el-button type="success" size="small" plain @click="itemExport">导出明细</el-button>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="dcSearch">
+        <el-radio v-model="query.dc" label="D" @input="dcInput">应收</el-radio>
+        <el-radio v-model="query.dc" label="C" @input="dcInput">应付</el-radio>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="typeSearch">
+        <search-query :datalist="typeData" :selectValue="query.type" :buttonIf="false" @corpChange="corpChange($event, 'type')"> </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="businessTypeSearch">
+        <search-query
+          :datalist="businessTypeData"
+          :selectValue="query.businessType"
+          :clearable="true"
+          :buttonIf="false"
+          @corpChange="corpChange($event, 'businessType')"
+        >
+        </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="clientIdSearch">
+        <search-query
+          :datalist="clientIdData"
+          :selectValue="query.clientName"
+          :filterable="true"
+          :remote="true"
+          :clearable="true"
+          :disabled="query.type != 2"
+          :buttonIf="false"
+          :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+          @remoteMethod="clientIdListfun"
+          @corpFocus="clientIdListfun"
+          @corpChange="corpChange($event, 'clientName')"
+        >
+        </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="corpIdSearch">
+        <search-query
+          :datalist="corpIdData"
+          :selectValue="query.corpName"
+          :disabled="query.type != 1"
+          :filterable="true"
+          :remote="true"
+          :clearable="true"
+          :buttonIf="false"
+          :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+          @remoteMethod="getBcorpsListfun"
+          @corpFocus="getBcorpsListfun"
+          @corpChange="corpChange($event, 'corpName')"
+        >
+        </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="srcTypeSearch">
+        <search-query
+          :datalist="srcTypeData"
+          :selectValue="query.srcType"
+          :disabled="query.type != 3"
+          :clearable="true"
+          :buttonIf="false"
+          :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+          @corpFocus="srcTypeWorkDictsfun"
+          @corpChange="corpChange($event, 'srcType')"
+        >
+        </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="srcIdSearch">
+        <search-query
+          :datalist="srcIdData"
+          :selectValue="query.srcName"
+          :disabled="query.type != 3"
+          :filterable="true"
+          :remote="true"
+          :clearable="true"
+          :buttonIf="false"
+          :forParameter="srcforParameter"
+          @remoteMethod="srcCorpFocus"
+          @corpFocus="srcCorpFocus"
+          @corpChange="corpChange($event, 'srcName')"
+        >
+        </search-query>
+      </template>
+      <template slot-scope="{ disabled, size }" slot="isBusinessDateSearch">
+        <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')">按业务日期</el-checkbox>
+      </template>
+    </avue-crud>
+  </basic-container>
 </template>
 </template>
 
 
 <script>
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
-import { financeStatisticsAgingAnalysis} from "@/api/iosBasicData/paymentSummary"
-import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-import {getWorkDicts} from "@/api/system/dictbiz";
-import {getDeptLazyTree} from "@/api/system/dept";
-import {getList as userGetList} from '@/api/system/user'
-import {getToken} from "@/util/auth";
+import { CurrentMonth, dateFormat, defaultDate3, defaultDate4 } from "@/util/date";
+import { financeStatisticsAgingAnalysis } from "@/api/iosBasicData/paymentSummary";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { getWorkDicts } from "@/api/system/dictbiz";
+import { getDeptLazyTree } from "@/api/system/dept";
+import { getList as userGetList } from "@/api/system/user";
+import { getToken } from "@/util/auth";
 
 
 export default {
 export default {
-    components: {SearchQuery},
-    data(){
-        return {
-            form: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0
+  components: { SearchQuery },
+  data() {
+    return {
+      form: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0
+      },
+      query: {
+        dc: "D",
+        isBusinessDate: 1,
+        type: "1",
+        etdStart: defaultDate3()[0],
+        etdEnd: defaultDate3()[1]
+      },
+      option: {},
+      optionBack: {
+        height: "auto",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 12,
+        border: true,
+        index: false,
+        selection: true,
+        dialogClickModal: false,
+        menu: false,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        column: [
+          {
+            label: "所属公司",
+            prop: "branchId",
+            hide: true,
+            type: "select",
+            filterable: true,
+            dicUrl: "/api/blade-system/dept/lazy-list",
+            props: {
+              label: "deptName",
+              value: "id"
             },
             },
-            query: {
-                dc:'D',
-                isBusinessDate:1,
-                type:'1',
-                etdStart:defaultDate3()[0],
-                etdEnd:defaultDate3()[1],
-            },
-            option:{},
-            optionBack:{
-                height:'auto',
-                calcHeight: 30,
-                tip: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                border: true,
-                index: false,
-                selection: true,
-                dialogClickModal: false,
-                menu:false,
-                addBtn:false,
-                viewBtn:false,
-                delBtn:false,
-                editBtn:false,
-                column:[
-                    {
-                        label: "所属公司",
-                        prop: "branchName",
-                        overHidden:true,
-                    },
-                    {
-                        label: "结算单位",
-                        prop: "corpName",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny总计",
-                        prop: "cnyTtl",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd总计",
-                        prop: "usdTtl",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd总计",
-                        prop: "hkdTtl",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk总计",
-                        prop: "vnkTtl",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd总计",
-                        prop: "sgdTtl",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny30",
-                        prop: "cny30",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny60",
-                        prop: "cny60",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny90",
-                        prop: "cny90",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny120",
-                        prop: "cny120",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cny150",
-                        prop: "cny150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "cnyOver150",
-                        prop: "cnyOver150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd30",
-                        prop: "usd30",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd60",
-                        prop: "usd60",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd90",
-                        prop: "usd90",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd120",
-                        prop: "usd120",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usd150",
-                        prop: "usd150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "usdOver150",
-                        prop: "usdOver150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd30",
-                        prop: "hkd30",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd60",
-                        prop: "hkd60",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd90",
-                        prop: "hkd90",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd120",
-                        prop: "hkd120",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkd150",
-                        prop: "hkd150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "hkdOver150",
-                        prop: "hkdOver150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk30",
-                        prop: "vnk30",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk60",
-                        prop: "vnk60",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk90",
-                        prop: "vnk90",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk120",
-                        prop: "vnk120",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnk150",
-                        prop: "vnk150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "vnkOver150",
-                        prop: "vnkOver150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd30",
-                        prop: "sgd30",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd60",
-                        prop: "sgd60",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd90",
-                        prop: "sgd90",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd120",
-                        prop: "sgd120",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgd150",
-                        prop: "sgd150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "sgdOver150",
-                        prop: "sgdOver150",
-                        overHidden:true,
-                    },
-                    {
-                        label: "查询方式",
-                        prop: "type",
-                        hide:true,
-                        search:true,
-                        type: 'select',
-                        searchslot:true,
-                    },
-                    {
-                        label: "业务类型",
-                        prop: "businessType",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                    },
-                    {
-                        label: "委托人",
-                        prop: "clientId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                    },
-                    {
-                        label: "结算单位",
-                        prop: "corpId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                    },
-                    {
-                        label: "业务来源",
-                        prop: "srcType",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                    },
-                    {
-                        label: "业务员",
-                        prop: "srcId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                    },
-                    {
-                        label: "开始日期",
-                        prop: "etdStart",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                    },
-                    {
-                        label: "结束日期",
-                        prop: "etdEnd",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
-                    },
-                    {
-                        label: "",
-                        prop: "dc",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchLabelWidth:'0'
-                    },
-                    {
-                        label: "",
-                        prop: "isBusinessDate",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchLabelWidth:'0'
-                    },
-                    {
-                        label: "",
-                        prop: "isToExamineDate",
-                        hide:true,
-                        searchLabelWidth:'0',
-                    },
-
-                ]
-            },
-            data:[],
-            // 查询方式
-            typeData:[
-                {
-                    label:'结算单位',
-                    value:'1'
-                },{
-                    label:'委托人',
-                    value:'2'
-                },{
-                    label:'业务来源',
-                    value:'3'
-                }
-            ],
-            // 业务类型
-            businessTypeData:[
-                {
-                    label:'海运出口',
-                    value:'HYCK'
-                },{
-                    label:'海运进口',
-                    value:'HYJK'
-                },{
-                    label:'空运出口',
-                    value:'KYCK'
-                },{
-                    label:'空运进口',
-                    value:'KYJK'
-                }
-            ],
-            clientIdData:[], // 委托人
-            corpIdData:[], // 结算单位
-            srcTypeData:[], // 业务来源
-            srcIdData:[], // 业务员
-            srcforParameter:{key:'id', label:'cnName', value:'cnName'},
-
-        }
-    },
-    async created() {
-        this.option = await this.getColumnData(this.getColumnName(335), this.optionBack);
-    },
-    methods:{
-        // 导出
-        exportfun(){
-            const routeData = this.$router.resolve({
-                path: '/api/blade-los/financeStatistics/agingAnalysisExport',//跳转目标窗口的地址
-                query: {
-                    ...this.query
-                }
-            })
-            window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-        },
-        // 下拉监听
-        corpChange(value,name){
-            if (name == 'type') {
-                if (value == 1) {
-                    this.$set(this.query,'clientId',null)
-                    this.$set(this.query,'clientName',null)
-                    this.$set(this.query,'srcType',null)
-                    this.$set(this.query,'srcId',null)
-                    this.$set(this.query,'srcName',null)
-                    this.findObject(this.option.column, "corpName").label = '结算单位'
-                }else if (value == 2) {
-                    this.$set(this.query,'corpId',null)
-                    this.$set(this.query,'corpName',null)
-                    this.$set(this.query,'srcType',null)
-                    this.$set(this.query,'srcId',null)
-                    this.$set(this.query,'srcName',null)
-                    this.findObject(this.option.column, "corpName").label = '委托人'
-                }else if (value == 3) {
-                    this.$set(this.query,'corpId',null)
-                    this.$set(this.query,'corpName',null)
-                    this.$set(this.query,'clientId',null)
-                    this.$set(this.query,'clientName',null)
-                    this.findObject(this.option.column, "corpName").label = '业务来源'
-                }
-                this.$set(this.query,name,value)
-            }else if (name == 'corpName') {
-                for (let item of this.corpIdData) {
-                    if (item.cnName == value) {
-                        this.$set(this.query,'corpId',item.corpId)
-                        this.$set(this.query,'corpName',item.corpName)
-                    }
-                }
-            } else if (name == 'clientName') {
-                for (let item of this.clientIdData) {
-                    if (item.cnName == value) {
-                        this.$set(this.query,'clientId',item.corpId)
-                        this.$set(this.query,'clientName',item.corpName)
-                    }
-                }
-            }else if (name == 'srcType') {
-                if (value == 'OWN') {
-                    // 公司
-                    this.srcforParameter = { key:'id', label:'title', value:'title'}
-                    this.ownDeptLazyTreefun()
-                }else if (value == 'AGENT') {
-                    // 代理
-                    this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
-                    this.agentBcorpsListfun()
-                }else if (value == 'SALES') {
-                    // 业务员
-                    this.srcforParameter = { key:'id', label:'name', value:'name'}
-                    this.salesUserGetListfun()
-                }else {}
-                this.$set(this.query,name,value)
-            }else if (name == 'srcName') {
-                for (let item of this.srcIdData) {
-                    if (item[this.srcforParameter.value] == value) {
-                        if (this.query.srcType == 'SALES') {
-                            // 业务员
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.name)
-                        }else if (this.form.srcType == 'AGENT') {
-                            // 代理
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.cnName)
-                        }else {
-                            this.$set(this.query,'srcId',item.id)
-                            this.$set(this.query,'srcName',item.title)
-                        }
-                    }
-                }
-            }
-            this.$set(this.query,name,value)
-        },
-        // 业务员下拉
-        srcCorpFocus(value,name){
-            if (this.query.srcType == 'SALES') {
-                // 业务员
-                this.srcforParameter = { key:'id', label:'name', value:'name'}
-                this.salesUserGetListfun(value)
-            }else if (this.form.srcType == 'AGENT') {
-                // 代理
-                this.srcforParameter = { key:'id', label:'cnName', value:'cnName'}
-                this.agentBcorpsListfun(value)
-            }else if (this.form.srcType == 'OWN') {
-                // 公司
-                this.srcforParameter = { key:'id', label:'title', value:'title'}
-                this.ownDeptLazyTreefun()
-            }else {}
-        },
-        // 多选切换
-        dateChange(name) {
-            if (name == 'isBusinessDate') {
-                this.$set(this.query,'isToExamineDate',0)
-                this.$set(this.query,'isBusinessDate',1)
-            }
-            if (name == 'isToExamineDate') {
-                this.$set(this.query,'isBusinessDate',0)
-                this.$set(this.query,'isToExamineDate',1)
-            }
-        },
-        // 收付单选
-        dcInput(){
-            let dcName = ''
-            if (this.query.dc == 'D') {
-                dcName = '收'
-            }else {
-                dcName = '付'
-            }
-            this.findObject(this.option.column, "amountusd").label = `应${dcName}美金`
-            this.findObject(this.option.column, "amount").label = `应${dcName}人民币`
-            this.findObject(this.option.column, "amountusdAlready").label = `已${dcName}款美金`
-            this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`
-            this.findObject(this.option.column, "amountusdNot").label = `未${dcName}款美金`
-            this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`
-        },
-        // 接口获取数据
-        // 结算单位
-        getBcorpsListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
-                this.corpIdData = res.data.data.records
-            })
+            search: true
+          },
+          {
+            label: "所属公司",
+            prop: "branchName",
+            overHidden: true
+          },
+          {
+            label: "结算单位",
+            prop: "corpName",
+            overHidden: true
+          },
+          {
+            label: "cny总计",
+            prop: "cnyTtl",
+            overHidden: true
+          },
+          {
+            label: "usd总计",
+            prop: "usdTtl",
+            overHidden: true
+          },
+          {
+            label: "hkd总计",
+            prop: "hkdTtl",
+            overHidden: true
+          },
+          {
+            label: "vnk总计",
+            prop: "vnkTtl",
+            overHidden: true
+          },
+          {
+            label: "sgd总计",
+            prop: "sgdTtl",
+            overHidden: true
+          },
+          {
+            label: "cny30",
+            prop: "cny30",
+            overHidden: true
+          },
+          {
+            label: "cny60",
+            prop: "cny60",
+            overHidden: true
+          },
+          {
+            label: "cny90",
+            prop: "cny90",
+            overHidden: true
+          },
+          {
+            label: "cny120",
+            prop: "cny120",
+            overHidden: true
+          },
+          {
+            label: "cny150",
+            prop: "cny150",
+            overHidden: true
+          },
+          {
+            label: "cnyOver150",
+            prop: "cnyOver150",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "usd30",
+            prop: "usd30",
+            overHidden: true
+          },
+          {
+            label: "usd60",
+            prop: "usd60",
+            overHidden: true
+          },
+          {
+            label: "usd90",
+            prop: "usd90",
+            overHidden: true
+          },
+          {
+            label: "usd120",
+            prop: "usd120",
+            overHidden: true
+          },
+          {
+            label: "usd150",
+            prop: "usd150",
+            overHidden: true
+          },
+          {
+            label: "usdOver150",
+            prop: "usdOver150",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "hkd30",
+            prop: "hkd30",
+            overHidden: true
+          },
+          {
+            label: "hkd60",
+            prop: "hkd60",
+            overHidden: true
+          },
+          {
+            label: "hkd90",
+            prop: "hkd90",
+            overHidden: true
+          },
+          {
+            label: "hkd120",
+            prop: "hkd120",
+            overHidden: true
+          },
+          {
+            label: "hkd150",
+            prop: "hkd150",
+            overHidden: true
+          },
+          {
+            label: "hkdOver150",
+            prop: "hkdOver150",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "vnk30",
+            prop: "vnk30",
+            overHidden: true
+          },
+          {
+            label: "vnk60",
+            prop: "vnk60",
+            overHidden: true
+          },
+          {
+            label: "vnk90",
+            prop: "vnk90",
+            overHidden: true
+          },
+          {
+            label: "vnk120",
+            prop: "vnk120",
+            overHidden: true
+          },
+          {
+            label: "vnk150",
+            prop: "vnk150",
+            overHidden: true
+          },
+          {
+            label: "vnkOver150",
+            prop: "vnkOver150",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "sgd30",
+            prop: "sgd30",
+            overHidden: true
+          },
+          {
+            label: "sgd60",
+            prop: "sgd60",
+            overHidden: true
+          },
+          {
+            label: "sgd90",
+            prop: "sgd90",
+            overHidden: true
+          },
+          {
+            label: "sgd120",
+            prop: "sgd120",
+            overHidden: true
+          },
+          {
+            label: "sgd150",
+            prop: "sgd150",
+            overHidden: true
+          },
+          {
+            label: "sgdOver150",
+            prop: "sgdOver150",
+            width: 100,
+            overHidden: true
+          },
+          {
+            label: "查询方式",
+            prop: "type",
+            hide: true,
+            search: true,
+            type: "select",
+            searchslot: true
+          },
+          {
+            label: "业务类型",
+            prop: "businessType",
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
+            label: "委托人",
+            prop: "clientId",
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
+            label: "结算单位",
+            prop: "corpId",
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
+            label: "业务来源",
+            prop: "srcType",
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          {
+            label: "业务员",
+            prop: "srcId",
+            hide: true,
+            search: true,
+            searchslot: true
+          },
+          // {
+          //     label: "开始日期",
+          //     prop: "etdStart",
+          //     search:true,
+          //     overHidden:true,
+          //     hide:true,
+          //     type: "date",
+          //     format: "yyyy-MM-dd",
+          //     valueFormat: "yyyy-MM-dd",
+          // },
+          {
+            label: "结束日期",
+            prop: "etdEnd",
+            search: true,
+            overHidden: true,
+            hide: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd"
+          },
+          {
+            label: "",
+            prop: "dc",
+            hide: true,
+            search: true,
+            searchslot: true,
+            searchLabelWidth: "0"
+          },
+          {
+            label: "",
+            prop: "isBusinessDate",
+            hide: true,
+            search: true,
+            searchslot: true,
+            searchLabelWidth: "0"
+          },
+          {
+            label: "",
+            prop: "isToExamineDate",
+            hide: true,
+            searchLabelWidth: "0"
+          }
+        ]
+      },
+      data: [],
+      // 查询方式
+      typeData: [
+        {
+          label: "结算单位",
+          value: "1"
         },
         },
-        // 委托人
-        clientIdListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
-                this.clientIdData = res.data.data.records
-            })
+        {
+          label: "委托人",
+          value: "2"
         },
         },
-        // 获取业务来源数据
-        srcTypeWorkDictsfun(){
-            getWorkDicts('src_type_los').then(res=>{
-                this.srcTypeData = res.data.data
-            })
-        },
-        // 获取公司名称 用户管理左侧
-        ownDeptLazyTreefun(){
-            getDeptLazyTree(0).then(res=>{
-                this.srcIdData = res.data.data
-            })
-        },
-        // 获取业务来源代理数据
-        agentBcorpsListfun(cnName){
-            let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-            getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
-                this.srcIdData = res.data.data.records
-            })
-        },
-        // 获取业务来源业务员数据
-        salesUserGetListfun(account){
-            userGetList(1,10,{account}).then(res=>{
-                this.srcIdData = res.data.data.records
-            })
-        },
-        // 清空搜索回调方法
-        searchReset() {
-            this.query = {};
-            this.onLoad(this.page);
-        },
-        // 搜索
-        searchChange(params, done) {
-            this.query = params;
-            this.page.currentPage = 1;
-            this.onLoad(this.page, params);
-            done();
-        },
-        currentChange(currentPage){
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize){
-            this.page.pageSize = pageSize;
-        },
-        refreshChange() {
-            this.onLoad(this.page, this.query);
-        },
-        onLoad(page, params = {}) {
-            this.loading = true;
-            financeStatisticsAgingAnalysis(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-                const data = res.data.data;
-                this.page.total = data.total;
-                this.data = data.records;
-                this.loading = false;
-                this.selectionClear();
-            });
+        {
+          label: "业务来源",
+          value: "3"
+        }
+      ],
+      // 业务类型
+      businessTypeData: [
+        {
+          label: "海运出口",
+          value: "HYCK"
         },
         },
-        selectionClear() {
-            this.$refs.crud.toggleSelection();
+        {
+          label: "海运进口",
+          value: "HYJK"
         },
         },
-        //自定义列保存
-        async saveColumnTwo(ref, option, optionBack, code) {
-            /**
-             * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-             * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-             * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
-             */
-            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-            if (inSave) {
-                this.$message.success("保存成功");
-                //关闭窗口
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
+        {
+          label: "空运出口",
+          value: "KYCK"
         },
         },
-        //自定义列重置
-        async resetColumnTwo(ref, option, optionBack, code) {
-            this[option] = this[optionBack];
-            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-            if (inSave) {
-                this.$message.success("重置成功");
-                this.$refs[ref].$refs.dialogColumn.columnBox = false;
-            }
-        },
-        // 更改表格颜色
-        headerClassName(tab){
-            //颜色间隔
-            let back = ""
-            if (tab.columnIndex >= 0 && tab.column.level === 1) {
-                if (tab.columnIndex % 2 === 0) {
-                    back = "back-one"
-                } else if (tab.columnIndex % 2 === 1) {
-                    back = "back-two"
-                }
+        {
+          label: "空运进口",
+          value: "KYJK"
+        }
+      ],
+      clientIdData: [], // 委托人
+      corpIdData: [], // 结算单位
+      srcTypeData: [], // 业务来源
+      srcIdData: [], // 业务员
+      srcforParameter: { key: "id", label: "cnName", value: "cnName" }
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(335), this.optionBack);
+  },
+  methods: {
+    // 导出
+    exportfun() {
+      const routeData = this.$router.resolve({
+        path: "/api/blade-los/financeStatistics/agingAnalysisExport", //跳转目标窗口的地址
+        query: {
+          ...this.query
+        }
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    // 导出
+    itemExport() {
+      const routeData = this.$router.resolve({
+        path: "/api/blade-los/financeStatistics/agingAnalysisExportItem", //跳转目标窗口的地址
+        query: {
+          ...this.query
+        }
+      });
+      window.open(routeData.href.slice(1, routeData.href.length) + "&" + `${this.website.tokenHeader}=${getToken()}`);
+    },
+    // 下拉监听
+    corpChange(value, name) {
+      if (name == "type") {
+        if (value == 1) {
+          this.$set(this.query, "clientId", null);
+          this.$set(this.query, "clientName", null);
+          this.$set(this.query, "srcType", null);
+          this.$set(this.query, "srcId", null);
+          this.$set(this.query, "srcName", null);
+          this.findObject(this.option.column, "corpName").label = "结算单位";
+        } else if (value == 2) {
+          this.$set(this.query, "corpId", null);
+          this.$set(this.query, "corpName", null);
+          this.$set(this.query, "srcType", null);
+          this.$set(this.query, "srcId", null);
+          this.$set(this.query, "srcName", null);
+          this.findObject(this.option.column, "corpName").label = "委托人";
+        } else if (value == 3) {
+          this.$set(this.query, "corpId", null);
+          this.$set(this.query, "corpName", null);
+          this.$set(this.query, "clientId", null);
+          this.$set(this.query, "clientName", null);
+          this.findObject(this.option.column, "corpName").label = "业务来源";
+        }
+        this.$set(this.query, name, value);
+      } else if (name == "corpName") {
+        for (let item of this.corpIdData) {
+          if (item.cnName == value) {
+            this.$set(this.query, "corpId", item.corpId);
+            this.$set(this.query, "corpName", item.corpName);
+          }
+        }
+      } else if (name == "clientName") {
+        for (let item of this.clientIdData) {
+          if (item.cnName == value) {
+            this.$set(this.query, "clientId", item.corpId);
+            this.$set(this.query, "clientName", item.corpName);
+          }
+        }
+      } else if (name == "srcType") {
+        if (value == "OWN") {
+          // 公司
+          this.srcforParameter = { key: "id", label: "title", value: "title" };
+          this.ownDeptLazyTreefun();
+        } else if (value == "AGENT") {
+          // 代理
+          this.srcforParameter = { key: "id", label: "cnName", value: "cnName" };
+          this.agentBcorpsListfun();
+        } else if (value == "SALES") {
+          // 业务员
+          this.srcforParameter = { key: "id", label: "name", value: "name" };
+          this.salesUserGetListfun();
+        } else {
+        }
+        this.$set(this.query, name, value);
+      } else if (name == "srcName") {
+        for (let item of this.srcIdData) {
+          if (item[this.srcforParameter.value] == value) {
+            if (this.query.srcType == "SALES") {
+              // 业务员
+              this.$set(this.query, "srcId", item.id);
+              this.$set(this.query, "srcName", item.name);
+            } else if (this.form.srcType == "AGENT") {
+              // 代理
+              this.$set(this.query, "srcId", item.id);
+              this.$set(this.query, "srcName", item.cnName);
+            } else {
+              this.$set(this.query, "srcId", item.id);
+              this.$set(this.query, "srcName", item.title);
             }
             }
-            return back;
-        },
+          }
+        }
+      }
+      this.$set(this.query, name, value);
+    },
+    // 业务员下拉
+    srcCorpFocus(value, name) {
+      if (this.query.srcType == "SALES") {
+        // 业务员
+        this.srcforParameter = { key: "id", label: "name", value: "name" };
+        this.salesUserGetListfun(value);
+      } else if (this.form.srcType == "AGENT") {
+        // 代理
+        this.srcforParameter = { key: "id", label: "cnName", value: "cnName" };
+        this.agentBcorpsListfun(value);
+      } else if (this.form.srcType == "OWN") {
+        // 公司
+        this.srcforParameter = { key: "id", label: "title", value: "title" };
+        this.ownDeptLazyTreefun();
+      } else {
+      }
+    },
+    // 多选切换
+    dateChange(name) {
+      if (name == "isBusinessDate") {
+        this.$set(this.query, "isToExamineDate", 0);
+        this.$set(this.query, "isBusinessDate", 1);
+      }
+      if (name == "isToExamineDate") {
+        this.$set(this.query, "isBusinessDate", 0);
+        this.$set(this.query, "isToExamineDate", 1);
+      }
+    },
+    // 收付单选
+    dcInput() {
+      let dcName = "";
+      if (this.query.dc == "D") {
+        dcName = "收";
+      } else {
+        dcName = "付";
+      }
+      this.findObject(this.option.column, "amountusd").label = `应${dcName}美金`;
+      this.findObject(this.option.column, "amount").label = `应${dcName}人民币`;
+      this.findObject(this.option.column, "amountusdAlready").label = `已${dcName}款美金`;
+      this.findObject(this.option.column, "amountAlready").label = `已${dcName}款人民币`;
+      this.findObject(this.option.column, "amountusdNot").label = `未${dcName}款美金`;
+      this.findObject(this.option.column, "amountNot").label = `未${dcName}款人民币`;
+    },
+    // 接口获取数据
+    // 结算单位
+    getBcorpsListfun(cnName) {
+      getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
+        this.corpIdData = res.data.data.records;
+      });
+    },
+    // 委托人
+    clientIdListfun(cnName) {
+      getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
+        this.clientIdData = res.data.data.records;
+      });
+    },
+    // 获取业务来源数据
+    srcTypeWorkDictsfun() {
+      getWorkDicts("src_type_los").then(res => {
+        this.srcTypeData = res.data.data;
+      });
+    },
+    // 获取公司名称 用户管理左侧
+    ownDeptLazyTreefun() {
+      getDeptLazyTree(0).then(res => {
+        this.srcIdData = res.data.data;
+      });
+    },
+    // 获取业务来源代理数据
+    agentBcorpsListfun(cnName) {
+      let corpTypeName = "国内直接客户,国内同行及代理,国外直接客户,国外同行及代理";
+      getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
+        this.srcIdData = res.data.data.records;
+      });
+    },
+    // 获取业务来源业务员数据
+    salesUserGetListfun(account) {
+      userGetList(1, 10, { account }).then(res => {
+        this.srcIdData = res.data.data.records;
+      });
+    },
+    // 清空搜索回调方法
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    // 搜索
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      financeStatisticsAgingAnalysis(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    selectionClear() {
+      this.$refs.crud.toggleSelection();
+      this.$refs.crud.dicInit();
+    },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行代码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = "";
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one";
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two";
+        }
+      }
+      return back;
     }
     }
-}
+  }
+};
 </script>
 </script>
 
 
 <style scoped>
 <style scoped>
 ::v-deep#out-table .back-one {
 ::v-deep#out-table .back-one {
-    background: #ecf5ff !important;
-    text-align: center;
+  background: #ecf5ff !important;
+  text-align: center;
 }
 }
 ::v-deep#out-table .back-two {
 ::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
-    text-align: center;
+  background: #ecf5ff !important;
+  text-align: center;
 }
 }
 </style>
 </style>

+ 55 - 4
src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -273,6 +273,7 @@
                         ]"
                         ]"
                       >
                       >
                         <dic-select
                         <dic-select
+                          ref="pol"
                           v-model="form.polCnName"
                           v-model="form.polCnName"
                           placeholder="起运港"
                           placeholder="起运港"
                           key="id"
                           key="id"
@@ -311,6 +312,7 @@
                         ]"
                         ]"
                       >
                       >
                         <dic-select
                         <dic-select
+                          ref="pod"
                           v-model="form.podCnName"
                           v-model="form.podCnName"
                           placeholder="卸货港"
                           placeholder="卸货港"
                           key="id"
                           key="id"
@@ -341,6 +343,7 @@
                     <el-col span="12">
                     <el-col span="12">
                       <el-form-item label="交货地" prop="placeDeliveryName">
                       <el-form-item label="交货地" prop="placeDeliveryName">
                         <dic-select
                         <dic-select
+                          ref="placeDelivery"
                           v-model="form.placeDeliveryName"
                           v-model="form.placeDeliveryName"
                           placeholder="交货地"
                           placeholder="交货地"
                           key="id"
                           key="id"
@@ -1950,7 +1953,23 @@ export default {
           this.form.polId = row.id;
           this.form.polId = row.id;
           this.form.polCode = row.code;
           this.form.polCode = row.code;
           this.form.polEnName = row.enName;
           this.form.polEnName = row.enName;
-          this.form.polNamePrint = row.enName;
+          // this.form.polNamePrint = row.enName;
+          if (this.form.polNamePrint) {
+            this.$confirm("是否覆盖内容?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            })
+              .then(() => {
+                this.form.polNamePrint = row.enName;
+                this.$refs.pol.$refs.mySelect.blur();
+              })
+              .catch(() => {
+                this.$refs.pol.$refs.mySelect.blur();
+              });
+          } else {
+            this.form.polNamePrint = row.enName;
+          }
         } else {
         } else {
           this.form.polId = null;
           this.form.polId = null;
           this.form.polCode = null;
           this.form.polCode = null;
@@ -1964,7 +1983,23 @@ export default {
           this.form.podId = row.id;
           this.form.podId = row.id;
           this.form.podCode = row.code;
           this.form.podCode = row.code;
           this.form.podEnName = row.enName;
           this.form.podEnName = row.enName;
-          this.form.podNamePrint = row.enName;
+          // this.form.podNamePrint = row.enName;
+          if (this.form.podNamePrint) {
+            this.$confirm("是否覆盖内容?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            })
+              .then(() => {
+                this.form.podNamePrint = row.enName;
+                this.$refs.pod.$refs.mySelect.blur();
+              })
+              .catch(() => {
+                this.$refs.pod.$refs.mySelect.blur();
+              });
+          } else {
+            this.form.podNamePrint = row.enName;
+          }
         } else {
         } else {
           this.form.podId = null;
           this.form.podId = null;
           this.form.podCode = null;
           this.form.podCode = null;
@@ -1977,8 +2012,24 @@ export default {
         if (row) {
         if (row) {
           this.form.placeDeliveryId = row.id;
           this.form.placeDeliveryId = row.id;
           this.form.placeDeliveryCode = row.code;
           this.form.placeDeliveryCode = row.code;
-          // this.form.podEnName = row.enName
-          this.form.placeDeliveryNamePrint = row.enName;
+          this.form.podEnName = row.enName
+          // this.form.placeDeliveryNamePrint = row.enName;
+          if (this.form.placeDeliveryNamePrint) {
+            this.$confirm("是否覆盖内容?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            })
+              .then(() => {
+                this.form.placeDeliveryNamePrint = row.enName;
+                this.$refs.placeDelivery.$refs.mySelect.blur();
+              })
+              .catch(() => {
+                this.$refs.placeDelivery.$refs.mySelect.blur();
+              });
+          } else {
+            this.form.placeDeliveryNamePrint = row.enName;
+          }
         } else {
         } else {
           this.form.placeDeliveryId = null;
           this.form.placeDeliveryId = null;
           this.form.placeDeliveryCode = null;
           this.form.placeDeliveryCode = null;

+ 30 - 2
src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -234,6 +234,7 @@
                     <el-col span="12">
                     <el-col span="12">
                       <el-form-item label="起运港" prop="polCnName" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                       <el-form-item label="起运港" prop="polCnName" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select
                         <dic-select
+                          ref="pol"
                           v-model="form.polCnName"
                           v-model="form.polCnName"
                           placeholder="起运港"
                           placeholder="起运港"
                           key="id"
                           key="id"
@@ -253,6 +254,7 @@
                     <el-col span="12">
                     <el-col span="12">
                       <el-form-item label="卸货港" prop="podCnName" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                       <el-form-item label="卸货港" prop="podCnName" :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select
                         <dic-select
+                          ref="pod"
                           v-model="form.podCnName"
                           v-model="form.podCnName"
                           placeholder="卸货港"
                           placeholder="卸货港"
                           key="id"
                           key="id"
@@ -1730,7 +1732,20 @@ export default {
           this.form.polId = row.id;
           this.form.polId = row.id;
           this.form.polCode = row.code;
           this.form.polCode = row.code;
           this.form.polEnName = row.enName;
           this.form.polEnName = row.enName;
-          this.form.polNamePrint = row.enName;
+          if (this.form.polNamePrint) {
+            this.$confirm("是否覆盖内容?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              this.form.polNamePrint = row.enName;
+              this.$refs.pol.$refs.mySelect.blur();
+            }).catch(()=>{
+            this.$refs.pol.$refs.mySelect.blur();
+            })
+          } else {
+            this.form.polNamePrint = row.enName;
+          }
         } else {
         } else {
           this.form.polId = null;
           this.form.polId = null;
           this.form.polCode = null;
           this.form.polCode = null;
@@ -1744,7 +1759,20 @@ export default {
           this.form.podId = row.id;
           this.form.podId = row.id;
           this.form.podCode = row.code;
           this.form.podCode = row.code;
           this.form.podEnName = row.enName;
           this.form.podEnName = row.enName;
-          this.form.podNamePrint = row.enName;
+          if (this.form.podNamePrint) {
+            this.$confirm("是否覆盖内容?", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(() => {
+              this.form.podNamePrint = row.enName;
+              this.$refs.pod.$refs.mySelect.blur();
+            });
+          } else {
+            this.form.podNamePrint = row.enName;
+            this.$refs.pod.$refs.mySelect.blur();
+          }
+          // this.form.podNamePrint = row.enName;
         } else {
         } else {
           this.form.podId = null;
           this.form.podId = null;
           this.form.podCode = null;
           this.form.podCode = null;

Some files were not shown because too many files changed in this diff