From f808b4dae0679f213f47b3175ddb0e893522bc1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com>
Date: Thu, 19 Sep 2024 11:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=B1=9E=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/odsRawOrderIn/index.vue |  2 +-
 src/views/wms/product/index.vue       | 41 +++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
index 300b0c1..992a910 100644
--- a/src/views/wms/odsRawOrderIn/index.vue
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -71,7 +71,7 @@
 					:disabled="single"
 					@click="handleUpdateSAP"
 					v-hasPermi="['wms:odsRawOrderIn:edit']"
-				>过账</el-button>
+				>105过账</el-button>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index fc11dd6..d23c529 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -462,6 +462,24 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+        <el-form-item label="品类" prop="category">
+          <el-select
+            v-model="form.category"
+            placeholder="请选择品类"
+            style="width: 320px"
+          >
+            <el-option
+              v-for="dict in dict.type.sys_category"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+
+
         <el-form-item label="仓库检验周期" prop="warehouseCycle">
           <el-input-number
             v-model="form.warehouseCycle"
@@ -488,6 +506,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
+
+
+        <el-form-item label="质量产品类型" prop="other">
+          <el-select
+            v-model="form.other"
+            placeholder="请选择质量产品类型"
+            style="width: 320px"
+          >
+            <el-option
+              v-for="dict in dict.type.qms_category"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAttachedForm">确 定</el-button>
@@ -601,7 +638,7 @@ import { syncProductSAP } from "@/api/technology/proroute";
 
 export default {
   name: "Product",
-  dicts: ["sys_normal_disable", "material_type","pack_type"],
+  dicts: ["sys_normal_disable", "material_type","pack_type","sys_category","qms_category"],
   data() {
     return {
       LS: {
@@ -854,7 +891,7 @@ export default {
         console.log(this.form.productCode);
         this.openAttached = true;
         if(this.form.id == null){
-          this.title = "新增产品附属信息";
+          this.title = "修改产品附属信息";
         }else{
           this.title = "修改产品附属信息";
         }