yangg 6 сар өмнө
parent
commit
affea680b8

+ 7 - 7
ui/src/views/ProductMent/newProduct/editor.vue

@@ -11,7 +11,7 @@
         <el-row :gutter="20">
         <el-row :gutter="20">
           <!-- 第一列 -->
           <!-- 第一列 -->
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="OA编">
+            <el-form-item label="OA编">
               <el-input v-model="productForm.dcp_oa_code" placeholder="请输入" />
               <el-input v-model="productForm.dcp_oa_code" placeholder="请输入" />
             </el-form-item>
             </el-form-item>
             <el-form-item label="工程" prop="wr_id">
             <el-form-item label="工程" prop="wr_id">
@@ -81,10 +81,10 @@
   
   
           <!-- 第三列 -->
           <!-- 第三列 -->
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="产品应用编">
+            <el-form-item label="产品应用编">
               <el-input v-model="productForm.dcp_p_no" placeholder="请输入" />
               <el-input v-model="productForm.dcp_p_no" placeholder="请输入" />
             </el-form-item>
             </el-form-item>
-            <el-form-item label="产品型">
+            <el-form-item label="产品型">
               <el-input v-model="productForm.dcp_model" placeholder="请输入" />
               <el-input v-model="productForm.dcp_model" placeholder="请输入" />
             </el-form-item>
             </el-form-item>
             <el-form-item label="产品区分代码">
             <el-form-item label="产品区分代码">
@@ -214,8 +214,8 @@
           @selection-change="handleSelectionChange"
           @selection-change="handleSelectionChange"
         >
         >
           <el-table-column type="selection" width="55" />
           <el-table-column type="selection" width="55" />
-          <el-table-column prop="dcp_oa_code" label="OA编" />
-          <el-table-column prop="dcp_p_no" label="产品应用编" />
+          <el-table-column prop="dcp_oa_code" label="OA编" />
+          <el-table-column prop="dcp_p_no" label="产品应用编" />
           <el-table-column prop="dcp_name" label="产品名称" />
           <el-table-column prop="dcp_name" label="产品名称" />
           <el-table-column prop="dcp_model" label="产品型号" />
           <el-table-column prop="dcp_model" label="产品型号" />
           <el-table-column label="长宽比">
           <el-table-column label="长宽比">
@@ -515,7 +515,7 @@
       // 修改生成规格方法
       // 修改生成规格方法
       generateSpec() {
       generateSpec() {
         if (!this.productForm.dcp_oa_code || !this.productForm.dcp_name) {
         if (!this.productForm.dcp_oa_code || !this.productForm.dcp_name) {
-          this.$message.warning("请先填写OA编和产品名称");
+          this.$message.warning("请先填写OA编和产品名称");
           return;
           return;
         }
         }
   
   
@@ -738,7 +738,7 @@
               dcp_model: content.dcp_model, // 产品型号
               dcp_model: content.dcp_model, // 产品型号
               dcp_name: content.dcp_name, // 产品名称
               dcp_name: content.dcp_name, // 产品名称
               dcp_p_no: content.dcp_p_no, // 产品编号
               dcp_p_no: content.dcp_p_no, // 产品编号
-              dcp_oa_code: content.dcp_oa_code, // OA编
+              dcp_oa_code: content.dcp_oa_code, // OA编
               dcp_price1: content.dcp_price1, // 公开价
               dcp_price1: content.dcp_price1, // 公开价
               dcp_price2: content.dcp_price2, // 销售价
               dcp_price2: content.dcp_price2, // 销售价
               dcp_price3: content.dcp_price3, // 标准价
               dcp_price3: content.dcp_price3, // 标准价

+ 7 - 7
ui/src/views/ProductMent/newProduct/index.vue

@@ -11,7 +11,7 @@
       <el-row :gutter="20">
       <el-row :gutter="20">
         <!-- 第一列 -->
         <!-- 第一列 -->
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="OA编">
+          <el-form-item label="OA编">
             <el-input v-model="productForm.dcp_oa_code" placeholder="请输入" />
             <el-input v-model="productForm.dcp_oa_code" placeholder="请输入" />
           </el-form-item>
           </el-form-item>
           <el-form-item label="工程" prop="wr_id">
           <el-form-item label="工程" prop="wr_id">
@@ -81,10 +81,10 @@
 
 
         <!-- 第三列 -->
         <!-- 第三列 -->
         <el-col :span="8">
         <el-col :span="8">
-          <el-form-item label="产品应用编">
+          <el-form-item label="产品应用编">
             <el-input v-model="productForm.dcp_p_no" placeholder="请输入" />
             <el-input v-model="productForm.dcp_p_no" placeholder="请输入" />
           </el-form-item>
           </el-form-item>
-          <el-form-item label="产品型">
+          <el-form-item label="产品型">
             <el-input v-model="productForm.dcp_model" placeholder="请输入" />
             <el-input v-model="productForm.dcp_model" placeholder="请输入" />
           </el-form-item>
           </el-form-item>
           <el-form-item label="产品区分代码">
           <el-form-item label="产品区分代码">
@@ -214,8 +214,8 @@
         @selection-change="handleSelectionChange"
         @selection-change="handleSelectionChange"
       >
       >
         <el-table-column type="selection" width="55" />
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="dcp_oa_code" label="OA编" />
-        <el-table-column prop="dcp_p_no" label="产品应用编" />
+        <el-table-column prop="dcp_oa_code" label="OA编" />
+        <el-table-column prop="dcp_p_no" label="产品应用编" />
         <el-table-column prop="dcp_name" label="产品名称" />
         <el-table-column prop="dcp_name" label="产品名称" />
         <el-table-column prop="dcp_model" label="产品型号" />
         <el-table-column prop="dcp_model" label="产品型号" />
         <el-table-column label="长宽比">
         <el-table-column label="长宽比">
@@ -515,7 +515,7 @@ export default {
     // 修改生成规格方法
     // 修改生成规格方法
     generateSpec() {
     generateSpec() {
       if (!this.productForm.dcp_oa_code || !this.productForm.dcp_name) {
       if (!this.productForm.dcp_oa_code || !this.productForm.dcp_name) {
-        this.$message.warning("请先填写OA编和产品名称");
+        this.$message.warning("请先填写OA编和产品名称");
         return;
         return;
       }
       }
 
 
@@ -738,7 +738,7 @@ export default {
             dcp_model: content.dcp_model, // 产品型号
             dcp_model: content.dcp_model, // 产品型号
             dcp_name: content.dcp_name, // 产品名称
             dcp_name: content.dcp_name, // 产品名称
             dcp_p_no: content.dcp_p_no, // 产品编号
             dcp_p_no: content.dcp_p_no, // 产品编号
-            dcp_oa_code: content.dcp_oa_code, // OA编
+            dcp_oa_code: content.dcp_oa_code, // OA编
             dcp_price1: content.dcp_price1, // 公开价
             dcp_price1: content.dcp_price1, // 公开价
             dcp_price2: content.dcp_price2, // 销售价
             dcp_price2: content.dcp_price2, // 销售价
             dcp_price3: content.dcp_price3, // 标准价
             dcp_price3: content.dcp_price3, // 标准价

+ 9 - 0
ui/src/views/ProductMent/specMent/index.vue

@@ -165,6 +165,12 @@
         <el-descriptions-item label="规格类型">{{
         <el-descriptions-item label="规格类型">{{
           viewForm.psp_type
           viewForm.psp_type
         }}</el-descriptions-item>
         }}</el-descriptions-item>
+         <el-descriptions-item label="规格值">{{
+          viewForm.psp_value
+        }}</el-descriptions-item>
+         <el-descriptions-item label="所属分类">{{
+          viewForm.psp_category
+        }}</el-descriptions-item>
       </el-descriptions>
       </el-descriptions>
       <div slot="footer">
       <div slot="footer">
         <el-button @click="viewDialogVisible = false">关闭</el-button>
         <el-button @click="viewDialogVisible = false">关闭</el-button>
@@ -380,6 +386,9 @@ export default {
       this.viewForm = {
       this.viewForm = {
         ps_no: row.ps_no,
         ps_no: row.ps_no,
         psp_name: row.psp_name,
         psp_name: row.psp_name,
+        psp_type:row.psp_type,
+        psp_value:row.psp_value?.join(','),
+        psp_category:row.psp_category,
       };
       };
       this.viewDialogVisible = true;
       this.viewDialogVisible = true;
     },
     },