INTTRA DOOR TO && TO DOOR 信息

.editorconfig

@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1266,55 +1266,55 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 this.$refs.form.validate((valid)=>{
                     if (valid) {
                         // 判断必填项
-                        let sum = '请填写'
+                        let msgs=[]
                         if (!this.form.quantity) {
-                            sum += ` 件数`
+                            msgs.push('件数')
                         }
                         if (!this.form.packingUnit) {
-                            sum += ` 包装`
+                            msgs.push('包装')
                         }
                         if (!this.form.grossWeight) {
-                            sum += ` 毛重`
+                            msgs.push('毛重')
                         }
                         if (!this.form.measurement) {
-                            sum += ` 尺码`
+                            msgs.push('尺码')
                         }
                         if (!this.form.eta) {
-                            sum += ` ETA`
+                            msgs.push('ETA')
                         }
                         if (!this.form.teamId) {
-                            sum += ` 所属团队`
+                            msgs.push('所属团队')
                         }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
-                                sum += ` 应收序号${item.$index + 1}往来单位`
+                                msgs.push(`应收序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应收序号${item.$index + 1}费用简称`
+                                msgs.push(`应收序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsCode) {
-                                sum += ` 应收序号${item.$index + 1}核算要素`
+                                msgs.push(`应收序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应收序号${item.$index + 1}币种`
+                                msgs.push(`应收序号${item.$index + 1}币种`)
                             }
                         }
                         for (let item of this.form.feeCenterListC) {
                             if (!item.corpId) {
-                                sum += ` 应付序号${item.$index + 1}往来单位`
+                                msgs.push(`应付序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应付序号${item.$index + 1}费用简称`
+                                msgs.push(`应付序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsCode) {
-                                sum += ` 应付序号${item.$index + 1}核算要素`
+                                msgs.push(`应付序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应付序号${item.$index + 1}币种`
+                                msgs.push(`应付序号${item.$index + 1}币种`)
                             }
                         }
-                        if(sum != '请填写') {
-                            this.$confirm(sum, {
+                        if(msgs.length>0) {
+                            this.$confirm(`请填写下列信息：${msgs.join(" ，")}！`, {
                                 confirmButtonText: "确定",
                                 cancelButtonText: "取消",
                                 type: "warning"

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

@@ -149,6 +149,9 @@
           detailData:{
               type:Boolean
           },
+        pid:{
+            type: Number
+        },
           assemblyForm:{
               type:Object
           },
@@ -508,7 +511,11 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
+        if(!this.assemblyForm.id) return
         this.loading = true;
+        params.pid=this.assemblyForm.id
+        params.businessType=this.assemblyForm.businessType
+        console.log(this.assemblyForm,  "id", this.pid, "assemblyForm.id", this.assemblyForm.id, "billNo", this.assemblyForm.billNo)
         filescenterList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -246,7 +246,7 @@
                                     <edicode :assemblyForm="form" :detailData="detailData"></edicode>
                                 </el-tab-pane>
                                 <el-tab-pane label="文件中心" name="seventh">
-                                    <filescenter :assemblyForm="form" :detailData="detailData"></filescenter>
+                                    <filescenter ref="filescenter" :assemblyForm="form" :pid="form.id" :detailData="detailData"></filescenter>
                                 </el-tab-pane>
                             </el-tabs>
                         </basic-container>
@@ -1350,55 +1350,55 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 this.$refs.form.validate((valid)=>{
                     if (valid) {
                         // 判断必填项
-                        let sum = '请填写'
+                        let msgs=[]
                         if (!this.form.quantity) {
-                            sum += ` 件数`
+                            msgs.push('件数')
                         }
                         if (!this.form.packingUnit) {
-                            sum += ` 包装`
+                            msgs.push('包装')
                         }
                         if (!this.form.grossWeight) {
-                            sum += ` 毛重`
+                            msgs.push('毛重')
                         }
                         if (!this.form.measurement) {
-                            sum += ` 尺码`
+                            msgs.push('尺码')
                         }
                         if (!this.form.etd) {
-                            sum += ` ETD`
+                            msgs.push('ETD')
                         }
                         if (!this.form.teamId) {
-                            sum += ` 所属团队`
+                            msgs.push('所属团队')
                         }
                         for (let item of this.form.feeCenterListD) {
                             if (!item.corpId) {
-                                sum += ` 应收序号${item.$index + 1}往来单位`
+                                msgs.push(`应收序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应收序号${item.$index + 1}费用简称`
+                                msgs.push(`应收序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsId) {
-                                sum += ` 应收序号${item.$index + 1}核算要素`
+                                msgs.push(`应收序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应收序号${item.$index + 1}币种`
+                                msgs.push(`应收序号${item.$index + 1}币种`)
                             }
                         }
                         for (let item of this.form.feeCenterListC) {
                             if (!item.corpId) {
-                                sum += ` 应付序号${item.$index + 1}往来单位`
+                                msgs.push(`应付序号${item.$index + 1}往来单位`)
                             }
                             if (!item.feeId) {
-                                sum += ` 应付序号${item.$index + 1}费用简称`
+                                msgs.push(`应付序号${item.$index + 1}费用简称`)
                             }
                             if (!item.elementsId) {
-                                sum += ` 应付序号${item.$index + 1}核算要素`
+                                msgs.push(`应付序号${item.$index + 1}核算要素`)
                             }
                             if (!item.curCode) {
-                                sum += ` 应付序号${item.$index + 1}币种`
+                                msgs.push(`应付序号${item.$index + 1}币种`)
                             }
                         }
-                        if(sum != '请填写') {
-                            this.$confirm(sum, {
+                        if(msgs.length>0) {
+                            this.$confirm(`请填写下列信息：${msgs.join(" ，")}！`, {
                                 confirmButtonText: "确定",
                                 cancelButtonText: "取消",
                                 type: "warning"
@@ -1620,7 +1620,11 @@ import {editypesList} from "@/api/iosBasicData/editypes";
             // 详情接口
             async billsDetailfun(id){
                 const res = await billsDetail(id)
-                this.form = res.data.data;
+                // this.form = res.data.data;
+                this.$set(this, 'form', res.data.data)
+              //   console.log('form', this.form)
+              // console.log(this.$refs)
+              //   this.$refs.filescenter.onload()
                 this.copyFormData = JSON.parse(JSON.stringify(res.data.data))
                 // 如果已经请核就禁用按钮
                 // if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {

src/views/iosBasicData/accounts/accountsDetails.vue

@@ -43,21 +43,21 @@
         methods:{
             // 大保存
             bigSavefun(){
-                let sum = '请填写'
+                let msgs=[]
                 if (!this.form.code) {
-                    sum += '科目编码 '
+                    msgs.push('科目编码')
                 }
                 if (!this.form.cnName) {
-                    sum += '科目名称 '
+                    msgs.push('科目名称')
                 }
                 if (!this.form.cnName) {
-                    sum += '科目英文 '
+                    msgs.push('科目英文')
                 }
                 if (!this.form.dc) {
-                    sum += '方向 '
+                    msgs.push('方向')
                 }
-                if (sum != '请填写') {
-                    this.$alert(sum, '提示', {
+                if(msgs.length>0) {
+                    this.$alert(`请填写下列信息：${msgs.join(" ，")}！`, '提示', {
                         confirmButtonText: '确定',
                     });
                     return

src/views/iosBasicData/accounts/index.vue

@@ -524,18 +524,18 @@ import {
         },
         // 大保存
         bigSavefun(){
-            let sum = '请填写'
+            let msgs=[]
             if (!this.form.code) {
-                sum += '科目编码 '
+                msgs.push('科目编码')
             }
             if (!this.form.cnName) {
-                sum += '科目名称 '
+                msgs.push('科目名称')
             }
             if (!this.form.dc) {
-                sum += '方向 '
+                msgs.push('方向')
             }
-            if (sum != '请填写') {
-                this.$alert(sum, '提示', {
+            if(msgs.length>0) {
+                this.$alert(`请填写下列信息：${msgs.join(" ，")}！`, '提示', {
                     confirmButtonText: '确定',
                 });
                 return