feat(wms): 添加出库状态列并优化产品/原材料表单

在多个报表页面添加出库状态列，显示"在库"或"已出库"
移除产品/原材料表单中的编号和负责人字段
自动生成产品/原材料编号

klp-ui/src/views/wms/product/index.vue

@@ -85,17 +85,17 @@
     <!-- 添加或修改产品对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="产品编号" prop="productCode">
+        <!-- <el-form-item label="产品编号" prop="productCode">
           <el-input v-model="form.productCode" placeholder="请输入产品编号" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="产品名称" prop="productName">
           <el-input v-model="form.productName" placeholder="请输入产品名称" />
         </el-form-item>
 
-        <el-form-item label="负责人" prop="owner">
+        <!-- <el-form-item label="负责人" prop="owner">
           <el-input v-model="form.owner" :multiple="false" placeholder="请填写负责人" />
-        </el-form-item>
+        </el-form-item> -->
 
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
@@ -199,15 +199,15 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        productCode: [
+        // productCode: [
-          { required: true, message: "产品编号不能为空", trigger: "blur" }
+        //   { required: true, message: "产品编号不能为空", trigger: "blur" }
-        ],
+        // ],
         productName: [
           { required: true, message: "产品名称不能为空", trigger: "blur" }
         ],
-        owner: [
+        // owner: [
-          { required: true, message: "负责人不能为空", trigger: "blur" }
+        //   { required: true, message: "负责人不能为空", trigger: "blur" }
-        ],
+        // ],
       },
       bomDialogVisible: false,
       bomId: undefined,
@@ -319,8 +319,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
+
           if (this.form.productId != null) {
-            updateProduct(this.form).then(response => {
+            updateProduct({
+              ...this.form,
+              productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
+
+            }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();

klp-ui/src/views/wms/rawMaterial/index.vue

@@ -128,9 +128,9 @@
     <!-- 添加或修改原材料对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="原材料编号" prop="rawMaterialCode">
+        <!-- <el-form-item label="原材料编号" prop="rawMaterialCode">
           <el-input v-model="form.rawMaterialCode" placeholder="请输入原材料编号" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="原材料名称" prop="rawMaterialName">
           <el-input v-model="form.rawMaterialName" placeholder="请输入原材料名称" />
         </el-form-item>
@@ -233,9 +233,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        rawMaterialCode: [
+        // rawMaterialCode: [
-          { required: true, message: "原材料编号不能为空", trigger: "blur" }
+        //   { required: true, message: "原材料编号不能为空", trigger: "blur" }
-        ],
+        // ],
         rawMaterialName: [
           { required: true, message: "原材料名称不能为空", trigger: "blur" }
         ],
@@ -367,7 +367,10 @@ export default {
         if (valid) {
           this.buttonLoading = true;
           if (this.form.rawMaterialId != null) {
-            updateRawMaterial(this.form).then(response => {
+            updateRawMaterial({
+              ...this.form,
+              productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
+            }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();

klp-ui/src/views/wms/report/delivery.vue

@@ -75,6 +75,13 @@
       <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
       <el-table-column label="长度 (米)" align="center" prop="length" />
       <el-table-column label="发货时间" align="center" prop="exportTime" />
+      <el-table-column label="出库状态" align="center" prop="status">
+        <!-- 0在库，1已出库 -->
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column>
+
       <el-table-column label="更新人" align="center" prop="updateByName" />
     </el-table>
   </div>

klp-ui/src/views/wms/report/receive.vue

@@ -74,6 +74,12 @@
       </el-table-column>
       <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
       <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="出库状态" align="center" prop="status">
+        <!-- 0在库，1已出库 -->
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
     </el-table>
   </div>
@@ -119,7 +125,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 9999,
-        status: 1,
+        // status: 1,
         startTime: startTime,
         endTime: endTime,
         selectType: 'product',

klp-ui/src/views/wms/report/zha.vue

@@ -73,6 +73,12 @@
         </template>
       </el-table-column>
       <el-table-column label="长度 (米)" align="center" prop="length" />
+      <el-table-column label="出库状态" align="center" prop="status">
+        <!-- 0在库，1已出库 -->
+        <template slot-scope="scope">
+          {{ scope.row.status === 0 ? '在库' : '已出库' }}
+        </template>
+      </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
     </el-table>
   </div>