提交仓储

src/views/warehousing/agreement/index.vue

@@ -1853,7 +1853,7 @@ export default {
     //自定义列重置
     async resetColumn(ref,option,optionBack,code) {
       this[option] = this[optionBack];
-      const inSave = await this.delColumnData(this.getColumnName(code), this.optionList);
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

src/views/warehousing/analysis/index.vue

@@ -34,16 +34,16 @@
         <el-col :xs="12" :sm="6">
           <el-form-item label="客户名称">
             <el-select
-              v-model="queryParams.fCorpid"
+              v-model="queryParams.corpid"
               clearable
               filterable
               placeholder="请输入客户名称"
             >
               <el-option
-                v-for="(item, index) in fMblnoOptions"
-                :key="index.fId"
-                :label="item.fName"
-                :value="item.fId"
+                v-for="(item, index) in mblnoOptions"
+                :key="index.id"
+                :label="item.name"
+                :value="item.id"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -51,7 +51,7 @@
         <el-col :xs="12" :sm="6">
           <el-form-item label="提单号">
             <el-input
-              v-model="queryParams.fMblno"
+              v-model="queryParams.mblno"
               placeholder="请输入提单号"
               clearable
               style="width: 200px"
@@ -60,12 +60,12 @@
         </el-col>
         <el-col :xs="12" :sm="6">
           <el-form-item label="仓库">
-            <el-select v-model="queryParams.fWarehouseid" placeholder="请选择仓库库区" clearable filterable>
+            <el-select v-model="queryParams.warehouseid" placeholder="请选择仓库库区" clearable filterable>
               <el-option
                 v-for="(item, index) in warehouseOptions"
-                :key="index.fId"
-                :label="item.fName"
-                :value="item.fId"
+                :key="index.id"
+                :label="item.name"
+                :value="item.id"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -73,7 +73,7 @@
         <el-col :xs="12" :sm="6">
           <el-form-item label="库管员">
             <el-select
-              v-model="queryParams.fStorekeeper"
+              v-model="queryParams.storekeeper"
               filterable
               clearable
               placeholder="请选择库管员"
@@ -92,7 +92,7 @@
         <el-col :xs="12" :sm="6">
           <el-form-item label="截止日期">
             <el-date-picker
-              v-model="queryParams.fBsdate"
+              v-model="queryParams.bsdate"
               type="date"
               value-format="yyyy-MM-dd"
               clearable
@@ -249,20 +249,20 @@
         v-if="item.show"
       >
         <template slot-scope="scope">
-          <span v-if="item.label == 'fBsdate'">
-            {{ scope.row.fBsdate | fBsdateFormat }}
+          <span v-if="item.label == 'bsdate'">
+            {{ scope.row.bsdate | bsdateFormat }}
           </span>
-          <span v-else-if="item.label == 'fMblno'">
+          <span v-else-if="item.label == 'mblno'">
             <el-link :underline="false" type="primary" v-if="activeName == 'outStock'">
-              <span @click="jumpPage(scope.row)">{{ scope.row.fMblno }}</span>
+              <span @click="jumpPage(scope.row)">{{ scope.row.mblno }}</span>
             </el-link>
-            <span v-else>{{ scope.row.fMblno }}</span>
+            <span v-else>{{ scope.row.mblno }}</span>
           </span>
-          <span v-else-if="item.label == 'fBilltype'">
-            {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
+          <span v-else-if="item.label == 'billtype'">
+            {{ scope.row.billtype | billTypeFormat(billTypeList) }}
           </span>
-          <span v-else-if="item.label == 'fCorpid'">
-            {{ scope.row.fCorpid | fMblnoFormat(fMblnoOptions) }}
+          <span v-else-if="item.label == 'corpid'">
+            {{ scope.row.corpid | mblnoFormat(mblnoOptions) }}
           </span>
           <span v-else>{{ scope.row[item.label] }}</span>
         </template>
@@ -304,7 +304,7 @@ export default {
       tableHeight: '300',
       // 显示搜索条件
       showSearch: true,
-      fMblnoOptions: [], //客户
+      mblnoOptions: [], //客户
       warehouseOptions: [], //仓库
       userOptions: [],
       billTypeList: [],
@@ -422,7 +422,7 @@ export default {
       tableDate:[
         {
           surface: "1",
-          label: "fBilltype",
+          label: "billtype",
           name: "业务类型",
           checked: 0,
           width: 100,
@@ -430,7 +430,7 @@ export default {
         },
         {
           surface: "2",
-          label: "fCorpid",
+          label: "corpid",
           name: "客户名称",
           checked: 0,
           width: 120,
@@ -438,7 +438,7 @@ export default {
         },
         {
           surface: "2",
-          label: "fName",
+          label: "name",
           name: "品名",
           checked: 0,
           width: 100,
@@ -446,7 +446,7 @@ export default {
         },
         {
           surface: "3",
-          label: "fMblno",
+          label: "mblno",
           name: "提单号",
           checked: 0,
           width: 130,
@@ -454,7 +454,7 @@ export default {
         },
         {
           surface: "4",
-          label: "fQty",
+          label: "qty",
           name: "件数",
           checked: 0,
           width: 80,
@@ -462,7 +462,7 @@ export default {
         },
         {
           surface: "5",
-          label: "fGrossweight",
+          label: "grossweight",
           name: "毛重",
           checked: 0,
           width: 120,
@@ -470,7 +470,7 @@ export default {
         },
         {
           surface: "6",
-          label: "fWarehouseInformation",
+          label: "warehouseInformation",
           name: "仓库",
           checked: 0,
           width: 150,
@@ -478,7 +478,7 @@ export default {
         },
         {
           surface: "7",
-          label: "fOriginalbilldate",
+          label: "originalbilldate",
           name: "入库日期",
           checked: 0,
           width: 150,
@@ -486,7 +486,7 @@ export default {
         },
         {
           surface: "8",
-          label: "fBsdate",
+          label: "bsdate",
           name: "出库日期",
           checked: 0,
           width: 150,
@@ -494,7 +494,7 @@ export default {
         },
         {
           surface: "9",
-          label: "fStorekeeper",
+          label: "storekeeper",
           name: "仓管员",
           checked: 0,
           width: 150,
@@ -535,9 +535,9 @@ export default {
       this.billTypeList = response.data;
     });
     listCorps({ type: 1 }).then((response) => {
-      this.fMblnoOptions = response.rows;
+      this.mblnoOptions = response.rows;
     });
-    listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
+    listWarehousesss({status: 0, delFlag: 0}).then((response) => {
       this.warehouseOptions = response.rows;
     });
     queryClerkRoleList().then((response) => {
@@ -555,7 +555,7 @@ export default {
     })
   },
   filters: {
-    fBsdateFormat(row) {
+    bsdateFormat(row) {
       if (row) {
         const dateMat = new Date(row);
         const year = dateMat.getFullYear();
@@ -574,11 +574,11 @@ export default {
       });
       return type;
     },
-    fMblnoFormat(row, fMblnoOptions) {
+    mblnoFormat(row, mblnoOptions) {
       let name;
-      fMblnoOptions.map((e) => {
-        if (row == e.fId) {
-          name = e.fName;
+      mblnoOptions.map((e) => {
+        if (row == e.id) {
+          name = e.name;
         }
       });
       return name;
@@ -645,15 +645,15 @@ export default {
           sums[index] = "合计";
           return;
         }
-        if (column.property === "fGrossweight") {
-          values = data.map((item) => Number(item["fGrossweight"]));
+        if (column.property === "grossweight") {
+          values = data.map((item) => Number(item["grossweight"]));
         }
-        if (column.property === "fQty") {
-          values = data.map((item) => Number(item["fQty"]));
+        if (column.property === "qty") {
+          values = data.map((item) => Number(item["qty"]));
         }
         if (
-          column.property === "fGrossweight" ||
-          column.property === "fQty"
+          column.property === "grossweight" ||
+          column.property === "qty"
         ) {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
@@ -663,10 +663,10 @@ export default {
               return prev;
             }
           }, 0);
-          if (column.property === "fGrossweight") {
+          if (column.property === "grossweight") {
             sums[index] = (sums[index] / 1000).toFixed(4) + "(吨)";
           }
-          if (column.property === "fQty") {
+          if (column.property === "qty") {
             // sums[index] = sums[index].toFixed(2);
             sums[index] = sums[index];
           }
@@ -696,7 +696,7 @@ export default {
       }
       this.tableDate.forEach(item => {
         if (this.activeName == 'inStock') {
-          if (item.label == 'fBsdate') {
+          if (item.label == 'bsdate') {
             item.show = false
           }
         } else {
@@ -712,7 +712,7 @@ export default {
       if (this.activeName == 'outStock') {
         this.$router.push({
           path: "/business/outStock",
-          query: { id: row.fId },
+          query: { id: row.id },
         });
       }
     },

src/views/warehousing/costModify/AddOrUpdate.vue

@@ -1109,7 +1109,7 @@ export default {
     //自定义列重置
     async resetColumn(ref,option,optionBack,code) {
       this[option] = this[optionBack];
-      const inSave = await this.delColumnData(this.getColumnName(code), this.optionList);
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

src/views/warehousing/costModify/index.vue

@@ -767,7 +767,7 @@ export default {
     //自定义列重置
     async resetColumn(ref,option,optionBack,code) {
       this[option] = this[optionBack];
-      const inSave = await this.delColumnData(this.getColumnName(code), this.optionList);
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;

src/views/warehousing/warehouseCheck/index.vue

@@ -706,6 +706,7 @@ export default {
     return {
       optionTwo: {},
       optionTwoBack: {
+        border: true,
         align: 'center',
         stripe: true,
         index: true,
@@ -720,41 +721,48 @@ export default {
         searchIndex: 2,
         highlightCurrentRow: true,
         column: [{
-            index: "1",
-            prop: "warehouseFid",
-            label: "仓库名称",
-            width: 160,
-          },{
-            index: "2",
-            prop: "inspectorId",
-            label: "巡检人",
-            width: 160,
-          },{
-            index: "3",
-            prop: "inspectionDatetime",
-            label: "计划日期",
-            width: 160,
-          },{
-            index: "4",
-            prop: "updateTime",
-            label: "最新巡检日期",
-            width: 160,
-          },{
-            index: "5",
-            prop: "updateBy",
-            label: "最新巡检人",
-            width: 160,
-          },{
-            index: "6",
-            prop: "record",
-            label: "巡检记录",
-            width: 160,
-          },{
-            index: "6",
-            prop: "remark",
-            label: "备注",
-            width: 160,
-          }]
+          index: "1",
+          prop: "warehouseFid",
+          label: "仓库名称",
+          width: 160,
+          slot:true
+        }, {
+          index: "2",
+          prop: "inspectorId",
+          label: "巡检人",
+          width: 160,
+          slot:true
+        }, {
+          index: "3",
+          prop: "inspectionDatetime",
+          label: "计划日期",
+          width: 160,
+          type: "date",
+          format:'yyyy-MM-dd',
+          valueFormat:'yyyy-MM-dd',
+          cell:true
+        }, {
+          index: "4",
+          prop: "updateTime",
+          label: "最新巡检日期",
+          width: 160,
+        }, {
+          index: "5",
+          prop: "updateBy",
+          label: "最新巡检人",
+          width: 160,
+        }, {
+          index: "6",
+          prop: "record",
+          label: "巡检记录",
+          width: 160,
+        }, {
+          index: "6",
+          prop: "remark",
+          label: "备注",
+          width: 160,
+          cell:true
+        }]
       },
       option: {},
       optionBack: {
@@ -1103,7 +1111,7 @@ export default {
     //自定义列重置
     async resetColumn(ref, option, optionBack, code) {
       this[option] = this[optionBack];
-      const inSave = await this.delColumnData(this.getColumnName(code), this.optionList);
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (inSave) {
         this.$message.success("重置成功");
         this.$refs[ref].$refs.dialogColumn.columnBox = false;
@@ -1142,6 +1150,7 @@ export default {
     inputDetails() {
       if (this.form.tWarehouseCheckItemsList === null) this.form.tWarehouseCheckItemsList = []
       this.form.tWarehouseCheckItemsList.push({
+        $cellEdit:true,
         warehousename: '',
         warehouseFid: this.form.warehouseFid,
         latestinspectorid: '',