修改数据表结构

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -10,12 +10,12 @@
                 <el-button size="small" style="margin-right: 8px" :disabled="!form.id"
                     @click="$refs.print.openDialog()">预 览
                 </el-button>
-                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
-                    @click="$refs.report.openDialog()">报表设计
+                <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px"
+                    :disabled="!form.id" @click="$refs.report.openDialog()">报表设计
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
                     v-if="editButton"
-                    :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser|| saberUserInfo.user_name == form.operatorName)"
+                    :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser || saberUserInfo.user_name == form.operatorName)"
                     @click="inEdit">编 辑
                 </el-button>
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
@@ -96,6 +96,25 @@
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
+                    <tempalte slot="mnotifyCntyName" slot-scope="{ row }">
+                        <dic-select v-model="form.detail.mnotifyCntyName" placeholder="运输方式" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=mode_transport"
+                            :filterable="true" :disabled="editDisabled"></dic-select>
+                    </tempalte>
+                    <tempalte slot="mshipperCntyName" slot-scope="{ row }">
+                        <dic-select v-model="form.detail.mshipperCntyName" placeholder="贸易方式" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=trade_Mode" :filterable="true"
+                            :disabled="editDisabled"></dic-select>
+                    </tempalte>
+                    <tempalte slot="mconsigneeCntyCode" slot-scope="{ row }">
+                        <dic-select v-model="form.detail.mconsigneeCntyCode" placeholder="放单方式" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=release_method"
+                            :filterable="true" :disabled="editDisabled"></dic-select>
+                    </tempalte>
+                    <tempalte slot="mnotify2CntyName" slot-scope="{ row }">
+                        <el-input  v-model="form.detail.mnotify2CntyName" placeholder="请输入 报关单号" :disabled="editDisabled">
+                        </el-input>
+                    </tempalte>
                     <!-- <tempalte slot="srcCnName">
                         <dic-select v-model="form.srcCnName" placeholder="业务员" key="id" label="realName" res="records"
                             url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"
@@ -127,14 +146,14 @@
                         </div>
                     </tempalte>
                     <tempalte slot="hshipperCnName">
-                        <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName"
+                        <dic-select v-model="form.detail.hshipperCnName" placeholder="发货人" key="id" label="cnName"
                             res="records" url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true"
                             :remote="true" dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="hconsigneeCnName">
-                        <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName"
+                        <dic-select v-model="form.detail.hconsigneeCnName" placeholder="收货人" key="id" label="cnName"
                             res="records" url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true"
                             :remote="true" dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
@@ -164,7 +183,7 @@
                         </div>
                     </template> -->
                     <tempalte slot="mnotifyCntyCode" slot-scope="{ row }">
-                        <dic-select v-model="form.mnotifyCntyCode" placeholder="原产地" key="id" label="cnName"
+                        <dic-select v-model="form.detail.mnotifyCntyCode" placeholder="原产地" key="id" label="cnName"
                             res="records" url="/blade-los/bcountrys/list" :filterable="true" :remote="true"
                             dataName="cnName"
                             :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
@@ -177,7 +196,8 @@
                             @selectChange="dicChange('operatorName', $event)"></dic-select>
                     </tempalte>
                     <tempalte slot="remarks">
-                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks" :disabled="editButton">
+                        <el-input type="textarea" :rows="2" placeholder="请输入 备注" v-model="form.remarks"
+                            :disabled="editButton">
                         </el-input>
                     </tempalte>
                 </avue-form>
@@ -403,7 +423,7 @@
         </div>
         <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告"
             :type="1"></business-reports>
-            <reports :id="form.id" :assemblyForm="form" businessValue="HYJK" ref="report"></reports>
+        <reports :id="form.id" :assemblyForm="form" businessValue="HYJK" ref="report"></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>
@@ -508,14 +528,17 @@ export default {
                 status: 0,
                 seaType: 'I',
                 billingStatus: 0,
-                mshipperCntyName: '一般贸易',
                 feeCenterListC: [],
                 feeCenterListD: [],
                 filesList: [],
                 inStorageList: [],//入库
                 outStorageList: [],//出库
                 dispatchVehiclesList: [],//派车
-                preContainersList: []//箱信息
+                preContainersList: [],//箱信息
+                detail: {
+                    mnotifyCntyName: '海运',
+                    mshipperCntyName: '一般贸易',
+                }
             },
             oldForm: {
                 billNoFormat: 'HYJK',
@@ -524,14 +547,17 @@ export default {
                 status: 0,
                 seaType: 'I',
                 billingStatus: 0,
-                mshipperCntyName: '一般贸易',
                 feeCenterListC: [],
                 feeCenterListD: [],
                 filesList: [],
                 inStorageList: [],//入库
                 outStorageList: [],//出库
                 dispatchVehiclesList: [],//派车
-                preContainersList: []//箱信息
+                preContainersList: [],//箱信息
+                detail: {
+                    mnotifyCntyName: '海运',
+                    mshipperCntyName: '一般贸易',
+                }
             },
             optionForm: {
                 menuBtn: false,
@@ -590,19 +616,19 @@ export default {
                     {
                         label: '运输方式',
                         prop: "mnotifyCntyName",
-                        type: 'select',
-                        filterable: true,
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
-                        props: {
-                            label: 'dictValue',
-                            value: 'dictValue',
-                        },
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }]
+                        // type: 'select',
+                        // filterable: true,
+                        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=mode_transport",
+                        // props: {
+                        //     label: 'dictValue',
+                        //     value: 'dictValue',
+                        // },
+                        // disabled: false,
+                        // rules: [{
+                        //     required: true,
+                        //     message: " ",
+                        //     trigger: "blur"
+                        // }]
                     },
                     {
                         label: "发货人",
@@ -812,18 +838,18 @@ export default {
                     {
                         label: '贸易方式',
                         prop: "mshipperCntyName",
-                        type: "select",
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=trade_Mode",
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        },
-                        disabled: false,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }],
+                        // type: "select",
+                        // dicUrl: "/api/blade-system/dict-biz/dictionary?code=trade_Mode",
+                        // props: {
+                        //     label: "dictValue",
+                        //     value: "dictValue"
+                        // },
+                        // disabled: false,
+                        // rules: [{
+                        //     required: true,
+                        //     message: " ",
+                        //     trigger: "blur"
+                        // }],
                     },
                     {
                         label: '操作员',
@@ -1863,18 +1889,18 @@ export default {
             }
             if (name == 'hshipperCnName') {
                 if (row) {
-                    this.form.hshipperId = row.id
-                    this.form.hshipperCnName = row.cnName
+                    this.form.detail.hshipperId = row.id
+                    this.form.detail.hshipperCnName = row.cnName
                 } else {
-                    this.form.hshipperId = null
+                    this.form.detail.hshipperId = null
                 }
             }
             if (name == 'hconsigneeCnName') {
                 if (row) {
-                    this.form.hconsigneeId = row.id
-                    this.form.hconsigneeCnName = row.cnName
+                    this.form.detail.hconsigneeId = row.id
+                    this.form.detail.hconsigneeCnName = row.cnName
                 } else {
-                    this.form.hconsigneeId = null
+                    this.form.detail.hconsigneeId = null
                 }
             }
             if (name == 'carrierCnName') {
@@ -1901,7 +1927,7 @@ export default {
             }
             if (name == 'mnotifyCntyCode') {
                 if (row) {
-                    this.form.mnotifyCntyCode = row.cnName
+                    this.form.detail.mnotifyCntyCode = row.cnName
                 }
             }
             if (name == 'operatorName') {