【新增】采购退料 、 其他入库单、 其他出库单

src/views/basic_data/stock/Issue_list.vue

@@ -16,18 +16,18 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据编码" prop="billNo">
+            <el-form-item label="单据编号" prop="billNo">
               <el-input
                 v-model="screenForm.billNo"
-                placeholder="请输入单据编码"
+                placeholder="请输入单据编号"
               />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料名称" prop="materialName">
+            <el-form-item label="产品名称" prop="materialName">
               <el-input
                 v-model="screenForm.materialName"
-                placeholder="请输入物料名称"
+                placeholder="请输入产品名称"
               />
             </el-form-item>
           </el-col>
@@ -176,12 +176,23 @@
               {{ "其他入库" }}
             </template>
           </el-table-column>
-
           <el-table-column
             align="left"
-            label="存货编码"
+            label="产品编码"
+            prop="materialOldNumber"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copy-text="scope.row.materialOldNumber" />
+              <span>{{ scope.row.materialOldNumber }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="物料编码"
             prop="materialNumber"
-            min-width="120"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -191,7 +202,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="存货名称"
+            label="物料名称"
             prop="materialName"
             min-width="200"
             show-overflow-tooltip

src/views/basic_data/stock/material_list.vue

@@ -16,18 +16,18 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据编码" prop="billNo">
+            <el-form-item label="单据编号" prop="billNo">
               <el-input
                 v-model="screenForm.billNo"
-                placeholder="请输入单据编码"
+                placeholder="请输入单据编号"
               />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料名称" prop="materialName">
+            <el-form-item label="产品名称" prop="materialName">
               <el-input
                 v-model="screenForm.materialName"
-                placeholder="请输入物料名称"
+                placeholder="请输入产品名称"
               />
             </el-form-item>
           </el-col>
@@ -141,7 +141,7 @@
           <el-table-column
             align="left"
             label="供货商"
-            prop="supplierId"
+            prop="supplierName"
             min-width="200"
             show-overflow-tooltip
           />
@@ -158,9 +158,9 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="厂产品编码"
+            label="产品编码"
             prop="materialOldNumber"
-            min-width="160"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -170,9 +170,9 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="存货编码"
+            label="物料编码"
             prop="materialNumber"
-            min-width="120"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -182,7 +182,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="存货名称"
+            label="物料名称"
             prop="materialName"
             min-width="200"
             show-overflow-tooltip

src/views/basic_data/stock/warehousing_list.vue

@@ -16,18 +16,18 @@
       >
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="单据编码" prop="billNo">
+            <el-form-item label="单据编号" prop="billNo">
               <el-input
                 v-model="screenForm.billNo"
-                placeholder="请输入单据编码"
+                placeholder="请输入单据编号"
               />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="物料名称" prop="materialName">
+            <el-form-item label="产品名称" prop="materialName">
               <el-input
                 v-model="screenForm.materialName"
-                placeholder="请输入物料名称"
+                placeholder="请输入产品名称"
               />
             </el-form-item>
           </el-col>
@@ -170,9 +170,9 @@
           />
           <el-table-column
             align="left"
-            label="厂产品代码"
+            label="产品编码"
             prop="materialOldNumber"
-            min-width="100"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -182,9 +182,9 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="存货编码"
+            label="物料编码"
             prop="materialNumber"
-            min-width="120"
+            min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -194,14 +194,14 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="存货名称"
+            label="物料名称"
             prop="materialOldNumber"
             min-width="200"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <CopyButton :copy-text="scope.row.materialOldNumber" />
-              <span>{{ scope.row.materialOldNumber }}</span>
+              <CopyButton :copy-text="scope.row.materialName" />
+              <span>{{ scope.row.materialName }}</span>
             </template>
           </el-table-column>
           <el-table-column

src/views/setting/other.vue

@@ -63,18 +63,18 @@
         ></el-input>
         <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>
       </div>
-      <!--      <div style="margin: 40px 0 30px">-->
-      <!--        <h4>广州自动预留配置</h4>-->
-      <!--        <div>预留单自动生成时间，从订单审单后，第</div>-->
-      <!--        <el-input-->
-      <!--          v-model="thirdForm.input2.dictValue"-->
-      <!--          type="number"-->
-      <!--          @mousewheel.native.prevent-->
-      <!--          size="small"-->
-      <!--          style="width: 150px; margin-top: 20px; margin-right: 10px"-->
-      <!--        ></el-input>-->
-      <!--        <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>-->
-      <!--      </div>-->
+      <div style="margin: 40px 0 30px">
+        <h4>广州自动预留配置</h4>
+        <div>预留单自动生成时间，从订单审单后，第</div>
+        <el-input
+          v-model="thirdForm.input2.dictValue"
+          type="number"
+          @mousewheel.native.prevent
+          size="small"
+          style="width: 150px; margin-top: 20px; margin-right: 10px"
+        ></el-input>
+        <span>天零时起，按商家提交订单时间顺序，自动生成预留单</span>
+      </div>
       <el-button type="primary" size="small" @click="submitForm('third')"
         >确 定</el-button
       >
@@ -445,7 +445,7 @@ export default {
       },
       thirdForm: {
         input1: {},
-        // input2: {},
+        input2: {},
       },
       fourthForm: {
         input1: {},
@@ -566,22 +566,11 @@ export default {
 
     changeType(val) {
       if (this.formType === "receipt") return;
+      console.log(val);
       this.getDetail(val);
     },
-
-    getDetail(type) {
-      console.log(type, "type");
-      const MAP = {
-        first: "ORDER_TIME_LIMIT",
-        second: "ENGIN_TWO_PWD",
-        third: "RESERVED_DAY",
-        fourth: "STOCK_ORDER",
-        fifth: "PRINT_PASSWORD",
-        sixth: "MACHINE_TYPE",
-        seventh: "SIGN_TYPE",
-        eigth: "POWER_CATEGORY",
-      };
-      getDictList({ sysDictEnum: MAP[type] }).then((res) => {
+    getDictList(type) {
+      getDictList({ sysDictEnum: type }).then((res) => {
         console.log(res, "99");
         let data = res.data.map((item) => {
           return {
@@ -614,6 +603,25 @@ export default {
         }
       });
     },
+    getDetail(type) {
+      const MAP = {
+        first: "ORDER_TIME_LIMIT",
+        second: "ENGIN_TWO_PWD",
+        third: ["GUANG_ZHOU_RESERVED_DAY", "FO_SHAN_RESERVED_DAY"],
+        fourth: "STOCK_ORDER",
+        fifth: "PRINT_PASSWORD",
+        sixth: "MACHINE_TYPE",
+        seventh: "SIGN_TYPE",
+        eigth: "POWER_CATEGORY",
+      };
+      if (type === "third") {
+        MAP[type].forEach((e) => {
+          this.getDictList(e);
+        });
+        return;
+      }
+      this.getDictList(MAP[type]);
+    },
 
     submitForm(type) {
       let list = [];