ysy 2 years ago
parent
commit
2b55448e12

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

@@ -25,12 +25,13 @@
               <el-option label="选择" :value="'2'" />
               <el-option label="产品参数" :value="'3'" />
               <el-option label="规格" :value="'4'" />
+              <el-option label="时间" :value="'5'" />
             </el-select>
           </el-form-item>
         </el-col>
 
 
-        <el-col :span="10" v-if="form.textType == 1 || form.textType == 4">
+        <el-col :span="10" v-if="form.textType == 1 || form.textType == 4 || form.textType == 5" >
           <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
@@ -68,13 +69,17 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="10" v-if="form.textType != 2">
+        <el-col :span="10" v-if="form.textType != 2 &&  form.textType != 5">
           <el-form-item label="参数单位:" prop="unitName">
-
             <DictSelection dictName="工艺参数单位" clearable filterable v-model="form.unitName">
             </DictSelection>
 
+          </el-form-item>
+        </el-col>
 
+        <el-col :span="10" v-if="form.textType == 5">
+          <el-form-item label="参数单位:" prop="unitName">
+            h(小时)
           </el-form-item>
         </el-col>
 
@@ -238,6 +243,9 @@ export default {
               return this.$message.warning('参数上限应大于参数下限')
             }
           }
+          if(this.form.textType == 5){
+            this.form.unitName = 'h'
+          }
           saveOrUpdate(this.form)
             .then((msg) => {
               this.loading = false;

+ 1 - 1
src/views/technology/parameter/index.vue

@@ -28,7 +28,7 @@
 
         <template v-slot:textType="{ row }">
           {{ row.textType == 1 ? '数值' : row.textType == 2 ? '选择' : row.textType == 3 ? '产品参数' : row.textType == 4 ? '规格' :
-            '' }}
+             row.textType == 5 ? '时间' : '' }}
         </template>
 
 

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

@@ -254,7 +254,7 @@ export default {
 
     chooseProcess(data) {
       this.$refs.table.setData([...data, ...this.$refs.table.getData()]);
-      this.$emit('chooseProcess', [...data, ...this.$refs.table.getData()])
+      this.$emit('chooseProcess', [...this.$refs.table.getData()])
 
     },
 

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

@@ -120,7 +120,7 @@
 
             <!-- 默认值 -->
             <template v-slot:defaultValue="{ row }">
-              <el-input v-if="row.textType == 1 || row.textType == 4" v-model="row.defaultValue"
+              <el-input v-if="row.textType == 1 || row.textType == 4 || row.textType == 5" v-model="row.defaultValue"
                 placeholder="请输入"></el-input>
               <el-select v-if="row.textType == 2" v-model="row.defaultValue" placeholder="请选择">
                 <el-option label="TRUE" :value="'TRUE'" />
@@ -140,12 +140,17 @@
 
             <!-- 单位 -->
             <template v-slot:unitName="{ row }">
-              <DictSelection v-if="row.textType != 2" dictName="工艺参数单位" clearable filterable v-model="row.unitName">
+              <DictSelection v-if="row.textType != 2 && row.textType != 5" dictName="工艺参数单位" clearable filterable
+                v-model="row.unitName">
               </DictSelection>
+
+              <span v-if="row.textType == 5"> h(小时)</span>
+
             </template>
 
 
 
+
             <!-- 操作列 -->
             <template v-slot:action="{ row }">
               <el-popconfirm class="ele-action" title="确定要删除当前参数吗?" @confirm="remove(row)">
@@ -166,7 +171,6 @@
 
 
 
-
     </el-form>
 
 
@@ -200,6 +204,8 @@ import ParamModal from './ParamModal.vue'
 
 import { pageList } from '@/api/technology/version/version.js';
 export default {
+
+
   components: {
     ProductModal,
     ParamModal,
@@ -392,8 +398,8 @@ export default {
     },
 
     remove(row) {
-      const data = this.$refs.table.getData() ?? [];
 
+      const data = this.$refs.table.getData() ?? [];
       if (row.id) {
         this.removeList.push(row.id);
         this.$refs.table.setData(data.filter((d) => d.id !== row.id));
@@ -425,11 +431,14 @@ export default {
             : parameter.save;
         }
 
-
+        if (this.removeList.length > 0) {
+          this.form['removeList'] = this.removeList
+        }
         saveOrUpdate(this.form)
           .then((msg) => {
             this.loading = false;
             this.form = {};
+            this.form['removeList'] = []
             this.$message.success(msg);
             this.updateVisible(false);
             this.$emit('done');