箱管

src/components/boxCost/index.vue

@@ -732,6 +732,9 @@ export default {
       }
     }
     this.key++
+    this.option.selectable = (row, index) => {
+      return row.id;
+    }
   },
   methods: {
     //生成账单
@@ -757,6 +760,7 @@ export default {
           loading.close();
           this.$message.success('生成成功')
           this.$parent.refresh(this.id)
+          this.selectionList = []
           this.$emit("generateBill")
         }).catch(() => {
           loading.close();
@@ -786,6 +790,7 @@ export default {
           loading.close();
           this.$message.success('撤销成功')
           this.$parent.refresh(this.id)
+          this.selectionList = []
           this.$emit("generateBill")
         }).catch(() => {
           loading.close();
@@ -916,6 +921,9 @@ export default {
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
       if (inSave) {
         this.$message.success("保存成功");
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
@@ -964,6 +972,9 @@ export default {
         } else {
           this.findObject(this.option.column, "corpName").label = "付款对象"
         }
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }

src/views/boxManagement/buyContainer/detailsPage.vue

@@ -62,7 +62,7 @@
           </el-button>
         </template>
         <template slot="addressForm" slot-scope="scope">
-          <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled" @balabalaTow="balabala"/>
+          <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled" @balabalaTow="(val)=>{balabala(val,['formTwo','address'])}"/>
         </template>
         <template slot-scope="{ row }" slot="status">
           <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
@@ -647,6 +647,9 @@ export default {
     selectByName("买箱费").then(res => {
       this.costData = res.data.data
     })
+    this.option.selectable = (row, index) => {
+      return row.id;
+    }
     //下拉箱号带出对应信息
     // this.findObject(this.option.column, "code").change = ({value, column}) => {
     //   selectArchivesList({code: value}).then(res => {
@@ -798,14 +801,13 @@ export default {
               }
             }
           }
-      )
-      ;
+      );
     },
-    balabala(val) {
+    balabala(val,type) {
       if (val === null) {
-        this.formTwo.address = ''
+        this[type[0]][type[1]] = ''
       } else {
-        this.formTwo.address = val.name
+        this[type[0]][type[1]] = val.name
       }
     },
     //选择费用名称
@@ -1008,6 +1010,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
       getParities({
         currency: form.currency,
@@ -1170,6 +1173,9 @@ export default {
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
       if (inSave) {
         this.$message.success("保存成功");
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
@@ -1224,6 +1230,9 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.resetTrigger()
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -1405,6 +1405,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
       getParities({
         currency: form.currency,

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -1412,6 +1412,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
       getParities({
         currency: form.currency,

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -1406,6 +1406,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
     },
     rowUpdate(form, index, done, loading) {

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -1381,6 +1381,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
     },
     rowUpdate(form, index, done, loading) {

src/views/boxManagement/sellingContainers/detailsPage.vue

@@ -67,7 +67,7 @@
           <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
         </template>
         <template slot="addressForm" slot-scope="scope">
-          <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled" @balabalaTow="balabala"/>
+          <port-info v-model="formTwo.addressId" type="id" :disabled="scope.disabled" @balabalaTow="(val)=>{balabala(val,['formTwo','address'])}"/>
         </template>
 <!--        <template slot="boxMakingCompanyForm" slot-scope="scope">-->
 <!--          <crop-select v-model="formTwo.boxMakingCompanyId" :disabled="scope.disabled" :refresh="false"-->
@@ -648,6 +648,9 @@ export default {
     selectByName("卖箱费").then(res => {
       this.costData = res.data.data
     })
+    this.option.selectable = (row, index) => {
+      return row.id;
+    }
     //下拉箱号带出对应信息
     this.findObject(this.option.column, "code").change = ({value, column}) => {
       selectArchivesList({code: value}).then(res => {
@@ -810,11 +813,11 @@ export default {
       )
       ;
     },
-    balabala(val) {
+    balabala(val,type) {
       if (val === null) {
-        this.formTwo.address = ''
+        this[type[0]][type[1]] = ''
       } else {
-        this.formTwo.address = val.name
+        this[type[0]][type[1]] = val.name
       }
     },
     //选择费用名称
@@ -1025,6 +1028,7 @@ export default {
         this.$message.error("已存在此箱号");
         return loading();
       }
+      form.boxType = form.$boxTypeId
       done(form)
       getParities({
         currency: form.currency,
@@ -1169,6 +1173,9 @@ export default {
       const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
       if (inSave) {
         this.$message.success("保存成功");
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         //关闭窗口
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }
@@ -1223,6 +1230,9 @@ export default {
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.resetTrigger()
+        this.option.selectable = (row, index) => {
+          return row.id;
+        }
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
       }

src/views/boxManagement/stockpilingManage/index.vue

@@ -135,7 +135,11 @@ export default {
           label: '起始日期',
           prop: 'startDate',
           overHidden: true,
-          width: 120
+          width: 120,
+          type: "date",
+          searchDefaultTime: ["00:00:00", "23:59:59"],
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd HH:mm:ss"
         }, {
           label: '付费对象',
           prop: 'purchaseCompanyId',