chencc 1 an în urmă
părinte
comite
ef12a264ba

+ 1 - 1
src/utils/permission.js

@@ -2,7 +2,7 @@
  * 按钮级权限控制
  */
 import store from '@/store';
-
+console.log(store,'store');
 /* 数组是否有某些值 */
 const arrayHas = function (array, value) {
   if (!value) {

+ 3 - 3
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -431,7 +431,7 @@
 
       <el-button type="primary" size="small" @click="save('close')">{{
         isView ? '确定' : '保存并关闭'
-      }}</el-button>
+        }}</el-button>
       <el-button size="small" @click="handleClose">关闭</el-button>
     </div>
   </el-dialog>
@@ -1280,13 +1280,13 @@ export default {
       this.selection = [];
     },
     save(type) {
-      if(this.activeName=='材料定额'){
+      if (this.activeName == '材料定额') {
 
       }
 
       this.$refs.form.validate((valid) => {
         let isYs = true;
-        if(this.activeName=='材料定额'){
+        if (this.activeName == '材料定额') {
           isYs = valid
         }
         if (isYs) {

+ 6 - 3
src/views/material/BOMmanage/qualityTesting/term.vue

@@ -34,8 +34,8 @@
       <template v-slot:defaultValue="{ row }">
         <div style="width: 100%; display: flex; justify-content: space-between">
           <div style="width: 8%">
-
-            <el-input v-model="row.symbol" :disabled="isView"> </el-input>
+            <DictSelection style="width: 100px" clearable dictName="数学字符" v-model="row.symbol"></DictSelection>
+            <!-- <el-input v-model="row.symbol" :disabled="isView"> </el-input> -->
           </div>
           <!-- 上下限 -->
           <div v-if="row.textType == 3" style="
@@ -46,6 +46,7 @@
             ">
             <el-input style="width: 45%" v-model="row.minValue" :disabled="isView"></el-input>
             <span>&nbsp;&nbsp;-</span>
+            
             <el-input style="width: 45%; margin-left: 10px" v-model="row.maxValue" :disabled="isView"></el-input>
           </div>
 
@@ -55,7 +56,9 @@
           </div>
 
           <div style="width: 15%">
-            <el-input v-model="row.unit" :disabled="isView"> </el-input>
+            <DictSelection dictName="工艺参数单位" clearable filterable v-model="row.unit">
+            </DictSelection>
+            <!-- <el-input v-model="row.unit" :disabled="isView"> </el-input> -->
           </div>
         </div>
       </template>