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

src/views/pro-operation/remove/index.vue

@@ -22,7 +22,12 @@
           </el-table-column>
           <el-table-column label="操作">
             <template #default="{ row }">
-              <el-button v-if="row.state != '1'&&row.state!=3" link type="danger" @click="del(row.id)" style="font-size: 20px"
+              <el-button
+                v-if="row.state != '1' && row.state != 3"
+                link
+                type="danger"
+                @click="del(row.id)"
+                style="font-size: 20px"
                 >删除</el-button
               >
             </template>
@@ -126,7 +131,7 @@
                 value-format="YYYY-MM-DD"
               />
             </el-form-item>
-<!--            <el-form-item
+            <!--            <el-form-item
               label="指定检验人"
               prop="remark2[user2]"
               :rules="{
@@ -159,7 +164,7 @@ import { addRework, addRework1, getList, getList1, delError } from "@/api/rework
 import { useProcessStore } from "@/store/modules/processView";
 import { useDictionaryStore } from "@/store/modules/dictionary";
 import { getUserTree } from "@/api/user/index";
-import {getunProcessedList} from "@/api/prosteps/index.js";
+import { getunProcessedList } from "@/api/prosteps/index.js";
 const dictStroe = useDictionaryStore();
 const processStore = useProcessStore();
 const ruleForm = ref({
@@ -177,7 +182,7 @@ const ruleForm1 = ref({
 });
 const tableData = ref([]);
 
-const processList=ref([]);
+const processList = ref([]);
 const toAdd = () => {
   formStatus.value = false;
   /*breakReportInfoById(processStore.scanInfo.id).then((res) => {
@@ -221,6 +226,7 @@ const getPagination1 = async () => {
     pageNo: page.value,
     pageSize: limit.value,
     workOrderCode: processStore.odersData.workOrderCode,
+    operationId: processStore.scanInfo.operationId,
   });
   tableData.value = data.records;
   total.value = data.totalCount;

src/views/pro-operation/report-work/index.vue

@@ -188,8 +188,13 @@ const handleCheckAll = (person) => {
   person.selectedProcess = [];
   if (person.checkAll) {
     person.selectedProcess = process.value;
+    person.startSelect = 1;
+    person.endSelect = person.selectedProcess.length;
+    minusCount.value = person.selectedProcess.length;
   } else {
     person.selectedProcess = [];
+    person.startSelect = null;
+    person.endSelect = null;
   }
 };
 

src/views/pro-steps/components/operates.vue

@@ -115,10 +115,10 @@ const stepComponents = ref([
     compentName: "印刷板",
     compentType: "printboard",
   },
-  // {
-  //   compentName: "检验批号",
-  //   compentType: "jianyanpihao",
-  // },
+  {
+    compentName: "产品文档",
+    compentType: "pdmfile",
+  },
 ]);
 const setComponents = () => {
   // if (store.scanInfo.inspection == 1 || store.scanInfo.firstCheck == 1) {
@@ -130,22 +130,17 @@ const setComponents = () => {
   //     compentType: "xunjian",
   //   });
   // }
-  if (store.processInfo.documentShow == 1) {
-    stepComponents.value = stepComponents.value.filter(
-      (item) => item.compentName !== "产品文档"
-    );
-    stepComponents.value.push({
-      compentName: "产品文档",
-      compentType: "pdmfile",
-    });
-  }
-  if (
-    store.odersData.operationType == "SX" ||
-    store.odersData.operationType == "RX"
-  ) {
-    stepComponents.value = stepComponents.value.filter(
-      (item) => item.compentName !== "返工"
-    );
+  // if (store.processInfo.documentShow == 1) {
+  //   stepComponents.value = stepComponents.value.filter(
+  //     (item) => item.compentName !== "产品文档"
+  //   );
+  //   stepComponents.value.push({
+  //     compentName: "产品文档",
+  //     compentType: "pdmfile",
+  //   });
+  // }
+  if (store.odersData.operationType == "SX" || store.odersData.operationType == "RX") {
+    stepComponents.value = stepComponents.value.filter((item) => item.compentName !== "返工");
   }
 };
 onMounted(async () => {