Kaynağa Gözat

Merge remote-tracking branch 'origin/dev' into dev

Z 1 yıl önce
ebeveyn
işleme
b1c14bb02f

BIN
dist.rar


+ 7 - 0
src/layout/index.vue

@@ -340,6 +340,13 @@
     }
   }
 
+  .ele-admin-layout .ele-admin-logo img  {
+    height: auto !important;
+    width: 80px !important;
+    margin-right: 5px;
+    max-height: 35px;
+  }
+
   // .ele-admin-layout .ele-admin-logo {
   //   background-image: url('@/assets/logo.png') !important;
   //   background-size: cover !important;

+ 30 - 0
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -509,6 +509,14 @@
             <!-- 表头工具栏 -->
             <template v-if="!isView" v-slot:toolbar>
               <el-button type="primary" @click="add">添加</el-button>
+              <div class="toolbar_box">
+                <div
+                  ><span>基本数量</span>
+                  <el-input placeholder="请输入" v-model.number="baseCount">
+                  </el-input>
+                  <DictSelection dictName="计量单位" v-model="baseCountUnit"
+                /></div>
+              </div>
             </template>
             <template v-slot:action="{ row, $index }">
               <el-link type="primary" @click="handleDel(row, $index)"
@@ -996,6 +1004,8 @@
     mixins: [dictMixins],
     data() {
       return {
+        baseCount: '',
+        baseCountUnit: '',
         isView: false,
         filedList: [],
         jobFiledList: [],
@@ -1616,6 +1626,11 @@
           // 保存标准工时
           this.tableData.taskParam[this.currentIndex].normalHours =
             this.normalHours;
+          // 保存材料定额
+          this.tableData.taskParam[this.currentIndex].baseCount =
+            thsis.baseCount;
+          this.tableData.taskParam[this.currentIndex].baseCountUnit =
+            thsis.baseCountUnit;
           workingProcedureUpdate({
             id: this.tableData.id,
             categoryId: this.treeData.categoryId,
@@ -1641,4 +1656,19 @@
   .downLoad {
     display: flex;
   }
+  .toolbar_box {
+    float: right;
+    margin-right: 10px;
+    > div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      > span {
+        width: 150px;
+      }
+      > div {
+        margin-left: 10px;
+      }
+    }
+  }
 </style>

+ 2 - 10
src/views/material/BOMmanage/details.vue

@@ -103,22 +103,14 @@
                 <document></document>
               </el-tab-pane>
               <el-tab-pane
-                v-if="
-                  currentNodeData.bomType == 2 &&
-                  treeList.length > 0 &&
-                  currentNodeData.children?.length < 1
-                "
+                v-if="currentNodeData.bomType == 2"
                 label="工艺路线"
                 name="工艺路线"
               >
                 <routing :taskParam="currentNodeData"></routing>
               </el-tab-pane>
               <el-tab-pane
-                v-if="
-                  currentNodeData.bomType == 2 &&
-                  treeList.length > 0 &&
-                  currentNodeData.children?.length < 1
-                "
+                v-if="currentNodeData.bomType == 2"
                 label="工艺"
                 name="工艺"
               >

+ 95 - 74
src/views/material/product/components/WarehouseInfo.vue

@@ -1,68 +1,88 @@
 <template>
   <div class="other">
-      <el-form label-width="120px"  ref="form" :model="form">
-         <div class="divider">
-           <div class="title">
-             <div class="ele-bg-primary"></div>
-             <span>仓储配置</span>
-           </div>
-           <div class="ele-bg-primary ele-width"></div>
-         </div>
-         <el-row :gutter="24">
-           <el-col :span="8">
-             <el-form-item label="启用库存预警">
-                <el-radio v-model="form.isWarn" :label="1">是</el-radio>
-                <el-radio v-model="form.isWarn" :label="0">否</el-radio>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="允许拆包" prop="isUnpack">
-                <el-switch v-model="form.isUnpack" :active-value="1" :inactive-value="0"> </el-switch>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="安全库存" prop="secureInventory">
-                <el-input  v-model="form.secureInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="最小库存" prop="minInventory">
-                <el-input  v-model="form.minInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="最大库存" prop="maxInventory">
-                <el-input  v-model="form.maxInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="盘点模式" prop="inventoryMode">
-               <el-radio v-model="form.inventoryMode" :label="1">逐个盘点</el-radio>
-               <el-radio v-model="form.inventoryMode" :label="2">批量盘点</el-radio>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
-                <DictSelection dictName="质保预警参考" clearable v-model="form.warrantyWarnRefer">
-                </DictSelection>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="保质期">
-                <div class="form-line">
-                  <el-input  v-model="form.warrantyPeriod"/>
-                  <DictSelection class="line-select" dictName="保质期单位" clearable v-model="form.warrantyPeriodUnit">
-                  </DictSelection>
-                </div>
-             </el-form-item>
-           </el-col>
-         </el-row>
-      </el-form>
+    <el-form label-width="120px" ref="form" :model="form">
+      <div class="divider">
+        <div class="title">
+          <div class="ele-bg-primary"></div>
+          <span>仓储配置</span>
+        </div>
+        <div class="ele-bg-primary ele-width"></div>
+      </div>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="启用库存预警">
+            <el-radio v-model="form.isWarn" :label="1">是</el-radio>
+            <el-radio v-model="form.isWarn" :label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点模式" prop="inventoryMode">
+            <el-radio-group
+              v-model="form.inventoryMode"
+              @input="inventoryModeChange"
+            >
+              <el-radio :label="1">逐个盘点</el-radio>
+              <el-radio :label="2">批量盘点</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="允许拆包" prop="isUnpack">
+            <el-switch
+              v-model="form.isUnpack"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="安全库存" prop="secureInventory">
+            <el-input v-model="form.secureInventory" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="最小库存" prop="minInventory">
+            <el-input v-model="form.minInventory" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="最大库存" prop="maxInventory">
+            <el-input v-model="form.maxInventory" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
+            <DictSelection
+              dictName="质保预警参考"
+              clearable
+              v-model="form.warrantyWarnRefer"
+            >
+            </DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="保质期">
+            <div class="form-line">
+              <el-input v-model="form.warrantyPeriod" />
+              <DictSelection
+                class="line-select"
+                dictName="保质期单位"
+                clearable
+                v-model="form.warrantyPeriodUnit"
+              >
+              </DictSelection>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script>
-  import deptSelect from '@/components/CommomSelect/dept-select.vue'
+  import deptSelect from '@/components/CommomSelect/dept-select.vue';
   import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
     props: {
@@ -71,17 +91,21 @@
         default: {}
       }
     },
-    components: { deptSelect , personSelect },
+    components: { deptSelect, personSelect },
     data() {
-      return {
-
-
-      };
+      return {};
     },
 
     methods: {
+      inventoryModeChange(value) {
+        if (value == 1) {
+          this.form.isUnpack = 1;
+        } else {
+          this.form.isUnpack = 0;
+        }
+      },
       // 选择所属部门
-      searchDeptNodeClick (id, info) {
+      searchDeptNodeClick(id, info) {
         // 根据部门获取人员
         const params = { executeGroupId: id };
         this.$nextTick(() => {
@@ -89,16 +113,13 @@
         });
       },
       //选择负责人
-      handleDirectorChange (id, info) {
-      },
-
-
+      handleDirectorChange(id, info) {}
     }
   };
 </script>
 
 <style lang="scss" scoped>
-  .other{
+  .other {
     background: #fff;
     padding: 1px 17px;
   }
@@ -117,17 +138,17 @@
         font-size: 20px;
       }
     }
-    .ele-width{
+    .ele-width {
       width: 100%;
       height: 2px;
     }
   }
-  .form-line{
+  .form-line {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    .line-select{
-      margin-left:15px;
+    .line-select {
+      margin-left: 15px;
     }
   }
 </style>

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

@@ -1,13 +1,25 @@
 <!-- 用户编辑弹窗 -->
 <template>
-  <ele-modal width="960px" :visible="visible" :append-to-body="true" :close-on-click-modal="false"
-    custom-class="ele-dialog-form" :title="isUpdate ? '修改参数' : '添加参数'" @update:visible="updateVisible">
+  <ele-modal
+    width="960px"
+    :visible="visible"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    custom-class="ele-dialog-form"
+    :title="isUpdate ? '修改参数' : '添加参数'"
+    @update:visible="updateVisible"
+  >
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="10">
           <el-form-item label="参数编码:" prop="code">
-            <el-input clearable disabled v-model="form.code" placeholder="请输入" />
+            <el-input
+              clearable
+              disabled
+              v-model="form.code"
+              placeholder="请输入"
+            />
           </el-form-item>
         </el-col>
 
@@ -17,40 +29,70 @@
           </el-form-item>
         </el-col>
 
-
         <el-col :span="10">
           <el-form-item label="参数类型:" prop="textType">
-            <el-select v-model="form.textType" placeholder="请选择" class="ele-block">
+            <el-select
+              v-model="form.textType"
+              placeholder="请选择"
+              class="ele-block"
+            >
               <el-option label="数值" :value="'1'" />
               <el-option label="选择" :value="'2'" />
               <el-option label="产品参数" :value="'3'" />
               <el-option label="规格" :value="'4'" />
               <el-option label="时间" :value="'5'" />
+              <el-option label="范围" :value="'6'" />
             </el-select>
           </el-form-item>
         </el-col>
 
-
-        <el-col :span="10" v-if="form.textType == 1  || form.textType == 3  || form.textType == 4 || form.textType == 5" >
+        <el-col
+          :span="10"
+          v-if="
+            form.textType == 1 ||
+            form.textType == 3 ||
+            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
-              v-model="form.defaultValue" placeholder="请输入"></el-input>
+              v-model="form.defaultValue"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
         </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-select
+              v-model="form.defaultValue"
+              placeholder="请选择"
+              class="ele-block"
+            >
               <el-option label="TRUE" :value="'TRUE'" />
               <el-option label="FALSE" :value="'FALSE'" />
             </el-select>
           </el-form-item>
         </el-col>
 
-
-
+        <el-col
+          :span="10"
+          v-if="
+            form.textType == 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="案例: 12.7≤IC<19.05 ;IC<12.7"
+            ></el-input>
+          </el-form-item>
+        </el-col>
 
         <el-col :span="10" v-if="form.textType == 3">
           <el-form-item label="参数上限:">
@@ -69,11 +111,15 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="10" v-if="form.textType != 2 &&  form.textType != 5">
+        <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
+              dictName="工艺参数单位"
+              clearable
+              filterable
+              v-model="form.unitName"
+            >
             </DictSelection>
-
           </el-form-item>
         </el-col>
 
@@ -88,6 +134,67 @@
             <el-input placeholder="请输入" v-model="form.description" />
           </el-form-item>
         </el-col>
+
+        <!-- <el-col :span="20" v-if="form.textType == 6">
+          <div class="btn_case">
+            <div>
+              <span>≤</span>
+              <span><</span>
+              <span>></span>
+              <span>≥</span>
+            </div>
+            <el-button type="primary" size="mini" @click="addInterval()"
+              >新增</el-button
+            >
+          </div>
+          <el-table
+         
+            :data="form.intervalList"
+            tooltip-effect="dark"
+            style="width: 100%"
+            stripe
+            border
+          >
+            <el-table-column label="名称" prop="name" min-width="120px">
+              <template slot-scope="{ row, $index }">
+                <el-form-item
+                  :prop="'intervalList.' + $index + '.name'"
+                  :rules="tableFormRules.name"
+                  label-width="0px"
+                >
+                  <el-input
+                    placeholder="请输入"
+                    clearable
+                    v-model="row.name"
+                  ></el-input>
+                </el-form-item> </template
+            ></el-table-column>
+            <el-table-column label="公式" min-width="120px">
+              <template slot-scope="scope">
+                 :prop="'intervalList.' + scope.$index + 'formula'"
+                 :rules="tableFormRules.formula" 
+                <el-form-item
+    
+                  label-width="px"
+                >
+                  <el-input
+                    placeholder="案例: 12.7≤IC<19.05 ;IC<12.7"
+                    v-model="scope.row.formula"
+                    clearable
+                  ></el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作" width="120px">
+              <template slot-scope="{ $index, row }">
+                <el-button type="text" @click="delInterval($index, row)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col> -->
       </el-row>
     </el-form>
     <header-title title="其他信息"></header-title>
@@ -95,8 +202,17 @@
       <el-row>
         <el-col :span="10">
           <el-form-item label="参数类别:" prop="categoryType">
-            <el-select v-model="form.categoryType" filterable placeholder="请选择">
-              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+            <el-select
+              v-model="form.categoryType"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in statusList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -104,7 +220,12 @@
         <el-col :span="10">
           <el-form-item label="是否必填:" prop="notNull">
             <el-select v-model="form.notNull" filterable placeholder="请选择">
-              <el-option v-for="item in timeType" :key="item.value" :label="item.label" :value="item.value">
+              <el-option
+                v-for="item in timeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -127,168 +248,204 @@
 </template>
 
 <script>
-import parameter from '@/api/technology/parameter';
+  import parameter from '@/api/technology/parameter';
 
-export default {
-  props: {
-    // 弹窗是否打开
-    visible: Boolean,
-    // 修改回显的数据
-    data: Object
-  },
-  data() {
-    const defaultForm = {
-      id: null,
-      code: '',
-      name: '',
-      textType: '1',
-      categoryType: '',
-      defaultValue: '',
-      description: '',
-      maxValue: '',
-      minValue: '',
-      unitName: '',
-      remark: '',
-      notNull: 0
-    };
-    return {
-      defaultForm,
-      // 表单数据
-      form: { ...defaultForm },
-      timeType: [
-        { value: 1, label: '是' },
-        { value: 0, label: '否' }
-      ],
-      statusList: [
-        { label: '工艺', value: 0 },
-        { label: '工序', value: 1 },
-        { label: '产品', value: 2 },
-        { label: '原料', value: 3 },
-        { label: '设备', value: 4 },
-        { label: '其他', value: 5 }
-      ],
-      tacticsType: [
-        { code: 1, label: '标准时间' },
-        { code: 2, label: '最短时间' }
-      ],
-
-      // 表单验证规则
-      rules: {
-        name: [
-          { required: true, message: '请输入工序名称', trigger: 'blur' }
-        ],
-        code: [
-          { required: true, message: '请输入工序编码', trigger: 'blur' }
-        ],
-
-        unitName: [
-          { required: true, message: '请选择参数单位', trigger: 'change' }
+  export default {
+    props: {
+      // 弹窗是否打开
+      visible: Boolean,
+      // 修改回显的数据
+      data: Object
+    },
+    data() {
+      const defaultForm = {
+        id: null,
+        code: '',
+        name: '',
+        textType: '1',
+        categoryType: '',
+        defaultValue: '',
+        description: '',
+        maxValue: '',
+        minValue: '',
+        unitName: '',
+        remark: '',
+        notNull: 0,
+        intervalList: []
+      };
+      return {
+        defaultForm,
+        // 表单数据
+        form: { ...defaultForm },
+        timeType: [
+          { value: 1, label: '是' },
+          { value: 0, label: '否' }
         ],
-        textType: [
-        { required: true, message: '请选择参数类型', trigger: 'blur' }
+        statusList: [
+          { label: '工艺', value: 0 },
+          { label: '工序', value: 1 },
+          { label: '产品', value: 2 },
+          { label: '原料', value: 3 },
+          { label: '设备', value: 4 },
+          { label: '其他', value: 5 }
         ],
-        categoryType: [
-          { required: true, message: '请选择参数类别', trigger: 'blur' }
+        tacticsType: [
+          { code: 1, label: '标准时间' },
+          { code: 2, label: '最短时间' }
         ],
-        notNull: [
-          { required: true, message: '请选择是否必填', trigger: 'blur' }
-        ]
-      },
-      // 提交状态
-      loading: false,
-      // 是否是修改
-      isUpdate: false
-    };
-  },
-  computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
-  },
-  methods: {
-    /* 保存编辑 */
-    save() {
-      this.$refs.form.validate((valid) => {
-        this.$refs.form1.validate((va) => {
-          if (!valid || !va) {
-            return false;
-          }
-          this.loading = true;
-          if (!this.isUpdate) {
-            delete this.form.id;
+
+        // 表单验证规则
+        rules: {
+          name: [
+            { required: true, message: '请输入工序名称', trigger: 'blur' }
+          ],
+          code: [
+            { required: true, message: '请输入工序编码', trigger: 'blur' }
+          ],
+
+          unitName: [
+            { required: true, message: '请选择参数单位', trigger: 'change' }
+          ],
+          textType: [
+            { required: true, message: '请选择参数类型', trigger: 'blur' }
+          ],
+          categoryType: [
+            { required: true, message: '请选择参数类别', trigger: 'blur' }
+          ],
+          notNull: [
+            { required: true, message: '请选择是否必填', trigger: 'blur' }
+          ]
+        },
+
+        tableFormRules: {
+          formula: {
+            required: true,
+            message: '请输入公式',
+            trigger: 'blur'
           }
-          const saveOrUpdate = this.isUpdate
-            ? parameter.update
-            : parameter.save;
+        },
 
-          const defaultValue = Number(this.form.defaultValue)
-          const maxValue = Number(this.form.maxValue)
-          const minValue = Number(this.form.minValue)
-          if (defaultValue != '' & maxValue != '') {
-            if (defaultValue > maxValue || defaultValue == maxValue) {
-              this.loading = false;
-              return this.$message.warning('默认值应小于参数上限')
+        // 提交状态
+        loading: false,
+        // 是否是修改
+        isUpdate: false
+      };
+    },
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
+    },
+    methods: {
+      addInterval() {
+        this.form.intervalList.push({ name: '', formula: '' });
+      },
+
+      delInterval(index) {
+        this.form.intervalList.splice(index, 1);
+      },
+
+      /* 保存编辑 */
+      save() {
+        this.$refs.form.validate((valid) => {
+          this.$refs.form1.validate((va) => {
+            if (!valid || !va) {
+              return false;
             }
-          }
-          if (defaultValue != '' & minValue != '') {
-            if (defaultValue < minValue || defaultValue == minValue) {
-              this.loading = false;
-              return this.$message.warning('默认值应大于参数下限')
+            this.loading = true;
+            if (!this.isUpdate) {
+              delete this.form.id;
             }
-          }
-          if (maxValue != '' & minValue != '') {
-            if (maxValue < minValue || maxValue == minValue) {
-              this.loading = false;
-              return this.$message.warning('参数上限应大于参数下限')
+            const saveOrUpdate = this.isUpdate
+              ? parameter.update
+              : parameter.save;
+
+            const defaultValue = Number(this.form.defaultValue);
+            const maxValue = Number(this.form.maxValue);
+            const minValue = Number(this.form.minValue);
+            if ((defaultValue != '') & (maxValue != '')) {
+              if (defaultValue > maxValue || defaultValue == maxValue) {
+                this.loading = false;
+                return this.$message.warning('默认值应小于参数上限');
+              }
             }
-          }
-          if(this.form.textType == 5){
-            this.form.unitName = 'h'
-          }
-          saveOrUpdate(this.form)
-            .then((msg) => {
-              this.loading = false;
-              this.form = {};
-              const info = this.isUpdate ? '修改成功' : '新增成功'
-              this.$message.success(info);
-              this.updateVisible(false);
-              this.$emit('done');
-            })
-            .catch((e) => {
-              this.loading = false;
-              // this.$message.error(e.message);
-            });
+            if ((defaultValue != '') & (minValue != '')) {
+              if (defaultValue < minValue || defaultValue == minValue) {
+                this.loading = false;
+                return this.$message.warning('默认值应大于参数下限');
+              }
+            }
+            if ((maxValue != '') & (minValue != '')) {
+              if (maxValue < minValue || maxValue == minValue) {
+                this.loading = false;
+                return this.$message.warning('参数上限应大于参数下限');
+              }
+            }
+            if (this.form.textType == 5) {
+              this.form.unitName = 'h';
+            }
+            saveOrUpdate(this.form)
+              .then((msg) => {
+                this.loading = false;
+                this.form = {};
+                const info = this.isUpdate ? '修改成功' : '新增成功';
+                this.$message.success(info);
+                this.updateVisible(false);
+                this.$emit('done');
+              })
+              .catch((e) => {
+                this.loading = false;
+                // this.$message.error(e.message);
+              });
+          });
         });
-      });
+      },
+      /* 更新visible */
+      updateVisible(value) {
+        this.$emit('update:visible', value);
+      }
     },
-    /* 更新visible */
-    updateVisible(value) {
-      this.$emit('update:visible', value);
-    }
-  },
 
-  watch: {
-    async visible(visible) {
-      if (visible) {
-        if (this.data) {
-          const res = await parameter.getById(this.data.id);
+    watch: {
+      async visible(visible) {
+        if (visible) {
+          if (this.data) {
+            const res = await parameter.getById(this.data.id);
 
-          this.$util.assignObject(this.form, {
-            ...res
-          });
-          this.isUpdate = true;
+            this.$util.assignObject(this.form, {
+              ...res
+            });
+            this.isUpdate = true;
+          } else {
+            const res = await parameter.getCode();
+            this.form.code = res;
+            this.isUpdate = false;
+          }
         } else {
-          const res = await parameter.getCode();
-          this.form.code = res;
-          this.isUpdate = false;
+          this.$refs.form.clearValidate();
+          this.$refs.form1.clearValidate();
+          
+          this.form = { ...this.defaultForm };
+         this.$set(this.form, 'intervalList', [])
         }
-      } else {
-        this.$refs.form.clearValidate();
-        this.$refs.form1.clearValidate();
-        this.form = { ...this.defaultForm };
       }
     }
-  }
-};
+  };
 </script>
+
+<style lang="scss" scoped>
+  .btn_case {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 6px 0;
+
+    span {
+      display: inline-block;
+      margin: 0 10px;
+      font-size: 18px;
+      cursor: pointer;
+    }
+  }
+</style>

+ 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 ? '时间' : '' }}
+             row.textType == 5 ? '时间' :   row.textType == 6 ? '范围' : '' }}
         </template>