Browse Source

修改禅道上面一体机的bug

ooo 11 months ago
parent
commit
2435f9717e

+ 2 - 1
src/api/prosteps/medias.ts

@@ -19,7 +19,7 @@ export function deleteMedias(ids: string[]) {
 }
 
 //分页查询
-export function pageMedias(proId: string, processId: string) {
+export function pageMedias(proId: string, processId: string,seqNo: string) {
   return request({
     url: "/api/v1/process/media/page",
     method: "post",
@@ -28,6 +28,7 @@ export function pageMedias(proId: string, processId: string) {
       processId,
       pageNum: 1,
       pageSize: 200,
+	  seqNo:seqNo
     },
   });
 }

+ 5 - 2
src/views/pro-steps/components/dianjian.vue

@@ -47,11 +47,13 @@ const getCheckList = async () => {
   //   pageNo: 1,
   // });
   const { data } = await checkList({
-    operationId: 2,
-    processId: 15,
+    operationId: Number(store.odersData.operationId),
+    processId: Number(store.scanInfo.id),
+	seqNo: store.scanInfo.seqNo,
     pageSize: 9999,
     pageNo: 1,
   });
+  // console.log("getCheckList",data)
   checkListData.value = data;
 };
 const updateCheck = async (item, res) => {
@@ -94,6 +96,7 @@ const buhege = async (index) => {
   updateCheck(checkListData.value[index], "2");
 };
 onMounted(() => {
+ console.log('wajajaj')
   getCheckList();
 });
 </script>

+ 8 - 5
src/views/pro-steps/components/duomeiticaiji.vue

@@ -45,6 +45,7 @@ const finish = (value: string) => {
     filePath: value,
     operationMediaId: proStore.odersData.operationId,
     processId: proStore.scanInfo.id,
+    seqNo: proStore.scanInfo.seqNo,
   }).then((res) => {
     getListData();
   });
@@ -55,11 +56,13 @@ onMounted(() => {
 });
 
 const getListData = () => {
-  pageMedias(proStore.odersData.operationId, proStore.scanInfo.id).then(
-    (res) => {
-      medias.value = res.data.records || [];
-    }
-  );
+  pageMedias(
+    proStore.odersData.operationId,
+    proStore.scanInfo.id,
+    proStore.scanInfo.seqNo
+  ).then((res) => {
+    medias.value = res.data.records || [];
+  });
 };
 
 const getImgurl = (item: any) => {

+ 66 - 22
src/views/pro-steps/components/jiluxiang.vue

@@ -8,51 +8,86 @@
               <div class="valueBox">
                 <div class="describeText value">{{ index + 1 }}.记录项:</div>
                 <div class="inputText">
-                  <el-input :disabled="item.addStatus == false && item.updateStatus == false
-                    " v-model="item.label" style="width: 240px" placeholder="请输入" />
+                  <el-input
+                    :disabled="
+                      item.addStatus == false && item.updateStatus == false
+                    "
+                    v-model="item.label"
+                    style="width: 240px"
+                    placeholder="请输入"
+                  />
                 </div>
               </div>
               <div class="valueBox">
                 <div class="describeText value">内容:</div>
                 <div class="inputText">
-                  <el-input :disabled="item.addStatus == false && item.updateStatus == false
-                    " v-model="item.inputValue" type="textarea" placeholder="请输入" maxlength="1000" />
+                  <el-input
+                    :disabled="
+                      item.addStatus == false && item.updateStatus == false
+                    "
+                    v-model="item.inputValue"
+                    type="textarea"
+                    placeholder="请输入"
+                    maxlength="1000"
+                  />
                 </div>
               </div>
             </div>
             <div class="operate">
               <div class="iconBox">
-                <div class="operateText" v-if="item.addStatus == false &&
-                  index == listData.length - 1 &&
-                  item.updateStatus == false
-                  " @click="addFnc">
+                <div
+                  class="operateText"
+                  v-if="
+                    item.addStatus == false &&
+                    index == listData.length - 1 &&
+                    item.updateStatus == false
+                  "
+                  @click="addFnc"
+                >
                   增加
                 </div>
-                <div v-if="item.addStatus == false && item.updateStatus == false" class="operateText"
-                  @click="deleteFnc(item.id, index)">
+                <div
+                  v-if="item.addStatus == false && item.updateStatus == false"
+                  class="operateText"
+                  @click="deleteFnc(item.id, index)"
+                >
                   删除
                 </div>
-                <div v-if="item.addStatus == false && item.updateStatus == false" class="operateText"
-                  @click="updateFnc(item)">
+                <div
+                  v-if="item.addStatus == false && item.updateStatus == false"
+                  class="operateText"
+                  @click="updateFnc(item)"
+                >
                   编辑
                 </div>
-                <div v-if="item.addStatus == true || item.updateStatus == true" class="operateText"
-                  @click="isOkFnc(item, index)">
+                <div
+                  v-if="item.addStatus == true || item.updateStatus == true"
+                  class="operateText"
+                  @click="isOkFnc(item, index)"
+                >
                   完成
                 </div>
-                <div v-if="item.addStatus == true || item.updateStatus == true" class="operateText"
-                  @click="cancelFnc(index, item)">
+                <div
+                  v-if="item.addStatus == true || item.updateStatus == true"
+                  class="operateText"
+                  @click="cancelFnc(index, item)"
+                >
                   取消
                 </div>
               </div>
             </div>
           </div>
-          <div @click="addFnc" class="operateBox" v-if="listData.length < 1" style="
+          <div
+            @click="addFnc"
+            class="operateBox"
+            v-if="listData.length < 1"
+            style="
               height: 80px;
               display: flex;
               align-items: center;
               justify-content: center;
-            ">
+            "
+          >
             <el-icon size="30">
               <Plus />
             </el-icon>
@@ -65,8 +100,11 @@
     <div class="recordBody" v-if="submitStatus == false">
       <div class="left" v-if="listData.length > 0">
         <el-scrollbar>
-          <div @click="showSelectIndex = index" :class="index == showSelectIndex ? 'infoBox active' : 'infoBox'"
-            v-for="(item, index) in listData">
+          <div
+            @click="showSelectIndex = index"
+            :class="index == showSelectIndex ? 'infoBox active' : 'infoBox'"
+            v-for="(item, index) in listData"
+          >
             <div>
               <div class="titleText">记录项名:</div>
               <div class="describeText">{{ item.label }}</div>
@@ -90,13 +128,16 @@
           </div>
         </el-scrollbar>
       </div>
-      <div style="
+      <div
+        style="
           height: 100%;
           width: 100%;
           display: flex;
           justify-content: center;
           align-items: center;
-        " v-if="listData.length == 0">
+        "
+        v-if="listData.length == 0"
+      >
         <Empty />
       </div>
     </div>
@@ -131,6 +172,7 @@ const getListData = async () => {
     pageNo: 1,
     pageSize: 9999,
     processId: Number(store.scanInfo.id),
+    seqNo: store.scanInfo.seqNo,
     operationRecordItemId: Number(store.odersData.operationId),
   });
   listData.value = data.records;
@@ -145,6 +187,7 @@ const item = {
   updateInputValue: "",
   updateLabel: "",
   processId: Number(store.scanInfo.id),
+  seqNo: store.scanInfo.seqNo,
   operationRecordItemId: Number(store.odersData.operationId),
   addStatus: true,
   updateStatus: false,
@@ -198,6 +241,7 @@ const isOkFnc = async (item, index) => {
       inputValue: item.inputValue,
       label: item.label,
       processId: Number(store.scanInfo.id),
+      seqNo: store.scanInfo.seqNo,
       operationRecordItemId: Number(store.odersData.operationId),
     });
     if (code == "200") {

+ 5 - 1
src/views/pro-steps/components/wuliaocaiji.vue

@@ -57,7 +57,8 @@ const enterfnc = async () => {
   const { code, data } = await searchMaterial({
     operationId: store.odersData.operationId,
     processId: store.scanInfo.id,
-    seqNo: scanCode.value,
+    seqNo: store.scanInfo.seqNo,
+	scanCode: scanCode.value,
     workOrderCode: store.odersData.workOrderCode,
   });
   if (code == "200") {
@@ -100,6 +101,7 @@ const submitRecordAdd = async (index) => {
     operationId: store.odersData.operationId,
     processId: store.scanInfo.id,
     num: chooseData.num,
+	seqNo: store.scanInfo.seqNo,
     trackBy: "S",
     workOrderCode: store.odersData.workOrderCode,
   });
@@ -116,9 +118,11 @@ const submit = () => {
 
 //获取tag列表数据
 const getOpCompentData = async () => {
+	console.log('store.scanInfo',store.scanInfo.seqNo)
   const { data } = await recordList({
     operationId: store.odersData.operationId,
     workOrderCode: store.odersData.workOrderCode,
+	seqNo: store.scanInfo.seqNo,
     pageNo: 1,
     pageSize: 9999,
   });