ysy 2 lat temu
rodzic
commit
a41d920f88

+ 20 - 12
src/views/technology/productParam/components/user-edit.vue

@@ -22,21 +22,21 @@
 
 
         <el-col :span="8">
-          <el-form-item label="型号:" prop="modelType">
-            <el-input disabled v-model="form.modelType" placeholder="自动带入" />
+          <el-form-item label="型号:" prop="categoryModelType">
+            <el-input disabled v-model="form.categoryModelType" placeholder="自动带入" />
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="牌号:" prop="brandNum">
-            <el-input disabled v-model="form.brandNum" placeholder="自动带入" />
+          <el-form-item label="牌号:" prop="categoryBrandNum">
+            <el-input disabled v-model="form.categoryBrandNum" placeholder="自动带入" />
           </el-form-item>
         </el-col>
 
 
         <el-col :span="8">
-          <el-form-item label="规格:" prop="specification">
-            <el-input disabled v-model="form.specification" placeholder="自动带入" />
+          <el-form-item label="规格:" prop="categorySpecification">
+            <el-input disabled v-model="form.categorySpecification" placeholder="自动带入" />
           </el-form-item>
         </el-col>
 
@@ -206,14 +206,22 @@ export default {
   data() {
     const defaultForm = {
       id: null,
-      code: '',
-      name: '',
-
+      categoryName: '',
+      categoryCode: '',
+      categoryModelType: '',
+      categoryBrandNum: '',
+      categorySpecification: '',
+      produceVersionId: '',
       moldingAgent: '',
+
+  
+
       palletId: '',
+      palletName: '',
+      palletCode: '',
+      palletSpecification: '',
       processingRequirement: '',
       remark: '',
-
       taskParam: [
       ],
       produceParam: []
@@ -338,8 +346,8 @@ export default {
         this.$set(this.form, 'categoryName', row.name)
         this.$set(this.form, 'categoryId', row.id)
         this.$set(this.form, 'categoryCode', row.code)
-        this.$set(this.form, 'modelType', row.name)
-        this.$set(this.form, 'brandNum', row.brandNum)
+        this.$set(this.form, 'categoryModelType', row.name)
+        this.$set(this.form, 'categoryBrandNum', row.categoryBrandNum)
         this.$set(this.form, 'specification', row.specification)
       } else if (title == '选择舟皿') {
         this.$set(this.form, 'palletName', row.name)

+ 3 - 9
src/views/technology/productParam/index.vue

@@ -65,13 +65,7 @@ export default {
       // 表格列配置
       columns: [
    
-        {
-          align: 'center',
-          prop: '',
-          label: '产品类别',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
+
         {
           prop: 'categoryCode',
           label: '产品编码',
@@ -98,7 +92,7 @@ export default {
         },
 
         {
-          prop: '',
+          prop: 'categoryMrpType',
           label: 'MRP代码',
           align: 'center',
           showOverflowTooltip: true
@@ -106,7 +100,7 @@ export default {
 
 
         {
-          prop: 'produceVersionId',
+          prop: 'produceVersionName',
           label: '生产版本',
           align: 'center',
           showOverflowTooltip: true