Bladeren bron

修改禅道的bug

ooo 1 jaar geleden
bovenliggende
commit
7da6010309

+ 12 - 6
src/views/pro-steps/components/dianjian.vue

@@ -18,12 +18,18 @@
         <div class="operate">
           <div class="describeText operateText">结果</div>
           <div class="operateBox">
-            <div class="operateBtn" @click="hege(index)"
-              :style="item.result == '1' ? setBoxStatus('1') : setBoxStatus('')">
+            <div
+              class="operateBtn"
+              @click="hege(index)"
+              :style="item.result == '1' ? setBoxStatus('1') : setBoxStatus('')"
+            >
               合格
             </div>
-            <div class="operateBtn" @click="buhege(index)"
-              :style="item.result == '2' ? setBoxStatus('2') : setBoxStatus('')">
+            <div
+              class="operateBtn"
+              @click="buhege(index)"
+              :style="item.result == '2' ? setBoxStatus('2') : setBoxStatus('')"
+            >
               不合格
             </div>
           </div>
@@ -49,7 +55,7 @@ const getCheckList = async () => {
   const { data } = await checkList({
     operationId: Number(store.odersData.operationId),
     processId: Number(store.scanInfo.id),
-	seqNo: store.scanInfo.seqNo,
+    seqNo: store.scanInfo.seqNo,
     pageSize: 9999,
     pageNo: 1,
   });
@@ -96,7 +102,7 @@ const buhege = async (index) => {
   updateCheck(checkListData.value[index], "2");
 };
 onMounted(() => {
- console.log('wajajaj')
+  console.log("wajajaj");
   getCheckList();
 });
 </script>

+ 14 - 5
src/views/pro-steps/components/shebeijilu.vue

@@ -10,7 +10,12 @@
       </div>
       <!-- 变量控制样式 -->
       <div class="footerBtn">
-        <el-button v-if="!item.equitCode" class="bottomBtn" style="background-color: #0a59f7">点击扫描设备</el-button>
+        <el-button
+          v-if="!item.equitCode"
+          class="bottomBtn"
+          style="background-color: #0a59f7"
+          >点击扫描设备</el-button
+        >
         <div v-else class="infoBox">
           <div class="info">
             <div>
@@ -46,11 +51,13 @@ const store = useProcessStore();
 const equitListData = ref([]);
 const getEquitList = async () => {
   const { data } = await equitList({
-    operationId: 5,
-    processId: 2,
+    seqNo: store.scanInfo.seqNo,
+    operationId: store.odersData.operationId,
+    processId: store.scanInfo.id,
     pageSize: 9999,
     pageNo: 1,
   });
+  equitListData.value = data;
 };
 const equitCheck = async () => {
   await equitUpdate({});
@@ -71,9 +78,11 @@ onMounted(() => {
   flex-direction: column;
   justify-content: space-between;
 
-  .headerText {}
+  .headerText {
+  }
 
-  .describeBox {}
+  .describeBox {
+  }
 
   //按钮样式
   .footerBtn {

+ 26 - 9
src/views/pro-steps/components/wuliaocaiji.vue

@@ -4,13 +4,21 @@
   </div>
   <div class="showCodeBody" v-if="opCompentDataList.length < 1">
     <div class="codeBox">
-      <img src="@/assets/icons/shaoma.svg" style="width: 134px; height: 134px" />
+      <img
+        src="@/assets/icons/shaoma.svg"
+        style="width: 134px; height: 134px"
+      />
       <div class="codeText">扫码物料码添加物料</div>
     </div>
   </div>
   <div class="materialInfoBody" v-else>
-    <div :class="item.needNum - item.realNum == 0 ? 'infoMsg infoMsgImg' : 'infoMsg'
-      " v-for="item in opCompentDataList" @click="toXQPop(item)">
+    <div
+      :class="
+        item.needNum - item.realNum == 0 ? 'infoMsg infoMsgImg' : 'infoMsg'
+      "
+      v-for="item in opCompentDataList"
+      @click="toXQPop(item)"
+    >
       <div class="leftMsg">
         <div class="nameMsg">{{ item.itemName }}</div>
         <div class="describe">{{ item.itemModel }}</div>
@@ -23,8 +31,17 @@
       <svg-icon icon-class="jiaobiao" size="25" class="svgStyle" />
     </div>
   </div>
-  <xiangqingPopUp v-model="showXQ" :showInfoData="showInfoData" :showInfo="showInfo" />
-  <caijiRightPopUp v-model="showCJ" @submit="submit" ref="caijiRef" :seqNo="scanCode" />
+  <xiangqingPopUp
+    v-model="showXQ"
+    :showInfoData="showInfoData"
+    :showInfo="showInfo"
+  />
+  <caijiRightPopUp
+    v-model="showCJ"
+    @submit="submit"
+    ref="caijiRef"
+    :seqNo="scanCode"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -58,7 +75,7 @@ const enterfnc = async () => {
     operationId: store.odersData.operationId,
     processId: store.scanInfo.id,
     seqNo: store.scanInfo.seqNo,
-	scanCode: scanCode.value,
+    scanCode: scanCode.value,
     workOrderCode: store.odersData.workOrderCode,
   });
   if (code == "200") {
@@ -101,7 +118,7 @@ const submitRecordAdd = async (index) => {
     operationId: store.odersData.operationId,
     processId: store.scanInfo.id,
     num: chooseData.num,
-	seqNo: store.scanInfo.seqNo,
+    seqNo: store.scanInfo.seqNo,
     trackBy: "S",
     workOrderCode: store.odersData.workOrderCode,
   });
@@ -118,11 +135,11 @@ const submit = () => {
 
 //获取tag列表数据
 const getOpCompentData = async () => {
-	console.log('store.scanInfo',store.scanInfo.seqNo)
+  console.log("store.scanInfo", store.scanInfo.seqNo);
   const { data } = await recordList({
     operationId: store.odersData.operationId,
     workOrderCode: store.odersData.workOrderCode,
-	seqNo: store.scanInfo.seqNo,
+    seqNo: store.scanInfo.seqNo,
     pageNo: 1,
     pageSize: 9999,
   });