修改禅道问题

src/views/boxManagement/agentBox/detailsPage.vue

@@ -312,7 +312,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -542,7 +542,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{
@@ -552,6 +552,16 @@ export default {
             }],
           },
           {
+            label: '起运港场站',
+            prop: 'stationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          },
+          {
             label: '目的港',
             prop: 'podCname',
             span: 24,

src/views/boxManagement/boxCost/detailsPage.vue

@@ -260,7 +260,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -429,7 +429,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -36,18 +36,21 @@
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
                 <dic-select v-model="form.purchaseCompanyName" placeholder="出售方" label="shortName" res="records"
-                  url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true" :remote="true" dataName="shortName"
-                  @selectChange="dicChange('purchaseCompanyName', $event)" :disabled="editDisabled" :slotRight="true" rightLabel="code"></dic-select>
+                  url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true" :remote="true"
+                  dataName="shortName" @selectChange="dicChange('purchaseCompanyName', $event)" :disabled="editDisabled"
+                  :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="addressCname">
                 <dic-select v-model="form.addressCname" placeholder="港口" label="cnName" res="records"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="dicChange('addressCname', $event)" :disabled="editDisabled"  :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="dicChange('addressCname', $event)" :disabled="editDisabled" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="stationCname">
-                <dic-select v-model="form.stationCname" placeholder="场站" :key="updateFormKey" label="cnName" res="records"
-                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids='+(form.cyText?form.cyText:'')" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="dicChange('stationCname', $event)" :disabled="editDisabled||!form.addressId"  :slotRight="true" rightLabel="code"></dic-select>
+                <dic-select v-model="form.stationCname" placeholder="场站" :key="updateFormKey" label="cnName"
+                  res="records" :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
+                  :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
+                  :disabled="editDisabled || !form.addressId" :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
             </avue-form>
           </trade-card>
@@ -97,29 +100,31 @@
               <tempalte slot="originalBoxEastNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.originalBoxEastName" placeholder="箱东" key="id"
                   label="shortName" res="records" url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true"
-                  :remote="true" dataName="shortName" @selectChange="rowDicChange('originalBoxEastName', $event, row)"  :slotRight="true" rightLabel="code">
+                  :remote="true" dataName="shortName" @selectChange="rowDicChange('originalBoxEastName', $event, row)"
+                  :slotRight="true" rightLabel="code">
                 </dic-select>
                 <span v-else>{{ row.originalBoxEastName }}</span>
               </tempalte>
               <tempalte slot="stationCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.stationCname" placeholder="场站" key="id" label="cnName"
-                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('stationCname', $event, row)"  :slotRight="true" rightLabel="code"></dic-select>
+                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
               </tempalte>
               <tempalte slot="restrictedPortsNameForm" slot-scope="{ row }">
                 <dic-select v-show="row.$cellEdit" v-model="row.restrictedPortsName" placeholder="港口" key="id"
                   label="cnName" url="/blade-los/bports/listAll" :filterable="true" :multiple="true"
                   :collapseTags="true" @selectChange="rowDicChange('restrictedPortsName', $event, row)"
-                  dataType="string"  :slotRight="true" rightLabel="code"></dic-select>
+                  dataType="string" :slotRight="true" rightLabel="code"></dic-select>
                 <span v-show="!row.$cellEdit">{{ row.restrictedPortsName }}</span>
               </tempalte>
               <tempalte slot="restrictingShippingCompaniesNameForm" slot-scope="{ row }">
                 <dic-select v-show="row.$cellEdit" v-model="row.restrictingShippingCompaniesName" placeholder="船公司"
                   key="id" label="cnName" url="/blade-los/bcorps/listAll?corpTypeName=船公司" :filterable="true"
                   :multiple="true" :collapseTags="true"
-                  @selectChange="rowDicChange('restrictingShippingCompaniesName', $event, row)"
-                  dataType="string"  :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('restrictingShippingCompaniesName', $event, row)" dataType="string"
+                  :slotRight="true" rightLabel="code"></dic-select>
                 <span v-show="!row.$cellEdit">{{ row.restrictingShippingCompaniesName }}</span>
               </tempalte>
             </avue-crud>
@@ -175,7 +180,8 @@
                   label="shortName" res="records"
                   :url="'/blade-los/bcorps/selectList?status=0&current=1&size=20&corpTypeName=' + row.billType"
                   :filterable="true" :remote="true" dataName="shortName"
-                  @selectChange="rowDicChange('corpCnName', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('corpCnName', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
                 <!-- <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" key="id" placeholder="付费对象" label="cnName"
                   res="records" url="/blade-los/bcorps/selectList?corpTypeName=船公司&status=0&current=1&size=20"
@@ -239,7 +245,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -247,6 +253,13 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname', $event)"></dic-select>
           </tempalte>
+          <tempalte slot="stationCname">
+            <dic-select v-model="activationForm.stationCname" placeholder="场站" :key="updateStationKey" label="cnName"
+              res="records" :slotRight="true" rightLabel="code"
+              :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
+              :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
+              :disabled="editDisabled || !activationForm.polCname"></dic-select>
+          </tempalte>
           <tempalte slot="podCname">
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -346,7 +359,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{
@@ -356,6 +369,16 @@ export default {
             }],
           },
           {
+            label: '起运港场站',
+            prop: 'stationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          },
+          {
             label: '目的港',
             prop: 'podCname',
             span: 24,
@@ -1082,6 +1105,7 @@ export default {
       roleName: [],
       updateSearchKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
+      updateStationKey: new Date().getTime(),
     }
   },
   components: {
@@ -1181,18 +1205,18 @@ export default {
           this.form.addressId = row.id
           this.form.addressCode = row.code
           this.form.addressEname = row.enName
-          this.form.cyText=row.addressId
+          this.form.cyText = row.addressId
           this.form.stationId = null
           this.form.stationCode = null
           this.form.stationCname = null
           this.form.stationEname = null
-          this.updateFormKey=new Date().getTime()
+          this.updateFormKey = new Date().getTime()
         } else {
           this.form.addressId = null
           this.form.addressCode = null
           this.form.addressEname = null
           this.form.addressCname = null
-          this.form.cyText=null
+          this.form.cyText = null
           this.form.stationId = null
           this.form.stationCode = null
           this.form.stationCname = null
@@ -1228,11 +1252,34 @@ export default {
           this.activationForm.polId = row.id
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
+          this.form.cyTextOne = row.addressId
+          this.activationForm.stationId = null
+          this.activationForm.stationCode = null
+          this.activationForm.stationCname = null
+          this.activationForm.stationEname = null
+          this.updateStationKey = new Date().getTime()
         } else {
           this.activationForm.polId = null
           this.activationForm.polCode = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
+          this.form.cyTextOne = null
+          this.activationForm.stationId = null
+          this.activationForm.stationCode = null
+          this.activationForm.stationCname = null
+          this.activationForm.stationEname = null
+        }
+      }
+      if (name == 'stationCname2') {
+        if (row) {
+          this.activationForm.stationId = row.id
+          this.activationForm.stationCode = row.code
+          this.activationForm.stationEname = row.enName
+        } else {
+          this.activationForm.stationId = null
+          this.activationForm.stationCode = null
+          this.activationForm.stationCname = null
+          this.activationForm.stationEname = null
         }
       }
       if (name == 'podCname') {
@@ -1422,7 +1469,7 @@ export default {
       });
       detail({ id: id }).then(res => {
         this.form = res.data.data
-        this.updateFormKey=new Date().getTime()
+        this.updateFormKey = new Date().getTime()
         // if (res.data.data.status != '录入') {
         //   this.editButton = true
         //   this.editDisabled = true
@@ -1441,7 +1488,7 @@ export default {
       });
       copyAgent({ id: id }).then(res => {
         this.form = res.data.data
-        this.updateFormKey=new Date().getTime()
+        this.updateFormKey = new Date().getTime()
       }).finally(() => {
         loading.close()
       })
@@ -1585,7 +1632,17 @@ export default {
             return this.$message.error("请勿重复启用");
           }
         }
-        this.activationForm = {}
+        this.form.cyTextOne = this.form.cyText
+        this.activationForm = {
+          polId: this.form.addressId,
+          polCode: this.form.addressCode,
+          polEname: this.form.addressEname,
+          polCname: this.form.addressCname,
+          stationId: this.form.stationId,
+          stationCode: this.form.stationCode,
+          stationCname: this.form.stationCname,
+          stationEname: this.form.stationEname,
+        }
         this.activationDialog = true
       }
 
@@ -1787,6 +1844,7 @@ export default {
 ::v-deep .el-form-item__error {
   display: none !important;
 }
+
 ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -60,10 +60,11 @@
               rightLabel="code"></dic-select>
           </tempalte>
           <tempalte slot="polCname">
-            <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName" url="/blade-los/bports/listAll"
-              :filterable="true" dataName="cnName" :multiple="true" :collapseTags="true" dataType="string"
-              :slotRight="true" rightLabel="code" @selectChange="dicChange('polCname', $event)"></dic-select>
-          </tempalte>
+                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName"  res="records"
+                  :disabled="editDisabled || form.whetherEnable == '是'" url="/blade-los/bports/list" :filterable="true"
+                  :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
+                  rightLabel="code"></dic-select>
+              </tempalte>
           <tempalte slot="podCname">
             <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName" url="/blade-los/bports/listAll"
               :filterable="true" dataName="cnName" :multiple="true" :collapseTags="true" dataType="string"
@@ -944,10 +945,13 @@ export default {
       }
       if (name == 'polCname') {
         if (row) {
-          this.form.polId = row.ids
-          this.form.polCname = row.names
+          this.form.polId = row.id
+          this.form.polCode = row.code
+          this.form.polEname = row.enName
         } else {
           this.form.polId = null
+          this.form.polCode = null
+          this.form.polEname = null
           this.form.polCname = null
         }
       }

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -319,7 +319,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -554,7 +554,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{
@@ -564,6 +564,16 @@ export default {
             }],
           },
           {
+            label: '起运港场站',
+            prop: 'stationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          },
+          {
             label: '目的港',
             prop: 'podCname',
             span: 24,

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -850,16 +850,6 @@ export default {
                         },
                     },
                     {
-                        label: '船名',
-                        prop: "shipCname",
-                        disabled: false,
-                    },
-                    {
-                        label: '航次',
-                        prop: "voyage",
-                        disabled: false,
-                    },
-                    {
                         label: '舱位类型',
                         prop: "cabinType",
                         disabled: false,
@@ -877,7 +867,7 @@ export default {
                         prop: "cabinTypeData",
                         disabled: false,
                         span: 2,
-                    },
+                    }, 
                     {
                         label: '舱位数',
                         prop: "shippingSpaceNumber",
@@ -887,6 +877,24 @@ export default {
                             message: " ",
                             trigger: "blur"
                         }]
+                    },    
+                    {
+                        label: '限大柜',
+                        prop: "limitBox",
+                        disabled: false,
+                    },
+                    {
+                        label: '船名/航次',
+                        prop: "shipCname",
+                        disabled: false,
+                        span: 4,
+                    },
+                    {
+                        label: '',
+                        prop: "voyage",
+                        labelWidth: 0,
+                        disabled: false,
+                        span: 2,
                     },
                     {
                         label: '限重含皮(吨)',

src/views/ow/owPut/detailsPage.vue

@@ -61,11 +61,10 @@
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="polCname">
-                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName"
-                  url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
-                  :slotRight="true" rightLabel="code" :collapseTags="true" dataType="string"
-                  @selectChange="dicChange('polCname', $event)"
-                  :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
+                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName"  res="records"
+                  :disabled="editDisabled || form.whetherEnable == '是'" url="/blade-los/bports/list" :filterable="true"
+                  :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
@@ -432,7 +431,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -563,7 +562,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{
@@ -706,11 +705,6 @@ export default {
             label: '箱量',
             prop: 'boxNumber',
             disabled: true,
-            rules: [{
-              required: true,
-              message: "",
-              trigger: "blur"
-            }]
           },
           {
             label: '剩余箱量',
@@ -1944,10 +1938,13 @@ export default {
       }
       if (name == 'polCname') {
         if (row) {
-          this.form.polId = row.ids
-          this.form.polCname = row.names
+          this.form.polId = row.id
+          this.form.polCode = row.code
+          this.form.polEname = row.enName
         } else {
           this.form.polId = null
+          this.form.polCode = null
+          this.form.polEname = null
           this.form.polCname = null
         }
       }
@@ -2300,8 +2297,10 @@ export default {
         }
         this.activationForm = {
           containerNumber: this.form.containerNumber,
-          polId: this.form.polId ? this.form.polId.split(",")[0] : null,
-          polCname: this.form.polCname ? this.form.polCname.split(",")[0] : null,
+          polId: this.form.polId ,
+          polCode: this.form.polCode,
+          polEname: this.form.polEname,
+          polCname: this.form.polCname,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           activationDate: null,

src/views/ow/owPut/index.vue

@@ -178,7 +178,7 @@ export default {
             }
           },
           {
-            label: '目的港提/送箱场站:',
+            label: '目的港提/送箱场站',
             prop: 'podStationCname',
             width: 140,
             overHidden: true,

src/views/ow/owTask/detailsPage.vue

@@ -36,45 +36,54 @@
           <trade-card title="基础信息">
             <avue-form :option="optionForm" v-model="form" ref="form">
               <tempalte slot="purchaseCompanyName">
-                <dic-select v-model="form.purchaseCompanyName" placeholder="USER" key="id" label="shortName" res="records"
-                  @selectChange="dicChange('purchaseCompanyName', $event)" :disabled="editDisabled||form.whetherEnable =='是'"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="USER" key="id" label="shortName"
+                  res="records" @selectChange="dicChange('purchaseCompanyName', $event)"
+                  :disabled="editDisabled || form.whetherEnable == '是'"
                   url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true" :remote="true"
-                  dataName="shortName"  :slotRight="true" rightLabel="code">
+                  dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
               </tempalte>
               <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="dicChange('polStationCname', $event)" :disabled="editDisabled||form.whetherEnable =='是'"  :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="dicChange('polStationCname', $event)"
+                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="polCyCname">
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="dicChange('polCyCname', $event)" :disabled="editDisabled||form.whetherEnable =='是'"  :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="dicChange('polCyCname', $event)" :disabled="editDisabled || form.whetherEnable == '是'"
+                  :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="podStationCname">
                 <dic-select v-model="form.podStationCname" placeholder="目的港还箱场站" key="id" label="cnName" res="records"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="dicChange('podStationCname', $event)" :disabled="editDisabled||form.whetherEnable =='是'"  :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="dicChange('podStationCname', $event)"
+                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="polCname">
-                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName" :disabled="editDisabled||form.whetherEnable =='是'"
-                  url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
-                  :collapseTags="true" dataType="string" @selectChange="dicChange('polCname', $event)"  :slotRight="true" rightLabel="code"></dic-select>
+                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName"  res="records"
+                  :disabled="editDisabled || form.whetherEnable == '是'" url="/blade-los/bports/list" :filterable="true"
+                  :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
                   url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
                   :collapseTags="true" dataType="string" @selectChange="dicChange('podCname', $event)"
-                  :disabled="editDisabled||form.whetherEnable =='是'"  :slotRight="true" rightLabel="code"></dic-select>
+                  :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
+                  rightLabel="code"></dic-select>
               </tempalte>
               <template slot="boxTypeQuantityOne">
                 <dic-select v-model="form.boxTypeQuantityOne" key="id" label="cnName" res="records"
                   url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
-                  dataName="cnName" :disabled="editDisabled||form.whetherEnable =='是'"></dic-select>
+                  dataName="cnName" :disabled="editDisabled || form.whetherEnable == '是'"></dic-select>
               </template>
               <template slot="perDiemAfterFreeDays">
-                <el-button type="primary" size="small" @click.stop="openRtDialog" :disabled="editDisabled||form.whetherEnable =='是'">箱租金条款</el-button>
+                <el-button type="primary" size="small" @click.stop="openRtDialog"
+                  :disabled="editDisabled || form.whetherEnable == '是'">箱租金条款</el-button>
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
             </avue-form>
@@ -120,43 +129,50 @@
               <tempalte slot="corpNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpName" placeholder="客户" key="id" label="shortName"
                   res="records" url="/blade-los/bcorps/selectList?corpTypeName=客户" :filterable="true" :remote="true"
-                  dataName="shortName" @selectChange="rowDicChange('corpName', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  dataName="shortName" @selectChange="rowDicChange('corpName', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.corpName }}</span>
               </tempalte>
               <tempalte slot="stationCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.stationCname" placeholder="场站" key="id" label="cnName"
-                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
               </tempalte>
               <tempalte slot="shipCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.shipCname" placeholder="船名" key="id" label="cnName"
                   res="records" url="/blade-los/bvessels/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('shipCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('shipCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.shipCname }}</span>
               </tempalte>
               <tempalte slot="portCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.portCname" placeholder="港口" key="id" label="cnName"
                   res="records" url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('portCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('portCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.portCname }}</span>
               </tempalte>
               <tempalte slot="polCyCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.polCyCname" placeholder="港口" key="id" label="cnName"
                   res="records" url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('polCyCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('polCyCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.polCyCname }}</span>
               </tempalte>
               <tempalte slot="podStationCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.podStationCname" placeholder="港口" key="id" label="cnName"
                   res="records" url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                  @selectChange="rowDicChange('podStationCname', $event, row)" :slotRight="true" rightLabel="code"></dic-select>
+                  @selectChange="rowDicChange('podStationCname', $event, row)" :slotRight="true"
+                  rightLabel="code"></dic-select>
                 <span v-else>{{ row.podStationCname }}</span>
               </tempalte>
               <tempalte slot="agentNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.agentName" placeholder="代理名称" key="id" label="shortName"
                   res="records" url="/blade-los/bcorps/listAll?corpTypeName=国内同行及代理,国外同行及代理" :filterable="true"
-                  :remote="true" dataName="cnName" @selectChange="rowDicChange('agentName', $event, row)" :slotRight="true" rightLabel="code">
+                  :remote="true" dataName="cnName" @selectChange="rowDicChange('agentName', $event, row)"
+                  :slotRight="true" rightLabel="code">
                 </dic-select>
                 <span v-else>{{ row.agentName }}</span>
               </tempalte>
@@ -418,7 +434,7 @@
       <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
     </el-dialog>
     <!-- 启用 -->
-    <el-dialog append-to-body title="箱池" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
+    <el-dialog append-to-body title="放箱号" :visible.sync="activationDialog" width="30%" :before-close="activationClose">
       <span>
         <avue-form ref="form2" v-model="activationForm" :option="activationOption">
           <tempalte slot="polCname">
@@ -465,8 +481,8 @@
           <span>{{ index + 1 }}</span>
         </template>
         <template slot="menu" slot-scope="{ row, index }">
-          <el-button size="small" icon="el-icon-edit" type="text"
-            @click="rowEdit(row)">{{ row.$cellEdit ? '保存' : '编辑' }}</el-button>
+          <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">{{ row.$cellEdit ? '保存' : '编辑'
+          }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row)">删除</el-button>
         </template>
       </avue-crud>
@@ -549,7 +565,7 @@ export default {
             }],
           },
           {
-            label: '起用港',
+            label: '起运港',
             prop: 'polCname',
             span: 24,
             rules: [{
@@ -692,11 +708,6 @@ export default {
             label: '箱量',
             prop: 'boxNumber',
             disabled: true,
-            rules: [{
-              required: true,
-              message: "",
-              trigger: "blur"
-            }]
           },
           {
             label: '剩余箱量',
@@ -1929,10 +1940,13 @@ export default {
       }
       if (name == 'polCname') {
         if (row) {
-          this.form.polId = row.ids
-          this.form.polCname = row.names
+          this.form.polId = row.id
+          this.form.polCode = row.code
+          this.form.polEname = row.enName
         } else {
           this.form.polId = null
+          this.form.polCode = null
+          this.form.polEname = null
           this.form.polCname = null
         }
       }
@@ -2158,10 +2172,10 @@ export default {
         this.feeCenterListD = res.data.data.feeCenterList.filter(item => item.dc == "D")
         this.feeCenterListC = res.data.data.feeCenterList.filter(item => item.dc == "C")
         this.form = res.data.data
-        if (res.data.data.whetherEnable =='是') {
-          this.optionForm.column.forEach(e=>{
-            if(e.prop!='remarks'){
-              e.disabled=true
+        if (res.data.data.whetherEnable == '是') {
+          this.optionForm.column.forEach(e => {
+            if (e.prop != 'remarks') {
+              e.disabled = true
             }
           })
         }
@@ -2290,8 +2304,10 @@ export default {
         }
         this.activationForm = {
           containerNumber: this.form.containerNumber,
-          polId: this.form.polId ? this.form.polId.split(",")[0] : null,
-          polCname: this.form.polCname ? this.form.polCname.split(",")[0] : null,
+          polId: this.form.polId ,
+          polCode: this.form.polCode,
+          polEname: this.form.polEname,
+          polCname: this.form.polCname,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           activationDate: null,
@@ -2587,6 +2603,7 @@ export default {
 ::v-deep .el-form-item__error {
   display: none !important;
 }
+
 ::v-deep .el-form-item {
   margin-bottom: 8px !important;
 }

src/views/ow/owTask/index.vue

@@ -178,7 +178,7 @@ export default {
             }
           },
           {
-            label: '目的港提/送箱场站:',
+            label: '目的港提/送箱场站',
             prop: 'podStationCname',
             width: 140,
             overHidden: true,