修改禅道bug

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

@@ -364,7 +364,7 @@ export default {
                 column: [
                     {
                         label: "放箱号",
-                        prop: "internalContainerNumber",
+                        prop: "containerNumber",
                         width: 100,
                         overHidden: true,
                     },

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -173,11 +173,11 @@ export default {
                         prop: "etd",
                         overHidden: true,
                     },
-                    {
-                        label: "提单号",
-                        prop: "mblNo",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: "提单号",
+                    //     prop: "mblNo",
+                    //     overHidden: true,
+                    // },
                     {
                         label: "起运港",
                         prop: "pol",

src/views/iosBasicData/businessCenter/customerLetter/index.vue

@@ -146,10 +146,9 @@ export default {
                         },
                         overHidden: true,
                     },
-
                     {
                         label: "起运港",
-                        prop: "polCnName",
+                        prop: "polEnName",
                         width: "80",
                         overHidden: true,
                         search: true,
@@ -158,15 +157,15 @@ export default {
                         remote: true,
                         dicUrl: "/api/blade-los/bports/list?current=1&size=5&cnName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             desc: 'code',
                             res: 'data.records'
                         },
                     },
                     {
                         label: "卸货港",
-                        prop: "podCnName",
+                        prop: "podEnName",
                         width: "80",
                         overHidden: true,
                         search: true,
@@ -175,13 +174,13 @@ export default {
                         remote: true,
                         dicUrl: "/api/blade-los/bports/list?current=1&size=5&cnName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             desc: 'code',
                             res: 'data.records'
                         },
                     },
-                             {
+                    {
                         label: "生成状态",
                         prop: "issueStatus",
                         width: "80",
@@ -212,7 +211,7 @@ export default {
                         }, {
                             label: '已审核',
                             value: 3,
-                        },{
+                        }, {
                             label: '驳回',
                             value: 4,
                         }],

src/views/iosBasicData/businessCenter/mkt&slot/index.vue

@@ -59,7 +59,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 12,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -73,8 +73,10 @@ export default {
                 column: [
                     {
                         label: '起运港',
-                        prop: 'polCnName',
+                        prop: 'polId',
                         overHidden: true,
+                        hide: true,
+                        showColumn: false,
                         search: true,
                         type: "select",
                         filterable: true,
@@ -82,15 +84,22 @@ export default {
                         dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
                         props: {
                             label: "cnName",
-                            value: "cnName",
+                            value: "id",
                             desc: 'code',
                             res: "data.records"
                         }
                     },
                     {
+                        label: '起运港',
+                        prop: 'polCnName',
+                        overHidden: true,
+                    },
+                    {
                         label: '目的港',
-                        prop: 'podCnName',
+                        prop: 'podId',
                         overHidden: true,
+                        hide: true,
+                        showColumn: false,
                         search: true,
                         type: "select",
                         filterable: true,
@@ -98,12 +107,17 @@ export default {
                         dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
                         props: {
                             label: "cnName",
-                            value: "cnName",
+                            value: "id",
                             desc: 'code',
                             res: "data.records"
                         }
                     },
                     {
+                        label: '目的港',
+                        prop: 'podCnName',
+                        overHidden: true,
+                    },
+                    {
                         label: '有效日期起',
                         prop: 'effectiveStartDate',
                         type: "date",
@@ -135,21 +149,28 @@ export default {
                     },
                     {
                         label: '航线',
-                        prop: "lineCnName",
+                        prop: "lineId",
                         search: true,
                         type: "select",
+                        hide: true,
+                        showColumn: false,
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bports/list?status=0&size=5&current=1&cnName={{key}}",
+                        dicUrl: "/api/blade-los/blines/list?status=0&size=5&current=1&cnName={{key}}",
                         props: {
                             label: "cnName",
-                            value: "cnName",
+                            value: "id",
                             desc: 'code',
                             res: "data.records"
                         },
                         overHidden: true,
                     },
                     {
+                        label: '航线',
+                        prop: "lineCnName",
+                        overHidden: true,
+                    },
+                    {
                         label: "制单人",
                         prop: "createUserName",
                         overHidden: true,
@@ -192,7 +213,7 @@ export default {
     },
     activated() {
         setTimeout(() => {
-                  this.$refs.crud.doLayout();
+            this.$refs.crud.doLayout();
         }, 100);
     },
     methods: {

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -114,7 +114,7 @@
                                 <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
                                     url="/blade-system/dept/top-list" :filterable="true" :remote="true"
                                     dataName="deptName" @selectChange="dicChange('branchName', $event)"
-                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
+                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))||buttonDisable"></dic-select>
                             </el-form-item>
                         </el-col>
 

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -30,7 +30,7 @@
                     :clearable="true" :remote="true" :buttonIf="false" :disabled="dcDisabled"
                     @corpChange="corpChange($event, 'dc', row)" placeholder="请选择收/付">
                 </search-query>
-                <span v-else>{{ row.dc=="D"?'收':'付' }}</span>
+                <span v-else>{{ row.dc == "D" ? '收' : '付' }}</span>
             </template>
             <template slot="corpCnName" slot-scope="{ row }">
                 <search-query v-if="row.editType" :datalist="corpCnNameData" :selectValue="row.corpCnName"
@@ -448,6 +448,9 @@ export default {
                     }
                 }
             } else if (name == 'feeCnName') {
+                if (!row.dc) {
+                    return this.$message.error('请选择收付方式')
+                }
                 if (!value) {
                     this.$set(row, 'feeCnName', '')
                     this.$set(row, 'feeEnName', '')
@@ -486,7 +489,9 @@ export default {
                         }
                         await this.checkRate(null, (this.form.etd ? this.form.etd + ' 00:00:00' : null), row.dc, 1, this.form.branchId)
                         this.curCodeData = this.getCheckRate()
-                        this.$set(row, 'exrate', this.getExchangeRate(item.curCode, row.dc, 1))
+                        console.log(item.curNo, row, 1)
+                        console.log(this.getExchangeRate(item.curNo, row.dc, 1), 1111111111)
+                        this.$set(row, 'exrate', this.getExchangeRate(item.curNo, row.dc, 1))
                         // // 汇率
                         // bcurrencyGetExrate({
                         //     date: this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 开船日期
@@ -548,7 +553,7 @@ export default {
                     }
                 }
                 this.$set(row, 'amount', Number(row.price ? row.price : 0) * Number(row.quantity ? row.quantity : 0))
-                if (row.curCode ==this.getLocalCurrency()) {
+                if (row.curCode == this.getLocalCurrency()) {
                     this.$set(row, 'rmbAmount', row.amount)
                     this.$set(row, 'usdAmount', '')
                     this.$set(row, 'rmbAmountNet', row.amount)
@@ -566,7 +571,7 @@ export default {
                 }
                 for (let item of this.curCodeData) {
                     if (item.code == value) {
-                        if (item.code !=this.getLocalCurrency()) {
+                        if (item.code != this.getLocalCurrency()) {
                             if (Number(item.exrate) <= 0) {
                                 this.$message.warning('当前选择的币别汇率不能小于零')
                                 return

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -136,7 +136,7 @@
                                 <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
                                     url="/blade-system/dept/top-list" :filterable="true" :remote="true"
                                     dataName="deptName" @selectChange="dicChange('branchName', $event)"
-                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))"></dic-select>
+                                    :disabled="!(roleName.includes('admin') || roleName.includes('总部'))||buttonDisable"></dic-select>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">