ysy 2 سال پیش
والد
کامیت
56921afa97

+ 1 - 1
src/views/technology/parameter/components/user-edit.vue

@@ -24,6 +24,7 @@
               <el-option label="数值" :value="1" />
               <el-option label="布尔(true/false)" :value="2" />
               <el-option label="产品参数" :value="3" />
+              <el-option label="规格" :value="4" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -33,7 +34,6 @@
           <el-form-item label="默认值:">
             <!-- oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value" -->
             <el-input
-           
               v-model="form.defaultValue" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>

+ 17 - 17
src/views/technology/version/components/user-edit.vue

@@ -25,13 +25,13 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="8" v-if="false">
           <el-form-item label="产品名称:" prop="categoryName">
             <el-input @click.native="chooseProduct" v-model="form.categoryName" readonly />
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="8" v-if="false">
           <el-form-item label="产品编码:" prop="categoryCode">
             <el-input placeholder="点击选择产品编码" disabled v-model="form.categoryCode" />
           </el-form-item>
@@ -40,9 +40,9 @@
       </el-row>
 
 
-      <header-title title="关联生产信息"></header-title>
+      <header-title v-if="false" title="关联生产信息"></header-title>
 
-      <el-row>
+      <el-row v-if="false">
         <el-col :span="8">
           <el-form-item label="工艺路线编码:" prop="routingCode">
             <el-input v-model="form.routingCode" @click.native="chooseRoute" />
@@ -129,19 +129,19 @@ export default {
       code: '',
       name: '',
       factoryId: '',
-      categoryId: '',
-      id: '',
-      categoryCode: '',
-      categoryName: '',
-      routingId: '',
-      bomId: '',
-
-      routingName: '',
-      routingCode: '',
-      routingVersion: '',
-      bomName: '',
-      bomCode: '',
-      bomVersion: '',
+      // categoryId: '',
+      // id: '',
+      // categoryCode: '',
+      // categoryName: '',
+      // routingId: '',
+      // bomId: '',
+
+      // routingName: '',
+      // routingCode: '',
+      // routingVersion: '',
+      // bomName: '',
+      // bomCode: '',
+      // bomVersion: '',
 
     };
     return {

+ 4 - 4
src/views/technology/version/components/user-search.vue

@@ -7,7 +7,7 @@
     @submit.native.prevent
   >
     <el-row>
-      <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.categoryCode" placeholder="请输入" />
         </el-form-item>
@@ -16,7 +16,7 @@
         <el-form-item label="产品名称:">
           <el-input clearable v-model="where.categoryName" placeholder="请输入" />
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="版本号:">
           <el-input
@@ -62,8 +62,8 @@
       const defaultWhere = {
         code: '',
         name: '',
-        categoryCode: '',
-        categoryName: ''
+        // categoryCode: '',
+        // categoryName: ''
       };
       return {
         // 表单数据

+ 28 - 28
src/views/technology/version/index.vue

@@ -59,20 +59,20 @@ export default {
     return {
       // 表格列配置
       columns: [
-        {
-          prop: 'categoryCode',
-          label: '产品编码',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
-        {
-          prop: 'categoryName',
-          label: '产品名称',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 110
-        },
+        // {
+        //   prop: 'categoryCode',
+        //   label: '产品编码',
+        //   showOverflowTooltip: true,
+        //   align: 'center',
+        //   minWidth: 110
+        // },
+        // {
+        //   prop: 'categoryName',
+        //   label: '产品名称',
+        //   showOverflowTooltip: true,
+        //   align: 'center',
+        //   minWidth: 110
+        // },
         {
           align: 'center',
           prop: 'code',
@@ -87,20 +87,20 @@ export default {
           showOverflowTooltip: true,
           minWidth: 110
         },
-        {
-          prop: 'routingCode',
-          label: '工艺路线编码',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
-        {
-          prop: 'routingVersion',
-          label: '工艺版本号',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 110
-        },
+        // {
+        //   prop: 'routingCode',
+        //   label: '工艺路线编码',
+        //   align: 'center',
+        //   showOverflowTooltip: true,
+        //   minWidth: 110
+        // },
+        // {
+        //   prop: 'routingVersion',
+        //   label: '工艺版本号',
+        //   align: 'center',
+        //   showOverflowTooltip: true,
+        //   minWidth: 110
+        // },
 
         {
           columnKey: 'action',