木材库

src/views/InventoryManagement/inventory/detailsPage.vue

@@ -209,7 +209,7 @@ export default {
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
         res.data.data;
     });

src/views/InventoryManagement/inventory/index.vue

@@ -36,7 +36,7 @@
                 </template>
             </avue-crud>
         </basic-container>
-        <el-dialog title="入库列表页" :visible.sync="inStockVisible" width="70%" @close="close" append-to-body>
+        <el-dialog title="盘点" :visible.sync="inStockVisible" width="70%" @close="close" append-to-body>
             <span>
                 <avue-crud ref="crud2" v-model="form2" :data="itemData" :option="itemOption" :page.sync="page2"
                     :search.sync="search2" @search-change="searchChange2" @current-change="currentChange2"
@@ -118,7 +118,7 @@ export default {
         this.option.height = window.innerHeight - 210;
         this.itemOption.height = window.innerHeight - 410;
 
-        this.getWorkDicts("approval_status").then(res => {
+        this.getWorkDicts("financing_status").then(res => {
             this.findObject(this.itemOption.column, "status").dicData =
                 res.data.data;
         });

src/views/InventoryManagement/inventoryAccount/index.vue

@@ -196,6 +196,13 @@ export default {
         }, {
           label: '等级',
           prop: 'grade',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=goods_grade",
+          type: "select",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
           index: 14,
           search: true
         }, {
@@ -250,7 +257,7 @@ export default {
         this.commodityLabel.push({label: res.data.data[item].cname, prop: item, id: res.data.data[item].id})
         this.commodityData[0] = {
           ...this.commodityData[0],
-          [item]: res.data.data[item].sliceNumber + '片,' + res.data.data[item].balanceNumber + '立方'
+          [item]: `${res.data.data[item].sliceNumber?res.data.data[item].sliceNumber:0}片,${res.data.data[item].balanceNumber?res.data.data[item].balanceNumber:0}立方`
         }
       }
     })

src/views/financing/financingManagement/detailsPage.vue

@@ -183,7 +183,7 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
         res.data.data;
     });

src/views/purchasingManagement/inStock/config/customerContact.json

@@ -66,7 +66,7 @@
     {
       "index": 2,
       "prop": "length",
-      "label": "*长度(m)",
+      "label": "*长度",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -81,7 +81,7 @@
     {
       "index": 3,
       "prop": "thickness",
-      "label": "*厚度(m)",
+      "label": "*厚度",
       "overHidden": true,
       "cell": true,
       "rules": [
@@ -164,6 +164,13 @@
       "index": 9,
       "prop": "grade",
       "label": "等级",
+      "type": "select",
+      "dicData": [],
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "dataType": "string",
       "overHidden": true,
       "cell": true,
       "width": 100

src/views/purchasingManagement/inStock/config/mainList.json

@@ -166,20 +166,6 @@
       "overHidden": true
     },
     {
-      "label": "单据状态",
-      "prop": "status",
-      "index": 16,
-      "width": 120,
-      "type": "select",
-      "dataType": "number",
-      "props": {
-        "label": "dictValue",
-        "value": "dictKey"
-      },
-      "dicData": [],
-      "overHidden": true
-    },
-    {
       "label": "备注",
       "prop": "orderRemark",
       "index": 17,

src/views/purchasingManagement/inStock/detailsPage.vue

@@ -348,10 +348,10 @@ export default {
             change: (data) => {
               if (data.value == 0) {
                 this.findObject(this.tableOption.column, "price").label = "入库单价"
-                this.findObject(this.tableOption.column, "price").rules.required = false
+                this.findObject(this.tableOption.column, "price").rules[0].required = false
               } else {
                 this.findObject(this.tableOption.column, "price").label = "*入库单价"
-                this.findObject(this.tableOption.column, "price").rules.required = true
+                this.findObject(this.tableOption.column, "price").rules[0].required = true
               }
             },
             span: 6
@@ -413,7 +413,7 @@ export default {
     getStoragetree().then(res => {
       this.storagetreeList = res.data.data;
     })
-    this.getWorkDicts("approval_status").then(res => {
+    this.getWorkDicts("financing_status").then(res => {
       this.findObject(this.option.column, "status").dicData =
           res.data.data;
     });
@@ -446,13 +446,23 @@ export default {
     },
     getAllWorkDicts() {
       getAllgoods().then(res => {
-        this.findObject(this.tableOption.column, "itemId").dicData =
-            res.data.data;
+        this.findObject(this.tableOption.column, "itemId").dicData = res.data.data;
       })
+      this.findObject(this.tableOption.column, "itemId").change = (data)=>{
+        for (let item of this.findObject(this.tableOption.column, "itemId").dicData){
+          if (data.value == item.id){
+            this.itemsVOList[data.index].cname = item.cname
+          }
+        }
+      }
       this.getWorkDicts("unit").then(res => {
         this.findObject(this.tableOption.column, "unit").dicData =
             res.data.data;
       });
+      this.getWorkDicts("goods_grade").then(res => {
+        this.findObject(this.tableOption.column, "grade").dicData =
+            res.data.data;
+      });
     },
     cellStyle() {
       return "padding:0;height:40px;";

src/views/purchasingManagement/inStock/index.vue

@@ -85,7 +85,7 @@ export default {
     },
     methods: {
         getAllWorkDicts() {
-            this.getWorkDicts("approval_status").then(res => {
+            this.getWorkDicts("financing_status").then(res => {
                 this.findObject(this.option.column, "status").dicData =
                     res.data.data;
             });