ysy vor 2 Jahren
Ursprung
Commit
e1738cedae

+ 2 - 1
src/enum/dict.js

@@ -35,7 +35,8 @@ export default {
   工种: 'workType',
   二级编码规则: 'Secondary',
   三级编码规则: 'Third',
-  工艺参数单位: 'parameter_code'
+  工艺参数单位: 'parameter_code',
+  成型剂类别: 'forming_code'
 
 
 };

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

@@ -22,7 +22,7 @@
           <el-form-item label="参数类型:" prop="textType">
             <el-select v-model="form.textType" placeholder="请选择" class="ele-block">
               <el-option label="数值" :value="1" />
-              <el-option label="布尔(true/false)" :value="2" />
+              <el-option label="布尔" :value="2" />
               <el-option label="产品参数" :value="3" />
               <el-option label="规格" :value="4" />
             </el-select>
@@ -30,7 +30,7 @@
         </el-col>
 
 
-        <el-col :span="10" v-if="form.textType == 1">
+        <el-col :span="10" v-if="form.textType == 1 || form.textType == 4">
           <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
@@ -39,6 +39,17 @@
         </el-col>
 
 
+        <el-col :span="10" v-if="form.textType == 2">
+          <el-form-item label="默认值:" prop="defaultValue">
+            <el-select v-model="form.defaultValue" placeholder="请选择" class="ele-block">
+              <el-option label="true" :value="1" />
+              <el-option label="false" :value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+
+
 
         <el-col :span="10" v-if="form.textType == 3">
           <el-form-item label="参数上限:">

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

@@ -54,7 +54,8 @@
 
         <el-col :span="8">
           <el-form-item label="成型剂:" prop="moldingAgent">
-            <el-input @click.native="chooseMolding" v-model="form.moldingAgent" />
+            <DictSelection dictName="工艺参数单位" clearable filterable v-model="form.unitName">
+            </DictSelection>
           </el-form-item>
         </el-col>
 

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

@@ -5,9 +5,17 @@
     <header-title title="基本信息"> </header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="140px">
       <el-row>
+
         <el-col :span="8">
-          <el-form-item label="版本号:" prop="code">
-            <el-input clearable v-model="form.code" placeholder="请输入版本号" />
+          <el-form-item label="版本编码:" prop="code">
+            <el-input clearable v-model="form.code" placeholder="请输入版本编码" />
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="版本号:" prop="version">
+            <el-input clearable v-model="form.version" placeholder="请输入版本号" />
           </el-form-item>
         </el-col>
 
@@ -160,6 +168,9 @@ export default {
           { required: true, message: '请输入版本名称', trigger: 'blur' }
         ],
         code: [
+          { required: true, message: '请输入版本编码', trigger: 'blur' }
+        ],
+        version: [
           { required: true, message: '请输入版本号', trigger: 'blur' }
         ],
         factoryId: [