dengrui 7 місяців тому
батько
коміт
0e4aae36cc

+ 1 - 0
src/views/pro-operation/inspect/components/checkForm.vue

@@ -81,6 +81,7 @@ defineExpose({
   setFileList,
   formRef,
   fileName,
+  getSeq,
 });
 </script>
 

+ 10 - 5
src/views/pro-operation/inspect/index.vue

@@ -70,7 +70,7 @@
           <el-table-column label="检验项内容" prop="checkContent" />
           <el-table-column label="流转卡号" prop="seqNo" />
           <el-table-column label="备注" prop="remark" />
-          <el-table-column label="附件" prop="filePath">
+          <!-- <el-table-column label="附件" prop="filePath">
             <template #default="scope">
               <span
                 v-if="scope.row.filePath"
@@ -80,7 +80,7 @@
               >
               <span v-else>无附件</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="结果" prop="result">
             <template #default="scope">
               <span
@@ -124,7 +124,7 @@
         </div>
         <div></div>
       </div>
-      <div v-if="editStatus" class="content">
+      <div v-show="editStatus" class="content">
         <div class="form">
           <div class="formContent">
             <el-scrollbar style="height: calc(100vh - 200px); padding: 20px">
@@ -164,9 +164,13 @@ const checkName = ref(null);
 const checkType = ref("first_check");
 const editStatus = ref(false);
 const editCheck = async (row) => {
-  editStatus.value = true;
   editType.value = "edit";
-  formData.value = row;
+  formData.value.checkContent = row.checkContent;
+  formData.value.checkName = row.checkName;
+  formData.value.result = row.result;
+  formData.value.remark = row.remark;
+  formData.value.seqNoList = [processStore.useSeqNo];
+  editStatus.value = true;
   if (row.filePath) {
     setTimeout(() => {
       formRef.value.setFileList([{ name: row.fileName }]);
@@ -184,6 +188,7 @@ const downLoad = async (url) => {
 };
 const addCheck = () => {
   formData.value = { ...checkObj };
+  formRef.value.getSeq();
   editStatus.value = true;
   editType.value = "add";
 };

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

@@ -13,19 +13,23 @@
   </div>
   <div v-else class="materialInfoBody">
     <div
-      v-for="item in opCompentDataList"
-      :class="[item.needNum - item.realNum === 0 ? 'infoMsg infoMsgImg blueBgClass' : 'infoMsg whiteBgClass']"
-
+      v-for="(item, index) in opCompentDataList"
+      :class="[
+        item.needNum - item.realNum === 0
+          ? 'infoMsg infoMsgImg blueBgClass'
+          : 'infoMsg whiteBgClass',
+      ]"
+      :key="index"
       @click="toXQPop(item)"
     >
       <div class="leftMsg">
         <div class="nameMsg">{{ item.itemName }}</div>
         <div class="describe">{{ item.itemCode }}</div>
         <div class="describe">{{ item.itemModel }}</div>
-        <div class="describe">需求:{{ item.needNum }}</div>
+        <div class="describe">需求:{{ Number(item.needNum) }}</div>
       </div>
       <div v-if="item.needNum - item.realNum != 0" class="rightMsg">
-        <div class="sum">{{ item.needNum - item.realNum }}</div>
+        <div class="sum">{{ Number(item.needNum) - Number(item.realNum) }}</div>
         <div class="describe">还需采集</div>
       </div>
       <svg-icon class="svgStyle" icon-class="jiaobiao" size="25" />
@@ -44,7 +48,7 @@
   />
 </template>
 
-<script lang="ts" setup>
+<script setup>
 import ScanCodeInput from "@/components/ScanCodeInput/index.vue";
 import caijiRightPopUp from "../popUpView/caijiRightPopUp.vue";
 import xiangqingPopUp from "../popUpView/xiangqingPopUp.vue";
@@ -89,7 +93,7 @@ const enterfnc = async () => {
 };
 const opCompentDataList = ref([]);
 //通过id获取详情
-const getInfoById = async (item: any) => {
+const getInfoById = async (item) => {
   const { data } = await getInfo({
     itemCode: item.itemCode,
     opId: store.odersData.operationId,
@@ -98,7 +102,7 @@ const getInfoById = async (item: any) => {
   showInfoData.value = data;
   showInfo.value = item;
 };
-const toXQPop = async (item: any) => {
+const toXQPop = async (itemName) => {
   await getInfoById(item);
   showXQ.value = true;
 };
@@ -172,7 +176,6 @@ onMounted(() => {
     background-position: right top;
     background-repeat: no-repeat;
     background-size: 100px 100px;
-
   }
 
   .blueBgClass {