Explorar o código

修改启用和禅道bug

Qukatie hai 9 meses
pai
achega
083a8f1d06

+ 2 - 2
src/views/basicData/container/archives.vue

@@ -245,13 +245,13 @@ export default {
           },
           {
             label: 'POD免箱使天数',
-            prop: 'containerNumber',
+            prop: 'podFreeBoxUseDays',
             width: 110,
             overHidden: true,
           },
           {
             label: 'POD箱使天数',
-            prop: 'podFreeBoxUseDays',
+            prop: 'podBoxUseDays',
             width: 100,
             overHidden: true,
           }

+ 3 - 3
src/views/boxManagement/boxPoolDynamics/index.vue

@@ -25,11 +25,11 @@
                             <!-- <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>
+                                @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('无货返空(excel)')">无货返空(excel)</el-button>
+                                @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>
@@ -598,7 +598,7 @@ export default {
                 })
                 this.excelBox = true
             }
-            if (name == 'POD场(EXCEL)') {
+            if (name == 'POD空箱进场(EXCEL)') {
                 this.excelOption.column.forEach(item=>{
                     if(item.prop=='excelFile'){
                         item.action="/api/blade-los/boxPool/giveAnEncore"

+ 2 - 2
src/views/boxManagement/boxTrack/index.vue

@@ -186,13 +186,13 @@ export default {
           },
           {
             label: 'POD免箱使天数',
-            prop: 'containerNumber',
+            prop: 'podFreeBoxUseDays',
             width: 110,
             overHidden: true,
           },
           {
             label: 'POD箱使天数',
-            prop: 'podFreeBoxUseDays',
+            prop: 'podBoxUseDays',
             width: 100,
             overHidden: true,
           }

+ 9 - 9
src/views/boxManagement/rentalBox/detailsPage.vue

@@ -70,15 +70,15 @@
             <avue-crud ref="crudBox" :option="boxOption" :data="form.boxTypeList"
               @selection-change="boxSelectionChange">
               <template slot="menuLeft">
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id"
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id||form.buxStaus != '录入'"
                   @click="allClick('box一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="editDisabled || form.boxTypeList.length == 0"
+                <el-button type="info" plain size="small" :disabled="editDisabled || form.boxTypeList.length == 0||form.buxStaus != '录入'"
                   @click="allClick('box一键编辑')">一键编辑</el-button>
-                <el-button type="danger" plain size="small" :disabled="editDisabled || boxSelectionList.length == 0"
+                <el-button type="danger" plain size="small" :disabled="editDisabled || boxSelectionList.length == 0||form.buxStaus != '录入'"
                   @click="allClick('box批量删除')">批量删除</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled||form.buxStaus != '录入'" circle
                   @click="boxAddRow()">
                 </el-button>
               </template>
@@ -129,12 +129,12 @@
               @resetColumn="resetColumn('crud', 'option', 'optionBack', 473)"
               @saveColumn="saveColumn('crud', 'option', 'optionBack', 473)">
               <template slot="menuLeft">
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id"
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id||form.buxStaus != '录入'"
                   @click="allClick('一键保存')">一键保存</el-button>
                 <el-button type="info" plain size="small"
-                  :disabled="editDisabled || form.tradingBoxItemsList.length == 0"
+                  :disabled="editDisabled || form.tradingBoxItemsList.length == 0||form.buxStaus != '录入'"
                   @click="allClick('一键编辑')">一键编辑</el-button>
-                <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
+                <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0||form.buxStaus != '录入'"
                   @click="allClick('批量删除')">批量删除</el-button>
                 <el-button type="primary" plain size="small" @click="allClick('起租')"
                   :disabled="form.buxStaus != '录入' || form.tradingBoxItemsList.length == 0">起租</el-button>
@@ -146,7 +146,7 @@
                   :disabled="form.buxStaus != '已启租'">退租</el-button>
                 <el-button type="danger" plain size="small" @click="allClick('撤销退租')"
                   :disabled="form.buxStaus != '已退租'">撤销退租</el-button>
-                <el-button type="success" size="small">导入</el-button>
+                <el-button type="success" size="small" :disabled="form.buxStaus != '录入'">导入</el-button>
                 <el-button type="info" size="small" @click="allClick('启用')"
                   :disabled="selectionList.length == 0 || form.buxStaus != '已启租'">启用</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
@@ -155,7 +155,7 @@
                 </el-button>
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled||form.buxStaus != '录入'" circle
                   @click="addRow()">
                 </el-button>
               </template>

+ 10 - 0
src/views/ow/owPut/detailsPage.vue

@@ -587,6 +587,16 @@ export default {
             }],
           },
           {
+            label: '起运港场站',
+            prop: 'polStationCname',
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
+          },
+          {
             label: '目的港',
             prop: 'podCname',
             span: 24,