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

src/views/base/apply/index.vue

@@ -189,27 +189,24 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    {
-      label: "是否H级",
-      prop: "hOrder",
-      rules: [
-        {
-          required: true,
-          message: "请选择文件",
-          trigger: "blur",
-        },
-      ],
-      dicData: [
-        {
-          label: "是",
-          value: "1",
-        },
-        {
-          label: "否",
-          value: "0",
-        },
-      ],
-    },
+      {
+          label: "质量等级",
+          prop: "hOrder",
+          search: true,
+          width: 100,
+          overHidden: true,
+          filterable: true,
+          type: "select",
+          dicData: dicts.quality_grade,
+          props: { label: "dictLabel", value: "dictValue" },
+          rules: [
+              {
+                  required: true,
+                  message: "请选择质量等级",
+                  trigger: "blur",
+              },
+          ],
+      },
   ],
 });
 watch(

src/views/base/check/index.vue

@@ -186,25 +186,22 @@ option.value = Object.assign(option.value, {
       ],
     },
     {
-      label: "是否H级",
+      label: "质量等级",
       prop: "hOrder",
+      search: true,
+      width: 100,
+      overHidden: true,
+      filterable: true,
+      type: "select",
+      dicData: dicts.quality_grade,
+      props: { label: "dictLabel", value: "dictValue" },
       rules: [
         {
           required: true,
-          message: "请选择文件",
+          message: "请选择质量等级",
           trigger: "blur",
         },
       ],
-      dicData: [
-        {
-          label: "是",
-          value: "1",
-        },
-        {
-          label: "否",
-          value: "0",
-        },
-      ],
     },
   ],
 });

src/views/base/craftManagement/process/index.vue

@@ -316,7 +316,7 @@ option.value = Object.assign(option.value, {
         },
       ],
     },
-    {
+    /*{
       label: "后置时间(分)",
       prop: "forceTime",
       type: "number",
@@ -328,7 +328,7 @@ option.value = Object.assign(option.value, {
           trigger: "blur",
         },
       ],
-    },
+    },*/
     /*{
       label: "标准机时",
       prop: "timeingNum",

src/views/base/craftManagement/route/bindConfig.ts

@@ -128,7 +128,7 @@ export const formOption = {
       //   },
       // ],
     },*/
-    {
+    /*{
       label: "后置时间",
       prop: "forceTime",
       span: 24,
@@ -142,7 +142,7 @@ export const formOption = {
         },
       ],
       // slot:true, // 自定义列
-    },
+    },*/
     /*{
       label: "是否外协",
       prop: "outsourcing",

src/views/base/craftManagement/route/index.vue

@@ -774,7 +774,6 @@ option.value = Object.assign(option.value, {
     {
       label: "主分支编码",
       prop: "mainCode",
-      search: true,
       width: 150,
       hide: true,
       display: false,

src/views/plan/filtersheet/index.vue

@@ -16,9 +16,9 @@
           {{ scope.row.seqNoList.join(", ") }}
         </template>
       </el-table-column> -->
-      <el-table-column prop="hOrder" label="H级">
+      <el-table-column prop="hOrder" label="质量等级">
         <template #default="{ row }">
-          {{ row.hOrder == "1" ? "是" : "否" }}
+          {{ queryDict(row.hOrder) }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -189,6 +189,7 @@ import {
   delFilter,
   getProExcel,
 } from "@/api/plan";
+import {useDictionaryStore} from "@/store";
 const updateTitle = ref("筛选单详情");
 const tableData = ref([]);
 const formRef = ref(null);
@@ -197,6 +198,7 @@ const ExDataObj = ref({});
 const workOderShow = ref(false);
 const showProList = ref([]);
 const showSeqList = ref([]);
+const { dicts } = useDictionaryStore();
 const showSeq = (seqs) => {
   showSeqList.value = seqs;
   dialog2.visible = true;
@@ -244,6 +246,13 @@ const submit = async () => {
     }
   });
 };
+const queryDict = (dictValue) =>{
+  for(var i = 0;i<dicts.quality_grade.length;i++){
+    if(dicts.quality_grade[i].dictValue===dictValue){
+         return  dicts.quality_grade[i].dictLabel;
+    }
+  }
+}
 const closeShow = () => {
   workOderShow.value = false;
 };

src/views/pro/baseoperation/index.vue

@@ -234,11 +234,11 @@ option.value = Object.assign(option.value, {
       prop: "mergeNum",
       search: false,
     },
-    {
+    /*{
       label: "前置时间",
       prop: "forceTime",
       search: false,
-    },
+    },*/
     {
       label: "外协时间",
       prop: "outTime",