Procházet zdrojové kódy

OW修改启用和主表起运港场站联动

Qukatie před 9 měsíci
rodič
revize
3d6d0be02f

+ 49 - 2
src/views/boxManagement/agentBox/detailsPage.vue

@@ -320,6 +320,13 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname', $event)"></dic-select>
               @selectChange="dicChange('polCname', $event)"></dic-select>
           </tempalte>
           </tempalte>
+          <tempalte slot="polStationCname">
+            <dic-select v-model="activationForm.polStationCname" 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('polStationCname2', $event)"
+              :disabled="editDisabled || !activationForm.polCname"></dic-select>
+          </tempalte>
           <tempalte slot="podCname">
           <tempalte slot="podCname">
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -553,7 +560,7 @@ export default {
           },
           },
           {
           {
             label: '起运港场站',
             label: '起运港场站',
-            prop: 'stationCname',
+            prop: 'polStationCname',
             span: 24,
             span: 24,
             rules: [{
             rules: [{
               required: true,
               required: true,
@@ -1259,6 +1266,7 @@ export default {
       roleName: [],
       roleName: [],
       updateSearchKey: new Date().getTime(),
       updateSearchKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
+      updateStationKey: new Date().getTime(),
     }
     }
   },
   },
   components: {
   components: {
@@ -1426,11 +1434,34 @@ export default {
           this.activationForm.polId = row.id
           this.activationForm.polId = row.id
           this.activationForm.polCode = row.code
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
           this.activationForm.polEname = row.enName
+          this.form.cyTextOne = row.addressId
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+          this.updateStationKey = new Date().getTime()
         } else {
         } else {
           this.activationForm.polId = null
           this.activationForm.polId = null
           this.activationForm.polCode = null
           this.activationForm.polCode = null
           this.activationForm.polEname = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
           this.activationForm.polCname = null
+          this.form.cyTextOne = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+        }
+      }
+      if (name == 'polStationCname2') {
+        if (row) {
+          this.activationForm.polStationId = row.id
+          this.activationForm.polStationCode = row.code
+          this.activationForm.polStationEname = row.enName
+        } else {
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname') {
       if (name == 'podCname') {
@@ -1922,7 +1953,23 @@ export default {
             return this.$message.error("请勿重复启用");
             return this.$message.error("请勿重复启用");
           }
           }
         }
         }
-        this.activationForm = {}
+        this.form.cyTextOne = this.form.cyText
+        this.activationForm = {
+          containerNumber: null,
+          polId: this.form.addressId,
+          polCode: this.form.addressCode,
+          polEname: this.form.addressEname,
+          polCname: this.form.addressCname,
+          polStationId: this.form.stationId,
+          polStationCode: this.form.stationCode,
+          polStationCname: this.form.stationCname,
+          polStationEname: this.form.stationEname,
+          podId: null,
+          podCode: null,
+          podEname: null,
+          podCname: null,
+          activationDate: null,
+        }
         this.activationDialog = true
         this.activationDialog = true
       }
       }
 
 

+ 32 - 25
src/views/boxManagement/buyContainer/detailsPage.vue

@@ -48,7 +48,8 @@
               </tempalte>
               </tempalte>
               <tempalte slot="stationCname">
               <tempalte slot="stationCname">
                 <dic-select v-model="form.stationCname" placeholder="场站" :key="updateFormKey" label="cnName"
                 <dic-select v-model="form.stationCname" placeholder="场站" :key="updateFormKey" label="cnName"
-                  res="records" :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
+                  res="records"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
                   :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
                   :disabled="editDisabled || !form.addressId" :slotRight="true" rightLabel="code"></dic-select>
                   :disabled="editDisabled || !form.addressId" :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
               </tempalte>
@@ -253,11 +254,11 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname', $event)"></dic-select>
               @selectChange="dicChange('polCname', $event)"></dic-select>
           </tempalte>
           </tempalte>
-          <tempalte slot="stationCname">
-            <dic-select v-model="activationForm.stationCname" placeholder="场站" :key="updateStationKey" label="cnName"
+          <tempalte slot="polStationCname">
+            <dic-select v-model="activationForm.polStationCname" placeholder="场站" :key="updateStationKey" label="cnName"
               res="records" :slotRight="true" rightLabel="code"
               res="records" :slotRight="true" rightLabel="code"
               :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
               :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
-              :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname2', $event)"
+              :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname', $event)"
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
           </tempalte>
           </tempalte>
           <tempalte slot="podCname">
           <tempalte slot="podCname">
@@ -370,7 +371,7 @@ export default {
           },
           },
           {
           {
             label: '起运港场站',
             label: '起运港场站',
-            prop: 'stationCname',
+            prop: 'polStationCname',
             span: 24,
             span: 24,
             rules: [{
             rules: [{
               required: true,
               required: true,
@@ -1253,10 +1254,10 @@ export default {
           this.activationForm.polCode = row.code
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
           this.activationForm.polEname = row.enName
           this.form.cyTextOne = row.addressId
           this.form.cyTextOne = row.addressId
-          this.activationForm.stationId = null
-          this.activationForm.stationCode = null
-          this.activationForm.stationCname = null
-          this.activationForm.stationEname = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
           this.updateStationKey = new Date().getTime()
           this.updateStationKey = new Date().getTime()
         } else {
         } else {
           this.activationForm.polId = null
           this.activationForm.polId = null
@@ -1264,22 +1265,22 @@ export default {
           this.activationForm.polEname = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
           this.activationForm.polCname = null
           this.form.cyTextOne = null
           this.form.cyTextOne = null
-          this.activationForm.stationId = null
-          this.activationForm.stationCode = null
-          this.activationForm.stationCname = null
-          this.activationForm.stationEname = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
-      if (name == 'stationCname2') {
+      if (name == 'polStationCname') {
         if (row) {
         if (row) {
-          this.activationForm.stationId = row.id
-          this.activationForm.stationCode = row.code
-          this.activationForm.stationEname = row.enName
+          this.activationForm.polStationId = row.id
+          this.activationForm.polStationCode = row.code
+          this.activationForm.polStationEname = row.enName
         } else {
         } else {
-          this.activationForm.stationId = null
-          this.activationForm.stationCode = null
-          this.activationForm.stationCname = null
-          this.activationForm.stationEname = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname') {
       if (name == 'podCname') {
@@ -1634,14 +1635,20 @@ export default {
         }
         }
         this.form.cyTextOne = this.form.cyText
         this.form.cyTextOne = this.form.cyText
         this.activationForm = {
         this.activationForm = {
+          containerNumber: null,
           polId: this.form.addressId,
           polId: this.form.addressId,
           polCode: this.form.addressCode,
           polCode: this.form.addressCode,
           polEname: this.form.addressEname,
           polEname: this.form.addressEname,
           polCname: this.form.addressCname,
           polCname: this.form.addressCname,
-          stationId: this.form.stationId,
-          stationCode: this.form.stationCode,
-          stationCname: this.form.stationCname,
-          stationEname: this.form.stationEname,
+          polStationId: this.form.stationId,
+          polStationCode: this.form.stationCode,
+          polStationCname: this.form.stationCname,
+          polStationEname: this.form.stationEname,
+          podId: null,
+          podCode: null,
+          podEname: null,
+          podCname: null,
+          activationDate: null,
         }
         }
         this.activationDialog = true
         this.activationDialog = true
       }
       }

+ 51 - 4
src/views/boxManagement/rentalBox/detailsPage.vue

@@ -327,6 +327,13 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname', $event)"></dic-select>
               @selectChange="dicChange('polCname', $event)"></dic-select>
           </tempalte>
           </tempalte>
+          <tempalte slot="polStationCname">
+            <dic-select v-model="activationForm.polStationCname" 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('polStationCname2', $event)"
+              :disabled="editDisabled || !activationForm.polCname"></dic-select>
+          </tempalte>
           <tempalte slot="podCname">
           <tempalte slot="podCname">
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -565,7 +572,7 @@ export default {
           },
           },
           {
           {
             label: '起运港场站',
             label: '起运港场站',
-            prop: 'stationCname',
+            prop: 'polStationCname',
             span: 24,
             span: 24,
             rules: [{
             rules: [{
               required: true,
               required: true,
@@ -1323,6 +1330,7 @@ export default {
       roleName: [],
       roleName: [],
       updateSearchKey: new Date().getTime(),
       updateSearchKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
       updateFormKey: new Date().getTime(),
+      updateStationKey: new Date().getTime(),
     }
     }
   },
   },
   components: {
   components: {
@@ -1490,11 +1498,34 @@ export default {
           this.activationForm.polId = row.id
           this.activationForm.polId = row.id
           this.activationForm.polCode = row.code
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
           this.activationForm.polEname = row.enName
+          this.form.cyTextOne = row.addressId
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+          this.updateStationKey = new Date().getTime()
         } else {
         } else {
           this.activationForm.polId = null
           this.activationForm.polId = null
           this.activationForm.polCode = null
           this.activationForm.polCode = null
           this.activationForm.polEname = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
           this.activationForm.polCname = null
+          this.form.cyTextOne = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+        }
+      }
+      if (name == 'polStationCname2') {
+        if (row) {
+          this.activationForm.polStationId = row.id
+          this.activationForm.polStationCode = row.code
+          this.activationForm.polStationEname = row.enName
+        } else {
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname') {
       if (name == 'podCname') {
@@ -1892,7 +1923,7 @@ export default {
           return this.$message.error("请添加数据");
           return this.$message.error("请添加数据");
         }
         }
         for (let row of this.form.tradingBoxItemsList) {
         for (let row of this.form.tradingBoxItemsList) {
-          if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
+          if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.currency || !row.exrate || !row.stationCname || !row.status) {
             this.$refs.crud.rowCell(row, row.$index)
             this.$refs.crud.rowCell(row, row.$index)
             return this.$message.error("请完善明细信息");
             return this.$message.error("请完善明细信息");
           }
           }
@@ -2196,7 +2227,23 @@ export default {
             return this.$message.error("请勿重复启用");
             return this.$message.error("请勿重复启用");
           }
           }
         }
         }
-        this.activationForm = {}
+        this.form.cyTextOne = this.form.cyText
+        this.activationForm = {
+          containerNumber: null,
+          polId: this.form.addressId,
+          polCode: this.form.addressCode,
+          polEname: this.form.addressEname,
+          polCname: this.form.addressCname,
+          polStationId: this.form.stationId,
+          polStationCode: this.form.stationCode,
+          polStationCname: this.form.stationCname,
+          polStationEname: this.form.stationEname,
+          podId: null,
+          podCode: null,
+          podEname: null,
+          podCname: null,
+          activationDate: null,
+        }
         this.activationDialog = true
         this.activationDialog = true
       }
       }
 
 
@@ -2276,7 +2323,7 @@ export default {
             }
             }
           }
           }
           for (let row of this.form.tradingBoxItemsList) {
           for (let row of this.form.tradingBoxItemsList) {
-            if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
+            if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition  || !row.currency || !row.exrate || !row.stationCname || !row.status) {
               this.$refs.crud.rowCell(row, row.$index)
               this.$refs.crud.rowCell(row, row.$index)
               return this.$message.error("请完善明细信息");
               return this.$message.error("请完善明细信息");
             }
             }

+ 58 - 2
src/views/ow/owPut/detailsPage.vue

@@ -42,12 +42,12 @@
                   :slotRight="true" rightLabel="code">
                   :slotRight="true" rightLabel="code">
                 </dic-select>
                 </dic-select>
               </tempalte>
               </tempalte>
-              <tempalte slot="polStationCname">
+              <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
                 <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"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true" rightLabel="code"></dic-select>
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true" rightLabel="code"></dic-select>
-              </tempalte>
+              </tempalte> -->
               <tempalte slot="polCyCname">
               <tempalte slot="polCyCname">
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -66,6 +66,14 @@
                   :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
                   :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
                   rightLabel="code"></dic-select>
                   rightLabel="code"></dic-select>
               </tempalte>
               </tempalte>
+              <tempalte slot="polStationCname">
+                <dic-select v-model="form.polStationCname" placeholder="场站" :key="updateFormKey"
+                  label="cnName" res="records" :slotRight="true" rightLabel="code"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
+                  :filterable="true" :remote="true" dataName="cnName"
+                  @selectChange="dicChange('polStationCname', $event)"
+                  :disabled="editDisabled || !form.polCname|| form.whetherEnable == '是'"></dic-select>
+              </tempalte>
               <tempalte slot="podCname">
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
                   url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
                   url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
@@ -439,6 +447,13 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname2', $event)"></dic-select>
               @selectChange="dicChange('polCname2', $event)"></dic-select>
           </tempalte>
           </tempalte>
+          <tempalte slot="polStationCname">
+            <dic-select v-model="activationForm.polStationCname" 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('polStationCname2', $event)"
+              :disabled="editDisabled || !activationForm.polCname"></dic-select>
+          </tempalte>
           <tempalte slot="podCname">
           <tempalte slot="podCname">
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -1753,6 +1768,8 @@ export default {
       },
       },
       roleName: [],
       roleName: [],
       updateSearchKey: new Date().getTime(),
       updateSearchKey: new Date().getTime(),
+      updateFormKey: new Date().getTime(),
+      updateStationKey: new Date().getTime(),
     }
     }
   },
   },
   components: {
   components: {
@@ -1941,11 +1958,22 @@ export default {
           this.form.polId = row.id
           this.form.polId = row.id
           this.form.polCode = row.code
           this.form.polCode = row.code
           this.form.polEname = row.enName
           this.form.polEname = row.enName
+          this.form.cyText = row.addressId
+          this.form.polStationId = null
+          this.form.polStationCode = null
+          this.form.polStationCname = null
+          this.form.polStationEname = null
+          this.updateFormKey = new Date().getTime()
         } else {
         } else {
           this.form.polId = null
           this.form.polId = null
           this.form.polCode = null
           this.form.polCode = null
           this.form.polEname = null
           this.form.polEname = null
           this.form.polCname = null
           this.form.polCname = null
+          this.form.cyText = null
+          this.form.polStationId = null
+          this.form.polStationCode = null
+          this.form.polStationCname = null
+          this.form.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname') {
       if (name == 'podCname') {
@@ -1962,11 +1990,34 @@ export default {
           this.activationForm.polId = row.id
           this.activationForm.polId = row.id
           this.activationForm.polCode = row.code
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
           this.activationForm.polEname = row.enName
+          this.form.cyTextOne = row.addressId
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+          this.updateStationKey = new Date().getTime()
         } else {
         } else {
           this.activationForm.polId = null
           this.activationForm.polId = null
           this.activationForm.polCode = null
           this.activationForm.polCode = null
           this.activationForm.polEname = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
           this.activationForm.polCname = null
+          this.form.cyTextOne = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+        }
+      }
+      if (name == 'polStationCname2') {
+        if (row) {
+          this.activationForm.polStationId = row.id
+          this.activationForm.polStationCode = row.code
+          this.activationForm.polStationEname = row.enName
+        } else {
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname2') {
       if (name == 'podCname2') {
@@ -2295,12 +2346,17 @@ export default {
         if (this.form.whetherEnable == '是') {
         if (this.form.whetherEnable == '是') {
           return this.$message.error("请勿重复启用");
           return this.$message.error("请勿重复启用");
         }
         }
+        this.form.cyTextOne = this.form.cyText
         this.activationForm = {
         this.activationForm = {
           containerNumber: this.form.containerNumber,
           containerNumber: this.form.containerNumber,
           polId: this.form.polId ,
           polId: this.form.polId ,
           polCode: this.form.polCode,
           polCode: this.form.polCode,
           polEname: this.form.polEname,
           polEname: this.form.polEname,
           polCname: this.form.polCname,
           polCname: this.form.polCname,
+          polStationId: this.form.polStationId,
+          polStationCode: this.form.polStationCode,
+          polStationCname: this.form.polStationCname,
+          polStationEname: this.form.polStationEname,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           activationDate: null,
           activationDate: null,

+ 70 - 4
src/views/ow/owTask/detailsPage.vue

@@ -43,13 +43,13 @@
                   dataName="shortName" :slotRight="true" rightLabel="code">
                   dataName="shortName" :slotRight="true" rightLabel="code">
                 </dic-select>
                 </dic-select>
               </tempalte>
               </tempalte>
-              <tempalte slot="polStationCname">
+              <!-- <tempalte slot="polStationCname">
                 <dic-select v-model="form.polStationCname" placeholder="起运港提/送箱场站" key="id" label="cnName" res="records"
                 <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"
                   url="/blade-los/bcorps/selectList?corpTypeName=场站" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
                   rightLabel="code"></dic-select>
                   rightLabel="code"></dic-select>
-              </tempalte>
+              </tempalte> -->
               <tempalte slot="polCyCname">
               <tempalte slot="polCyCname">
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                 <dic-select v-model="form.polCyCname" placeholder="港口" key="id" label="cnName" res="records"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
                   url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -64,11 +64,19 @@
                   rightLabel="code"></dic-select>
                   rightLabel="code"></dic-select>
               </tempalte>
               </tempalte>
               <tempalte slot="polCname">
               <tempalte slot="polCname">
-                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName"  res="records"
+                <dic-select v-model="form.polCname" placeholder="港口" key="id" label="cnName" res="records"
                   :disabled="editDisabled || form.whetherEnable == '是'" url="/blade-los/bports/list" :filterable="true"
                   :disabled="editDisabled || form.whetherEnable == '是'" url="/blade-los/bports/list" :filterable="true"
                   :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
                   :remote="true" dataName="cnName" @selectChange="dicChange('polCname', $event)" :slotRight="true"
                   rightLabel="code"></dic-select>
                   rightLabel="code"></dic-select>
               </tempalte>
               </tempalte>
+              <tempalte slot="polStationCname">
+                <dic-select v-model="form.polStationCname" placeholder="场站" :key="updateFormKey"
+                  label="cnName" res="records" :slotRight="true" rightLabel="code"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
+                  :filterable="true" :remote="true" dataName="cnName"
+                  @selectChange="dicChange('polStationCname', $event)"
+                  :disabled="editDisabled || !form.polCname|| form.whetherEnable == '是'"></dic-select>
+              </tempalte>
               <tempalte slot="podCname">
               <tempalte slot="podCname">
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
                 <dic-select v-model="form.podCname" placeholder="港口" key="id" label="cnName"
                   url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
                   url="/blade-los/bports/listAll" :filterable="true" dataName="cnName" :multiple="true"
@@ -442,6 +450,13 @@
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polCname2', $event)"></dic-select>
               @selectChange="dicChange('polCname2', $event)"></dic-select>
           </tempalte>
           </tempalte>
+          <tempalte slot="polStationCname">
+            <dic-select v-model="activationForm.polStationCname" 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('polStationCname2', $event)"
+              :disabled="editDisabled || !activationForm.polCname"></dic-select>
+          </tempalte>
           <tempalte slot="podCname">
           <tempalte slot="podCname">
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
             <dic-select v-model="activationForm.podCname" placeholder="港口" key="id" label="cnName" res="records"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
               url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
@@ -575,6 +590,16 @@ export default {
             }],
             }],
           },
           },
           {
           {
+            label: '起运港场站',
+            prop: 'polStationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          },
+          {
             label: '目的港',
             label: '目的港',
             prop: 'podCname',
             prop: 'podCname',
             span: 24,
             span: 24,
@@ -1755,6 +1780,8 @@ export default {
       },
       },
       roleName: [],
       roleName: [],
       updateSearchKey: new Date().getTime(),
       updateSearchKey: new Date().getTime(),
+      updateFormKey: new Date().getTime(),
+      updateStationKey: new Date().getTime(),
     }
     }
   },
   },
   components: {
   components: {
@@ -1943,11 +1970,22 @@ export default {
           this.form.polId = row.id
           this.form.polId = row.id
           this.form.polCode = row.code
           this.form.polCode = row.code
           this.form.polEname = row.enName
           this.form.polEname = row.enName
+          this.form.cyText = row.addressId
+          this.form.polStationId = null
+          this.form.polStationCode = null
+          this.form.polStationCname = null
+          this.form.polStationEname = null
+          this.updateFormKey = new Date().getTime()
         } else {
         } else {
           this.form.polId = null
           this.form.polId = null
           this.form.polCode = null
           this.form.polCode = null
           this.form.polEname = null
           this.form.polEname = null
           this.form.polCname = null
           this.form.polCname = null
+          this.form.cyText = null
+          this.form.polStationId = null
+          this.form.polStationCode = null
+          this.form.polStationCname = null
+          this.form.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname') {
       if (name == 'podCname') {
@@ -1964,11 +2002,34 @@ export default {
           this.activationForm.polId = row.id
           this.activationForm.polId = row.id
           this.activationForm.polCode = row.code
           this.activationForm.polCode = row.code
           this.activationForm.polEname = row.enName
           this.activationForm.polEname = row.enName
+          this.form.cyTextOne = row.addressId
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+          this.updateStationKey = new Date().getTime()
         } else {
         } else {
           this.activationForm.polId = null
           this.activationForm.polId = null
           this.activationForm.polCode = null
           this.activationForm.polCode = null
           this.activationForm.polEname = null
           this.activationForm.polEname = null
           this.activationForm.polCname = null
           this.activationForm.polCname = null
+          this.form.cyTextOne = null
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
+        }
+      }
+      if (name == 'polStationCname2') {
+        if (row) {
+          this.activationForm.polStationId = row.id
+          this.activationForm.polStationCode = row.code
+          this.activationForm.polStationEname = row.enName
+        } else {
+          this.activationForm.polStationId = null
+          this.activationForm.polStationCode = null
+          this.activationForm.polStationCname = null
+          this.activationForm.polStationEname = null
         }
         }
       }
       }
       if (name == 'podCname2') {
       if (name == 'podCname2') {
@@ -2302,12 +2363,17 @@ export default {
         if (this.form.whetherEnable == '是') {
         if (this.form.whetherEnable == '是') {
           return this.$message.error("请勿重复启用");
           return this.$message.error("请勿重复启用");
         }
         }
+        this.form.cyTextOne = this.form.cyText
         this.activationForm = {
         this.activationForm = {
           containerNumber: this.form.containerNumber,
           containerNumber: this.form.containerNumber,
-          polId: this.form.polId ,
+          polId: this.form.polId,
           polCode: this.form.polCode,
           polCode: this.form.polCode,
           polEname: this.form.polEname,
           polEname: this.form.polEname,
           polCname: this.form.polCname,
           polCname: this.form.polCname,
+          polStationId: this.form.polStationId,
+          polStationCode: this.form.polStationCode,
+          polStationCname: this.form.polStationCname,
+          polStationEname: this.form.polStationEname,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podId: this.form.podId ? this.form.podId.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           podCname: this.form.podCname ? this.form.podCname.split(",")[0] : null,
           activationDate: null,
           activationDate: null,