修改bug

src/components/tradeAgency/businessReports.vue

@@ -517,8 +517,8 @@ export default {
     },
     // 打印报表获取数据
     reportsGetReportDatafun(url, row) {
-      if (row.groupCode == '首款' && this.itemIds == null) return this.$message.error("请选择明细");
-      if (row.groupCode == '尾款' && this.itemIds == null) return this.$message.error("请选择明细");
+      // if (row.groupCode == '首款' && this.itemIds == null) return this.$message.error("请选择明细");
+      // if (row.groupCode == '尾款' && this.itemIds == null) return this.$message.error("请选择明细");
       reportsGetReportData({
         billId: this.id,
         reportCode: row.classifyCode,

src/components/tradeAgency/businessReportsJK.vue

@@ -42,6 +42,14 @@ export default {
       type: String,
       default: ''
     },
+    classifyCode: {
+      type: String,
+      default: ''
+    },
+    groupCode: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
@@ -52,7 +60,6 @@ export default {
       form: {},
       formReport: {},
       query: {
-        classifyCode: '业务',
       },
       loading: true,
       page: {
@@ -66,8 +73,6 @@ export default {
         height: 400,
         calcHeight: 30,
         tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
         border: true,
         index: true,
         viewBtn: true,
@@ -876,6 +881,8 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       params.businessType = this.businessValue
+      params.classifyCode = this.classifyCode
+      params.groupCode = this.groupCode
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;

src/components/tradeAgency/fee-info.vue

@@ -34,7 +34,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -112,7 +112,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -419,7 +419,7 @@ export default {
                         label: "结算日期",
                         prop: "stlDate",
                         width: "120",
-                        cell: true,
+                        // cell: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
@@ -582,7 +582,7 @@ export default {
                         label: "结算日期",
                         prop: "stlDate",
                         width: "120",
-                        cell: true,
+                        // cell: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",

src/components/tradeAgency/fee-infosimple.vue

@@ -19,7 +19,7 @@
             </template>
             <template slot="corpCnName" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -91,7 +91,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
                     @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -273,7 +273,7 @@ export default {
                     },
                     {
                         label: "结算日期",
-                        prop: "stlDate",
+                        // prop: "stlDate",
                         width: "120",
                         cell: true,
                         type: "date",
@@ -466,7 +466,7 @@ export default {
                     },
                     {
                         label: "结算日期",
-                        prop: "stlDate",
+                        // prop: "stlDate",
                         width: "120",
                         cell: true,
                         type: "date",

src/components/tradeAgency/fee-oceanFreight.vue

@@ -18,12 +18,11 @@
                     @click="allClick('生成账单', 'D')">生成账单</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionDList.length == 0"
                     @click="allClick('撤销账单', 'D')">撤销账单</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('打印账单', 'D')">打印账单</el-button> -->
+                <el-button type="primary" plain size="small" @click="$refs.printD.openDialog()">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('应收模板', 'D')">应收模板</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('生成应收', 'D')">生成应收</el-button> -->
+                <el-button type="primary" plain size="small" :disabled="disabled || selectionDList.length == 0"
+                    @click="allClick('生成应付', 'D')">生成应收</el-button>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('D')">
@@ -34,8 +33,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -99,12 +98,11 @@
                 <el-button type="primary" plain size="small" :disabled="disabled"
                     @click="allClick('增值税', 'C')">增值税</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled" @click="allClick('关税', 'C')">关税</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('打印账单', 'C')">打印账单</el-button> -->
+                <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button>
                 <el-button type="success" plain size="small" :disabled="disabled"
                     @click="allClick('应付模板', 'C')">应付模板</el-button>
-                <!-- <el-button type="primary" plain size="small" :disabled="disabled"
-                    @click="allClick('生成应付', 'C')">生成应付</el-button> -->
+                <el-button type="primary" plain size="small" :disabled="disabled || selectionCList.length == 0"
+                    @click="allClick('生成应收', 'C')">生成应付</el-button>
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('C')">
@@ -115,8 +113,8 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
-                    @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
+                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
             <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -181,6 +179,10 @@
                 <el-button type="primary" size="mini" @click="templateExport">导 入</el-button>
             </span>
         </el-dialog>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="printD" businessValue="HYJK" classifyCode="费用"
+            groupCode="应收"></business-reports>
+        <business-reports :id="form.id" :itemIds="itemIds" ref="printC" businessValue="HYJK" classifyCode="费用"
+            groupCode="应付"></business-reports>
     </div>
 </template>
 
@@ -191,10 +193,12 @@ import { submitListTrade, feeRemove, generateBill, revokeBill, synchronization,
 import { defaultDate } from "@/util/date";
 import { losbfeestemplateDetail } from "@/api/iosBasicData/losbfeestemplate";
 import { losbfeestemplateGetListTemplate } from "@/api/iosBasicData/bills";
+import businessReports from "@/components/tradeAgency/businessReportsJK.vue";
 import _ from "lodash";
 export default {
     components: {
-        dicSelect
+        dicSelect,
+        businessReports
     },
     props: {
         detailData: {},
@@ -1097,6 +1101,36 @@ export default {
                     })
                 })
             }
+            if (name == '生成应付') {
+                if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
+                let arr = this.deepClone(this.selectionDList)
+                arr.forEach(e => {
+                    e.dc = 'C'
+                    delete e.id
+                    delete e.createTime
+                    delete e.createUser
+                    delete e.createUserName
+                    delete e.updateTime
+                    delete e.updateUser
+                    delete e.updateUserName
+                })
+                this.form.feeCenterListC = this.form.feeCenterListC.concat(this.selectionDList)
+            }
+            if (name == '生成应收') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                let arr = this.deepClone(this.selectionCList)
+                arr.forEach(e => {
+                    e.dc = 'D'
+                    delete e.id
+                    delete e.createTime
+                    delete e.createUser
+                    delete e.createUserName
+                    delete e.updateTime
+                    delete e.updateUser
+                    delete e.updateUserName
+                })
+                this.form.feeCenterListD = this.form.feeCenterListD.concat(arr)
+            }
         },
         submitValidate() {
             for (let row of this.form.feeCenterListD) {
@@ -1114,7 +1148,7 @@ export default {
                 }
             }
             for (let index in this.form.feeCenterListC) {
-                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款'|| this.form.feeCenterListC[index].feeCnName == '手续费') {
+                if (this.form.feeCenterListC[index].feeCnName == '首款' || this.form.feeCenterListC[index].feeCnName == '尾款' || this.form.feeCenterListC[index].feeCnName == '手续费') {
                     if (!this.form.feeCenterListC[index].discountExrate) {
                         this.$message.error("第" + (Number(index) + 1) + "行" + this.form.feeCenterListC[index].feeCnName + "费用优惠汇率不能为空");
                         return false

src/enums/column-name.js

@@ -1776,6 +1776,9 @@ const columnName = [{
     code: 383,
     name: '贸易代理-购汇付汇-列表'
   },{
+    code: 383.1,
+    name: '贸易代理-货款收费-收费列表'
+  },{
     code: 384,
     name: '贸易代理-购汇付汇-明细'
   },{

src/views/iosBasicData/advanceCharge/detailsPage.vue

@@ -6,10 +6,34 @@
                     @click="goBack(0)">返回列表
                 </el-button>
             </div>
+            <div class="add-customer-btn">
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    @click="submit">保 存
+                </el-button>
+            </div>
         </div>
         <div style="margin-top: 50px">
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="corpName" slot-scope="{ row }">
+                        <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('corpName', $event)"
+                            :disabled="editDisabled"></dic-select>
+                    </tempalte>
+                    <tempalte slot="advancePaymentBalance">
+                        <el-input-number v-model="form.advancePaymentBalance"
+                            @change="dicChange('advancePaymentBalance', form)" :controls="false" placeholder="请输入 预付款余额"
+                            size="small" style="width: 100%;"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="inOverpayment">
+                        <el-input-number v-model="form.inOverpayment" @change="dicChange('inOverpayment', form)"
+                            :controls="false" placeholder="请输入 增加金额" size="small" style="width: 100%;"></el-input-number>
+                    </tempalte>
+                    <tempalte slot="outOverpaymen">
+                        <el-input-number v-model="form.outOverpaymen" @change="dicChange('outOverpaymen', form)"
+                            :controls="false" placeholder="请输入 消费金额" size="small" style="width: 100%;"></el-input-number>
+                    </tempalte>
                 </avue-form>
             </trade-card>
             <trade-card title="预付款明细">
@@ -31,6 +55,7 @@
 <script>
 import { submit, getDetail } from "@/api/iosBasicData/advanceCharge";
 import dicSelect from "@/components/dicSelect/main";
+
 import { bfeesList } from "@/api/iosBasicData/bfees";
 import _ from "lodash";
 export default {
@@ -45,11 +70,15 @@ export default {
             optionForm: {
                 menuBtn: false,
                 span: 8,
-                disabled: true,
                 column: [
                     {
                         label: '客户',
                         prop: "corpName",
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
                     },
                     {
                         label: "预付款余额",
@@ -156,6 +185,24 @@ export default {
         }
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'corpName') {
+                if (row) {
+                    this.form.corpId = row.id
+                } else {
+                    this.form.corpId = null
+                }
+            }
+            if (name == 'advancePaymentBalance') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'inOverpayment') {
+                row.advancePaymentBalance = _.subtract(Number(row.inOverpayment ? row.inOverpayment : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+            if (name == 'outOverpaymen') {
+                row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
+            }
+        },
         rowEdit(row) {
             if (row.overpaymentType == 1) {
                 if (this.$store.getters.firstSetStatus) {
@@ -207,6 +254,28 @@ export default {
                 loading.close()
             })
         },
+        submit() {
+            this.$refs["form"].validate((valid, done) => {
+                done();
+                if (valid) {
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    submit(this.form).then(res => {
+                        this.$message.success("保存成功");
+                        this.getDetails(res.data.data.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+
+                } else {
+                    return false;
+                }
+            });
+        },
         //自定义列保存
         async saveColumn(ref, option, optionBack, code) {
             const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -651,6 +651,7 @@
                 <el-table-column prop="accountName" label="账户名称" width="180" />
                 <el-table-column prop="accountBank" label="开户银行" width="180" />
                 <el-table-column prop="accountNo" label="银行账号" width="180" />
+                <el-table-column prop="mnemonicCode" label="助记码" width="180" />
                 <el-table-column prop="curNo" label="币别" width="180" />
                 <el-table-column prop="subjectNumber" label="科目编码" width="180" />
                 <el-table-column prop="address" label="地址" width="180" />
@@ -791,7 +792,7 @@
     </el-card>
 
     <el-dialog :title="dialogTitle" :visible.sync="corpsAttnDialogVisible" :append-to-body="true" width="40%"
-      :before-close="handleClose">
+      :before-close="handleClose" :close-on-click-modal="false">
 
       <el-form ref="corpsAttnForm" :rules="corpsAttnRules" :model="corpsAttnForm" label-width="120px">
         <div v-if="activeName == 'khlxk'">
@@ -849,6 +850,9 @@
           <el-form-item label="银行账号" prop="accountNo">
             <el-input v-model="corpsAttnForm.accountNo"></el-input>
           </el-form-item>
+          <el-form-item label="助记码" prop="mnemonicCode">
+            <el-input v-model="corpsAttnForm.mnemonicCode"></el-input>
+          </el-form-item>
           <el-form-item label="币别" prop="curId">
             <!-- <el-input v-model="corpsAttnForm.curId"></el-input> -->
             <search-query ref="SearchQuery"
@@ -1256,6 +1260,9 @@ export default {
         accountNo: [
           { required: true, message: ' ', trigger: 'change' }
         ],
+        mnemonicCode: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
         curId: [
           { required: true, message: ' ', trigger: 'change' }
         ],

src/views/tirePartsMall/salesManagement/outboundTask/index.vue

@@ -5,12 +5,12 @@
         ref="crud" :key="key" @selection-change="selectionChange" @on-load="onLoad" @search-change="searchChange"
         @row-del="rowDel" @refresh-change="refreshChange"
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 271)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 271)" :page.sync="page"
-        @row-update="rowUpdate">
-        <template slot-scope="{type,size,row,index}" slot="menu" >
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 271)" :page.sync="page" @row-update="rowUpdate">
+        <template slot-scope="{type,size,row,index}" slot="menu">
           <!--<el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>-->
           <!--  :disabled="Number(row.sendTotalNum) == Number(row.goodsTotalNum)" 之前的判断是否修改的条件 -->
-          <el-button type="text" size="small" :disabled="row.statusName != '待处理'" @click="rowCell(row, index)">{{ row.$cellEdit ? '保存' : '修改' }}
+          <el-button type="text" size="small" :disabled="row.statusName != '待处理'" @click="rowCell(row, index)">{{
+            row.$cellEdit ? '保存' : '修改' }}
           </el-button>
           <!-- <el-button :disabled="row.statusName === '已派工'" :size="size" :type="type"
             @click="$refs.crud.rowDel(row, index)">删除
@@ -19,6 +19,12 @@
         <template slot="corpNameSearch">
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
+        <template slot="stockClerkNameForm" slot-scope="{ row }">
+          <dic-select v-if="row.$cellEdit" v-model="row.stockClerkName" placeholder="库管" key="id" label="realName"
+            url="/blade-user/stockClerkList" :filterable="true" :remote="true" dataName="realName"
+            @selectChange="rowDicChange('stockClerkName', $event, row)"></dic-select>
+          <span v-else>{{ row.stockClerkName }}</span>
+        </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <!--  <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新增</el-button>-->
           <!--  <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>-->
@@ -26,9 +32,9 @@
             :disabled="selectionList.length <= 0">派工
           </el-button>
 
-            <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
-                       :disabled="!chexiaofun()">撤销派工
-            </el-button>
+          <el-button type="success" icon="el-icon-finished" size="small" @click="shipRevokeWorkOrderfun"
+            :disabled="!chexiaofun()">撤销派工
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -37,15 +43,16 @@
 </template>
 
 <script>
-import { getList, remove, outboundWorkOrder,typeSave } from "@/api/tirePartsMall/salesManagement/outboundTask";
+import { getList, remove, outboundWorkOrder, typeSave } from "@/api/tirePartsMall/salesManagement/outboundTask";
 import { shipRevokeWorkOrder } from '@/api/tirePartsMall/salesManagement/outboundTask'
 import da from "element-ui/src/locale/lang/da";
 // import detailsPage from "./detailsPage"
-
+import dicSelect from "@/components/dicSelect/main";
 export default {
   name: "index",
   components: {
     // detailsPage
+    dicSelect
   },
   data() {
     return {
@@ -87,51 +94,51 @@ export default {
         dialogWidth: "70%",
         summaryText: "合计",
         showSummary: true,
-        sumColumnList: [ {
-            name: 'goodsTotalNum',
-            type: 'sum',
-            decimals: 0
-          }, {
-            name: 'sendTotalNum',
-            type: 'sum',
-            decimals: 0
-          },],
+        sumColumnList: [{
+          name: 'goodsTotalNum',
+          type: 'sum',
+          decimals: 0
+        }, {
+          name: 'sendTotalNum',
+          type: 'sum',
+          decimals: 0
+        },],
         column: [{
           label: '销售单号',
           prop: "ordNo",
-          searchOrder:1,
+          searchOrder: 1,
           search: true,
           width: 140,
           overHidden: true,
-        },{
-            label: '单据编号',
-            prop: "billno",
-            searchOrder:1,
-            search: true,
-            width: 140,
-            overHidden: true,
         }, {
-            label: '状态',
-            prop: "statusName",
-            searchOrder:2,
-            width: 100,
-            search: true,
-            type: 'select',
-            overHidden: true,
-            searchValue:'待处理',
-            dicData: [{
-                label: '待处理',
-                value: '待处理'
-            }, {
-                label: '已派工',
-                value: '已派工'
-            },{
-                label: '未完成',
-                value: '未完成'
-            }, {
-                label: '已完成',
-                value: '已完成'
-            }],
+          label: '单据编号',
+          prop: "billno",
+          searchOrder: 1,
+          search: true,
+          width: 140,
+          overHidden: true,
+        }, {
+          label: '状态',
+          prop: "statusName",
+          searchOrder: 2,
+          width: 100,
+          search: true,
+          type: 'select',
+          overHidden: true,
+          searchValue: '待处理',
+          dicData: [{
+            label: '待处理',
+            value: '待处理'
+          }, {
+            label: '已派工',
+            value: '已派工'
+          }, {
+            label: '未完成',
+            value: '未完成'
+          }, {
+            label: '已完成',
+            value: '已完成'
+          }],
         }, {
           label: '业务对象',
           prop: "customerName",
@@ -139,8 +146,8 @@ export default {
           width: 140,
           type: 'select',
           overHidden: true,
-          filterable:true,
-          remote:true,
+          filterable: true,
+          remote: true,
           props: {
             label: 'cname',
             value: 'cname',
@@ -179,7 +186,7 @@ export default {
           width: 100,
           search: true,
           overHidden: true,
-          cell:false,
+          cell: false,
           type: 'select',
           props: {
             label: 'cname',
@@ -187,18 +194,21 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/storageDesc/listAll',
         },
-         {
+        {
           label: '库管',
           prop: "stockClerkName",
           width: 100,
-          cell:false,
+          cell: true,
+          slot: true,
+          formslot: true,
+          // cell: false,
           overHidden: true,
-          type: 'select',
-          props: {
-            label: 'realName',
-            value: 'realName'
-          },
-          dicUrl: '/api/blade-user/stockClerkList',
+          // type: 'select',
+          // props: {
+          //   label: 'realName',
+          //   value: 'realName'
+          // },
+          // dicUrl: '/api/blade-user/stockClerkList',
         },
         {
           label: '收货地址',
@@ -232,7 +242,7 @@ export default {
           label: '备注',
           prop: "remarks",
           width: 200,
-          cell:false,
+          cell: false,
           overHidden: true,
         }, {
           label: '业务日期',
@@ -270,43 +280,53 @@ export default {
 
   },
   methods: {
-      // 撤销派工的数据判断
-      chexiaofun(){
-          let typefalse = false
-          for(let item of this.selectionList) {
-              if (item.statusName == '已派工') {
-                  typefalse = true
-              }else {
+    rowDicChange(name, row, el) {
+      if (name == 'stockClerkName') {
+        if (row) {
+          console.log(row, 11111)
+          el.stockClerkId = row.id
+        } else {
+          el.stockClerkId = null
+        }
+      }
+    },
+    // 撤销派工的数据判断
+    chexiaofun() {
+      let typefalse = false
+      for (let item of this.selectionList) {
+        if (item.statusName == '已派工') {
+          typefalse = true
+        } else {
 
-                  typefalse = false
-                  break;
-              }
-          }
-          return typefalse
-      },
+          typefalse = false
+          break;
+        }
+      }
+      return typefalse
+    },
     selectionChange(list) {
       this.selectionList = list
     },
-      // 撤销派工
-      shipRevokeWorkOrderfun(){
-          this.$confirm('是否要撤销派工?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-          }).then(()=>{
-              const data = []
-              for(let i in this.selectionList) {
-                  data.push(this.selectionList[i].id)
-              }
-              shipRevokeWorkOrder(data.join(',')).then(res=>{
-                  this.$message({
-                      type: 'success',
-                      message: '撤销派工成功!'
-                  });
-                  this.onLoad(this.page)
-              })
-          })
-      },
+    // 撤销派工
+    shipRevokeWorkOrderfun() {
+      this.$confirm('是否要撤销派工?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const data = []
+        for (let i in this.selectionList) {
+          data.push(this.selectionList[i].id)
+        }
+        shipRevokeWorkOrder(data.join(',')).then(res => {
+          this.$message({
+            type: 'success',
+            message: '撤销派工成功!'
+          });
+          this.onLoad(this.page)
+        })
+      })
+    },
     dispatching() {
       this.$confirm('是否确认派工?', '提示', {
         confirmButtonText: '确定',
@@ -345,7 +365,7 @@ export default {
     rowUpdate(form, index, done) {
       console.log(form);
       typeSave(form).then(res => {
-        this.$message({type: "success", message: form.id ? "修改成功!" : "新增成功!"});
+        this.$message({ type: "success", message: form.id ? "修改成功!" : "新增成功!" });
         // this.page.currentPage = 1;
         // this.onLoad(this.page);
         //成功关闭此页面回到列表页
@@ -357,7 +377,7 @@ export default {
     refreshChange() {
       this.onLoad(this.page, this.search)
     },
-    rowCell(row,index){
+    rowCell(row, index) {
       this.findObject(this.option.column, "storageName").cell = true
       this.findObject(this.optionList.column, "storageName").cell = true
       this.findObject(this.option.column, "stockClerkName").cell = true
@@ -394,9 +414,9 @@ export default {
         current: page.currentPage,
         size: page.pageSize,
         bizTypeName: "FHRW",
-          statusName:'待处理',
+        statusName: '待处理',
         ...Object.assign(params, this.search),
-        customerName : params.$customerName
+        customerName: params.$customerName
       }
       console.log(params);
       this.loading = true
@@ -440,8 +460,8 @@ export default {
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
       this.option.selectable = (row, index) => {
-      return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
-    }
+        return Number(row.sendTotalNum) !== Number(row.goodsTotalNum);
+      }
     }
   }
 }

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -148,6 +148,26 @@ export default {
                         disabled: false,
                     },
                     {
+                        label: '外国发货人',
+                        prop: "abroadConsignorCname",
+                        disabled: true,
+                    },
+                    {
+                        label: '银行助记码',
+                        prop: "abroadBankMnemonicCode",
+                        disabled: true,
+                    },
+                    {
+                        label: '银行',
+                        prop: "abroadBank",
+                        disabled: true,
+                    },
+                    {
+                        label: '币别',
+                        prop: "abroadCurrency",
+                        disabled: true,
+                    },
+                    {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
@@ -269,6 +289,9 @@ export default {
         if (this.$route.query.billNo) {
             this.getDetails(this.$route.query.billNo)
         }
+        if (this.$route.query.params) {
+            this.getDetails(this.$route.query.params)
+        }
     },
     methods: {
         getDetails(id) {

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -46,7 +46,7 @@ export default {
                 calcHeight: 30,
                 menuWidth: 80,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -64,7 +64,7 @@ export default {
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=客户&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -88,11 +88,25 @@ export default {
                         searchOrder: 2,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        overHidden: true,
+                        search: true,
+                        searchOrder: 3,
+                    },
+                    {
+                        label: '提单号',
+                        prop: "billNoJoin",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true,
+                    },
+                    {
                         label: "业务日期",
                         prop: "businessDate",
                         type: "date",
                         search: true,
-                        searchOrder: 6,
+                        searchOrder: 5,
                         searchProp: "businessDateList",
                         unlinkPanels: true,
                         searchRange: true,
@@ -109,7 +123,7 @@ export default {
                     {
                         label: '付汇美元金额',
                         prop: "paymentInUsd",
-                        width:'140',
+                        width: '140',
                         overHidden: true,
                     },
                     {
@@ -136,6 +150,7 @@ export default {
                         label: '申报单号',
                         prop: "declarationNumber",
                         search: true,
+                        searchOrder: 6,
                         overHidden: true,
                     },
                     {
@@ -156,7 +171,7 @@ export default {
     },
     activated() {
         setTimeout(() => {
-            if (this.$route.query.billNo) {
+            if (this.$route.query.billNo || this.$route.query.params) {
                 this.isShow = false
                 this.$store.commit("IN_EXPUR_DETAIL");
             }

src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -74,6 +74,11 @@ export default {
                         disabled: true,
                     },
                     {
+                        label: '提单号',
+                        prop: "billNoJoin",
+                        disabled: true,
+                    },
+                    {
                         label: '业务日期',
                         prop: "businessDate",
                         type: "date",
@@ -122,6 +127,26 @@ export default {
                         disabled: false,
                     },
                     {
+                        label: '国内收货人',
+                        prop: "domesticConsigneeCname",
+                        disabled:true,
+                    },
+                    {
+                        label: '银行助记码',
+                        prop: "domesticBankMnemonicCode",
+                        disabled:true,
+                    },
+                    {
+                        label: '银行',
+                        prop: "domesticBank",
+                        disabled:true,
+                    },
+                    {
+                        label: '币别',
+                        prop: "domesticCurrency",
+                        disabled:true,
+                    },
+                    {
                         label: '备注',
                         prop: "remarks",
                         type: 'textarea',
@@ -242,6 +267,9 @@ export default {
         if (this.$route.query.billNo) {
             this.getDetails(this.$route.query.billNo)
         }
+        if (this.$route.query.params) {
+            this.getDetails(this.$route.query.params)
+        }
     },
     methods: {
         getDetails(id) {

src/views/tradeAgency/firstSettlement/index.vue

@@ -5,8 +5,8 @@
                 v-model="form" id="out-table" :header-cell-class-name="headerClassName" ref="crud" @row-del="rowDel"
                 @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
                 @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
-                @resetColumn="resetColumn('crud', 'option', 'optionBack', 383)"
-                @saveColumn="saveColumn('crud', 'option', 'optionBack', 383)" @on-load="onLoad">
+                @resetColumn="resetColumn('crud', 'option', 'optionBack', 383.1)"
+                @saveColumn="saveColumn('crud', 'option', 'optionBack', 383.1)" @on-load="onLoad">
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
                 </template>
@@ -64,7 +64,7 @@ export default {
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=客户&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -88,12 +88,32 @@ export default {
                         searchOrder: 2,
                     },
                     {
+                        label: '合同号',
+                        prop: "contractNo",
+                        search: true,
+                        searchOrder: 3,
+                        overHidden: true,
+                    },
+                    {
+                        label: '提单号',
+                        prop: "billNoJoin",
+                        search: true,
+                        searchOrder: 4,
+                        overHidden: true,
+                    },
+                    {
                         label: "业务日期",
                         prop: "businessDate",
                         type: "date",
+                        search: true,
+                        searchOrder: 5,
+                        searchProp: "businessDateList",
+                        unlinkPanels: true,
+                        searchRange: true,
                         format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                        overHidden: true
+                        valueFormat: "yyyy-MM-dd HH:mm:ss",
+                        searchDefaultTime: ["00:00:00", "23:59:59"],
+                        overHidden: true,
                     },
                     {
                         label: "金额",
@@ -111,7 +131,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '实付金额',
+                        label: '实收金额',
                         prop: "actualAmount",
                         overHidden: true,
                     },
@@ -128,6 +148,8 @@ export default {
                     {
                         label: '申报单号',
                         prop: "declarationNumber",
+                        search: true,
+                        searchOrder: 6,
                         overHidden: true,
                     },
                     {
@@ -144,11 +166,11 @@ export default {
         detailsPage,
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(383), this.optionBack);
+        this.option = await this.getColumnData(this.getColumnName(383.1), this.optionBack);
     },
     activated() {
         setTimeout(() => {
-            if (this.$route.query.billNo) {
+            if (this.$route.query.billNo||this.$route.query.params) {
                 this.isShow = false
                 this.$store.commit("IN_FIRSTSET_DETAIL");
             }

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -38,7 +38,7 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <tempalte slot="corpCnName">
                         <dic-select v-model="form.corpCnName" placeholder="客户" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true" dataName="cnName"
                             @selectChange="dicChange('corpCnName', $event)" :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="polCnName">
@@ -58,12 +58,12 @@
                     </tempalte>
                     <tempalte slot="hshipperCnName">
                         <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                            url="/blade-los/bcorps/listByType?corpTypeName=外国工厂" :filterable="true" :remote="true" dataName="cnName"
                             @selectChange="dicChange('hshipperCnName', $event)" :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="hconsigneeCnName">
                         <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
+                            url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true" :remote="true" dataName="cnName"
                             @selectChange="dicChange('hconsigneeCnName', $event)" :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="carrierCnName">
@@ -199,7 +199,7 @@
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
                 deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
         </div>
-        <business-reports :id="form.id" ref="print" businessValue="HYJK"></business-reports>
+        <business-reports :id="form.id" ref="print" businessValue="HYJK"  classifyCode="业务"></business-reports>
         <!--审核弹窗-->
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -109,7 +109,7 @@ export default {
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=客户&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'cnName',

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -39,8 +39,9 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <tempalte slot="corpName" slot-scope="{ row }">
                         <dic-select v-model="form.corpName" placeholder="客户" key="id" label="cnName" res="records"
-                            url="/blade-los/bcorps/listByType" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('corpName', $event)" :disabled="editDisabled"></dic-select>
+                            url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                            dataName="cnName" @selectChange="dicChange('corpName', $event)"
+                            :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="countryOfOrigin" slot-scope="{ row }">
                         <dic-select v-model="form.countryOfOrigin" placeholder="原产地" key="id" label="cnName" res="records"
@@ -68,13 +69,13 @@
                     </tempalte>
                     <tempalte slot="abroadConsignorCname" slot-scope="{ row }">
                         <dic-select v-model="form.abroadConsignorCname" placeholder="外国发货人" key="id" label="cnName"
-                            res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('abroadConsignorCname', $event)"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true"
+                            :remote="true" dataName="cnName" @selectChange="dicChange('abroadConsignorCname', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="abroadBankMnemonicCode" slot-scope="{ row }">
                         <dic-select ref="abankCode" v-model="form.abroadBankMnemonicCode" placeholder="银行助记码" key="id"
-                            label="accountNo" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
+                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
                             :filterable="true" @selectChange="dicChange('abroadBankMnemonicCode', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
@@ -84,13 +85,13 @@
                     </tempalte>
                     <tempalte slot="domesticConsigneeCname" slot-scope="{ row }">
                         <dic-select v-model="form.domesticConsigneeCname" placeholder="国内收货人" key="id" label="cnName"
-                            res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('domesticConsigneeCname', $event)"
+                            res="records" url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true"
+                            :remote="true" dataName="cnName" @selectChange="dicChange('domesticConsigneeCname', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
                     <tempalte slot="domesticBankMnemonicCode" slot-scope="{ row }">
                         <dic-select ref="dbankCode" v-model="form.domesticBankMnemonicCode" placeholder="银行助记码" key="id"
-                            label="accountNo" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
+                            label="mnemonicCode" res="corpsBankList" url="/blade-los/bcorps/detail" :activateCreated="false"
                             :filterable="true" @selectChange="dicChange('domesticBankMnemonicCode', $event)"
                             :disabled="editDisabled"></dic-select>
                     </tempalte>
@@ -193,10 +194,10 @@
                             :filterable="true"></dic-select>
                         <span v-else>{{ row.goodsType }}</span>
                     </tempalte>
-                    <tempalte slot="quantityForm" slot-scope="{ row }">
-                        <el-input-number v-if="row.$cellEdit" v-model="row.quantity" @change="countChange(row)"
-                            :controls="false" placeholder="请输入 数量" size="small" style="width: 100%;"></el-input-number>
-                        <span v-else>{{ row.quantity }}</span>
+                    <tempalte slot="netWeightForm" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit" v-model="row.netWeight" @change="countChange(row)"
+                            :controls="false" placeholder="请输入 净重" size="small" style="width: 100%;"></el-input-number>
+                        <span v-else>{{ row.netWeight }}</span>
                     </tempalte>
                     <tempalte slot="priceForm" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)"
@@ -287,6 +288,8 @@ 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 { getDicinit } from "@/api/dicSelect/index";
+import { dateFormat } from "@/util/date";
 import { getBcorpsDetail } from "@/api/iosBasicData/bcorps";
 import { getToken } from "@/util/auth";
 import _ from "lodash";
@@ -357,6 +360,11 @@ export default {
             editDisabled: false,
             activeName: '1',
             form: {
+                typeOfShipping: '海运',
+                contractDate: dateFormat(new Date(), "yyyy-MM-dd") + " 00:00:00",
+                currency: 'USD',
+                documentType: '普通',
+                advanceRatio: 'T/T 10%',
                 billNoFormat: 'MYDL',
                 businessTypeCode: 'MYDL',
                 businessType: 'MYDL',
@@ -507,6 +515,12 @@ export default {
                     {
                         label: '预付比例',
                         prop: "advanceRatio",
+                        type: "select",
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=advance_ratio",
+                        props: {
+                            label: "dictValue",
+                            value: "dictValue"
+                        },
                         disabled: false,
                         rules: [{
                             required: true,
@@ -592,7 +606,7 @@ export default {
                     {
                         label: "箱型",
                         prop: "boxType",
-                        width: "120",
+                        width: "80",
                         cell: true,
                         slot: true,
                         formslot: true,
@@ -608,7 +622,7 @@ export default {
                     {
                         label: "箱号",
                         prop: "boxNo",
-                        width: "120",
+                        width: "140",
                         cell: true,
                         overHidden: true,
                         rules: [
@@ -717,8 +731,8 @@ export default {
                         prop: "quantity",
                         width: "120",
                         cell: true,
-                        slot: true,
-                        formslot: true,
+                        type: 'number',
+                        controls: false,
                         overHidden: true,
                         rules: [
                             {
@@ -733,8 +747,8 @@ export default {
                         prop: "netWeight",
                         width: "120",
                         cell: true,
-                        type: 'number',
-                        controls: false,
+                        slot: true,
+                        formslot: true,
                         overHidden: true,
                         rules: [
                             {
@@ -964,12 +978,36 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(376), this.optionBack);
+        console.log(this.detailData.new)
+        if (this.detailData.new) {
+            getDicinit('get', '/blade-los/bports/list', { cnName: '青岛' }).then(res => {
+                res.data.data.records.forEach(e => {
+                    if (e.cnName == '青岛') {
+                        this.form.polId = e.id
+                        this.form.polCode = e.code
+                        this.form.polEnName = e.enName
+                        this.form.podCnName = e.cnName
+                    }
+                })
+            })
+            getDicinit('get', '/blade-system/dept/lazy-list?parentId=0').then(res => {
+                res.data.data.forEach(e => {
+                    if (e.deptName == '君海贸易') {
+                        this.form.affiliatedCompanyId = e.id
+                        this.form.affiliatedCompanyName = e.deptName
+                    }
+                })
+            })
+        }
         if (this.detailData.id) {
             this.editButton = true
             this.editDisabled = true
             this.optionForm.disabled = true
             this.getDetails(this.detailData.id)
         }
+        if (this.$route.query.params) {
+            this.getDetails(this.$route.query.params)
+        }
         if (this.detailData.copyId) {
             this.getCopydate(this.detailData.copyId)
         }
@@ -1037,7 +1075,7 @@ export default {
             }
             if (name == 'affiliatedCompanyName') {
                 if (row) {
-                    this.form.affiliatedCompanyTId = row.id
+                    this.form.affiliatedCompanyId = row.id
                 } else {
                     this.form.affiliatedCompanyId = null
                 }
@@ -1078,7 +1116,7 @@ export default {
             }
         },
         countChange(row) {
-            row.amount = _.multiply(Number(row.quantity ? row.quantity : 0), Number(row.price ? row.price : 0))
+            row.amount = _.multiply(Number(row.netWeight ? row.netWeight : 0), Number(row.price ? row.price : 0))
         },
         wkChange(row) {
             let sum = 0
@@ -1150,7 +1188,30 @@ export default {
         },
         addRow() {
             if (!this.form.corpId) return this.$message.error("请选择客户名称");
-            this.form.agentItemsList.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
+                })
+            }
+
         },
         rowCell(row, index) {
             if (!row.billNo || !row.boxType || !row.boxNo || !row.hsCode || !row.goodsType || !row.quantity || !row.netWeight || !row.price || !row.grossWeight) {

src/views/tradeAgency/tradeAgency/index.vue

@@ -187,7 +187,7 @@ export default {
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=客户&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -301,7 +301,7 @@ export default {
                         filterable: true,
                         remote: true,
                         searchOrder: 12,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=外国工厂&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -325,7 +325,7 @@ export default {
                         filterable: true,
                         remote: true,
                         searchOrder: 13,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?corpTypeName=国内贸易商&cnName={{key}}",
                         props: {
                             label: 'cnName',
                             value: 'id',
@@ -526,6 +526,13 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(375), this.optionBack);
     },
+    activated() {
+        setTimeout(() => {
+            if (this.$route.query.params) {
+                this.isShow = false
+            }
+        }, 100);
+    },
     methods: {
         handleCheckedChange() {
             delete this.query.whetherSail
@@ -596,6 +603,9 @@ export default {
         },
         addButton() {
             this.isShow = false
+            this.detailData = {
+                new:true
+            };
         },
         copyButton() {
             this.isShow = false
@@ -707,12 +717,12 @@ export default {
         // 详情的返回列表
         goBack() {
             // 初始化数据
-            // if (JSON.stringify(this.$route.query) != "{}") {
-            //     this.$router.$avueRouter.closeTag();
-            //     this.$router.push({
-            //         path: "/iosBasicData/accounts/index"
-            //     });
-            // }
+            if (JSON.stringify(this.$route.query) != "{}") {
+                this.$router.$avueRouter.closeTag();
+                this.$router.push({
+                    path: "/tradeAgency/tradeAgency/index"
+                });
+            }
             this.detailData = {}
             this.isShow = true;
             this.onLoad(this.page, this.query);