jiaxiaoqiang 3 месяцев назад
Родитель
Сommit
5e7a98d9b5

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

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

+ 14 - 6
src/views/pro-steps/components/duomeiticaiji.vue

@@ -37,7 +37,12 @@
 
 <script lang="ts" setup>
 import { useProcessStore } from "@/store";
-import { addMedia, deleteMedias, pageMedias } from "@/api/prosteps/medias";
+import {
+  addMedia,
+  deleteMedias,
+  pageMedias,
+  pageMediasV2,
+} from "@/api/prosteps/medias";
 
 import CameraUpload from "@/components/Upload/CameraUpload.vue";
 
@@ -68,11 +73,13 @@ onMounted(() => {
 });
 
 const getListData = () => {
-  pageMedias(
-    proStore.odersData.operationId,
-    proStore.scanInfo.id,
-    proStore.scanInfo.seqNo
-  ).then((res: any) => {
+  let p = {
+    workOrderCode: proStore.scanInfo.workOrderCode,
+    operationId: proStore.scanInfo.operationId,
+    processId: proStore.scanInfo.id,
+    seqNo: proStore.scanInfo.seqNo,
+  };
+  pageMediasV2(p).then((res: any) => {
     medias.value = res.data.records || [];
     urlList.value = res.data.records.map((item: any) => {
       return import.meta.env.VITE_APP_UPLOAD_URL + item.filePath;
@@ -89,6 +96,7 @@ const clickReset = () => {
   medias.value.forEach((item: any) => {
     item.isSelected = false;
   });
+  getListData();
 };
 
 const clickDeleteAll = () => {

+ 14 - 0
src/views/process/components/order.vue

@@ -49,6 +49,7 @@
       {{ dictS.getLableByValue("plan_work_order_state", item.workOrderState) }}
     </div>
     <div class="water-box" v-if="item?.waterVapor == '1'">水汽</div>
+    <div class="dpa-box" v-if="item?.dpa == '1'">DPA</div>
   </div>
 </template>
 
@@ -195,4 +196,17 @@ const planStyle = (val) => {
   background-color: $select-hover;
   font-size: $f14;
 }
+.dpa-box {
+  position: absolute;
+  top: 0;
+  right: 65px;
+  width: 60px;
+  height: 30px;
+  border-radius: 0 10px 0 10px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: $select-hover;
+  font-size: $f14;
+}
 </style>