新加调箱 申请模块 修改其他页面bug

src/views/basicData/container/archives.vue

@@ -401,6 +401,20 @@ export default {
             disabled: true,
           },
           {
+            label: '放箱号OW',
+            prop: 'containerNumberOw',
+            width: 100,
+            overHidden: true,
+            disabled: true,
+          },
+          {
+            label: '放箱号类型OW',
+            prop: 'containerNumberTypeOw',
+            width: 110,
+            overHidden: true,
+            disabled: true,
+          },
+          {
             label: '箱东',
             prop: 'boxEastName',
             width: 100,

src/views/boxManagement/boxAdjustment/detailsPage.vue

@@ -77,6 +77,35 @@
               </tempalte>
             </avue-form>
           </trade-card>
+          <trade-card title="箱型箱量">
+            <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||form.buxStaus == '已确认'"
+                  @click="allClick('box一键保存')">一键保存</el-button>
+                <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||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 || !form.id" circle @click="boxAddRow()">
+                </el-button>
+              </template>
+              <template slot="index" slot-scope="{row,index}">
+                <span>{{ index + 1 }}</span>
+              </template>
+              <template slot="boxTypeForm" slot-scope="{ row }">
+                <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
+                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
+                <span v-else>{{ row.boxType }}</span>
+              </template>
+            </avue-crud>
+          </trade-card>
           <trade-card title="箱明细">
             <avue-crud :option="option" :data="form.tradingBoxItemsList" id="out-table" ref="crud"
               :header-cell-class-name="headerClassName" :row-style="{ height: '20px', padding: '0px' }"
@@ -278,6 +307,8 @@ import {
   submitItemList,
   submitFeeList,
   enable,
+  submitBoxList,
+  boxRemove,
   copyAgent,
   confirm,
   revoke
@@ -294,6 +325,90 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      boxSelectionList: [],
+      boxOption: {
+        calcHeight: 30,
+        menuWidth: 120,
+        menu: false,
+        tip: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        // header: false,
+        columnBtn: false,
+        refreshBtn: false,
+        selection: true,
+        align: 'center',
+        column: [
+          {
+            label: "index",
+            prop: "index",
+            width: "55",
+            headerslot: true,
+          },
+          {
+            label: "箱型",
+            prop: "boxType",
+            cell: true,
+            slot: true,
+            formslot: true,
+            overHidden: true,
+            rules: [{
+              required: true,
+              message: "请选择箱型",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "箱数",
+            prop: "number",
+            cell: true,
+            overHidden: true,
+            rules: [{
+              required: true,
+              message: "请输入箱量",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+          },
+          {
+            label: "制单日期",
+            prop: "createTime",
+            type: "date",
+            overHidden: true,
+            width: 120,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "修改人",
+            prop: "updateUserName",
+            overHidden: true,
+          },
+          {
+            label: "修改日期",
+            prop: "updateTime",
+            type: "date",
+            overHidden: true,
+            width: 120,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: '备注',
+            prop: 'remarks',
+            cell: true,
+            width: 150,
+            overHidden: true,
+          }
+        ]
+      },
       excelBox: false,
       excelForm: {},
       excelLoading: false,
@@ -395,6 +510,7 @@ export default {
       editDisabled: false,
       form: {
         type: "XGDX",
+        boxTypeList: [],
         tradingBoxItemsList: [],
         feeCenterList: [],
         tradingBoxFilesList: [],
@@ -1280,8 +1396,14 @@ export default {
         boxCondition:'新',
         $cellEdit: true
       })
-
-
+    },
+    boxAddRow() {
+      this.form.boxTypeList.push(
+        {
+          pid: this.form.id ? this.form.id : null,
+          $cellEdit: true
+        }
+      )
     },
     feecAddRow() {
       if (!this.form.id) {
@@ -1300,6 +1422,9 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    boxSelectionChange(list) {
+      this.boxSelectionList = list;
+    },
     feecChange(list) {
       let ids = []
       list.forEach(e => {
@@ -1405,6 +1530,75 @@ export default {
       });
     },
     allClick(name) {
+      if (name == 'box一键保存') {
+        if (!this.form.boxTypeList.length) {
+          return this.$message.error("请添加数据");
+        }
+        for (let row of this.form.boxTypeList) {
+          if (!row.boxType || !row.number) {
+            this.$refs.crudBox.rowCell(row, row.$index)
+            return this.$message.error("请完善箱型箱量");
+          }
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        submitBoxList(this.form.boxTypeList).then(res => {
+          this.$message.success("保存成功");
+          this.form.boxTypeList = res.data.data
+        }).finally(() => {
+          loading.close();
+        })
+      }
+      if (name == 'box一键编辑') {
+        for (let row of this.form.boxTypeList) {
+          this.$set(row, "$cellEdit", true);
+        }
+      }
+      if (name == 'box批量删除') {
+        for (let item of this.selectionList) {
+          if (item.whetherEnable == '是') {
+            return this.$message.error("启用状态不能删除!");
+          }
+        }
+        let multiList = []
+        let arr = []
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          multiList = this.boxSelectionList
+          arr = this.form.boxTypeList
+          // 获取有id 的数据
+          const itemsWithId = multiList.filter(item => item.id != null);
+          let arrIds = itemsWithId.map(item => item.id) // 获取id 数据
+          // 把选中的删除掉
+          multiList.forEach((item) => {
+            for (let index in arr) {
+              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                arr.splice(Number(index), 1)
+              }
+            }
+          })
+          if (itemsWithId.length != 0) {
+            const loading = this.$loading({
+              lock: true,
+              text: '加载中',
+              spinner: 'el-icon-loading',
+              background: 'rgba(255,255,255,0.7)'
+            });
+            boxRemove({ ids: arrIds.join(',') }).then(res => {
+              this.$message.success("删除成功");
+            }).finally(() => {
+              loading.close();
+            })
+          }
+        })
+      }
       if (name == '一键保存') {
         if (!this.form.tradingBoxItemsList.length) {
           return this.$message.error("请添加数据");
@@ -1412,7 +1606,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -1554,10 +1748,16 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          for (let row of this.form.boxTypeList) {
+          if (!row.boxType || !row.number) {
+            this.$refs.crudBox.rowCell(row, row.$index)
+            return this.$message.error("请完善箱型箱量");
+          }
+        }
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.form.feeCenterList) {

src/views/boxManagement/boxCost/detailsPage.vue

@@ -2054,7 +2054,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) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -2305,7 +2305,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) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.feeCenterListD) {

src/views/boxManagement/boxExit/detailsPage.vue

@@ -14,8 +14,8 @@
         <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
           :disabled="isSaveBtn" @click="submit">保 存
         </el-button>
-        <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">调箱确认</el-button>
-        <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">调箱撤销</el-button>
+        <el-button type="success" size="small" v-if="form.buxStaus == '录入'" @click.stop="confirm">确认出场</el-button>
+        <el-button type="danger" size="small" v-if="form.buxStaus == '已确认'" @click.stop="revoke">撤销出场</el-button>
         <!-- <el-button v-if="form.status == '审核提交'" class="el-button--small-yh" style="margin-left: 6px;" type="danger"
           size="small" @click="revokeApplication">撤销单据请核
         </el-button> -->
@@ -71,6 +71,35 @@
               </tempalte>
             </avue-form>
           </trade-card>
+          <trade-card title="箱型箱量">
+            <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||form.buxStaus == '已确认'"
+                  @click="allClick('box一键保存')">一键保存</el-button>
+                <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||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 || !form.id" circle @click="boxAddRow()">
+                </el-button>
+              </template>
+              <template slot="index" slot-scope="{row,index}">
+                <span>{{ index + 1 }}</span>
+              </template>
+              <template slot="boxTypeForm" slot-scope="{ row }">
+                <dic-select v-if="row.$cellEdit" v-model="row.boxType" key="id" label="cnName" res="records"
+                  url="/blade-los/bcntrtypes/list?status=0&current=1&size=20" :filterable="true" :remote="true"
+                  dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
+                <span v-else>{{ row.boxType }}</span>
+              </template>
+            </avue-crud>
+          </trade-card>
           <trade-card title="箱明细">
             <avue-crud :option="option" :data="form.tradingBoxItemsList" id="out-table" ref="crud"
               :header-cell-class-name="headerClassName" :row-style="{ height: '20px', padding: '0px' }"
@@ -293,6 +322,8 @@ import {
   submitItemList,
   submitFeeList,
   enable,
+  submitBoxList,
+  boxRemove,
   copyAgent,
   confirm,
   revoke
@@ -309,6 +340,100 @@ export default {
   name: "detailsPage",
   data() {
     return {
+      boxSelectionList: [],
+      boxOption: {
+        calcHeight: 30,
+        menuWidth: 120,
+        menu: false,
+        tip: false,
+        border: true,
+        addBtn: false,
+        viewBtn: false,
+        editBtn: false,
+        delBtn: false,
+        // header: false,
+        columnBtn: false,
+        refreshBtn: false,
+        selection: true,
+        align: 'center',
+        column: [
+          {
+            label: "index",
+            prop: "index",
+            width: "55",
+            headerslot: true,
+          },
+          {
+            label: "箱型",
+            prop: "boxType",
+            cell: true,
+            slot: true,
+            formslot: true,
+            overHidden: true,
+            rules: [{
+              required: true,
+              message: "请选择箱型",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "箱数",
+            prop: "number",
+            cell: true,
+            overHidden: true,
+            rules: [{
+              required: true,
+              message: "请输入箱量",
+              trigger: "blur"
+            }]
+          },
+          {
+            label: "出场日期",
+            prop: "exitDate",
+            type: "date",
+            cell: true,
+            overHidden: true,
+            width: 120,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+          },
+          {
+            label: "制单日期",
+            prop: "createTime",
+            type: "date",
+            overHidden: true,
+            width: 120,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: "修改人",
+            prop: "updateUserName",
+            overHidden: true,
+          },
+          {
+            label: "修改日期",
+            prop: "updateTime",
+            type: "date",
+            overHidden: true,
+            width: 120,
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss"
+          },
+          {
+            label: '备注',
+            prop: 'remarks',
+            cell: true,
+            width: 150,
+            overHidden: true,
+          }
+        ]
+      },
       excelBox: false,
       excelForm: {},
       excelLoading: false,
@@ -347,7 +472,8 @@ export default {
       editButton: false,
       editDisabled: false,
       form: {
-        type: "XGDX",
+        type: "CCSQ",
+        boxTypeList: [],
         tradingBoxItemsList: [],
         feeCenterList: [],
         tradingBoxFilesList: [],
@@ -1322,8 +1448,14 @@ export default {
         boxCondition:'新',
         $cellEdit: true
       })
-
-
+    },
+    boxAddRow() {
+      this.form.boxTypeList.push(
+        {
+          pid: this.form.id ? this.form.id : null,
+          $cellEdit: true
+        }
+      )
     },
     feecAddRow() {
       if (!this.form.id) {
@@ -1342,6 +1474,9 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
     },
+    boxSelectionChange(list) {
+      this.boxSelectionList = list;
+    },
     feecChange(list) {
       let ids = []
       list.forEach(e => {
@@ -1447,6 +1582,75 @@ export default {
       });
     },
     allClick(name) {
+      if (name == 'box一键保存') {
+        if (!this.form.boxTypeList.length) {
+          return this.$message.error("请添加数据");
+        }
+        for (let row of this.form.boxTypeList) {
+          if (!row.boxType || !row.number || !row.exitDate) {
+            this.$refs.crudBox.rowCell(row, row.$index)
+            return this.$message.error("请完善箱型箱量");
+          }
+        }
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
+        submitBoxList(this.form.boxTypeList).then(res => {
+          this.$message.success("保存成功");
+          this.form.boxTypeList = res.data.data
+        }).finally(() => {
+          loading.close();
+        })
+      }
+      if (name == 'box一键编辑') {
+        for (let row of this.form.boxTypeList) {
+          this.$set(row, "$cellEdit", true);
+        }
+      }
+      if (name == 'box批量删除') {
+        for (let item of this.selectionList) {
+          if (item.whetherEnable == '是') {
+            return this.$message.error("启用状态不能删除!");
+          }
+        }
+        let multiList = []
+        let arr = []
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          multiList = this.boxSelectionList
+          arr = this.form.boxTypeList
+          // 获取有id 的数据
+          const itemsWithId = multiList.filter(item => item.id != null);
+          let arrIds = itemsWithId.map(item => item.id) // 获取id 数据
+          // 把选中的删除掉
+          multiList.forEach((item) => {
+            for (let index in arr) {
+              if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                arr.splice(Number(index), 1)
+              }
+            }
+          })
+          if (itemsWithId.length != 0) {
+            const loading = this.$loading({
+              lock: true,
+              text: '加载中',
+              spinner: 'el-icon-loading',
+              background: 'rgba(255,255,255,0.7)'
+            });
+            boxRemove({ ids: arrIds.join(',') }).then(res => {
+              this.$message.success("删除成功");
+            }).finally(() => {
+              loading.close();
+            })
+          }
+        })
+      }
       if (name == '一键保存') {
         if (!this.form.tradingBoxItemsList.length) {
           return this.$message.error("请添加数据");
@@ -1454,7 +1658,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -1596,10 +1800,16 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          for (let row of this.form.boxTypeList) {
+          if (!row.boxType || !row.number || !row.exitDate) {
+            this.$refs.crudBox.rowCell(row, row.$index)
+            return this.$message.error("请完善箱型箱量");
+          }
+        }
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.form.feeCenterList) {
@@ -1627,7 +1837,7 @@ export default {
       });
     },
     confirm() {
-      this.$confirm("确定调箱?", {
+      this.$confirm("确定出场?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -1647,7 +1857,7 @@ export default {
       });
     },
     revoke() {
-      this.$confirm("确定撤销调箱?", {
+      this.$confirm("确定撤销出场?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

src/views/boxManagement/boxExit/index.vue

@@ -47,7 +47,7 @@ export default {
       isShow: true,
       form: {},
       query: {
-        type: "XGDX",
+        type: "CCSQ",
       },
       loading: false,
       page: {
@@ -75,32 +75,29 @@ export default {
         searchIcon: true,
         align: 'center',
         searchIndex: 3,
-        summaryText: "合计",
-        showSummary: true,
-        sumColumnList: [
-          {
-            name: 'totalAmount',
-            type: 'sum',
-            decimals: 2
-          }
-        ],
+        // summaryText: "合计",
+        // showSummary: true,
+        // sumColumnList: [
+        //   {
+        //     name: 'totalAmount',
+        //     type: 'sum',
+        //     decimals: 2
+        //   }
+        // ],
         column: [
           {
-            label: '船公司/车队',
-            prop: 'purchaseCompanyName',
+            label: '出场类型',
+            prop: 'type',
+            disabled: true,
+            type: 'select',
+            dicData:[{
+              label:'申请',
+              value:'CCSQ'
+            }],
             width: 150,
             overHidden: true,
             search: true,
             searchOrder: 1,
-            type: 'select',
-            filterable: true,
-            remote: true,
-            dicUrl: "/api/blade-los/bcorps/listAll?status=0&corpTypeName=船公司,车队&cnName={{key}}",
-            props: {
-              label: 'shortName',
-              value: 'shortName',
-              desc: 'code',
-            },
           },
           {
             label: '系统号',
@@ -109,15 +106,6 @@ export default {
             overHidden: true,
           },
           {
-            label: '提单号/运单号',
-            prop: 'contractNo',
-            searchLabelWidth: 100,
-            width: 100,
-            search: true,
-            searchOrder: 2,
-            overHidden: true
-          },
-          {
             label: '放箱号',
             prop: 'containerNumber',
             width: 100,
@@ -126,20 +114,6 @@ export default {
             overHidden: true
           },
           {
-            label: '调箱日期',
-            prop: 'purchaseDate',
-            width: 100,
-            search: true,
-            searchOrder: 3,
-            searchProp: 'purchaseDateList',
-            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: 'polCname',
             overHidden: true,
@@ -237,6 +211,12 @@ export default {
             overHidden: true
           },
           {
+            label: '剩余箱量',
+            prop: 'remainingBoxNumber',
+            width: 100,
+            overHidden: true
+          },
+          {
             label: "制单人",
             prop: "createUserName",
             overHidden: true,

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -1557,7 +1557,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.status) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -1733,7 +1733,7 @@ export default {
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxCategory || !row.boxStatus || !row.boxCondition || !row.amount || !row.currency || !row.exrate || !row.status) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.form.feeCenterList) {

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -115,7 +115,7 @@
           </tempalte>
         </avue-form>
       </trade-card>
-      <trade-card title="基础明细">
+      <trade-card title="箱明细">
         <avue-crud :option="option" :data="form.putBoxItemsList" id="out-table" ref="crud"
           :header-cell-class-name="headerClassName" :row-style="{ height: '20px', padding: '0px' }"
           :cell-style="{ height: '20px', padding: '0px' }" @selection-change="selectionChange" @select="selectHandle"
@@ -1204,7 +1204,7 @@ export default {
           if (!row.boxCode || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxClass || !row.boxStatus || !row.boxCondition) {
             this.$refs.crud.rowCell(row, row.$index)
             this.$refs.crud.dicInit();
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -1327,7 +1327,7 @@ export default {
             if (!row.boxCode || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxClass || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index)
               this.$refs.crud.dicInit();
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           const loading = this.$loading({

src/views/boxManagement/rentalBox/detailsPage.vue

@@ -95,34 +95,6 @@
                   dataName="cnName" @selectChange="rowDicChange('boxType', $event, row)"></dic-select>
                 <span v-else>{{ row.boxType }}</span>
               </template>
-              <!-- <template slot="rentTermList" slot-scope="{ row,index }">
-                <div>
-                  <el-link type="primary" :underline="false" @click.stop="openRtDialog(row, index)">阶梯计算</el-link>
-                  <el-dialog title="阶梯计算" append-to-body :visible.sync="rtDialog" width="50%"
-                    :close-on-click-modal="false">
-                    <avue-crud :option="rtOption" :data="rulesList" id="out-table"
-                      :header-cell-class-name="headerClassName" :row-style="{ height: '20px', padding: '0px' }"
-                      :cell-style="{ height: '20px', padding: '0px' }">
-                      <template slot="indexHeader" slot-scope="{row,index}">
-                        <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
-                          @click="rtAddRow()">
-                        </el-button>
-                      </template>
-                      <template slot="index" slot-scope="{row,index}">
-                        <span>{{ index + 1 }}</span>
-                      </template>
-                      <template slot="menu" slot-scope="{ row, index }">
-                        <el-button size="small" icon="el-icon-edit" type="text" @click="rowItemEdit(row)">编辑</el-button>
-                        <el-button size="small" icon="el-icon-delete" type="text"
-                          @click="rowItemDel(row)">删除</el-button>
-                      </template>
-                    </avue-crud>
-                    <span slot="footer" class="dialog-footer">
-                      <el-button type="primary" @click="rowSave(row, rulesList)" size="mini">保 存</el-button>
-                    </span>
-                  </el-dialog>
-                </div>
-              </template> -->
             </avue-crud>
           </trade-card>
           <trade-card title="箱明细">
@@ -1936,7 +1908,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           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("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -2352,7 +2324,7 @@ export default {
           for (let row of this.form.tradingBoxItemsList) {
             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("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.form.feeCenterList) {

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

@@ -1678,7 +1678,10 @@ export default {
                 this.templateDialog = true
                 let obj = {
                     status: 0,
-                    type: 'COC',
+                    type: 'CBMB-POD',
+                    addressId: this.form.podId,
+                    shippingCompanyId: this.form.shippingCompanyId,
+                    transportationTerms: this.form.transportationTerms,
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1705,7 +1708,10 @@ export default {
                 this.templateDialog = true
                 let obj = {
                     status: 0,
-                    type: 'COC',
+                    type: 'CBMB-POD',
+                    addressId: this.form.podId,
+                    shippingCompanyId: this.form.shippingCompanyId,
+                    transportationTerms: this.form.transportationTerms,
                 }
                 const loading = this.$loading({
                     lock: true,

src/views/iosBasicData/podTemplate/feesTemplateItems.vue

@@ -620,7 +620,7 @@ export default {
     },
     methods: {
         rowCell(row, index) {
-            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.unitNo || !row.curCode) {
+            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.curCode) {
                 this.$refs.crud.rowCell(row, index)
                 return this.$message.error("请完善明细信息");
             }
@@ -949,7 +949,7 @@ export default {
         },
         // 费用详细编辑
         feestemplateCompanyEdit(index, row) {
-            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.unitNo || !row.curCode) {
+            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.curCode) {
                 this.$refs.crud.rowCell(row, index)
                 return this.$message.error("请完善明细信息");
             }

src/views/iosBasicData/polTemplate/feesTemplateItems.vue

@@ -53,8 +53,8 @@
                     </template>
                     <template slot="corpTypeForm" slot-scope="{row,index}">
                         <dic-select v-if="row.$cellEdit" v-model="row.corpType" key="id" label="dictValue"
-                            url="/blade-system/dict-biz/dictionary?code=corp_type"
-                            :filterable="true" @selectChange="rowDicChange('corpType', $event, row)"></dic-select>
+                            url="/blade-system/dict-biz/dictionary?code=corp_type" :filterable="true"
+                            @selectChange="rowDicChange('corpType', $event, row)"></dic-select>
                         <span v-else>{{ row.corpType }}</span>
                     </template>
                     <template slot="feeCnNameForm" slot-scope="{ row }">
@@ -76,8 +76,8 @@
                         <span v-else>{{ row.unitNo }}</span>
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
-                        <el-button v-if="row.quantityRule=='按箱型'" type="text" size="small" :disabled="basicData.disabled"
-                            @click="feestemplateCompanyEdit(index, row)">集装箱</el-button>
+                        <el-button v-if="row.quantityRule == '按箱型'" type="text" size="small"
+                            :disabled="basicData.disabled" @click="feestemplateCompanyEdit(index, row)">集装箱</el-button>
                         <el-button size="small" type="text" :disabled="basicData.disabled" @click="rowCell(row, index)">
                             {{ row.$cellEdit ? '保存' : '编辑' }}
                         </el-button>
@@ -231,7 +231,7 @@ export default {
                             value: 'USD'
                         }],
                     },
-                  
+
                 ]
             },
             pageLoading: false,
@@ -620,7 +620,7 @@ export default {
     },
     methods: {
         rowCell(row, index) {
-            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.unitNo || !row.curCode) {
+            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.curCode) {
                 this.$refs.crud.rowCell(row, index)
                 return this.$message.error("请完善明细信息");
             }
@@ -949,7 +949,7 @@ export default {
         },
         // 费用详细编辑
         feestemplateCompanyEdit(index, row) {
-            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price || !row.unitNo || !row.curCode) {
+            if (!row.feeCnName || !row.quantityRule || !row.quantity || !row.price  || !row.curCode) {
                 this.$refs.crud.rowCell(row, index)
                 return this.$message.error("请完善明细信息");
             }

src/views/ow/owPut/detailsPage.vue

@@ -2365,7 +2365,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -2596,7 +2596,7 @@ export default {
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.feeCenterListD) {

src/views/ow/owPut/index.vue

@@ -103,6 +103,22 @@ export default {
             }
           },
           {
+            label: '启用',
+            prop: 'whetherEnable',
+            width: 80,
+            overHidden: true,
+            search: true,
+            searchOrder: 10,
+            type: 'select',
+            dicData: [{
+              label: '是',
+              value: '是',
+            }, {
+              label: '否',
+              value: '否',
+            }],
+          },
+          {
             label: '系统号',
             prop: 'sysNo',
             width: 100,
@@ -269,22 +285,22 @@ export default {
               value: "dictValue"
             },
           },
-          {
-            label: '箱属',
-            prop: 'boxBelongsTo',
-            width: 120,
-            overHidden: true,
-            hide: true,
-            showColumn: false,
-            search: true,
-            searchOrder: 10,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-          },
+          // {
+          //   label: '箱属',
+          //   prop: 'boxBelongsTo',
+          //   width: 120,
+          //   overHidden: true,
+          //   hide: true,
+          //   showColumn: false,
+          //   search: true,
+          //   searchOrder: 10,
+          //   type: 'select',
+          //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
+          //   props: {
+          //     label: "dictValue",
+          //     value: "dictValue"
+          //   },
+          // },
           {
             label: '有效日期起',
             prop: 'effectiveDate',

src/views/ow/owTask/detailsPage.vue

@@ -2375,7 +2375,7 @@ export default {
         for (let row of this.form.tradingBoxItemsList) {
           if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
             this.$refs.crud.rowCell(row, row.$index)
-            return this.$message.error("请完善明细信息");
+            return this.$message.error("请完善箱明细信息");
           }
         }
         const loading = this.$loading({
@@ -2619,7 +2619,7 @@ export default {
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index)
-              return this.$message.error("请完善明细信息");
+              return this.$message.error("请完善箱明细信息");
             }
           }
           for (let row of this.feeCenterListD) {

src/views/ow/owTask/index.vue

@@ -104,11 +104,28 @@ export default {
             index:1,
           },
           {
+            label: '启用',
+            prop: 'whetherEnable',
+            width: 80,
+            overHidden: true,
+            search: true,
+            searchOrder: 10,
+            type: 'select',
+            dicData: [{
+              label: '是',
+              value: '是',
+            }, {
+              label: '否',
+              value: '否',
+            }],
+            index:2,
+          },
+          {
             label: '系统号',
             prop: 'sysNo',
             width: 100,
             overHidden: true,
-            index:2,
+            index:3,
           },
           {
             label: '放箱号',
@@ -117,7 +134,7 @@ export default {
             overHidden: true,
             search: true,
             searchOrder: 1,
-            index:3,
+            index:4,
           },
           {
             label: '箱号',
@@ -126,14 +143,14 @@ export default {
             overHidden: true,
             search: true,
             searchOrder: 2,
-            index:3,
+            index:5,
           },
           {
             label: '内部放箱号',
             prop: 'internalContainerNumber',
             width: 100,
             overHidden: true,
-            index:4,
+            index:6,
           },
           {
             label: '起运港',
@@ -152,7 +169,7 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:5,
+            index:7,
           },
           {
             label: '目的港',
@@ -171,7 +188,7 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:6,
+            index:8,
           },
           {
             label: '起运港提/送箱场站',
@@ -191,7 +208,7 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:7,
+            index:9,
           },
           {
             label: '目的港提/送箱场站',
@@ -211,7 +228,7 @@ export default {
               desc: 'code',
               res: "data.records"
             },
-            index:8,
+            index:10,
           },
           {
             label: '箱型',
@@ -229,21 +246,21 @@ export default {
               value: "cnName",
               res: "data.records"
             },
-            index:9,
+            index:11,
           },
           {
             label: '箱量',
             prop: 'boxNumber',
             width: 80,
             overHidden: true,
-            index:10,
+            index:12,
           },
           {
             label: '剩余箱量',
             prop: 'remainingBoxNumber',
             width: 100,
             overHidden: true,
-            index:11,
+            index:13,
           },
           // {
           //   label: '场站',
@@ -279,25 +296,27 @@ export default {
               label: "dictValue",
               value: "dictValue"
             },
-            index:12,
-          },
-          {
-            label: '箱属',
-            prop: 'boxBelongsTo',
-            width: 120,
-            overHidden: true,
-            hide: true,
-            showColumn: false,
-            search: true,
-            searchOrder: 10,
-            type: 'select',
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxBelongsTo",
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            },
-            index:13,
+            index:14,
           },
+          // {
+          //   label: '启用',
+          //   prop: 'whetherEnable',
+          //   width: 120,
+          //   overHidden: true,
+          //   hide: true,
+          //   showColumn: false,
+          //   search: true,
+          //   searchOrder: 10,
+          //   type: 'select',
+          //   dicData: [{
+          //     label: '是',
+          //     value: '是',
+          //   }, {
+          //     label: '否',
+          //     value: '否',
+          //   }],
+          //   index:13,
+          // },
           {
             label: '有效日期起',
             prop: 'effectiveDate',
@@ -306,7 +325,7 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 100,
             overHidden: true,
-            index:14,
+            index:15,
           },
           {
             label: '有效日期止',
@@ -316,7 +335,7 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             width: 100,
             overHidden: true,
-            index:15,
+            index:16,
           },
           {
             label: '有效日期',
@@ -333,14 +352,14 @@ export default {
             searchDefaultTime: ["00:00:00", "23:59:59"],
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index:16,
+            index:17,
           },
           {
             label: 'Pickup fee',
             prop: 'pickupFee',
             width: 80,
             overHidden: true,
-            index:17
+            index:18
           },
           {
             label: '收/付',