优化app界面

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java

@@ -126,4 +126,7 @@ public class ProcessDesignRespVO {
     @Schema(description = "项目状态")
     private Integer planStatus;
 
+    @Schema(description = "图纸链接")
+    private String blueprintLink;
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java

@@ -132,4 +132,8 @@ public class ProcessDesignDO extends BaseDO {
     @TableField(exist = false)
     private Integer planStatus;
 
+    @TableField(exist = false)
+    private String blueprintLink;
+
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java

@@ -33,7 +33,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
                 .select("b.blank_date as blankDate", "b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate")
                 .select("u3.nickname as blankOwnerName", "u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName")
                 .select("c.name as projectSubName", "b.project_sub_code as projectSubCode")
-                .select("z.progress")
+                .select("z.progress,z.blueprint_link as blueprintLink ")
                 .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId)
                 .leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.project_sub_id = t.project_sub_id")
                 .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId)
@@ -44,7 +44,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
                 .leftJoin("system_users u3 on u3.id = b.blank_owner")
                 .leftJoin("system_users u4 on u4.id = b.two_dim_owner")
                 .leftJoin("system_users u5 on u5.id = b.three_dim_owner")
-                .leftJoin("(select progress,process_design_id FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id")
+                .leftJoin("(select progress,process_design_id,blueprint_link FROM pro_process_design_progress where id in (select max(id) FROM pro_process_design_progress GROUP BY process_design_id) ) z on z.process_design_id = t.id")
                 .orderByDesc(ProcessDesignDO::getId)
                 .disableSubLogicDel();
         query.like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode())

mes-ui/mini-app/src/pages/moJuSheJiReport/components/dataItem.vue

@@ -5,6 +5,7 @@ import { getListAPI, getDictAPI,postOperateAPIZF,updateBaoGong } from '@/service
 import { useLoginStore } from '@/stores/modules/login'
 import { formatDate } from '@/utils/index'
 import popup from './popup.vue';
+import { nextTick } from 'vue';
 
 
 const userStore = useLoginStore() 
@@ -15,6 +16,8 @@ const isFinish = ref(false)
 // 是否触发下拉刷新
 const isTriggered = ref(false)
 const progress = ref(0)
+const imageLink = ref(0)
+
 const selectedId = ref(null);  // 定义 selectedId 变量
 
 // 定义 porps
@@ -126,8 +129,10 @@ onShow(async () => {
 
 
 
-const handleDetail = (item) => {
+const handleDetail =async  (item) => { 
 	progress.value = 0;
+	imageLink.value = item.blueprintLink;
+	await nextTick(); // 等待数据更新和DOM渲染
 	 showPopup.value = true;
 	selectedId.value = item.id;  // 为 selectedId 赋值
  /* const url = `/pages/zjPgMaster/zjPgMaster-detail?id=${item.id}`
@@ -216,7 +221,7 @@ const onRefresherrefresh = async () => {
       </view>
     </scroll-view>
 	<!-- <popup  :show="showPopup" :progress="0.0" :imageLink="''" @close="onPopupClose" /> -->
-	 <popup :showPopup="showPopup" :progress="progress" :imageLink="''" @close="onPopupClose" /> 
+	 <popup :showPopup="showPopup" :progress="progress" :imageLink="imageLink" @close="onPopupClose" />   
   </view>
 </template>
 

mes-ui/mini-app/src/pages/moJuSheJiReport/components/popup.vue

@@ -2,8 +2,10 @@
     <view class="popup-container" v-if="showPopup">
         <view class="popup-mask" @click="onMaskClick"></view>
         <view class="popup-content">
-            <input type="number" class="progress-info" v-model="progress" placeholder="请输入进度">
+			<text class="popup-title">进度百分比%:</text>
-            <input type="text" class="image-info" v-model="imageLink" placeholder="请输入图片链接">
+            <input type="number" class="popup-input" v-model="progress" placeholder="请输入进度">
+			<view class="product-item">图纸链接</view>
+            <input type="text" class="popup-input" v-model="imageLink" placeholder="请输入图片链接">
             <button @click="onClose">确认上报</button>
         </view>
     </view>   
@@ -16,11 +18,15 @@ const props = defineProps({
     showPopup: {
         type: Boolean,
         default: false
-    }   
+    },
+	imageLink:{
+		type:String,
+		default:'123'
+	}
 });
    
 const progress = ref(0);   
-const imageLink = ref('');
+  const imageLink = ref(0);
    
 const emit = defineEmits(['close']);
    
@@ -36,6 +42,10 @@ const onClose = () => {
 </script>
    
 <style scoped>   
+  .popup-title {
+    margin-bottom: 20px;
+    
+  }
 .popup-container {
     position: fixed;
     top: 0;
@@ -63,6 +73,8 @@ const onClose = () => {
     padding: 20px;
     border-radius: 10px;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+	width: 300px;
+	height: 300px;
 }
    
 .progress-info {

mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue

@@ -18,7 +18,7 @@ const props = defineProps<{
 }>()
 
 const statusText = computed(() => {
-  const text = props.orderState == '0' ? '检查' : '查看'
+  const text = props.orderState == '0' ? '检验' : '查看'
   return text
 })
 // 是否加载中标记，用于防止滚动触底触发多次请求

mes-ui/mini-app/src/pages/pgMaster/pgMaster-detail.vue

@@ -178,7 +178,8 @@ const handleStop = async () => {
             detailInfo.pgType == 1 ? '已完成' : '未完成' }}</view>
           <view class="product-item">子项目：{{ detailInfo.projectSubCode || '' }} {{' ' + detailInfo.projectSubName }}
           </view>
-		  <view class="product-item">模具名称：{{detailInfo.mouldName}}</view>
+		  <view class="product-item">零件名称：{{detailInfo.materialName}}</view>
+		  <view class="product-item">图号：{{ detailInfo.blueprintNo }}</view>
           <view class="product-row">
             <view class="row-item">
               <view class="label">派工数量</view>