Prechádzať zdrojové kódy

相关问题修改。解决

cz 2 rokov pred
rodič
commit
f8369bcc23

+ 45 - 17
src/views/inbound-outbound/arrivalInspection/index.vue

@@ -19,6 +19,7 @@ export default {
     return {
       warehouseSelectList: [],
       warehouseTypeList: [],
+      qualityStatusList: [],
       btnForm: {
         otherButton: {
           list: [
@@ -65,14 +66,13 @@ export default {
     const businessDictData = JSON.parse(
       window.localStorage.getItem("businessDict")
     );
-    this.warehouseTypeList = businessDictData.find(
-      (item) => item.code === "warehouseType"
+    this.qualityStatusList = businessDictData.find(
+      (item) => item.code === "qualityStatus"
     ).children;
-    this.selectConfig[0].data = [
-      { label: "未质检", value: "10" },
-      { label: "部分质检", value: "20" },
-      { label: "已质检", value: "30" },
-    ];
+    this.selectConfig[0].data = this.qualityStatusList.map((item) => ({
+      label: item.dictValue,
+      value: item.dictKey,
+    }));
     // warehouseSelectList().then((res) => {
     //   this.warehouseSelectList = res.data.data;
     //   this.selectConfig[0].data = this.warehouseSelectList.map((item) => ({
@@ -178,20 +178,48 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="采购单号" align="left" prop="code" />
-        <el-table-column label="供应商" align="left" prop="name" />
-        <el-table-column label="物流公司" align="left" prop="specs" />
+        <el-table-column
+          label="采购单号"
+          align="left"
+          prop="code"
+          width="150"
+        />
+        <el-table-column label="供应商" align="left" prop="supplierName" />
+        <el-table-column
+          label="物流公司"
+          align="left"
+          prop="specs"
+          width="100"
+        />
         <el-table-column
           label="物流/快递单号"
           align="left"
-          prop="outWarehouseName"
+          prop="logisticsInfoCode"
+          width="140"
         />
-        <el-table-column label="采购员" align="left" prop="outQuantity" />
-        <el-table-column label="采购时间" align="left" prop="outUserName" />
-        <el-table-column label="调入仓库" align="left" prop="inWarehouseName" />
-        <el-table-column label="状态" align="left" prop="inQuantity" />
-
-        <el-table-column label="操作" align="left" width="120">
+        <el-table-column
+          label="采购员"
+          align="left"
+          prop="purchaseName"
+          width="100"
+        />
+        <el-table-column
+          label="采购时间"
+          align="left"
+          prop="createTime"
+          width="150"
+        />
+        <!-- <el-table-column label="调入仓库" align="left" prop="warehouseName" /> -->
+        <el-table-column
+          label="状态"
+          align="left"
+          prop="qualityStatus"
+          width="100"
+          :formatter="
+            (row) => dictDataEcho(row.qualityStatus, qualityStatusList)
+          "
+        />
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleReceive(scope.row)"
               >质检

+ 1 - 1
src/views/inbound-outbound/inbound/manualInbound/index.vue

@@ -40,7 +40,7 @@ export default {
       selectConfig: [
         {
           label: "仓库名称",
-          prop: "type",
+          prop: "warehouseId",
           data: [],
         },
       ],

+ 1 - 1
src/views/inbound-outbound/outbound/manualOutbound/index.vue

@@ -48,7 +48,7 @@ export default {
       selectConfig: [
         {
           label: "仓库名称",
-          prop: "type",
+          prop: "warehouseId",
           data: [],
         },
       ],

+ 10 - 0
src/views/inbound-outbound/transfer/index.vue

@@ -89,6 +89,16 @@ export default {
         value: item.id,
       }));
     });
+    this.selectConfig[2].data = [
+      {
+        label: "待接收",
+        value: "0",
+      },
+      {
+        label: "已接收",
+        value: "1",
+      },
+    ];
     this.getList();
   },
   methods: {

+ 5 - 4
src/views/product-material/customer/addCustomer.vue

@@ -53,7 +53,6 @@
                   placeholder="省/洲"
                   style="width: 100%"
                   @change="provinceChange"
-                  :disabled="!provinceData.length > 0"
                 >
                   <el-option
                     v-for="item in provinceData"
@@ -71,7 +70,6 @@
                   v-model="form.cityId"
                   placeholder="城市"
                   style="width: 100%"
-                  :disabled="form.provinceId"
                 >
                   <el-option
                     v-for="item in cityData"
@@ -230,6 +228,9 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.loading = true;
+          this.form.fileInfoList = this.fileList.map((x) => ({
+            ...x.response.data,
+          }));
           this.$emit("submit");
         }
       });
@@ -248,10 +249,10 @@ export default {
       });
     },
     handleSuccess(response, file, fileList) {
-      this.form.fileInfoList = fileList;
+      this.fileList = fileList;
     },
     handleRemove(response, file, fileList) {
-      this.form.fileInfoList = fileList;
+      this.fileList = fileList;
     },
     handlePreview() {},
   },

+ 8 - 8
src/views/product-material/customer/index.vue

@@ -29,14 +29,14 @@ export default {
                 this.handleAdd();
               },
             },
-            {
-              name: "Excel导入",
-              methodsText: "excelImport",
-              type: "defualt",
-              excelImport: () => {
-                this.excelImport();
-              },
-            },
+            // {
+            //   name: "Excel导入",
+            //   methodsText: "excelImport",
+            //   type: "defualt",
+            //   excelImport: () => {
+            //     this.excelImport();
+            //   },
+            // },
           ],
         },
       },

+ 16 - 2
src/views/product-material/product/addProduct.vue

@@ -100,7 +100,9 @@
                 v-model="form.clearancePeriod"
                 type="date"
                 placeholder="请选择"
-                value-format="yyyy-MM-dd"
+                value-format="MM-dd"
+                format="MM-dd"
+                @focus="handleFocus"
               >
               </el-date-picker>
             </el-form-item>
@@ -136,7 +138,7 @@
           <el-table :data="form.productCombinationList">
             <el-table-column label="产品编码" prop="code"> </el-table-column>
             <el-table-column label="产品名称" prop="name"> </el-table-column>
-            <el-table-column label="本次入库" prop="linkQuantity">
+            <el-table-column label="组合数量" prop="linkQuantity">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="
@@ -362,6 +364,8 @@ export default {
               ...x.response.data,
             };
           });
+
+          // this.clearancePeriod = this.clearancePeriod.slice(-5);
           this.$emit("submit");
         }
       });
@@ -397,6 +401,16 @@ export default {
       this.fileList = fileList;
     },
     handlePreview() {},
+    handleFocus() {
+      this.$nextTick(() => {
+        const dom0 = document.querySelector(".el-date-picker__prev-btn");
+        const dom1 = document.querySelector(".el-date-picker__next-btn");
+        const dom2 = document.querySelector(".el-date-picker__header-label");
+        dom0.style.display = "none";
+        dom1.style.display = "none";
+        dom2.style.display = "none";
+      });
+    },
   },
 };
 </script>

+ 1 - 1
src/views/product-material/product/index.vue

@@ -564,12 +564,12 @@ export default {
             this.form.growUpDay1 = this.form.growUpDay;
             this.form.combination = this.form.combination + "";
             this.form.productCombinationList = [...res.data.data.records];
-            console.log(this.form, "ss");
             this.$refs.addProduct.loading = false;
           });
         });
       } else {
         this.form = data;
+        this.form.productCombinationList = [];
         this.form.newProductsDay1 = Number(this.form.newProductsDay) + 1;
         this.form.growUpDay1 = this.form.growUpDay;
       }

+ 3 - 2
src/views/product-material/supply/addSupplyPrice.vue

@@ -136,7 +136,8 @@ export default {
       this.form.code = row.code;
       this.form.name = row.name;
       this.form.materialId = row.id;
-      this.msgSuccess("添加成功");
+      this.msgSuccess("选择成功");
+      this.selectDialog = false;
     },
   },
 };
@@ -144,7 +145,7 @@ export default {
 
 <style lang="scss" scoped>
 .form-box {
-  height: calc(100vh - 280px);
+  height: 320px;
   overflow: auto;
   box-sizing: border-box;
   padding: 10px;

+ 10 - 0
src/views/product-material/supply/index.vue

@@ -379,6 +379,16 @@ export default {
       label: item.dictValue,
       value: item.dictKey,
     }));
+    this.selectConfig[0].data = [
+      {
+        label: "有",
+        value: "1",
+      },
+      {
+        label: "无",
+        value: "0",
+      },
+    ];
     this.getList();
   },
   methods: {

+ 9 - 4
src/views/product-material/warehouse/index.vue

@@ -236,10 +236,15 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        API.warehouseDel({ id: row.id }).then(() => {
-          this.msgSuccess("删除成功");
-          this.getList();
-        });
+        API.warehouseDel({ id: row.id }).then(
+          (res) => {
+            this.msgSuccess("删除成功");
+            this.getList();
+          },
+          (err) => {
+            console.log("warehouseDel: " + err);
+          }
+        );
       });
     },
     showWarehouseKeeperId(row) {