ysy 2 лет назад
Родитель
Сommit
4e02ed06f8

+ 1 - 1
src/api/technology/productParam/index.js

@@ -10,7 +10,7 @@ export default {
   },
   //详情
   getById: async (id) => {
-    const res = await request.get(`/main/produceparam/getById/${id}`);
+    const res = await request.get(`/main/categoryparam/getById/${id}`);
     if (res.data.code == 0) {
       return res.data.data;
     }

+ 3 - 1
src/styles/transition/common.scss

@@ -59,7 +59,9 @@
 }
 
 .ele-form-actions {
+  padding-left: 10px;
   display: flex;
   align-items: center;
-  justify-content: flex-end;
+  justify-content: flex-end !important;
+  
 }

+ 1 - 1
src/views/technology/productParam/components/ProductModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
+  <el-dialog :title="title" :visible.sync="visible" v-if="visible" :before-close="handleClose" :close-on-click-modal="false"
     :close-on-press-escape="false" append-to-body width="70%">
     <el-card shadow="never">
       <ProductSearch @search="reload" />

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

@@ -73,8 +73,8 @@
 
 
         <el-col :span="8">
-          <el-form-item label="舟皿规格:" prop="palletSpecs">
-            <el-input disabled placeholder="自动带入" v-model="form.palletSpecs" />
+          <el-form-item label="舟皿规格:" prop="palletSpecification	">
+            <el-input disabled placeholder="自动带入" v-model="form.palletSpecification	" />
           </el-form-item>
         </el-col>
 

+ 7 - 20
src/views/technology/productParam/components/user-search.vue

@@ -7,37 +7,28 @@
     @submit.native.prevent
   >
     <el-row>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="参数编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="参数名称:">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
+
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="产品编码:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? {   lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="产品名称:">
           <el-input
             clearable
-            v-model="where.defaultValue"
+            v-model="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
 
 
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -59,12 +50,8 @@
     data() {
       // 默认表单数据
       const defaultWhere = {
-        code: '',
-        name: '',
-        defaultValue: '',
-        categoryType: ''
-        // nickname: '',
-        // sex: undefined
+        categoryName: '',
+        categoryCode: ''
       };
       return {
         // 表单数据

+ 4 - 19
src/views/technology/productParam/index.vue

@@ -64,22 +64,7 @@ export default {
     return {
       // 表格列配置
       columns: [
-        {
-          prop: 'code',
-          label: '参数编码',
-          // sortable: 'custom',
-          showOverflowTooltip: true,
-          align: 'center',
-
-          minWidth: 110
-        },
-        {
-          prop: 'name',
-          label: '参数名称',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
+   
         {
           align: 'center',
           prop: '',
@@ -94,19 +79,19 @@ export default {
           showOverflowTooltip: true
         },
         {
-          prop: '',
+          prop: 'categoryName',
           label: '产品名称',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          prop: '',
+          prop: 'categoryBrandNum',
           label: '牌号',
           align: 'center',
           showOverflowTooltip: true
         },
         {
-          prop: '',
+          prop: 'categoryModelType',
           label: '型号',
           align: 'center',
           showOverflowTooltip: true