【nev-pc】现场问题更改

fe/PC/src/filters/status.js

@@ -2272,10 +2272,10 @@ export function SupplierAsnCtypeStaBack(name){
       value: '不合格',
       label: '不合格'
     },
-    '不涉及': {
+    // '不涉及': {
-      value: '不涉及',
+    //   value: '不涉及',
-      label: '不涉及'
+    //   label: '不涉及'
-    },
+    // },
   }
   return Enum(type, index, prop)
 }

fe/PC/src/utils/tableColumns/index.js

@@ -130,8 +130,8 @@ export const AQL = [
   { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
   { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true },
   { label: _Names.floorQty, prop: "floorQty",isNumber:true},
-  { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
+  // { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
-  { label: _Names.samplePercent, prop: 'samplePercent' },
+  // { label: _Names.samplePercent, prop: 'samplePercent' },
   { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true },
   { label: _Public.remark, prop: "remark" },
   { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },

fe/PC/src/utils/tabsDesTions/index.js

@@ -89,8 +89,8 @@ export const AQL =  [
   { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
   { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true },
   { label: _Names.floorQty, prop: "floorQty",isNumber:true},
-  { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
+  // { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
-  { label: _Names.samplePercent, prop: 'samplePercent' },
+  // { label: _Names.samplePercent, prop: 'samplePercent' },
   { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true },
   { label: _Public.remark, prop: "remark" },
   { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },

fe/PC/src/views/basicData/ItemsManage/AQL.vue

@@ -199,8 +199,8 @@ export default {
         { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'pointNumber', colSpan: 12 },
-        { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        // { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
@@ -214,8 +214,8 @@ export default {
         { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'pointNumber', colSpan: 12 },
-        { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        // { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
@@ -224,24 +224,24 @@ export default {
           supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
           ceilingQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           floorQty: [{ required: true, trigger: "blur", message: "不可为空" }],
-          samplePercent: [
+          // samplePercent: [
-            // { validator:numberValidate, trigger: "blur"},
+          //   // { validator:numberValidate, trigger: "blur"},
-            { required: true, trigger: "blur",message: "不可为空"},
+          //   { required: true, trigger: "blur",message: "不可为空"},
-          ],
+          // ],
           sampleQty: [{ required: true, trigger: "blur", message: "不可为空" }],
-          isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" },],
           supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
           ceilingQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           floorQty: [{ required: true, trigger: "blur", message: "不可为空" }],
-          samplePercent: [
+          // samplePercent: [
-            // { validator:numberValidate, trigger: "blur"},
+          //   // { validator:numberValidate, trigger: "blur"},
-            { required: true, trigger: "blur",message: "不可为空"},
+          //   { required: true, trigger: "blur",message: "不可为空"},
-          ],
+          // ],
           sampleQty: [{ required: true, trigger: "blur", message: "不可为空" }],
-          isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };

fe/PC/src/views/systemManage/userWorkGroup.vue

@@ -58,6 +58,12 @@
               sortable="custom"
             />
             <el-table-column
+              prop="name"
+              label="名称"
+              width="180"
+              sortable="custom"
+            />
+            <!-- <el-table-column
               prop="email"
               label="邮箱"
               align="left"
@@ -69,7 +75,7 @@
               sortable="custom"
               align="left"
               width="180"
-            >
+            > -->
             </el-table-column>
             <!-- <el-table-column prop="address" label="创建时间" />
         <el-table-column prop="address" label="编辑" /> -->