修改禅道bug

src/views/basicData/container/archives.vue

@@ -340,6 +340,13 @@ export default {
           }
         },
         {
+          label: '场站',
+          prop: 'stationCname',
+          width: 100,
+          overHidden: true,
+          disabled: true,
+        },
+        {
           label: '放箱号',
           prop: 'containerNumber',
           width: 100,
@@ -368,13 +375,6 @@ export default {
           disabled: true,
         },
         {
-          label: '场站',
-          prop: 'stationCname',
-          width: 100,
-          overHidden: true,
-          disabled: true,
-        },
-        {
           label: '限制港口',
           prop: 'restrictedPortsName',
           width: 100,

src/views/boxManagement/agentBox/detailsPage.vue

@@ -54,7 +54,7 @@
               <tempalte slot="stationCname">
                 <dic-select v-model="form.stationCname" placeholder="场站" :key="updateFormKey" label="cnName"
                   res="records" :slotRight="true" rightLabel="code"
-                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&ids=' + (form.cyText ? form.cyText : '')"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
                   :disabled="editDisabled || !form.addressId"></dic-select>
               </tempalte>
@@ -175,7 +175,7 @@
               </tempalte>
               <tempalte slot="stationCnameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.stationCname" placeholder="场站" key="id" label="cnName"
-                  :slotRight="true" rightLabel="code" res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站"
+                  :slotRight="true" rightLabel="code" res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0"
                   :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="rowDicChange('stationCname', $event, row)"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
@@ -323,7 +323,7 @@
           <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 : '')"
+              :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
               :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname2', $event)"
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
           </tempalte>
@@ -809,19 +809,19 @@ export default {
             label: '箱属',
             prop: 'boxBelongsTo',
             overHidden: true,
-            cell: true,
-            width: 100,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            rules: [{
-              required: true,
-              message: "请选择箱属",
-              trigger: "blur"
-            }]
+            // cell: true,
+            // width: 100,
+            // type: 'select',
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // },
+            // rules: [{
+            //   required: true,
+            //   message: "请选择箱属",
+            //   trigger: "blur"
+            // }]
           },
           {
             label: '放箱号类型',
@@ -1850,7 +1850,7 @@ export default {
           return this.$message.error("请添加数据");
         }
         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.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
             this.$refs.crud.rowCell(row, row.$index)
             return this.$message.error("请完善明细信息");
           }
@@ -2049,7 +2049,7 @@ export default {
             }
           }
           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.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
               this.$refs.crud.rowCell(row, row.$index)
               return this.$message.error("请完善明细信息");
             }

src/views/boxManagement/boxCost/detailsPage.vue

@@ -55,7 +55,7 @@
               </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 : '')"
+                  res="records" :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('stationCname', $event)"
                   :disabled="editDisabled || !form.addressId"></dic-select>
               </tempalte> -->
@@ -122,7 +122,7 @@
               </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"
+                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
                   rightLabel="code"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>

src/views/boxManagement/boxPoolDynamics/index.vue

@@ -1,7 +1,14 @@
 <template>
     <div>
         <basic-container v-if="isShow">
-            <el-tabs v-model="activeName" type="card">
+            <el-button type="success" plain size="small" @click="allClick('POL空箱出场(EXCEL)')">POL空箱出场(EXCEL)</el-button>
+            <!-- <el-button type="primary" plain size="small"
+                                @click="allClick('POL返场(EXCEL)')">POL返场(EXCEL)</el-button> -->
+            <el-button type="info" plain size="small" @click="allClick('POD空箱进场(EXCEL)')">POD空箱进场(EXCEL)</el-button>
+            <!-- <el-button type="warning" plain size="small"
+                                @click="allClick('空箱进场(excel)')">空箱进场(excel)</el-button> -->
+            <el-button type="danger" plain size="small" @click="allClick('POL无货返空(EXCEL)')">POL无货返空(EXCEL)</el-button>
+            <el-tabs v-model="activeName" type="card" style="margin-top: 8px;">
                 <el-tab-pane label="按港口" name="1">
                     <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page"
                         :search.sync="query" v-model="form" id="out-table" :header-cell-class-name="headerClassName"
@@ -20,16 +27,16 @@
                         <template slot="menuLeft">
                             <!-- <el-button type="primary" plain size="small"
                                 @click="allClick('空箱出场(EDI)')">空箱出场(EDI)</el-button> -->
-                            <el-button type="success" plain size="small"
-                                @click="allClick('POL空箱出场(EXCEL)')">POL空箱出场(EXCEL)</el-button>
+                            <!-- <el-button type="success" plain size="small"
+                                @click="allClick('POL空箱出场(EXCEL)')">POL空箱出场(EXCEL)</el-button> -->
                             <!-- <el-button type="primary" plain size="small"
                                 @click="allClick('POL返场(EXCEL)')">POL返场(EXCEL)</el-button> -->
-                            <el-button type="info" plain size="small"
-                                @click="allClick('POD空箱进场(EXCEL)')">POD空箱进场(EXCEL)</el-button>
+                            <!-- <el-button type="info" plain size="small"
+                                @click="allClick('POD空箱进场(EXCEL)')">POD空箱进场(EXCEL)</el-button> -->
                             <!-- <el-button type="warning" plain size="small"
                                 @click="allClick('空箱进场(excel)')">空箱进场(excel)</el-button> -->
-                            <el-button type="danger" plain size="small"
-                                @click="allClick('POL无货返空(EXCEL)')">POL无货返空(EXCEL)</el-button>
+                            <!-- <el-button type="danger" plain size="small"
+                                @click="allClick('POL无货返空(EXCEL)')">POL无货返空(EXCEL)</el-button> -->
                         </template>
                         <template slot="menu" slot-scope="{ row, index }">
                             <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">查看</el-button>
@@ -243,14 +250,19 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '总箱量',
+                        label: '场地盘存',
                         prop: 'total',
-                        width: 60,
+                        width: 100,
                         overHidden: true,
                     },
-
                     {
-                        label: '剩余总箱量',
+                        label: '操作占用',
+                        prop: 'occupyNum',
+                        width: 100,
+                        overHidden: true,
+                    },
+                    {
+                        label: '可用箱量',
                         prop: 'remainingTotal',
                         width: 100,
                         overHidden: true,
@@ -481,14 +493,19 @@ export default {
                         }
                     },
                     {
-                        label: '总箱量',
+                        label: '场地盘存',
                         prop: 'total',
                         width: 100,
                         overHidden: true,
                     },
-
                     {
-                        label: '剩余总箱量',
+                        label: '操作占用',
+                        prop: 'occupyNum',
+                        width: 100,
+                        overHidden: true,
+                    },
+                    {
+                        label: '可用箱量',
                         prop: 'remainingTotal',
                         width: 100,
                         overHidden: true,
@@ -591,17 +608,17 @@ export default {
         },
         allClick(name) {
             if (name == 'POL空箱出场(EXCEL)') {
-                this.excelOption.column.forEach(item=>{
-                    if(item.prop=='excelFile'){
-                        item.action="/api/blade-los/boxPool/emptyContainerAppearance"
+                this.excelOption.column.forEach(item => {
+                    if (item.prop == 'excelFile') {
+                        item.action = "/api/blade-los/boxPool/emptyContainerAppearance"
                     }
                 })
                 this.excelBox = true
             }
             if (name == 'POD空箱进场(EXCEL)') {
-                this.excelOption.column.forEach(item=>{
-                    if(item.prop=='excelFile'){
-                        item.action="/api/blade-los/boxPool/giveAnEncore"
+                this.excelOption.column.forEach(item => {
+                    if (item.prop == 'excelFile') {
+                        item.action = "/api/blade-los/boxPool/giveAnEncore"
                     }
                 })
                 this.excelBox = true

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -49,7 +49,7 @@
               <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 : '')"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&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>
@@ -108,9 +108,9 @@
               </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=场站&status=0" :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 }">
@@ -257,7 +257,7 @@
           <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 : '')"
+              :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
               :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname', $event)"
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
           </tempalte>
@@ -644,19 +644,19 @@ export default {
             label: '箱属',
             prop: 'boxBelongsTo',
             overHidden: true,
-            cell: true,
-            width: 100,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            rules: [{
-              required: true,
-              message: "请选择箱属",
-              trigger: "blur"
-            }]
+            // cell: true,
+            // width: 100,
+            // type: 'select',
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // },
+            // rules: [{
+            //   required: true,
+            //   message: "请选择箱属",
+            //   trigger: "blur"
+            // }]
           },
           {
             label: '放箱号类型',
@@ -1557,7 +1557,7 @@ export default {
           return this.$message.error("请添加数据");
         }
         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.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
             this.$refs.crud.rowCell(row, row.$index)
             return this.$message.error("请完善明细信息");
           }
@@ -1723,7 +1723,7 @@ export default {
         done();
         if (valid) {
           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.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.stationCname || !row.status) {
               this.$refs.crud.rowCell(row, row.$index)
               return this.$message.error("请完善明细信息");
             }
@@ -1843,7 +1843,25 @@ export default {
     goBack(type) {
       this.$emit("goBack");
     },
-  }
+  },
+  // watch: {
+  //   // 监听业务类型 如果不是分单 可以编辑分单号
+  //   'form.tradingBoxItemsList': {
+  //     // 执行方法
+  //     handler(oldValue, newValue) {
+  //       if (this.form.tradingBoxItemsList) {
+  //         this.optionForm.forEach(item => {
+  //           if (item.prop=='purchaseCompanyName'||item.prop=='contractNo') {
+
+  //           }
+  //         })
+  //       }
+
+  //     },
+  //     deep: true, // 深度监听
+  //     immediate: true  // 第一次改变就执行
+  //   },
+  // }
 }
 </script>
 

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -49,13 +49,13 @@
           </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"
+              url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('polStationCname', $event)" :disabled="editDisabled" :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"
+              url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
               @selectChange="dicChange('podStationCname', $event)" :disabled="editDisabled" :slotRight="true"
               rightLabel="code"></dic-select>
           </tempalte>
@@ -259,7 +259,7 @@ export default {
         labelWidth: 120,
         column: [
           {
-            label: 'USER',
+            label: '箱东',
             prop: 'boxEastName',
             disabled: true
           },

src/views/boxManagement/containerNumber/index.vue

@@ -72,7 +72,7 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
-                        label: 'USER',
+                        label: '箱东',
                         prop: 'boxEastName',
                         width: 150,
                         overHidden: true,
@@ -238,21 +238,27 @@ export default {
                         }
                     },
                     {
-                        label: '剩余箱量',
+                        label: '可用箱量',
                         prop: 'remainingNum',
                         width: 100,
                         overHidden: true,
                     },
                     {
-                        label: '总箱量',
+                        label: '操作占用',
+                        prop: 'occupyNum',
+                        width: 100,
+                        overHidden: true,
+                    },
+                    {
+                        label: '场地盘存',
                         prop: 'totalNum',
-                        width: 80,
+                        width: 100,
                         overHidden: true,
                     },
                     {
                         label: '内部放箱号类型',
                         prop: 'internalBoxClass',
-                        width: 100,
+                        width: 120,
                         overHidden: true,
                     },
                     {

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -844,19 +844,19 @@ export default {
             label: '箱属',
             prop: 'boxBelongsTo',
             overHidden: true,
-            cell: true,
-            width: 100,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            rules: [{
-              required: true,
-              message: "请选择箱属",
-              trigger: "blur"
-            }]
+            // cell: true,
+            // width: 100,
+            // type: 'select',
+            // dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+            // props: {
+            //   label: "dictValue",
+            //   value: "dictValue"
+            // },
+            // rules: [{
+            //   required: true,
+            //   message: "请选择箱属",
+            //   trigger: "blur"
+            // }]
           },
           {
             label: '放箱号类型',
@@ -1923,7 +1923,7 @@ export default {
           return this.$message.error("请添加数据");
         }
         for (let row of this.form.tradingBoxItemsList) {
-          if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.currency || !row.exrate || !row.stationCname || !row.status) {
+          if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.currency || !row.exrate || !row.stationCname || !row.status) {
             this.$refs.crud.rowCell(row, row.$index)
             return this.$message.error("请完善明细信息");
           }
@@ -2069,13 +2069,13 @@ export default {
               type: "date",
               format: "yyyy-MM-dd",
               valueFormat: "yyyy-MM-dd HH:mm:ss",
-              pickerOptions: {
-                disabledDate(time) {
-                  const date = new Date(_this.form.rentEndDate)
-                  date.setDate(date.getDate() + 1);
-                  return time.getTime() < date.getTime();
-                },
-              },
+              // pickerOptions: {
+              //   disabledDate(time) {
+              //     const date = new Date(_this.form.rentEndDate)
+              //     date.setDate(date.getDate() + 1);
+              //     return time.getTime() < date.getTime();
+              //   },
+              // },
               rules: [{
                 required: true,
                 message: "请选择日期",
@@ -2323,7 +2323,7 @@ export default {
             }
           }
           for (let row of this.form.tradingBoxItemsList) {
-            if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxCategory || !row.boxStatus || !row.boxCondition  || !row.currency || !row.exrate || !row.stationCname || !row.status) {
+            if (!row.code || !row.boxType  || !row.boxCategory || !row.boxStatus || !row.boxCondition  || !row.currency || !row.exrate || !row.stationCname || !row.status) {
               this.$refs.crud.rowCell(row, row.$index)
               return this.$message.error("请完善明细信息");
             }

src/views/boxManagement/rentalBox/index.vue

@@ -63,7 +63,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 12,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         addBtn: false,
@@ -117,7 +117,7 @@ export default {
             overHidden: true
           },
           {
-            label: '租入日期',
+            label: '合同日期',
             prop: 'effectiveDate',
             width: 100,
             search: true,
@@ -131,20 +131,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss"
           },
           {
-            label: '到期日期',
-            prop: 'expiryDate',
-            width: 100,
-            search: true,
-            searchOrder: 4,
-            searchProp: 'expiryDateList',
-            overHidden: true,
-            type: "date",
-            searchRange: true,
-            searchDefaultTime: ["00:00:00", "23:59:59"],
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss"
-          },
-          {
             label: '箱号',
             prop: 'code',
             width: 100,
@@ -303,6 +289,10 @@ export default {
       obj = {
         ...Object.assign(params, this.query),
       }
+      if(this.query.effectiveDateList&&this.query.effectiveDateList.length){
+        obj.effectiveDate=this.query.effectiveDateList[0]
+        obj.expiryDate=this.query.effectiveDateList[1]
+      }
       this.loading = true;
       getList(page.currentPage, page.pageSize, obj).then(res => {
         this.data = res.data.data.records;

src/views/iosBasicData/costcenter/airlineProfit/index.vue

@@ -241,14 +241,14 @@ export default {
                         }
                     },
                     {
-                        label: '总箱量',
+                        label: '场地盘存',
                         prop: 'total',
                         width: 100,
                         overHidden: true,
                     },
 
                     {
-                        label: '剩余总箱量',
+                        label: '可用箱量',
                         prop: 'remainingTotal',
                         width: 100,
                         overHidden: true,
@@ -427,14 +427,14 @@ export default {
                         }
                     },
                     {
-                        label: '总箱量',
+                        label: '场地盘存',
                         prop: 'total',
                         width: 100,
                         overHidden: true,
                     },
 
                     {
-                        label: '剩余总箱量',
+                        label: '可用箱量',
                         prop: 'remainingTotal',
                         width: 100,
                         overHidden: true,
@@ -875,7 +875,7 @@ export default {
             obj = {
                 ...Object.assign(params, this.query2),
             }
-            obj.busType='自有,代理箱'
+            obj.busType='自有箱,代理箱'
             this.loading2 = true;
             getList2(page.currentPage, page.pageSize, obj).then(res => {
                 this.data2 = res.data.data.records;
@@ -912,7 +912,7 @@ export default {
             obj = {
                 ...Object.assign(params, this.query3),
             }
-            obj.busType='OW'
+            obj.busType='OW(拿)'
             this.loading3 = true;
             getList2(page.currentPage, page.pageSize, obj).then(res => {
                 this.data3 = res.data.data.records;

src/views/ow/owPut/detailsPage.vue

@@ -36,7 +36,7 @@
           <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="cnName" res="records"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="箱东" key="id" label="cnName" res="records"
                   @selectChange="dicChange('purchaseCompanyName', $event)" :disabled="form.whetherEnable == '是'"
                   url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true" :remote="true" dataName="cnName"
                   :slotRight="true" rightLabel="code">
@@ -44,7 +44,7 @@
               </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"
+                  url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true" rightLabel="code"></dic-select>
               </tempalte> -->
@@ -56,7 +56,7 @@
               </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"
+                  url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('podStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true" rightLabel="code"></dic-select>
               </tempalte>
@@ -69,7 +69,7 @@
               <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 : '')"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || !form.polCname|| form.whetherEnable == '是'"></dic-select>
@@ -140,7 +140,7 @@
               </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"
+                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
                   rightLabel="code"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
@@ -450,7 +450,7 @@
           <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 : '')"
+              :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
               :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname2', $event)"
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
           </tempalte>
@@ -659,7 +659,7 @@ export default {
         labelWidth: 120,
         column: [
           {
-            label: 'USER',
+            label: '箱东',
             prop: 'purchaseCompanyName',
             disabled: false
           },
@@ -729,7 +729,12 @@ export default {
           {
             label: '箱量',
             prop: 'boxNumber',
-            disabled: true,
+            disabled: false,
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }]
           },
           {
             label: '剩余箱量',

src/views/ow/owPut/index.vue

@@ -85,7 +85,7 @@ export default {
         ],
         column: [
           {
-            label: 'USER',
+            label: '箱东',
             prop: 'purchaseCompanyName',
             width: 150,
             overHidden: true,
@@ -169,7 +169,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
             props: {
               label: "cnName",
               value: "cnName",
@@ -188,7 +188,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
             props: {
               label: "cnName",
               value: "cnName",
@@ -237,7 +237,7 @@ export default {
           //   type: "select",
           //   filterable: true,
           //   remote: true,
-          //   dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+          //   dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
           //   props: {
           //     label: "cnName",
           //     value: "id",

src/views/ow/owTask/detailsPage.vue

@@ -36,7 +36,7 @@
           <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"
+                <dic-select v-model="form.purchaseCompanyName" placeholder="箱东" key="id" label="shortName"
                   res="records" @selectChange="dicChange('purchaseCompanyName', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'"
                   url="/blade-los/bcorps/selectList?corpTypeName=箱东" :filterable="true" :remote="true"
@@ -45,7 +45,7 @@
               </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"
+                  url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
                   rightLabel="code"></dic-select>
@@ -58,7 +58,7 @@
               </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"
+                  url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('podStationCname', $event)"
                   :disabled="editDisabled || form.whetherEnable == '是'" :slotRight="true"
                   rightLabel="code"></dic-select>
@@ -72,7 +72,7 @@
               <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 : '')"
+                  :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyText ? form.cyText : '')"
                   :filterable="true" :remote="true" dataName="cnName"
                   @selectChange="dicChange('polStationCname', $event)"
                   :disabled="editDisabled || !form.polCname|| form.whetherEnable == '是'"></dic-select>
@@ -143,7 +143,7 @@
               </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"
+                  res="records" url="/blade-los/bcorps/selectList?corpTypeName=场站&status=0" :filterable="true" :remote="true"
                   dataName="cnName" @selectChange="rowDicChange('stationCname', $event, row)" :slotRight="true"
                   rightLabel="code"></dic-select>
                 <span v-else>{{ row.stationCname }}</span>
@@ -453,7 +453,7 @@
           <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 : '')"
+              :url="'/blade-los/bcorps/selectList?corpTypeName=场站&status=0&ids=' + (form.cyTextOne ? form.cyTextOne : '')"
               :filterable="true" :remote="true" dataName="cnName" @selectChange="dicChange('polStationCname2', $event)"
               :disabled="editDisabled || !activationForm.polCname"></dic-select>
           </tempalte>
@@ -662,7 +662,7 @@ export default {
         labelWidth: 120,
         column: [
           {
-            label: 'USER',
+            label: '箱东',
             prop: 'purchaseCompanyName',
             disabled: false
           },
@@ -732,7 +732,12 @@ export default {
           {
             label: '箱量',
             prop: 'boxNumber',
-            disabled: true,
+            disabled: false,
+            rules: [{
+              required: true,
+              message: "",
+              trigger: "blur"
+            }]
           },
           {
             label: '剩余箱量',

src/views/ow/owTask/index.vue

@@ -85,7 +85,7 @@ export default {
         ],
         column: [
           {
-            label: 'USER',
+            label: '箱东',
             prop: 'purchaseCompanyName',
             width: 150,
             overHidden: true,
@@ -169,7 +169,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
             props: {
               label: "cnName",
               value: "cnName",
@@ -188,7 +188,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
             props: {
               label: "cnName",
               value: "cnName",
@@ -237,7 +237,7 @@ export default {
           //   type: "select",
           //   filterable: true,
           //   remote: true,
-          //   dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&size=20&current=1&cnName={{key}}",
+          //   dicUrl: "/api/blade-los/bcorps/selectList?corpTypeName=场站&status=0&size=20&current=1&cnName={{key}}",
           //   props: {
           //     label: "cnName",
           //     value: "id",