修改bug

src/api/tradeAgency/exchangePurchasing.js

@@ -128,7 +128,7 @@ export const revokeBill = (data) => {
 }
 
 
-//确认收款首款/尾款
+//确认收款
 export const confirmCollectionOfPayments = (data) => {
     return request({
         url: '/api/blade-los/agent/confirmCollectionOfPayments',
@@ -136,7 +136,15 @@ export const confirmCollectionOfPayments = (data) => {
         data: data
     })
 }
-//确认付款首款/尾款
+//撤销收款
+export const revokeCollectionOfPayments = (data) => {
+    return request({
+        url: '/api/blade-los/agent/revokeCollectionOfPayments',
+        method: 'post',
+        data: data
+    })
+}
+//确认付款
 export const confirmThePayment = (data) => {
     return request({
         url: '/api/blade-los/agent/confirmThePayment',
@@ -144,6 +152,14 @@ export const confirmThePayment = (data) => {
         data: data
     })
 }
+//确认付款
+export const revokeConfirmThePayment = (data) => {
+    return request({
+        url: '/api/blade-los/agent/revokeConfirmThePayment',
+        method: 'post',
+        data: data
+    })
+}
 //确认付款-是否实收已收
 export const confirmReceived = (data) => {
     return request({

src/api/tradeAgency/oceanFreightImport.js

@@ -237,4 +237,48 @@ export const submitList2= (data) => {
         method: 'post',
         data: data
     })
+}
+//撤销派车/自提
+export const revokePrecontainers= (data) => {
+    return request({
+        url: '/api/blade-los/precontainers/revokeDispatchVehicles',
+        method: 'post',
+        data: data
+    })
+}
+
+//撤销确认派车
+export const revokeDispatchVehicles= (data) => {
+    return request({
+        url: '/api/blade-los/dispatchvehicles/revokeDispatchVehicles',
+        method: 'post',
+        data: data
+    })
+}
+
+//撤销入库信息
+export const revokeWarehouseEntry= (data) => {
+    return request({
+        url: '/api/blade-los/dispatchvehicles/revokeWarehouseEntry',
+        method: 'post',
+        data: data
+    })
+}
+
+//撤销入出库
+export const revokeInoutstorage= (data) => {
+    return request({
+        url: '/api/blade-los/inoutstorage/revokeWarehouseEntry',
+        method: 'post',
+        data: data
+    })
+}
+
+//撤销生成出库
+export const revokeOutbound= (data) => {
+    return request({
+        url: '/api/blade-los/inoutstorage/revokeOutbound',
+        method: 'post',
+        data: data
+    })
 }

src/components/tradeAgency/fee-oceanFreight.vue

@@ -1167,7 +1167,7 @@ export default {
                     delete e.updateUser
                     delete e.updateUserName
                 })
-                this.form.feeCenterListC = this.form.feeCenterListC.concat(this.selectionDList)
+                this.form.feeCenterListC = this.form.feeCenterListC.concat(arr)
             }
             if (name == '生成应收') {
                 if (this.selectionCList.length == 0) return this.$message.error("请选择费用");

src/views/TaskKanban/index.vue

@@ -567,11 +567,7 @@ import {getDetailByTask, addComment, removeComment} from "@/api/TaskKanban/comme
           })
         },
         handleClose(done) {
-          this.$confirm('确认关闭？')
-            .then(_ => {
-              done();
-            })
-            .catch(_ => {});
+          done();
         },
         // 获取负责人数据
         getUserApprovalListfun(){

src/views/approveDataH/index.vue

@@ -337,11 +337,7 @@ export default {
       },
       // 关闭弹窗
       handleClose(done) {
-          this.$confirm('确认关闭？')
-              .then(_ => {
-                  done();
-              })
-              .catch(_ => {});
+        done()
       },
     // 预览报表
      handleReportPreview(url,data){

src/views/iosBasicData/AirtransportExport/bills/assembly/DocumentCenter.vue

@@ -533,11 +533,7 @@ import BillofLadingDetails
             // },
             // 类别弹窗关闭
             corpTypeClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => { });
+               done();
             },
             // 点击搜索触发
             searchChange(params, done){

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

@@ -681,6 +681,24 @@
                     editBtn: false,
                     menuWidth: '100',
                     column: [
+                    {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 100,
+                        cell: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
                         {
                             label: "客户名称",
                             prop: "cnName",
@@ -1177,6 +1195,7 @@
                     reportCode:this.reportformsObj.classifyCode,
                     groupCode:this.reportformsObj.groupCode,
                     corpIds:row.id,
+                    curCode:row.curCode,
                     type:'KYCK'
                 }).then(res=>{
                     this.handleReportPreview(this.reportformsObj.url,res.data.data.data)
@@ -1235,6 +1254,10 @@
                         type:'KYCK',
                     }).then(res=>{
                         this.printingLoading = false
+                        res.data.data.forEach(e => {
+                        e.$cellEdit = true
+                        e.curCode=null
+                    })
                         this.PrintingData = res.data.data
                     })
                     this.reportsListfun({
@@ -2566,13 +2589,7 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        this.feesselectionList = [] // 清空多选
-                        this.templateRightData = [] // 清空数据
-                        done();
-                    })
-                    .catch(_ => {});
+                done();
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/AirtransportExport/bills/assembly/formbottom.vue

@@ -603,11 +603,7 @@
             },
             // 弹窗关闭
             beforeClose(done){
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => {});
+             done();
             },
             // 邮箱跳转
             emailJump(){

src/views/iosBasicData/AirtransportExport/bills/index.vue

@@ -1574,12 +1574,7 @@ export default {
         },
         // 弹窗关闭
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    this.dialogRadio = null
-                    done();
-                })
-                .catch(_ => { });
+            done()
         },
         toAddEdit() {
             this.datekey = Date.now()

src/views/iosBasicData/AirtransportImport/bills/assembly/DocumentCenter.vue

@@ -383,11 +383,7 @@ import BillofLadingDetails
             // },
             // 类别弹窗关闭
             corpTypeClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => { });
+               done();
             },
             // 点击搜索触发
             searchChange(params, done){

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

@@ -91,7 +91,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'D')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'D')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -115,16 +116,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'D')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -227,7 +229,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'C')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'C')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -251,16 +254,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'C')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -407,8 +411,8 @@
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table :data="corpDialog" border show-summary size="mini"
-                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }" :cell-style="{ padding: '0px', fontSize: '12px' }"
-                    style="width: 100%">
+                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                    :cell-style="{ padding: '0px', fontSize: '12px' }" style="width: 100%">
                     <el-table-column prop="corpCnName" label="客户名称" width="140px">
                         <template slot-scope="{ row }">
                             <span class="textoverflow">{{ row.corpCnName }}</span>
@@ -561,6 +565,24 @@ export default {
                 menuWidth: '100',
                 column: [
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 100,
+                        cell: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
@@ -1039,6 +1061,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
+                curCode: row.curCode,
                 type: 'KYJK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -1097,6 +1120,10 @@ export default {
                     type: 'KYJK',
                 }).then(res => {
                     this.printingLoading = false
+                    res.data.data.forEach(e => {
+                        e.$cellEdit = true
+                        e.curCode = null
+                    })
                     this.PrintingData = res.data.data
                 })
                 this.reportsListfun({
@@ -1904,7 +1931,7 @@ export default {
         },
         // 获取客户数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName }).then(res => {
                 this.corpCnNameData = res.data.data.records
                 // this.corpCnNameData = res.data.data.records.map(item=>{
                 //     // 创建自定义参数暂存
@@ -2111,80 +2138,80 @@ export default {
             }
 
             this.assemblyForm.feeCenterListD.map((row, index) => {
-                    row.dc = 'D'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
-                this.assemblyForm.feeCenterListC.map((row, index) => {
-                    row.dc = 'C'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
+                row.dc = 'D'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
+            this.assemblyForm.feeCenterListC.map((row, index) => {
+                row.dc = 'C'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
 
-                feecenterSubmitList([
-                    ...this.assemblyForm.feeCenterListD,
-                    ...this.assemblyForm.feeCenterListC
-                ]).then(res => {
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                    this.$emit('billsDetailfun')
-                })
+            feecenterSubmitList([
+                ...this.assemblyForm.feeCenterListD,
+                ...this.assemblyForm.feeCenterListC
+            ]).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                });
+                this.$emit('billsDetailfun')
+            })
 
         },
 
@@ -2430,13 +2457,9 @@ export default {
         },
         // 关闭弹窗
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    this.feesselectionList = [] // 清空多选
-                    this.templateRightData = [] // 清空数据
-                    done();
-                })
-                .catch(_ => { });
+            this.feesselectionList = [] // 清空多选
+            this.templateRightData = [] // 清空数据
+            done();
         },
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/AirtransportImport/bills/assembly/formbottom.vue

@@ -603,11 +603,7 @@
             },
             // 弹窗关闭
             beforeClose(done){
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => {});
+             done();
             },
             // 邮箱跳转
             emailJump(){

src/views/iosBasicData/AirtransportImport/bills/index.vue

@@ -1630,12 +1630,7 @@ import { getDeptTree } from "@/api/system/dept";
         },
         // 弹窗关闭
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    this.dialogRadio = null
-                    done();
-                })
-                .catch(_ => {});
+            done();
         },
         toAddEdit(){
             this.datekey=Date.now()

src/views/iosBasicData/OceanFreightImport/bills/assembly/DocumentCenter.vue

@@ -545,11 +545,7 @@ export default {
         // },
         // 类别弹窗关闭
         corpTypeClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+  done();
         },
         // 点击搜索触发
         searchChange(params, done){

src/views/iosBasicData/OceanFreightImport/bills/assembly/EntrustmentLnformation.vue

@@ -1047,11 +1047,7 @@ export default {
         },
         // 通知人
         hnotify2HandleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+  done();
         },
         // 危险品弹窗开启
         DangerousGoodsAdd() {

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

@@ -68,12 +68,10 @@
                         size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterEditfun('D')">一键编辑
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="copyfun('D')">生成应付</el-button>
+                        size="small" :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
@@ -101,7 +99,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'D')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'D')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -125,16 +124,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'D')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -158,8 +158,7 @@
                 <template slot-scope="scope" slot="menu">
                     <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
                     <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
-                    <el-button type="text" size="small"
-                        :disabled="scope.row.accStatus || disabled || pleasereviewType"
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType"
                         @click="deletefun(scope.row, scope.index, 'D')">删除</el-button>
                 </template>
             </avue-crud>
@@ -196,12 +195,10 @@
                         @click="templateClick('C')">应付模板
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterSubmitListfun">一键保存
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterEditfun('C')">一键编辑
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
                         size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
@@ -209,8 +206,7 @@
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType"
-                        @click="addCfun">
+                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -234,7 +230,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'C')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'C')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -258,16 +255,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'C')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -291,8 +289,7 @@
                 <template slot-scope="scope" slot="menu">
                     <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>-->
                     <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>-->
-                    <el-button type="text" size="small"
-                        :disabled="scope.row.accStatus || disabled || pleasereviewType"
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType"
                         @click="deletefun(scope.row, scope.index, 'C')">删除</el-button>
                 </template>
             </avue-crud>
@@ -411,8 +408,8 @@
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table :data="corpDialog" border show-summary size="mini"
-                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }" :cell-style="{ padding: '0px', fontSize: '12px' }"
-                    style="width: 100%">
+                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                    :cell-style="{ padding: '0px', fontSize: '12px' }" style="width: 100%">
                     <el-table-column prop="corpCnName" label="客户名称" width="140px">
                         <template slot-scope="{ row }">
                             <span class="textoverflow">{{ row.corpCnName }}</span>
@@ -569,6 +566,24 @@ export default {
                 // menu:false,
                 column: [
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 100,
+                        cell: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
@@ -1088,6 +1103,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
+                curCode:row.curCode,
                 type: 'HYJK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -1146,6 +1162,10 @@ export default {
                     type: 'HYJK',
                 }).then(res => {
                     this.printingLoading = false
+                    res.data.data.forEach(e => {
+                        e.$cellEdit = true
+                        e.curCode=null
+                    })
                     this.PrintingData = res.data.data
                 })
                 this.reportsListfun({
@@ -1953,7 +1973,7 @@ export default {
         },
         // 获取客户数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName, status: 0 }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
                 this.corpCnNameData = res.data.data.records
                 // this.corpCnNameData = res.data.data.records.map(item=>{
                 //     // 创建自定义参数暂存
@@ -2157,80 +2177,80 @@ export default {
             }
 
             this.assemblyForm.feeCenterListD.map((row, index) => {
-                    row.dc = 'D'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
-                this.assemblyForm.feeCenterListC.map((row, index) => {
-                    row.dc = 'C'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
+                row.dc = 'D'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
+            this.assemblyForm.feeCenterListC.map((row, index) => {
+                row.dc = 'C'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
 
-                feecenterSubmitList([
-                    ...this.assemblyForm.feeCenterListD,
-                    ...this.assemblyForm.feeCenterListC
-                ]).then(res => {
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                    this.$emit('billsDetailfun')
-                })
+            feecenterSubmitList([
+                ...this.assemblyForm.feeCenterListD,
+                ...this.assemblyForm.feeCenterListC
+            ]).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                });
+                this.$emit('billsDetailfun')
+            })
 
         },
 

src/views/iosBasicData/OceanFreightImport/bills/assembly/formbottom.vue

@@ -115,8 +115,8 @@
                         </search-query> -->
                         <el-select style="width: 100%" v-model="assemblyForm.issueType" size="small" placeholder="请选择签单方式"
                             :filterable="true" :clearable="true" :disabled="detailData.seeDisabled">
-                            <el-option v-for="item in issueTypeData" :key="item.dictKey"
-                                :label="item.dictValue" :value="item.dictKey">
+                            <el-option v-for="item in issueTypeData" :key="item.dictKey" :label="item.dictValue"
+                                :value="item.dictKey">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -128,8 +128,9 @@
                         </span>
                         <search-query :datalist="numberOfData" :selectValue="assemblyForm.numberOfObl" :clearable="true"
                             :disabled="detailData.seeDisabled" :buttonIf="false"
-                            :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictValue', }" placeholder="请选择正本份数"
-                            @corpChange="corpChange($event, 'Obl')" @corpFocus="remoteMethod($event, 'numberOfObl')">
+                            :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictValue', }"
+                            placeholder="请选择正本份数" @corpChange="corpChange($event, 'Obl')"
+                            @corpFocus="remoteMethod($event, 'numberOfObl')">
                         </search-query>
                     </el-form-item>
                 </el-col>
@@ -361,7 +362,7 @@ export default {
                 this.cyBcorpslistByType(value)
             } else if (inttraArr.indexOf(name) != -1) {
                 this.inttraBcorpslistByType(value)
-            } 
+            }
             // else if (name == 'issueType') {
             //     // 签单方式
             //     this.getWorkDictsfun()
@@ -490,11 +491,7 @@ export default {
         },
         // 弹窗关闭
         beforeClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+            done();
         },
         // 邮箱跳转
         emailJump() {

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

@@ -632,7 +632,7 @@ export default {
                         }],
                         overHidden: true,
                     },
-                    
+
                     {
                         label: "单据编号",
                         prop: "billNo",
@@ -1437,8 +1437,8 @@ export default {
 
         // tabs切换筛选
         handleClick(tab, event) {
-            if(this.query.billStatus==4){
-                this.query.billStatus=null
+            if (this.query.billStatus == 4) {
+                this.query.billStatus = null
             }
             this.onLoad(this.page, this.query);
         },
@@ -1637,12 +1637,7 @@ export default {
         },
         // 弹窗关闭
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    this.dialogRadio = null
-                    done();
-                })
-                .catch(_ => { });
+            done();
         },
         toAddEdit() {
             this.datekey = Date.now()

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

@@ -561,11 +561,7 @@ import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
             // },
             // 类别弹窗关闭
             corpTypeClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
-                        done();
-                    })
-                    .catch(_ => { });
+               done();
             },
             // 点击搜索触发
             searchChange(params, done){

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

@@ -1413,11 +1413,7 @@ export default {
         },
         // 通知人
         hnotify2HandleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+  done();
         },
         // 危险品弹窗开启
         DangerousGoodsAdd() {

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

@@ -60,12 +60,12 @@
                         size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
-                        plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
+                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success" plain
+                        size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger" plain
-                        size="small" :disabled="!selectionDList.length || disabled|| pleasereviewType"
+                        size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
@@ -76,12 +76,10 @@
                         size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterEditfun('D')">一键编辑
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('D')">一键编辑
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="copyfun('D')">生成应付</el-button>
+                        size="small" :disabled="disabled || pleasereviewType" @click="copyfun('D')">生成应付</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
@@ -109,7 +107,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'D')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'D')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -133,16 +132,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'D')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('D')"
-                        @corpChange="corpChange($event, 'curCode', row, 'D')" @corpFocus="bcurrencyGetExratefun('D')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('D')" @corpChange="corpChange($event, 'curCode', row, 'D')"
+                        @corpFocus="bcurrencyGetExratefun('D')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -166,8 +166,7 @@
                 <template slot-scope="scope" slot="menu">
                     <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'D')">保存</el-button>-->
                     <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editDfun(scope.row,scope.index)">编辑</el-button>-->
-                    <el-button type="text" size="small"
-                        :disabled="scope.row.accStatus || disabled || pleasereviewType"
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType"
                         @click="deletefun(scope.row, scope.index, 'D')">删除</el-button>
                 </template>
             </avue-crud>
@@ -204,12 +203,10 @@
                         @click="templateClick('C')">应付模板
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterSubmitListfun">一键保存
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info" plain
-                        size="small" :disabled="disabled || pleasereviewType"
-                        @click="feecenterEditfun('C')">一键编辑
+                        size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('C')">一键编辑
                     </el-button>
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary" plain
                         size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
@@ -217,8 +214,7 @@
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType"
-                        @click="addCfun">
+                        size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType" @click="addCfun">
                     </el-button>
                 </template>
                 <template slot="index" slot-scope="scope">
@@ -242,7 +238,8 @@
                         :clearable="true" :remote="true" :buttonIf="false"
                         :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
                         @remoteMethod="bfeesListfun($event, 'feeCnName')"
-                        @corpChange="corpChange($event, 'feeCnName', row, 'C')" @corpFocus="bfeesListfun($event, 'feeCnName')">
+                        @corpChange="corpChange($event, 'feeCnName', row, 'C')"
+                        @corpFocus="bfeesListfun($event, 'feeCnName')">
                     </search-query>
                     <span v-else>{{ row.feeCnName }}</span>
                 </template>
@@ -266,16 +263,17 @@
                 <template slot="unitNo" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="unitNoData" :selectValue="row.unitNo" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }" @corpFocus="getBunitsPagefun"
-                        @corpChange="corpChange($event, 'unitNo', row, 'C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code', disabled: 'status' }"
+                        @corpFocus="getBunitsPagefun" @corpChange="corpChange($event, 'unitNo', row, 'C')">
                     </search-query>
                     <span v-else>{{ row.unitNo }}</span>
                 </template>
                 <template slot="curCode" slot-scope="{ row }">
                     <search-query v-if="row.edit" :datalist="curCodeData" :selectValue="row.curCode" :filterable="true"
                         :clearable="true" :remote="true" :buttonIf="false"
-                        :forParameter="{ key: 'id', label: 'code', value: 'code' }" @remoteMethod="bcurrencyGetExratefun('C')"
-                        @corpChange="corpChange($event, 'curCode', row, 'C')" @corpFocus="bcurrencyGetExratefun('C')">
+                        :forParameter="{ key: 'id', label: 'code', value: 'code' }"
+                        @remoteMethod="bcurrencyGetExratefun('C')" @corpChange="corpChange($event, 'curCode', row, 'C')"
+                        @corpFocus="bcurrencyGetExratefun('C')">
                     </search-query>
                     <span v-else>{{ row.curCode }}</span>
                 </template>
@@ -299,8 +297,7 @@
                 <template slot-scope="scope" slot="menu">
                     <!--<el-button v-if="scope.row.edit" type="text" size="small" @click="savefun(scope.row,scope.index,'C')">保存</el-button>-->
                     <!--<el-button v-else type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType" @click="editCfun(scope.row,scope.index)">编辑</el-button>-->
-                    <el-button type="text" size="small"
-                        :disabled="scope.row.accStatus || disabled || pleasereviewType"
+                    <el-button type="text" size="small" :disabled="scope.row.accStatus || disabled || pleasereviewType"
                         @click="deletefun(scope.row, scope.index, 'C')">删除</el-button>
                 </template>
             </avue-crud>
@@ -419,8 +416,8 @@
             </span>
             <div style="padding-bottom: 30px;">
                 <el-table :data="corpDialog" border show-summary size="mini"
-                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }" :cell-style="{ padding: '0px', fontSize: '12px' }"
-                    style="width: 100%">
+                    :row-style="{ height: '20px', padding: '0px', fontSize: '12px' }"
+                    :cell-style="{ padding: '0px', fontSize: '12px' }" style="width: 100%">
                     <el-table-column prop="corpCnName" label="客户名称" width="140px">
                         <template slot-scope="{ row }">
                             <span class="textoverflow">{{ row.corpCnName }}</span>
@@ -577,6 +574,24 @@ export default {
                 menuWidth: '100',
                 column: [
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width:100,
+                        cell:true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
@@ -1097,6 +1112,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
+                curCode:row.curCode,
                 type: 'HYCK'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -1155,6 +1171,10 @@ export default {
                     type: 'HYCK',
                 }).then(res => {
                     this.printingLoading = false
+                    res.data.data.forEach(e => {
+                        e.$cellEdit = true
+                        e.curCode=null
+                    })
                     this.PrintingData = res.data.data
                 })
                 this.reportsListfun({
@@ -1252,7 +1272,7 @@ export default {
                     feesTemplateItemsList: this.feesselectionList,
                     billNoId: this.assemblyForm.id
                 }).then(res => {
-                    if (res.data.msg.indexOf('未导入')>=0) {
+                    if (res.data.msg.indexOf('未导入') >= 0) {
                         this.$message({
                             type: "error",
                             message: res.data.msg
@@ -1965,7 +1985,7 @@ export default {
         },
         // 获取客户数据
         getBcorpsListfun(cnName) {
-            getBcorpsList(1, 10, { shortName:cnName, status: 0 }).then(res => {
+            getBcorpsList(1, 10, { shortName: cnName, status: 0 }).then(res => {
                 this.corpCnNameData = res.data.data.records
                 // this.corpCnNameData = res.data.data.records.map(item=>{
                 //     // 创建自定义参数暂存
@@ -2170,80 +2190,80 @@ export default {
             }
 
             this.assemblyForm.feeCenterListD.map((row, index) => {
-                    row.dc = 'D'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
-                this.assemblyForm.feeCenterListC.map((row, index) => {
-                    row.dc = 'C'
-                    row.pid = this.pid
-                    row.sort = Number(index) + 1
-                    row.businessType = this.assemblyForm.businessType // 业务类型
-                    row.billType = this.assemblyForm.billType // 单据类型
-                    row.billNo = this.assemblyForm.billNo // 单据编号
-                    row.billDate = this.assemblyForm.billDate // 单据日期
-                    row.billCorpId = this.assemblyForm.corpId // 主表客户 id
-                    row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
-                    row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
-                    row.lineId = this.assemblyForm.lineId // 航线 id
-                    row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
-                    row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
-                    row.vesselId = this.assemblyForm.vesselId // 船名 id
-                    row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
-                    row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
-                    row.voyageNo = this.assemblyForm.voyageNo // 航次
-                    row.mblno = this.assemblyForm.mblno // MB/L NO
-                    row.hblno = this.assemblyForm.hblno // HB/L NO
-                    row.etd = this.assemblyForm.etd // 开船日期
-                    row.eta = this.assemblyForm.eta // 到港日期
-                    row.polId = this.assemblyForm.polId // 装货港 id
-                    row.polCode = this.assemblyForm.polCode // 装货港代码
-                    row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
-                    row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
-                    row.podId = this.assemblyForm.podId // 卸货港 id
-                    row.podCode = this.assemblyForm.podCode // 卸货港代码
-                    row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
-                    row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
-                    row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
-                })
+                row.dc = 'D'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
+            this.assemblyForm.feeCenterListC.map((row, index) => {
+                row.dc = 'C'
+                row.pid = this.pid
+                row.sort = Number(index) + 1
+                row.businessType = this.assemblyForm.businessType // 业务类型
+                row.billType = this.assemblyForm.billType // 单据类型
+                row.billNo = this.assemblyForm.billNo // 单据编号
+                row.billDate = this.assemblyForm.billDate // 单据日期
+                row.billCorpId = this.assemblyForm.corpId // 主表客户 id
+                row.billCorpCnName = this.assemblyForm.corpCnName // 主表客户中文名称
+                row.billCorpEnName = this.assemblyForm.corpEnName // 主表客户英文名称
+                row.lineId = this.assemblyForm.lineId // 航线 id
+                row.lineCnName = this.assemblyForm.lineCnName // 航线中文名称
+                row.lineEnName = this.assemblyForm.lineEnName // 航线英文名称
+                row.vesselId = this.assemblyForm.vesselId // 船名 id
+                row.vesselCnName = this.assemblyForm.vesselCnName // 中文船名
+                row.vesselEnName = this.assemblyForm.vesselEnName // 英文船名
+                row.voyageNo = this.assemblyForm.voyageNo // 航次
+                row.mblno = this.assemblyForm.mblno // MB/L NO
+                row.hblno = this.assemblyForm.hblno // HB/L NO
+                row.etd = this.assemblyForm.etd // 开船日期
+                row.eta = this.assemblyForm.eta // 到港日期
+                row.polId = this.assemblyForm.polId // 装货港 id
+                row.polCode = this.assemblyForm.polCode // 装货港代码
+                row.polCnName = this.assemblyForm.polCnName // 装货港中文名称
+                row.polEnName = this.assemblyForm.polEnName // 装货港英文名称
+                row.podId = this.assemblyForm.podId // 卸货港 id
+                row.podCode = this.assemblyForm.podCode // 卸货港代码
+                row.podCnName = this.assemblyForm.podCnName // 卸货港中文名称
+                row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
+                row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
+            })
 
-                feecenterSubmitList([
-                    ...this.assemblyForm.feeCenterListD,
-                    ...this.assemblyForm.feeCenterListC
-                ]).then(res => {
-                    this.$message({
-                        type: "success",
-                        message: "操作成功!"
-                    });
-                    this.$emit('billsDetailfun')
-                })
+            feecenterSubmitList([
+                ...this.assemblyForm.feeCenterListD,
+                ...this.assemblyForm.feeCenterListC
+            ]).then(res => {
+                this.$message({
+                    type: "success",
+                    message: "操作成功!"
+                });
+                this.$emit('billsDetailfun')
+            })
 
         },
 

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

@@ -736,11 +736,7 @@ export default {
         },
         // 弹窗关闭
         beforeClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+  done();
         },
         // 邮箱跳转
         emailJump() {

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

@@ -2036,11 +2036,7 @@ export default {
                     })
                 })
             }
-
-
         },
-
-
     },
 }
 

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

@@ -1682,12 +1682,7 @@ export default {
         },
         // 弹窗关闭
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    this.dialogRadio = null
-                    done();
-                })
-                .catch(_ => { });
+   done();
         },
         toAddEdit() {
             this.datekey = Date.now()

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -461,6 +461,24 @@ export default {
                 menuWidth: '100',
                 column: [
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 100,
+                        cell: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
@@ -557,6 +575,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
+                curCode:row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -589,6 +608,10 @@ export default {
                 type: 'AMEND'
             }).then(res => {
                 this.printingLoading = false
+                res.data.data.forEach(e => {
+                    e.$cellEdit = true
+                    e.curCode = null
+                })
                 this.PrintingData = res.data.data
             })
         },
@@ -1035,7 +1058,7 @@ export default {
             this.form.billNoFormat = 'AEA'
             this.form.businessTypeCode = 'AEA'
             amendsSubmit(this.form).then(res => {
-                
+
                 // 把费用编辑状态变成不可编辑
                 for (let item of this.form.feeCenterList) {
                     this.$delete(item, 'editType')

src/views/iosBasicData/bcorps/index.vue

@@ -737,11 +737,7 @@ export default {
     },
     // 类别弹窗关闭
     corpTypeClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
           done();
-        })
-        .catch(_ => { });
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -578,11 +578,7 @@ export default {
         },
         // 弹窗点击差号
         handleClose(done) {
-            this.$confirm('确认关闭？')
-                .then(_ => {
-                    done();
-                })
-                .catch(_ => { });
+            done();
         },
         // 获取字典数据
         getWorkDictsfun() {

src/views/iosBasicData/psBcorps/index.vue

@@ -741,11 +741,7 @@ export default {
     },
     // 类别弹窗关闭
     corpTypeClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
           done();
-        })
-        .catch(_ => { });
     },
     //自定义列保存
     async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/reportClose/AEreportClose/assembly/feecenter.vue

@@ -2493,13 +2493,9 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
                         done();
-                    })
-                    .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/reportClose/AIreportClose/assembly/feecenter.vue

@@ -2493,13 +2493,9 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
                         done();
-                    })
-                    .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/reportClose/SEreportClose/assembly/feecenter.vue

@@ -2493,13 +2493,9 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
                         done();
-                    })
-                    .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/reportClose/SIreportClose/assembly/feecenter.vue

@@ -2493,13 +2493,9 @@
             },
             // 关闭弹窗
             handleClose(done) {
-                this.$confirm('确认关闭？')
-                    .then(_ => {
                         this.feesselectionList = [] // 清空多选
                         this.templateRightData = [] // 清空数据
                         done();
-                    })
-                    .catch(_ => {});
             },
             //自定义列保存
             async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -475,6 +475,24 @@ export default {
                 menuWidth: '100',
                 column: [
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 100,
+                        cell: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '全部',
+                            value: null
+                        }, {
+                            label: 'USD',
+                            value: 'USD'
+                        }, {
+                            label: 'CNY',
+                            value: 'CNY'
+                        }],
+                        overHidden: true,
+                    },
+                    {
                         label: "客户名称",
                         prop: "cnName",
                         overHidden: true,
@@ -575,6 +593,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
+                curCode:row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -609,6 +628,10 @@ export default {
                 type: 'AMEND'
             }).then(res => {
                 this.printingLoading = false
+                res.data.data.forEach(e => {
+                    e.$cellEdit = true
+                    e.curCode = null
+                })
                 this.PrintingData = res.data.data
             })
         },

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -7,9 +7,18 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
+                <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.print.openDialog()">打印账单
+                </el-button>
+                <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.report.openDialog()">报表设计
+                </el-button>
                 <el-button v-if="!editDisabled" class="el-button--small-yh" type="success" size="small"
                     :disabled="isSaveBtn || form.firstStatus != '审核通过' || form.orderStatus == '已结算'" @click="submitFee">确认付款
                 </el-button>
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="warning" size="small"
+                    :disabled="isSaveBtn || form.firstStatus != '审核通过' || form.orderStatus != '已结算'" @click="revokeFee">撤销付款
+                </el-button>
                 <el-button v-if="!editDisabled" class="el-button--small-yh" type="danger" size="small"
                     :disabled="isSaveBtn || form.firstStatus != '审核通过'" @click="revokeApplication">撤销申请付款
                 </el-button>
@@ -19,7 +28,8 @@
                 <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" @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"
@@ -47,26 +57,31 @@
                 </avue-crud>
             </trade-card> -->
             <trade-card title="费用明细">
-                <fee-infosimple ref="feeInfo" feeType="C" :form="form" :disabled="editDisabled || form.firstStatus == '审核通过'"
-                    @getDetails="getDetails"></fee-infosimple>
+                <fee-infosimple ref="feeInfo" feeType="C" :form="form"
+                    :disabled="editDisabled || form.firstStatus == '审核通过'" @getDetails="getDetails"></fee-infosimple>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled|| form.orderStatus == '已确认'"></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>
                 <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
             </el-dialog>
         </div>
+        <business-reports :id="form.id" ref="print" businessValue="MYDL" :type="true"></business-reports>
+        <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
     </div>
 </template>
 
 <script>
-import { submit, getDetail, checkAgent, revokeCheckAgent, confirmThePayment, confirmReceived } from "@/api/tradeAgency/exchangePurchasing";
+import { submit, getDetail, checkAgent, revokeCheckAgent, confirmThePayment, confirmReceived, revokeConfirmThePayment } from "@/api/tradeAgency/exchangePurchasing";
 import feeInfosimple from "@/components/tradeAgency/fee-infosimple";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
+import businessReports from "@/components/tradeAgency/businessReports.vue";
+import reports from "@/components/tradeAgency/reports.vue";
 import _ from "lodash";
 export default {
     name: "detailsPage",
@@ -147,6 +162,17 @@ export default {
                         disabled: false,
                     },
                     {
+                        label: '付费方式',
+                        prop: "advanceRatio",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=advance_ratio",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        disabled: false
+                    },
+                    {
                         label: '国外发货人',
                         prop: "abroadConsignorCname",
                         disabled: true,
@@ -170,7 +196,7 @@ export default {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
-                        span: 6,
+                        span: 12,
                         disabled: false,
                         minRows: 2,
                     }
@@ -274,7 +300,9 @@ export default {
     components: {
         dicSelect,
         feeInfosimple,
-        checkSchedule
+        checkSchedule,
+        businessReports,
+        reports
     },
     props: {
         detailData: Object
@@ -361,6 +389,27 @@ export default {
             })
 
         },
+        revokeFee() {
+            this.$confirm('撤销付款?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                revokeConfirmThePayment(this.form).then(res => {
+                    this.getDetails(res.data.data.id)
+                    this.$message.success("撤销成功");
+                }).finally(() => {
+                    loading.close();
+                })
+
+            })
+        },
         application() {
             this.$confirm("确定请核数据?", {
                 confirmButtonText: "确定",
@@ -469,7 +518,9 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
-::v-deep .el-table--small td, .el-table--small th {
+
+::v-deep .el-table--small td,
+.el-table--small th {
     padding: 2px !important;
 }
 </style>

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -7,9 +7,18 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
+                <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.print.openDialog()">打印账单
+                </el-button>
+                <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
+                    @click="$refs.report.openDialog()">报表设计
+                </el-button>
                 <el-button v-if="!editDisabled" class="el-button--small-yh" type="success" size="small"
                     :disabled="isSaveBtn || form.orderStatus == '已确认'" @click="submitFee">确认收款
                 </el-button>
+                <el-button v-if="!editDisabled" class="el-button--small-yh" type="warning" size="small"
+                    :disabled="isSaveBtn || form.orderStatus != '已确认'" @click="revokeFee">撤销收款
+                </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editDisabled" @click="inEdit">编 辑
                 </el-button>
@@ -37,14 +46,18 @@
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
                 deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
+            <business-reports :id="form.id" ref="print" businessValue="MYDL" :type="true"></business-reports>
+            <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
         </div>
     </div>
 </template>
 
 <script>
-import { submit, getDetail, confirmCollectionOfPayments } from "@/api/tradeAgency/exchangePurchasing";
+import { submit, getDetail, confirmCollectionOfPayments, revokeCollectionOfPayments } from "@/api/tradeAgency/exchangePurchasing";
 import feeInfosimple from "@/components/tradeAgency/fee-infosimple";
 import dicSelect from "@/components/dicSelect/main";
+import businessReports from "@/components/tradeAgency/businessReports.vue";
+import reports from "@/components/tradeAgency/reports.vue";
 import _ from "lodash";
 export default {
     name: "detailsPage",
@@ -129,28 +142,39 @@ export default {
                     {
                         label: '国内收货人',
                         prop: "domesticConsigneeCname",
-                        disabled:true,
+                        disabled: true,
                     },
                     {
                         label: '银行助记码',
                         prop: "domesticBankMnemonicCode",
-                        disabled:true,
+                        disabled: true,
                     },
                     {
                         label: '银行',
                         prop: "domesticBank",
-                        disabled:true,
+                        disabled: true,
                     },
                     {
                         label: '币别',
                         prop: "domesticCurrency",
-                        disabled:true,
+                        disabled: true,
+                    },
+                    {
+                        label: '付费方式',
+                        prop: "advanceRatio",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=advance_ratio",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
+                        disabled: false
                     },
                     {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
-                        span: 6,
+                        span: 12,
                         disabled: false,
                         minRows: 2,
                     }
@@ -253,7 +277,9 @@ export default {
     },
     components: {
         dicSelect,
-        feeInfosimple
+        feeInfosimple,
+        businessReports,
+        reports
     },
     props: {
         detailData: Object
@@ -335,6 +361,27 @@ export default {
             })
 
         },
+        revokeFee() {
+            this.$confirm('撤销收费?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                revokeCollectionOfPayments(this.form).then(res => {
+                    this.getDetails(res.data.data.id)
+                    this.$message.success("撤销成功");
+                }).finally(() => {
+                    loading.close();
+                })
+            })
+
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
@@ -386,7 +433,9 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
-::v-deep .el-table--small td, .el-table--small th {
+
+::v-deep .el-table--small td,
+.el-table--small th {
     padding: 2px !important;
 }
 </style>

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -90,15 +90,56 @@
                 <avue-crud :option="option" :data="form.preContainersList" id="out-table" ref="crud"
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 388)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 388)">
+                    <template slot="menuLeft">
+                        <el-button type="primary" size="small" icon="el-icon-plus" :disabled="editDisabled"
+                            @click="addRow">新 增
+                        </el-button>
+                    </template>
+                    <template slot="cntrTypeCode" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.cntrTypeCode" placeholder="箱型" key="id"
+                            res="records" label="cnName" url="/blade-los/bcntrtypes/list" :filterable="true" :remote="true"
+                            dataName="cnName"></dic-select>
+                        <span v-else>{{ row.cntrTypeCode }}</span>
+                    </template>
+                    <template slot="boxNo" slot-scope="{ row }">
+                        <el-input v-if="row.$cellEdit && !row.srcId" v-model="row.boxNo" placeholder="请输入内容"
+                            size="small"></el-input>
+                        <span v-else>{{ row.boxNo }}</span>
+                    </template>
+                    <template slot="goodsName" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsName" placeholder="品名" key="id"
+                            res="records" label="cnName" url="/blade-los/bcommodity/list" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="rowDicChange('goodsName', $event, row)"></dic-select>
+                        <span v-else>{{ row.goodsName }}</span>
+                    </template>
+                    <tempalte slot="goodsType" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsType" placeholder="类型" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
+                            :filterable="true"></dic-select>
+                        <span v-else>{{ row.goodsType }}</span>
+                    </tempalte>
+                    <tempalte slot="quantity" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.quantity" :controls="false"
+                            placeholder="请输入 件数" size="small" style="width: 100%;"></el-input-number>
+                        <span v-else>{{ row.quantity }}</span>
+                    </tempalte>
+                    <tempalte slot="grossWeight" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.grossWeight" :controls="false"
+                            placeholder="请输入 重量" size="small" style="width: 100%;"></el-input-number>
+                        <span v-else>{{ row.grossWeight }}</span>
+                    </tempalte>
+                    <tempalte slot="price" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.price" :controls="false"
+                            placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
+                        <span v-else>{{ row.price }}</span>
+                    </tempalte>
                     <template slot="menu" slot-scope="{ row, index }">
                         <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"
-                            @click="rowCell('派车', row, index)">派
-                            车</el-button>
-                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1"
-                            @click="rowCell('自提', row, index)">自
-                            提</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled || row.type == 2"
+                            @click="rowCell('派车', row, index)">{{ row.type == 1 ? '撤销派车' : '派车' }}</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled || row.type == 1"
+                            @click="rowCell('自提', row, index)">{{ row.type == 2 ? '撤销自提' : '自 提' }}</el-button>
                     </template>
                 </avue-crud>
             </trade-card>
@@ -137,13 +178,17 @@
                     <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)">{{ 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||row.$cellEdit"
-                            @click="rowCell('生成入库', row, index)">入
-                            库</el-button>
+                            @click="rowCell('派车编辑', row, index)">
+                            {{ row.$cellEdit ? '保 存' : '编 辑' }}
+                        </el-button>
+                        <el-button size="small" type="text"
+                            :disabled="editDisabled || row.whetherWarehouseEntry == 1 || row.$cellEdit"
+                            @click="rowCell('确认派车', row, index)">
+                            {{ row.whetherDispatchVehicles == 1 ? '撤销确认' : '确 认' }}
+                        </el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled || row.$cellEdit"
+                            @click="rowCell('生成入库', row, index)">{{ row.whetherWarehouseEntry == 1 ? '撤销入库' : '入 库'
+                            }}</el-button>
                         <!-- <el-button size="small" type="text"
                             :disabled="editDisabled || row.whetherDispatchVehicles == 1 || row.whetherWarehouseEntry == 1"
                             @click="rowCell('派车删除', row, index)">删 除</el-button> -->
@@ -162,13 +207,19 @@
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <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>
+                            @click="rowCell('入库编辑', row, index)">
+                            {{ row.$cellEdit ? '保 存' : '编 辑' }}
+                        </el-button>
+                        <el-button size="small" type="text"
+                            :disabled="editDisabled || row.whetherInOutStorage == 1 || row.$cellEdit"
+                            @click="rowCell('入库确认', row, index)">
+                            {{ row.confirmDispatchVehicles == 1 ? '撤销确认' : '入库确认' }}
+                        </el-button>
                         <el-button size="small" type="text"
-                            :disabled="editDisabled || (row.whetherInOutStorage == 1 && row.surplusQuantity == 0)||row.$cellEdit"
-                            @click="rowCell('生成出库', row, index)">出
-                            库</el-button>
+                            :disabled="editDisabled || row.surplusQuantity == 0 || row.$cellEdit"
+                            @click="rowCell('生成出库', row, index)">
+                            {{ row.whetherInOutStorage == 1 ? '撤销出库' : '出 库' }}
+                        </el-button>
                         <!-- <el-button size="small" type="text"
                             :disabled="editDisabled || row.confirmDispatchVehicles == 1 || row.whetherInOutStorage == 1"
                             @click="rowCell('入库删除', row, index)">删 除</el-button> -->
@@ -182,8 +233,9 @@
                     <template slot="menu" slot-scope="{ row, index }">
                         <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"
-                            @click="rowCell('出库确认', row, index)">出库确认</el-button>
+                        <el-button size="small" type="text" :disabled="editDisabled" @click="rowCell('出库确认', row, index)">{{
+                            row.confirmDispatchVehicles ==
+                            1 ? '撤销确认' : '出库确认' }}</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled" @click="rowCell('开票', row, index)">开
                             票</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.confirmDispatchVehicles == 1"
@@ -208,7 +260,7 @@
 </template>
 
 <script>
-import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2 } from "@/api/tradeAgency/oceanFreightImport";
+import { submit, getDetail, detailTradeByMblno, remove, checkAgent, revokeCheckAgent, copyAgent, generateDispatchVehicles, confirmDispatchVehicles, generateWarehouseEntry, confirmWarehouseEntry, generateOutbound, dispatchvehiclesRemove, inoutstorageRemove, calculationWarehouseUnitPrice, billsCopyBills, submitList1, submitList2, revokePrecontainers, revokeDispatchVehicles, revokeWarehouseEntry, revokeInoutstorage, revokeOutbound } from "@/api/tradeAgency/oceanFreightImport";
 import feeInfo from "@/components/tradeAgency/fee-oceanFreight";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -488,7 +540,7 @@ export default {
             optionBack: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 120,
+                menuWidth: 160,
                 tip: false,
                 border: true,
                 index: true,
@@ -519,6 +571,12 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "类型",
+                        prop: "goodsType",
+                        width: "120",
+                        overHidden: true
+                    },
+                    {
                         label: "件数",
                         prop: "quantity",
                         width: "120",
@@ -633,7 +691,7 @@ export default {
             optionBack2: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 120,
+                menuWidth: 160,
                 tip: false,
                 border: true,
                 index: true,
@@ -777,7 +835,7 @@ export default {
             optionBack3: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 140,
+                menuWidth: 160,
                 tip: false,
                 border: true,
                 index: true,
@@ -1062,6 +1120,33 @@ export default {
                 loading.close()
             })
         },
+        addRow() {
+            if (!this.form.corpId) return this.$message.error("请选择客户名称");
+            this.form.preContainersList.push({ $cellEdit: true })
+            // if (this.form.agentItemsList.length == 0) {
+            //     this.form.agentItemsList.push({ $cellEdit: true })
+            // } else {
+            //     let obj = {}
+            //     obj = this.deepClone(this.form.agentItemsList[this.form.agentItemsList.length - 1])
+            //     this.form.agentItemsList.push({
+            //         billNo: obj.billNo,
+            //         boxType: obj.boxType,
+            //         leadSealNo: obj.leadSealNo,
+            //         orderReleaseMethod: obj.orderReleaseMethod,
+            //         orderNo: obj.orderNo,
+            //         hsCode: obj.hsCode,
+            //         factoryNumber: obj.factoryNumber,
+            //         labelProductName: obj.labelProductName,
+            //         goodsType: obj.goodsType,
+            //         quantity: obj.quantity,
+            //         netWeight: obj.netWeight,
+            //         price: obj.price,
+            //         grossWeight: obj.grossWeight,
+            //         amount: obj.amount,
+            //         $cellEdit: true
+            //     })
+            // }
+        },
         dicChange(name, row) {
             if (name == 'corpCnName') {
                 if (row) {
@@ -1131,6 +1216,13 @@ export default {
             }
         },
         rowDicChange(name, row, el) {
+            if (name == 'goodsName') {
+                if (row) {
+                    el.hsCode = row.hsCode
+                } else {
+                    el.hsCode = null
+                }
+            }
             if (name == 'fleetName') {
                 if (row) {
                     el.fullName = row.mgrName
@@ -1237,37 +1329,67 @@ export default {
                     ...row,
                     type: 1,
                 }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
+                if (row.whetherDispatchVehicles == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokePrecontainers(obj).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    generateDispatchVehicles(obj).then(res => {
+                        this.$message.success("派车成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
 
-                generateDispatchVehicles(obj).then(res => {
-                    this.$message.success("派车成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
             }
             if (name == '自提') {
                 let obj = {
                     ...row,
                     type: 2,
                 }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                generateDispatchVehicles(obj).then(res => {
-                    this.$message.success("自提成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
+                if (row.whetherDispatchVehicles == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokePrecontainers(obj).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    generateDispatchVehicles(obj).then(res => {
+                        this.$message.success("自提成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
             }
             // if (name == '派车删除') {
             //     const loading = this.$loading({
@@ -1287,96 +1409,174 @@ export default {
                 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,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                confirmDispatchVehicles(row).then(res => {
-                    this.$message.success("派车成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
+                if (row.whetherDispatchVehicles == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokeDispatchVehicles(row).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    console.log(row)
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    confirmDispatchVehicles(row).then(res => {
+                        this.$message.success("派车成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
+
             }
             if (name == '生成入库') {
                 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,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                generateWarehouseEntry(row).then(res => {
-                    this.$message.success("生成入库成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
+                if (row.whetherWarehouseEntry == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokeWarehouseEntry(row).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    generateWarehouseEntry(row).then(res => {
+                        this.$message.success("生成入库成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
+
             }
             if (name == '入库确认') {
                 if (!this.form.eta || !row.warehouseName) {
                     return this.$message.error((!this.form.eta ? "基础信息的实际到港，" : '') + (!row.warehouseName ? "仓库" : '') + "不能为空");
                 }
-                calculationWarehouseUnitPrice(row).then(res => {
-                    this.$confirm(res.data.data, '提示', {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        dangerouslyUseHTMLString: true,
-                    }).then(() => {
-                        const loading = this.$loading({
-                            lock: true,
-                            text: '加载中',
-                            spinner: 'el-icon-loading',
-                            background: 'rgba(255,255,255,0.7)'
-                        });
-                        confirmWarehouseEntry(row).then(res => {
-                            this.$message.success("入库成功");
-                            this.getDetails(this.form.id)
-                        }).finally(() => {
-                            loading.close()
+                if (row.confirmDispatchVehicles == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokeInoutstorage(row).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    calculationWarehouseUnitPrice(row).then(res => {
+                        this.$confirm(res.data.data, '提示', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            dangerouslyUseHTMLString: true,
+                        }).then(() => {
+                            const loading = this.$loading({
+                                lock: true,
+                                text: '加载中',
+                                spinner: 'el-icon-loading',
+                                background: 'rgba(255,255,255,0.7)'
+                            });
+                            confirmWarehouseEntry(row).then(res => {
+                                this.$message.success("入库成功");
+                                this.getDetails(this.form.id)
+                            }).finally(() => {
+                                loading.close()
+                            })
                         })
                     })
-                })
-
-
+                }
             }
             if (name == '生成出库') {
                 if (!row.warehouseName || !row.warehouseUnitPrice) {
                     return this.$message.error((!row.warehouseName ? "仓库，" : '') + (!row.warehouseUnitPrice ? "仓储单价" : '') + "不能为空");
                 }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                generateOutbound(row).then(res => {
-                    this.$message.success("生成出库成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
+                if (row.whetherInOutStorage == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokeOutbound(row).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    generateOutbound(row).then(res => {
+                        this.$message.success("生成出库成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
+
             }
             if (name == '出库确认') {
                 if (!row.outQuantity || !row.outWeight) {
                     return this.$message.error((!row.outQuantity ? "出库件数，" : '') + (!row.outWeight ? "出库重量" : '') + "不能为空");
                 }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                confirmWarehouseEntry(row).then(res => {
-                    this.$message.success("出库成功");
-                    this.getDetails(this.form.id)
-                }).finally(() => {
-                    loading.close()
-                })
+                if (row.confirmDispatchVehicles == 1) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    revokeInoutstorage(row).then(res => {
+                        this.$message.success("撤销成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                } else {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    confirmWarehouseEntry(row).then(res => {
+                        this.$message.success("出库成功");
+                        this.getDetails(this.form.id)
+                    }).finally(() => {
+                        loading.close()
+                    })
+                }
+
             }
             if (name == '开票') {
                 this.$message.error("待开发");
@@ -1576,4 +1776,9 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
+
+::v-deep .el-table--small td,
+.el-table--small th {
+    padding: 2px !important;
+}
 </style>

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -126,19 +126,24 @@
                         <el-button type="primary" size="small" icon="el-icon-plus" :disabled="editDisabled"
                             @click="addRow">新 增
                         </el-button>
-                        <el-button type="success" size="small" :disabled="editDisabled||!form.id" @click="allClick('首款账单')">首款账单
+                        <el-button type="info" plain size="small" :disabled="editDisabled"
+                            @click="allClick('一键保存')">一键保存</el-button>
+                        <el-button type="info" plain size="small" :disabled="editDisabled"
+                            @click="allClick('一键编辑')">一键编辑</el-button>
+                        <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||!form.id"
-                            @click="allClick('尾款账单')">尾款账单
+                        <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||!form.id"
+                        <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||!form.id">
+                            <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">
@@ -204,6 +209,11 @@
                             :controls="false" placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
                         <span v-else>{{ row.price }}</span>
                     </tempalte>
+                    <tempalte slot="amountForm" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit" v-model="row.amount" @change="amountChange(row)"
+                            :controls="false" placeholder="请输入 金额" size="small" style="width: 100%;"></el-input-number>
+                        <span v-else>{{ row.amount }}</span>
+                    </tempalte>
                     <template slot="menu" slot-scope="{ row, index }">
                         <el-button size="small" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" type="text"
                             :disabled="editDisabled" @click="rowCell(row, index)">{{ row.$cellEdit ? '保 存' : '编 辑'
@@ -513,7 +523,7 @@ export default {
                         disabled: true,
                     },
                     {
-                        label: '预付比例',
+                        label: '付费方式',
                         prop: "advanceRatio",
                         type: "select",
                         dicUrl: "/api/blade-system/dict-biz/dictionary?code=advance_ratio",
@@ -592,7 +602,7 @@ export default {
                     {
                         label: "提单号",
                         prop: "billNo",
-                        width: "120",
+                        width: "160",
                         cell: true,
                         overHidden: true,
                         rules: [
@@ -622,7 +632,7 @@ export default {
                     {
                         label: "箱号",
                         prop: "boxNo",
-                        width: "140",
+                        width: "160",
                         cell: true,
                         overHidden: true,
                         rules: [
@@ -794,6 +804,9 @@ export default {
                         label: "金额",
                         prop: "amount",
                         width: "120",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
                         overHidden: true
                     },
                     {
@@ -1118,6 +1131,10 @@ export default {
         countChange(row) {
             row.amount = _.multiply(Number(row.netWeight ? row.netWeight : 0), Number(row.price ? row.price : 0))
         },
+        amountChange(row) {
+            if (row.netWeight == 0) return this.$message.error("净重不能为零");
+            row.price = _.divide(Number(row.amount ? row.amount : 0), Number(row.netWeight ? row.netWeight : 1))
+        },
         wkChange(row) {
             let sum = 0
             this.wkForm.agentItemsRList.forEach(e => {
@@ -1350,6 +1367,20 @@ export default {
             }
         },
         allClick(name) {
+            if (name == '一键保存') {
+                for (let row of this.form.agentItemsList) {
+                    if (!row.billNo || !row.boxType || !row.boxNo || !row.hsCode || !row.goodsType || !row.quantity || !row.netWeight || !row.price || !row.grossWeight) {
+                        this.$refs.crud.rowCell(row, row.$index)
+                        return this.$message.error("请完善明细信息");
+                    }
+                    this.$set(row, "$cellEdit", false);
+                }
+            }
+            if (name == '一键编辑') {
+                for (let row of this.form.agentItemsList) {
+                    this.$set(row, "$cellEdit", true);
+                }
+            }
             if (name == '首款账单') {
                 if (!this.form.domesticConsigneeCname) return this.$message.error("请选择国内收货人");
                 bcurrencyGetExrate({ date: this.form.contractDate, dc: 'D' }).then(res => {
@@ -1724,7 +1755,9 @@ export default {
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
 }
-::v-deep .el-table--small td, .el-table--small th {
+
+::v-deep .el-table--small td,
+.el-table--small th {
     padding: 2px !important;
 }
 </style>

src/views/warehousing/cargoClearance/AddOrUpdate.vue

@@ -2121,11 +2121,7 @@ export default {
     },
     //树状库位下拉关闭询问
     hanDleclose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => { });
+      done();
     },
     getTreeselect(row) {
       this.treeselectList.fWarehouselocid = null;