修改bug

src/api/tradeAgency/oceanFreightImport.js

@@ -220,4 +220,21 @@ export const calculationWarehouseUnitPrice= (data) => {
         method: 'post',
         data: data
     })
+}
+//批量保存派车信息
+export const submitList1= (data) => {
+    return request({
+        url: '/api/blade-los/dispatchvehicles/submitList',
+        method: 'post',
+        data: data
+    })
+}
+
+//批量保存出入库信息
+export const submitList2= (data) => {
+    return request({
+        url: '/api/blade-los/inoutstorage/submitList',
+        method: 'post',
+        data: data
+    })
 }

src/components/tradeAgency/businessReports.vue

@@ -2,12 +2,12 @@
   <div>
     <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+      <avue-crud :option="selecList.length||type ? option : optionPrinting" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName" :search.sync="query"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 397)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 397)" @search-change="searchChange"
         @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-        @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+        @size-change="sizeChange" @refresh-change="refreshChange">
         <template slot-scope="scope" slot="menu">
           <el-link type="primary" :disabled="scope.row.status == 1"
             @click="reportsGetReportDatafun(scope.row.url, scope.row)">预览报表</el-link>
@@ -26,7 +26,7 @@ import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
-
+import { getFeeCenterCorpIds } from "@/api/iosBasicData/feecenter";
 export default {
   components: {
     reportContainer
@@ -43,10 +43,27 @@ export default {
       type: String,
       default: ''
     },
+    classifyCode: {
+      type: String,
+      default: ''
+    },
+    groupCode: {
+      type: String,
+      default: ''
+    },
+    selecList: {
+      type: Array,
+      default: []
+    },
     itemIds: {
       type: String,
       default: null
-    }
+    },
+    type: {
+      type: Boolean,
+      default: false,
+    },
+
   },
   data() {
     return {
@@ -65,6 +82,37 @@ export default {
         currentPage: 1,
         total: 0
       },
+      optionPrinting: {
+        stripe: true,
+        height: 400,
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        selection: true,
+        dialogClickModal: false,
+        refreshBtn: false,
+        columnBtn: false,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        menuWidth: '100',
+        // menu:false,
+        column: [
+          {
+            label: "客户名称",
+            prop: "cnName",
+            overHidden: true,
+          },
+          {
+            label: "客户编号",
+            prop: "code",
+            overHidden: true,
+          },
+        ]
+      },
       selectionList: [],
       option: {},
       optionBack: {
@@ -77,7 +125,8 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        search: false,
+        searchBtn: false,
+        emptyBtn:false,
         dialogClickModal: false,
         menuWidth: 100,
         column: [
@@ -131,7 +180,7 @@ export default {
           },
         ]
       },
-      data: []
+      data: [],
     };
   },
   async created() {
@@ -165,6 +214,7 @@ export default {
   methods: {
     openDialog() {
       this.previewDialog = true
+      this.onLoad(this.page, this.query);
     },
     // 设计报表
     async reportDesignButton(url) {
@@ -517,16 +567,30 @@ export default {
     },
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
-      // if (row.groupCode == '首款' && this.itemIds == null) return this.$message.error("请选择明细");
-      // if (row.groupCode == '尾款' && this.itemIds == null) return this.$message.error("请选择明细");
-      reportsGetReportData({
-        billId: this.id,
-        reportCode: row.classifyCode,
-        groupCode: row.groupCode,
-        itemIds: this.itemIds,
-        type: this.businessValue
-      }).then(res => {
-        this.handleReportPreview(url, res.data.data.data)
+      let obj = {}
+      if (this.selecList.length||this.type) {
+        obj = {
+          billId: this.id,
+          reportCode: row.classifyCode,
+          groupCode: row.groupCode,
+          itemIds: this.itemIds,
+          type: this.businessValue
+        }
+      } else {
+        obj = {
+          billId: this.id,
+          reportCode: this.classifyCode,
+          groupCode: this.groupCode,
+          type: this.businessValue,
+          corpIds: row.id
+        }
+      }
+      reportsGetReportData(obj).then(res => {
+        if (this.selecList.length||this.type) {
+          this.handleReportPreview(url, res.data.data.data)
+        } else {
+          this.handleReportPreview(this.url, res.data.data.data)
+        }
       })
     },
     // 预览报表
@@ -885,13 +949,31 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       params.businessType = this.businessValue
-      getList(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();
-      });
+      params.classifyCode = this.classifyCode
+      params.groupCode = this.groupCode
+      if (this.selecList.length||this.type) {
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          this.page.total = res.data.data.total;
+          this.data = res.data.data.records;
+          this.selectionClear();
+        }).finally(() => {
+          this.loading = false;
+        })
+      } else {
+        getFeeCenterCorpIds({
+          billId: this.id,
+          dc: this.groupCode == '应收' ? 'D' : 'C',
+          type: this.businessValue,
+        }).then(res => {
+          this.data = res.data.data;
+          getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            this.url = res.data.data.records.length ? res.data.data.records[0].url : null;
+          })
+          this.selectionClear();
+        }).finally(() => {
+          this.loading = false;
+        })
+      }
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/components/tradeAgency/businessReportsJK.vue

@@ -1,13 +1,14 @@
 <template>
   <div>
-    <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
+    <el-dialog class="dialogClass" append-to-body title="预览报表" :visible.sync="previewDialog" width="60%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-      <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
-        v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName" :search.sync="query"
+      <avue-crud :option="selecList.length ? option : optionPrinting" :table-loading="loading" :data="data"
+        :page.sync="page" :permission="permissionList" v-model="form" ref="crud" id="out-table"
+        :header-cell-class-name="headerClassName" :search.sync="query"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 397)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 397)" @search-change="searchChange"
         @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
-        @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+        @size-change="sizeChange" @refresh-change="refreshChange">
         <template slot-scope="scope" slot="menu">
           <el-link type="primary" :disabled="scope.row.status == 1"
             @click="reportsGetReportDatafun(scope.row.url, scope.row)">预览报表</el-link>
@@ -25,7 +26,7 @@ import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
-
+import { getFeeCenterCorpIds } from "@/api/iosBasicData/feecenter";
 export default {
   components: {
     reportContainer
@@ -50,6 +51,14 @@ export default {
       type: String,
       default: ''
     },
+    selecList: {
+      type: Array,
+      default: []
+    },
+    itemIds: {
+      type: String,
+      default: null
+    }
   },
   data() {
     return {
@@ -68,6 +77,37 @@ export default {
         total: 0
       },
       selectionList: [],
+      optionPrinting: {
+        stripe: true,
+        height: 400,
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        selection: true,
+        dialogClickModal: false,
+        refreshBtn: false,
+        columnBtn: false,
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: false,
+        menuWidth: '100',
+        // menu:false,
+        column: [
+          {
+            label: "客户名称",
+            prop: "cnName",
+            overHidden: true,
+          },
+          {
+            label: "客户编号",
+            prop: "code",
+            overHidden: true,
+          },
+        ]
+      },
       option: {},
       optionBack: {
         height: 400,
@@ -77,7 +117,8 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        search: false,
+        searchBtn: false,
+        emptyBtn:false,
         dialogClickModal: false,
         menuWidth: 100,
         column: [
@@ -131,7 +172,8 @@ export default {
           },
         ]
       },
-      data: []
+      data: [],
+      url: null,
     };
   },
   async created() {
@@ -165,6 +207,7 @@ export default {
   methods: {
     openDialog() {
       this.previewDialog = true
+      this.onLoad(this.page, this.query);
     },
     // 设计报表
     async reportDesignButton(url) {
@@ -516,13 +559,32 @@ export default {
     },
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
-      reportsGetReportData({
-        billId: this.id,
-        reportCode: row.classifyCode,
-        groupCode: row.groupCode,
-        type: this.businessValue
-      }).then(res => {
-        this.handleReportPreview(url, res.data.data.data)
+      let obj = {}
+      if (this.selecList.length) {
+        obj = {
+          billId: this.id,
+          reportCode: row.classifyCode,
+          groupCode: row.groupCode,
+          itemIds:this.itemIds,
+          type: this.businessValue
+        }
+      } else {
+        obj = {
+          billId: this.id,
+          reportCode: this.classifyCode,
+          groupCode: this.groupCode,
+          type: this.businessValue,
+          corpIds: row.id
+        }
+      }
+
+      reportsGetReportData(obj).then(res => {
+        if (this.selecList.length) {
+          this.handleReportPreview(url, res.data.data.data)
+        } else {
+          this.handleReportPreview(this.url, res.data.data.data)
+        }
+
       })
     },
     // 预览报表
@@ -883,13 +945,31 @@ export default {
       params.businessType = this.businessValue
       params.classifyCode = this.classifyCode
       params.groupCode = this.groupCode
-      getList(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();
-      });
+      if (this.selecList.length) {
+        getList(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.selectionClear();
+        }).finally(() => {
+          this.loading = false;
+        })
+      } else {
+        getFeeCenterCorpIds({
+          billId: this.id,
+          dc: this.groupCode == '应收' ? 'D' : 'C',
+          type: 'HYJK',
+        }).then(res => {
+          this.data = res.data.data;
+          getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            this.url = res.data.data.records.length ? res.data.data.records[0].url : null;
+          })
+          this.selectionClear();
+        }).finally(() => {
+          this.loading = false;
+        })
+      }
+
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {
@@ -951,4 +1031,8 @@ export default {
 /deep/ .el-col-md-8 {
   width: 24.33333%;
 }
+
+// .dialogClass{
+//   padding-bottom: 10px !important;
+// }
 </style>

src/components/tradeAgency/fee-info.vue

@@ -18,8 +18,7 @@
                     @click="allClick('生成账单', 'D')">生成账单</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                     @click="allClick('撤销账单', 'D')">撤销账单</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('打印账单', 'D')">打印账单</el-button> -->
+                <el-button type="primary" plain size="small" @click="$refs.printD.openDialog()">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('应收模板', 'D')">应收模板</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
@@ -34,8 +33,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -96,8 +95,7 @@
                     @click="allClick('生成账单', 'C')">生成账单</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionCList.length == 0"
                     @click="allClick('撤销账单', 'C')">撤销账单</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('打印账单', 'C')">打印账单</el-button> -->
+                <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('应付模板', 'C')">应付模板</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="disabled"
@@ -112,8 +110,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -155,6 +153,10 @@
                 <span v-else>{{ row.stlExrate }}</span>
             </tempalte>
         </avue-crud>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="MYDL" classifyCode="费用"
+            groupCode="应收" :selecList="selectionDList"></business-reports>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="MYDL" classifyCode="费用"
+            groupCode="应付"></business-reports>
         <!--模板弹窗-->
         <el-dialog title="提示" :visible.sync="templateVisible" append-to-body width="70%" :close-on-click-modal="false"
             :before-close="handleClose">
@@ -188,10 +190,12 @@ import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import { submitListTrade, feeRemove, generateBill, revokeBill, feecenterTemplateImport } from "@/api/tradeAgency/tradeAgency";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
+import businessReports from "@/components/tradeAgency/businessReports.vue";
 import _ from "lodash";
 export default {
     components: {
-        dicSelect
+        dicSelect,
+        businessReports
     },
     props: {
         detailData: {},
@@ -616,7 +620,8 @@ export default {
             templateData: [],
             lefttemplate: {}, // 左侧选择的数据
             feesselectionList: [], // 清空多选
-            templateRightData: []
+            templateRightData: [],
+            itemIds: null,
         }
     },
     async created() {
@@ -709,9 +714,27 @@ export default {
             }
         },
         selectionDChange(list) {
+            let ids = []
+            list.forEach(e => {
+                ids.push(e.id)
+            })
+            if (ids.length) {
+                this.itemIds = ids.join(',')
+            } else {
+                this.itemIds = null
+            }
             this.selectionDList = list
         },
         selectionCChange(list) {
+            let ids = []
+            list.forEach(e => {
+                ids.push(e.id)
+            })
+            if (ids.length) {
+                this.itemIds = ids.join(',')
+            } else {
+                this.itemIds = null
+            }
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {
@@ -803,7 +826,7 @@ export default {
                         }
                     }
                     for (let index in this.form.feeCenterListC) {
-                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                        if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款' || this.form.feeCenterListC[index].feeCnName == '手续费') {
                             this.$refs.crudC.rowCell(this.form.feeCenterListC[index], index)
                             if (!this.form.feeCenterListC[index].discountExrate) return this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         }
@@ -1067,7 +1090,7 @@ export default {
                 }
             }
             for (let index in this.form.feeCenterListC) {
-                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款' || this.form.feeCenterListC[index].feeCnName == '手续费') {
                     if (!this.form.feeCenterListC[index].discountExrate) {
                         this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         return false

src/components/tradeAgency/fee-oceanFreight.vue

@@ -180,7 +180,7 @@
             </span>
         </el-dialog>
         <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="HYJK" classifyCode="费用"
-            groupCode="应收"></business-reports>
+            groupCode="应收" :selecList="selectionDList"></business-reports>
         <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="HYJK" classifyCode="费用"
             groupCode="应付"></business-reports>
     </div>
@@ -640,7 +640,8 @@ export default {
             templateData: [],
             lefttemplate: {}, // 左侧选择的数据
             feesselectionList: [], // 清空多选
-            templateRightData: []
+            templateRightData: [],
+            itemIds: null,
         }
     },
     async created() {
@@ -731,9 +732,27 @@ export default {
             }
         },
         selectionDChange(list) {
+            let ids = []
+            list.forEach(e => {
+                ids.push(e.id)
+            })
+            if (ids.length) {
+                this.itemIds = ids.join(',')
+            } else {
+                this.itemIds = null
+            }
             this.selectionDList = list
         },
         selectionCChange(list) {
+            let ids = []
+            list.forEach(e => {
+                ids.push(e.id)
+            })
+            if (ids.length) {
+                this.itemIds = ids.join(',')
+            } else {
+                this.itemIds = null
+            }
             this.selectionCList = list
         },
         rowDicChange(name, row, el) {

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

@@ -1748,7 +1748,11 @@ export default {
             if (this.form.carrierCnName) {
                 let corpTypeName = '船公司'
                 getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, status: 0, corpTypeName }).then(res => {
-                    this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
+                    // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
+                    res.data.data.records.forEach(e=>{
+                        if(this.form.carrierCnName==e.cnName)
+                        this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
+                    })
                 })
                 // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
             }
@@ -1775,13 +1779,20 @@ export default {
             // 船名
             if (this.form.vesselCnName) {
                 getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
+                    res.data.data.records.forEach(e=>{
+                        if(this.form.vesselCnName==e.cnName)
+                        this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
+                    })
+                    // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
                 })
             }
             // 客户名称
             if (this.form.corpCnName) {
                 getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
-                    this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
+                    res.data.data.records.forEach(e=>{
+                        if(this.form.corpCnName==e.cnName)
+                        this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
+                    })
                 })
             }
 

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

@@ -1067,6 +1067,7 @@ export default {
         this.templateOption = await this.getColumnData(this.getColumnName(309.5), this.templateOptionBack);
         this.getBcorpsListfun() // 获取客户数据
         this.paymodeWorkDictsfun() // 获取预付/到付数据
+        console.log()
     },
     methods: {
         getKeyName(key) {

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

@@ -18,7 +18,8 @@
                 <el-button size="small" type="primary" style="margin-right: 8px" @click="addEdit">新 建
                 </el-button>
                 <el-dropdown style="line-height: 0" v-if="saberTenantId == '409341'">
-                    <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.status > 0||showLock">
+                    <el-button size="small" type="warning" style="margin-right: 8px"
+                        :disabled="form.status > 0 || showLock">
                         导入模板<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -29,7 +30,7 @@
                 </el-dropdown>
                 <el-dropdown style="line-height: 0">
                     <el-button size="small" type="success" style="margin-right: 8px" :loading="saveLoading"
-                        :disabled="!form.id ||showLock">
+                        :disabled="!form.id || showLock">
                         发送 EDI<i class="el-icon-arrow-down el-icon--right"></i>
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -41,17 +42,17 @@
 
                 <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
                 </el-button>
-                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled||showLock"
+                <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled||showLock"
+                <el-button size="small" type="success" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 0 || form.status == 4" @click.stop="DocumentApproval">单据请核
                 </el-button>
                 <!--<el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"-->
                 <!--            :loading="saveLoading" @click="editHandle">编 辑-->
                 <!--</el-button>-->
-                <el-button size="small" type="primary" style="margin-right: 8px" :disabled="detailData.seeDisabled||showLock"
-                    :loading="saveLoading" @click="editCustomer">保 存
+                <el-button size="small" type="primary" style="margin-right: 8px"
+                    :disabled="detailData.seeDisabled || showLock" :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
                     <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
@@ -212,23 +213,25 @@
                         <basic-container :showBtn="true">
                             <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
                                 <el-tab-pane label="委托详情" name="first">
-                                    <entrustment-lnformation :assemblyForm="form" :detailData="detailData" :disabled="showLock"
-                                        :generateBillsfalse="generateBillsfalse" @billsDetailfun="billsDetailfun(form.id)">
+                                    <entrustment-lnformation :assemblyForm="form" :detailData="detailData"
+                                        :disabled="showLock" :generateBillsfalse="generateBillsfalse"
+                                        @billsDetailfun="billsDetailfun(form.id)">
                                     </entrustment-lnformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="配箱信息" name="second">
-                                    <DistributionBox :assemblyForm="form" :detailData="detailData"  :showLock="showLock"
+                                    <DistributionBox :assemblyForm="form" :detailData="detailData" :showLock="showLock"
                                         :pleasereviewType="pleasereviewType" @billsAddfun="billsAddfun"
                                         @billsDetailfun="billsDetailfun(form.id)">
                                     </DistributionBox>
                                 </el-tab-pane>
                                 <el-tab-pane label="MB/L信息" name="third">
-                                    <mbinformation :assemblyForm="form" :detailData="detailData" :disabled="showLock"></mbinformation>
+                                    <mbinformation :assemblyForm="form" :detailData="detailData" :disabled="showLock">
+                                    </mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth"
                                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false">
-                                    <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled||showLock"
-                                        businessValue="HYCK"></reports>
+                                    <reports :id="form.id" :assemblyForm="form"
+                                        :disabled="detailData.seeDisabled || showLock" businessValue="HYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="EDI CODE" name="sixth">
                                     <edicode :assemblyForm="form" :detailData="detailData" :disabled="showLock"></edicode>
@@ -248,15 +251,18 @@
 
                 <el-tab-pane label="费用信息" name="fy" class="scrollable-container"
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('应收修改') != -1 || roleName.indexOf('应付修改') != -1 || roleName.indexOf('应收查看') != -1 || roleName.indexOf('应付查看') != -1">
-                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData" :disabled="detailData.seeDisabled||showLock"
-                        :pleasereviewType="pleasereviewType" :pid="form.id" @billsDetailfun="billsDetailfun(form.id)">
+                    <feecenter :assemblyForm="form" :copyFormData="copyFormData" :detailData="detailData"
+                        :disabled="detailData.seeDisabled || showLock" :pleasereviewType="pleasereviewType" :pid="form.id"
+                        @billsDetailfun="billsDetailfun(form.id)">
                     </feecenter>
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
-                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form" :disabled="detailData.seeDisabled||showLock"></document-center>
+                    <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"
+                        :disabled="detailData.seeDisabled || showLock"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'" class="scrollable-container">
-                    <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData" :disabled="detailData.seeDisabled||showLock"
+                    <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"
+                        :disabled="detailData.seeDisabled || showLock"
                         @billsListAllfun="billsListAllfun(form.id)"></Split-list>
                 </el-tab-pane>
             </el-tabs>
@@ -347,7 +353,7 @@ export default {
     },
     data() {
         return {
-            showLock:false,
+            showLock: false,
             ediData: [], // edi 列表数据
             previewDialog: false, // 预览报表弹窗开启
             generateBillsfalse: false, // 如果生成账单就禁用
@@ -771,7 +777,7 @@ export default {
     },
     methods: {
         inLock() {
-            this.showLock=true;
+            this.showLock = true;
             const data = {
                 moduleName: "SE",
                 tableName: "SE_order",
@@ -789,7 +795,7 @@ export default {
                 if (res.data.code == 200) {
                     this.onLock(data).then(res => {
                         if (res.data.code == 200) {
-                            this.showLock=false
+                            this.showLock = false
                         }
                     });
                 }
@@ -1389,13 +1395,13 @@ export default {
         },
         //返回列表
         backToList() {
-            if(this.form.id){
+            if (this.form.id) {
                 this.unLock({
-                moduleName: "SE",
-                tableName: "SE_order",
-                billId: this.form.id,
-                billNo: this.form.mblno
-            });
+                    moduleName: "SE",
+                    tableName: "SE_order",
+                    billId: this.form.id,
+                    billNo: this.form.mblno
+                });
             }
             this.$emit('goBack')
         },
@@ -1966,14 +1972,24 @@ export default {
             if (this.form.coloaderCnName) {
                 let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
                 getBcorpslistByType(1, 10, { cnName: this.form.coloaderCnName, status: 0, corpTypeName }).then(res => {
-                    this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
+                    res.data.data.records.forEach(e => {
+                        if (this.form.coloaderCnName == e.cnName) {
+                            this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + e.code
+                        }
+                    })
+                    // this.form.coloaderCnName = this.form.coloaderCnName + ' - ' + res.data.data.records[0].code
                 })
             }
             // 船公司
             if (this.form.carrierCnName) {
                 let corpTypeName = '船公司'
                 getBcorpslistByType(1, 10, { cnName: this.form.carrierCnName, status: 0, corpTypeName }).then(res => {
-                    this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
+                    res.data.data.records.forEach(e => {
+                        if (this.form.carrierCnName == e.cnName) {
+                            this.form.carrierCnName = this.form.carrierCnName + ' - ' + e.code
+                        }
+                    })
+                    // this.form.carrierCnName = this.form.carrierCnName + ' - ' + res.data.data.records[0].code
                 })
                 // this.form.carrierCnName = this.form.carrierCnName + ' - ' + this.form.carrierCode
             }
@@ -2010,13 +2026,22 @@ export default {
             // 船名
             if (this.form.vesselCnName) {
                 getBvesselsList(1, 10, { cnName: this.form.vesselCnName }).then(res => {
-                    this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
+                    // this.form.vesselCnName = this.form.vesselCnName + ' - ' + res.data.data.records[0].code
+                    res.data.data.records.forEach(e => {
+                        if (this.form.vesselCnName == e.cnName) {
+                            this.form.vesselCnName = this.form.vesselCnName + ' - ' + e.code
+                        }
+                    })
                 })
             }
             // 客户名称
             if (this.form.corpCnName) {
                 getBcorpslistByType(1, 10, { cnName: this.form.corpCnName }).then(res => {
-                    this.form.corpCnName = this.form.corpCnName + ' - ' + res.data.data.records[0].shortName
+                    res.data.data.records.forEach(e => {
+                        if (this.form.corpCnName == e.cnName){
+                            this.form.corpCnName = this.form.corpCnName + ' - ' + e.shortName
+                        }
+                    })
                 })
             }
 

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -19,8 +19,7 @@
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editDisabled" @click="inEdit">编 辑
                 </el-button>
-                <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
-                    :disabled="isSaveBtn" @click="submit">保 存
+                <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small" @click="submit">保 存
                 </el-button>
                 <el-dropdown style="line-height: 0">
                     <el-button class="el-button--small-yh" style="margin-left: 6px;" type="warning" :disabled="!form.id"
@@ -51,9 +50,9 @@
                 <fee-infosimple ref="feeInfo" feeType="C" :form="form" :disabled="editDisabled || form.firstStatus == '审核通过'"
                     @getDetails="getDetails"></fee-infosimple>
             </trade-card>
-            <!-- <containerTitle title="上传附件"></containerTitle>
+            <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload> -->
+                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled|| form.orderStatus == '已确认'"></c-upload>
             <!--审核弹窗-->
             <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -148,7 +147,7 @@ export default {
                         disabled: false,
                     },
                     {
-                        label: '外国发货人',
+                        label: '国外发货人',
                         prop: "abroadConsignorCname",
                         disabled: true,
                     },

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -46,7 +46,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 80,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -102,6 +102,29 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "状态",
+                        prop: "orderStatus",
+                        search: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '录入',
+                            value: '录入'
+                        }, {
+                            label: '已申请首付款',
+                            value: '已申请首付款'
+                        }, {
+                            label: '审核通过',
+                            value: '审核通过'
+                        }, {
+                            label: '审核中',
+                            value: '审核中'
+                        }, {
+                            label: '已结算',
+                            value: '已结算'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "业务日期",
                         prop: "businessDate",
                         type: "date",

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -14,7 +14,7 @@
                     v-if="editDisabled" @click="inEdit">编 辑
                 </el-button>
                 <el-button v-if="!editDisabled" class="el-button--small-yh" style="margin-left: 6px;" type="primary"
-                    size="small" :disabled="isSaveBtn || form.orderStatus == '已确认'" @click="submit">保 存
+                    size="small" :disabled="isSaveBtn" @click="submit">保 存
                 </el-button>
             </div>
         </div>
@@ -34,9 +34,9 @@
             <trade-card title="费用明细">
                 <fee-infosimple feeType="D" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-infosimple>
             </trade-card>
-            <!-- <containerTitle title="上传附件"></containerTitle>
+            <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload> -->
+                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
         </div>
     </div>
 </template>
@@ -282,6 +282,7 @@ export default {
             getDetail({ id: id }).then(res => {
                 if (res.data.data.orderStatus == '已确认') this.optionForm.disabled = true
                 this.form = res.data.data
+                // this.form.filesCenterList=[]
             }).finally(() => {
                 loading.close()
             })

src/views/tradeAgency/firstSettlement/index.vue

@@ -46,7 +46,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 80,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 6,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -116,6 +116,20 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "状态",
+                        prop: "orderStatus",
+                        search: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '录入',
+                            value: '录入'
+                        }, {
+                            label: '已确认',
+                            value: '已确认'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "金额",
                         prop: "goodsValue",
                         overHidden: true,
@@ -123,6 +137,7 @@ export default {
                     {
                         label: '付汇美元金额',
                         prop: "paymentInUsd",
+                        width: 160,
                         overHidden: true,
                     },
                     {
@@ -170,7 +185,7 @@ export default {
     },
     activated() {
         setTimeout(() => {
-            if (this.$route.query.billNo||this.$route.query.params) {
+            if (this.$route.query.billNo || this.$route.query.params) {
                 this.isShow = false
                 this.$store.commit("IN_FIRSTSET_DETAIL");
             }

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -38,8 +38,9 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <tempalte slot="corpCnName">
                         <dic-select v-model="form.corpCnName" placeholder="客户" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('corpCnName', $event)" :disabled="editDisabled"></dic-select>
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('corpCnName', $event)"
+                            :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="polCnName">
                         <dic-select v-model="form.polCnName" placeholder="起运港" key="id" label="cnName" res="records"
@@ -58,13 +59,15 @@
                     </tempalte>
                     <tempalte slot="hshipperCnName">
                         <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=外国工厂" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('hshipperCnName', $event)" :disabled="editDisabled"></dic-select>
+                            url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)"
+                            :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="hconsigneeCnName">
                         <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('hconsigneeCnName', $event)" :disabled="editDisabled"></dic-select>
+                            url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)"
+                            :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="carrierCnName">
                         <dic-select v-model="form.carrierCnName" placeholder="船公司" key="id" label="cnName" res="records"
@@ -89,8 +92,7 @@
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 388)">
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1"
-                            @click="rowCell('编辑', row, index)">编
-                            辑</el-button>
+                            @click="rowCell('箱编辑', row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1"
                             @click="rowCell('派车', row, index)">派
                             车</el-button>
@@ -135,12 +137,11 @@
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" type="text"
                             :disabled="editDisabled || row.whetherDispatchVehicles == 1 || row.whetherWarehouseEntry == 1"
-                            @click="rowCell('编辑', row, index)">编
-                            辑</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1"
+                            @click="rowCell('派车编辑', row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1||row.$cellEdit"
                             @click="rowCell('确认派车', row, index)">确
                             认</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherWarehouseEntry == 1"
+                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherWarehouseEntry == 1||row.$cellEdit"
                             @click="rowCell('生成入库', row, index)">入
                             库</el-button>
                         <!-- <el-button size="small" type="text"
@@ -161,12 +162,11 @@
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
-                            @click="rowCell('编辑', row, index)">编
-                            辑</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
+                            @click="rowCell('入库编辑', row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1||row.$cellEdit"
                             @click="rowCell('入库确认', row, index)">入库确认</el-button>
                         <el-button size="small" type="text"
-                            :disabled="editDisabled || (row.whetherInOutStorage == 1 && row.surplusQuantity == 0)"
+                            :disabled="editDisabled || (row.whetherInOutStorage == 1 && row.surplusQuantity == 0)||row.$cellEdit"
                             @click="rowCell('生成出库', row, index)">出
                             库</el-button>
                         <!-- <el-button size="small" type="text"
@@ -181,8 +181,7 @@
                     @saveColumn="saveColumn('crud4', 'option4', 'optionBack4', 391)">
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
-                            @click="rowCell('编辑', row, index)">编
-                            辑</el-button>
+                            @click="rowCell('出库编辑', row, index)">{{ row.$cellEdit ? '保 存' : '编 辑' }}</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
                             @click="rowCell('出库确认', row, index)">出库确认</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled" @click="rowCell('开票', row, index)">开
@@ -199,7 +198,7 @@
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
                 deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
         </div>
-        <business-reports :id="form.id" ref="print" businessValue="HYJK"  classifyCode="业务"></business-reports>
+        <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务"></business-reports>
         <!--审核弹窗-->
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -209,7 +208,7 @@
 </template>
 
 <script>
-import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills } from "@/api/tradeAgency/oceanFreightImport";
+import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2 } from "@/api/tradeAgency/oceanFreightImport";
 import feeInfo from "@/components/tradeAgency/fee-oceanFreight";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1164,9 +1163,65 @@ export default {
             }
         },
         rowCell(name, row, index) {
-            if (name == '编辑') {
-                console.log(2232323)
+            if (name == '箱编辑') {
+                if (row.$cellEdit == true) {
+                    this.$set(row, "$cellEdit", false);
+                } else {
+                    this.$set(row, "$cellEdit", true);
+                }
+            }
+            if (name == '派车编辑') {
+                if (row.$cellEdit == true) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submitList1(this.form.dispatchVehiclesList).then(res => {
+                        this.form.dispatchVehiclesList = res.data.data
+                        this.$message.success("保存成功");
+                    }).finally(() => {
+                        loading.close()
+                    })
+                    this.$set(row, "$cellEdit", false);
+                } else {
+                    this.$set(row, "$cellEdit", true);
+                }
+            }
+            if (name == '入库编辑') {
+                if (row.$cellEdit == true) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submitList2(this.form.inStorageList).then(res => {
+                        this.form.inStorageList = res.data.data
+                        this.$message.success("保存成功");
+                    }).finally(() => {
+                        loading.close()
+                    })
+                    this.$set(row, "$cellEdit", false);
+                } else {
+                    this.$set(row, "$cellEdit", true);
+                }
+            }
+            if (name == '出库编辑') {
                 if (row.$cellEdit == true) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submitList2(this.form.outStorageList).then(res => {
+                        this.form.outStorageList = res.data.data
+                        this.$message.success("保存成功");
+                    }).finally(() => {
+                        loading.close()
+                    })
                     this.$set(row, "$cellEdit", false);
                 } else {
                     this.$set(row, "$cellEdit", true);
@@ -1174,11 +1229,8 @@ export default {
             }
             if (name == '派车') {
                 if (row.whetherMachineInspection == 1) {
-                    if (!row.inspectionType) {
-                        return this.$message.error("查验类型不能为空");
-                    }
-                    if (!row.inspectionDate) {
-                        return this.$message.error("查验时间不能为空");
+                    if (!row.inspectionType || !row.inspectionDate) {
+                        return this.$message.error((!row.inspectionType ? "查验类型," : '') + (!row.inspectionDate ? "查验时间" : '') + "不能为空");
                     }
                 }
                 let obj = {
@@ -1232,23 +1284,8 @@ export default {
             //     })
             // }
             if (name == '确认派车') {
-                if (!row.fleetName) {
-                    return this.$message.error("承运车队不能为空");
-                }
-                if (!row.licenseNumber) {
-                    return this.$message.error("车号不能为空");
-                }
-                if (!row.fullName) {
-                    return this.$message.error("姓名不能为空");
-                }
-                if (!row.contactInformation) {
-                    return this.$message.error("联系方式不能为空");
-                }
-                if (!row.deliveryDate) {
-                    return this.$message.error("送货时间不能为空");
-                }
-                if (!row.deliveryAddressName) {
-                    return this.$message.error("送货地点不能为空");
+                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation || !row.deliveryDate || !row.deliveryAddressName) {
+                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式，" : '') + (!row.deliveryDate ? "送货时间，" : null) + (!row.deliveryAddressName ? "送货地点" : null) + "不能为空");
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1264,23 +1301,8 @@ export default {
                 })
             }
             if (name == '生成入库') {
-                if (!row.fleetName) {
-                    return this.$message.error("承运车队不能为空");
-                }
-                if (!row.licenseNumber) {
-                    return this.$message.error("车号不能为空");
-                }
-                if (!row.fullName) {
-                    return this.$message.error("姓名不能为空");
-                }
-                if (!row.contactInformation) {
-                    return this.$message.error("联系方式不能为空");
-                }
-                if (!row.deliveryDate) {
-                    return this.$message.error("送货时间不能为空");
-                }
-                if (!row.deliveryAddressName) {
-                    return this.$message.error("送货地点不能为空");
+                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation || !row.deliveryDate || !row.deliveryAddressName) {
+                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式，" : '') + (!row.deliveryDate ? "送货时间，" : null) + (!row.deliveryAddressName ? "送货地点" : null) + "不能为空");
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1296,11 +1318,8 @@ export default {
                 })
             }
             if (name == '入库确认') {
-                if (!this.form.eta) {
-                    return this.$message.error("实际到港不能为空");
-                }
-                if (!row.warehouseName) {
-                    return this.$message.error("仓库不能为空");
+                if (!this.form.eta || !row.warehouseName) {
+                    return this.$message.error((!this.form.eta ? "基础信息的实际到港，" : '') + (!row.warehouseName ? "仓库" : '') + "不能为空");
                 }
                 calculationWarehouseUnitPrice(row).then(res => {
                     this.$confirm(res.data.data, '提示', {
@@ -1326,11 +1345,8 @@ export default {
 
             }
             if (name == '生成出库') {
-                if (!row.warehouseName) {
-                    return this.$message.error("仓库不能为空");
-                }
-                if (!row.warehouseUnitPrice) {
-                    return this.$message.error("仓储单价不能为空");
+                if (!row.warehouseName || !row.warehouseUnitPrice) {
+                    return this.$message.error((!row.warehouseName ? "仓库，" : '') + (!row.warehouseUnitPrice ? "仓储单价" : '') + "不能为空");
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1346,11 +1362,8 @@ export default {
                 })
             }
             if (name == '出库确认') {
-                if (!row.outQuantity) {
-                    return this.$message.error("出库件数不能为空");
-                }
-                if (!row.outWeight) {
-                    return this.$message.error("出库重量不能为空");
+                if (!row.outQuantity || !row.outWeight) {
+                    return this.$message.error((!row.outQuantity ? "出库件数，" : '') + (!row.outWeight ? "出库重量" : '') + "不能为空");
                 }
                 const loading = this.$loading({
                     lock: true,

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -68,7 +68,7 @@
                             url="/blade-los/bcurrency/page" :filterable="true" :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="abroadConsignorCname" slot-scope="{ row }">
-                        <dic-select v-model="form.abroadConsignorCname" placeholder="外国发货人" key="id" label="cnName"
+                        <dic-select v-model="form.abroadConsignorCname" placeholder="国外发货人" key="id" label="cnName"
                             res="records" url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true"
                             :remote="true" dataName="cnName" @selectChange="dicChange('abroadConsignorCname', $event)"
                             :disabled="editDisabled"></dic-select>
@@ -126,19 +126,19 @@
                         <el-button type="primary" size="small" icon="el-icon-plus" :disabled="editDisabled"
                             @click="addRow">新 增
                         </el-button>
-                        <el-button type="success" size="small" :disabled="editDisabled" @click="allClick('首款账单')">首款账单
+                        <el-button type="success" size="small" :disabled="editDisabled||!form.id" @click="allClick('首款账单')">首款账单
                         </el-button>
-                        <el-button type="info" size="small" :disabled="editDisabled || selectionList.length == 0"
+                        <el-button type="info" size="small" :disabled="editDisabled || selectionList.length == 0||!form.id"
                             @click="allClick('尾款账单')">尾款账单
                         </el-button>
-                        <el-button type="warning" size="small" :disabled="selectionList.length == 0"
+                        <el-button type="warning" size="small" :disabled="selectionList.length == 0||!form.id"
                             @click="allClick('生成货代')">生成货代
                         </el-button>
                         <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                             @click="$refs.print.openDialog()">打印账单
                         </el-button>
                         <el-dropdown>
-                            <el-button type="danger" size="small" :disabled="editDisabled">
+                            <el-button type="danger" size="small" :disabled="editDisabled||!form.id">
                                 生成应付<i class="el-icon-arrow-down el-icon--right"></i>
                             </el-button>
                             <el-dropdown-menu slot="dropdown">
@@ -157,7 +157,7 @@
                             </el-dropdown-menu>
                         </el-dropdown> -->
                         <el-dropdown>
-                            <el-button type="primary" size="small">
+                            <el-button type="primary" size="small" :disabled="!form.id">
                                 应收待确认通知<i class="el-icon-arrow-down el-icon--right"></i>
                             </el-button>
                             <el-dropdown-menu slot="dropdown">
@@ -255,7 +255,7 @@
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
                 deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
         </div>
-        <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL"></business-reports>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
         <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
         <!--审核弹窗-->
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
@@ -458,7 +458,7 @@ export default {
                         }]
                     },
                     {
-                        label: '外国发货人',
+                        label: '国外发货人',
                         prop: "abroadConsignorCname",
                         disabled: false,
                         rules: [{
@@ -1613,10 +1613,10 @@ export default {
             this.wkType = null
         },
         application() {
-            if (this.form.downPayment != 1) return this.$message.error("未申请首款账单");
-            if (this.form.balancePayment != 1) return this.$message.error("未申请尾款账单");
-            if (this.form.applyForPayment != 1) return this.$message.error("未申请首款付款");
-            if (this.form.applyForPaymentBalance != 1) return this.$message.error("未申请尾款付款");
+            // if (this.form.downPayment != 1) return this.$message.error("未申请首款账单");
+            // if (this.form.balancePayment != 1) return this.$message.error("未申请尾款账单");
+            // if (this.form.applyForPayment != 1) return this.$message.error("未申请首款付款");
+            // if (this.form.applyForPaymentBalance != 1) return this.$message.error("未申请尾款付款");
             this.$confirm("确定请核数据?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

src/views/tradeAgency/tradeAgency/index.vue

@@ -293,7 +293,7 @@ export default {
                         searchOrder: 11,
                     },
                     {
-                        label: '外国发货人',
+                        label: '国外发货人',
                         prop: "abroadConsignorId",
                         width: "120",
                         search: true,
@@ -301,7 +301,7 @@ export default {
                         filterable: true,
                         remote: true,
                         searchOrder: 12,
-                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=外国工厂&cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国外工厂&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -311,7 +311,7 @@ export default {
                         showColumn: false,
                     },
                     {
-                        label: "外国发货人",
+                        label: "国外发货人",
                         prop: "abroadConsignorCname",
                         width: "120",
                         overHidden: true,