Prechádzať zdrojové kódy

修复接口调整导致的受理单签名失败、编辑报表失败等问题;调整签名推送逻辑、更新按钮逻辑;调整文字提示

yangguanjin 1 týždeň pred
rodič
commit
1c0c090a61

+ 1 - 1
src/pages/editor/inspectionPlanEditor.vue

@@ -162,7 +162,7 @@ const init = async () => {
   const resData = (res as any).data
   const dataMap: any = {}
 
-  const dynamicTbValResp = await getDynamicTbVal({ refId })
+  const dynamicTbValResp = await getDynamicTbVal({ refId, templateId })
   const dynamicTb: any = dynamicTbValResp.data
   instId.value = dynamicTb?.dynamicTbInsRespVO?.id || ''
   for (let i = 0; i < dynamicTb.dynamicTbValRespVOList.length; i++) {

+ 2 - 2
src/pages/editor/mainQuestionEditor.vue

@@ -63,12 +63,12 @@ const init = async () => {
   if (!templateId || !refId) {
     return
   }
-
+  
   const res = await getStandardTemplate({ id: templateId })
   const resData = (res as any).data
   const dataMap: any = {}
 
-  const dynamicTbValResp = await getDynamicTbVal({ refId })
+  const dynamicTbValResp = await getDynamicTbVal({ refId, templateId })
   const dynamicTb: any = dynamicTbValResp.data
   instId.value = dynamicTb?.dynamicTbInsRespVO?.id || ''
   for (let i = 0; i < dynamicTb.dynamicTbValRespVOList.length; i++) {

+ 1 - 1
src/pages/editor/securityCheckEditor.vue

@@ -98,7 +98,7 @@ const init = async () => {
   const resData = (res as any).data
   const dataMap: any = {}
 
-  const dynamicTbValResp = await getDynamicTbVal({ refId: refId.value })
+  const dynamicTbValResp = await getDynamicTbVal({ refId: refId.value, templateId })
   const dynamicTb: any = dynamicTbValResp.data
   instId.value = dynamicTb?.dynamicTbInsRespVO?.id || ''
   for (let i = 0; i < dynamicTb.dynamicTbValRespVOList.length; i++) {

+ 1 - 1
src/pages/editor/serviceOrderEditor.vue

@@ -70,7 +70,7 @@ const init = async () => {
   const resData = (res as any).data
   const dataMap: any = {}
 
-  const dynamicTbValResp = await getDynamicTbVal({ refId })
+  const dynamicTbValResp = await getDynamicTbVal({ refId, templateId })
   const dynamicTb: any = dynamicTbValResp.data
   instId.value = dynamicTb?.dynamicTbInsRespVO?.id || ''
   for (let i = 0; i < dynamicTb.dynamicTbValRespVOList.length; i++) {

+ 1 - 1
src/pages/editor/workInstructionEditor.vue

@@ -143,7 +143,7 @@ const init = async () => {
   const resData = (res as any).data
   const dataMap: any = {}
 
-  const dynamicTbValResp = await getDynamicTbVal({ refId: workInstructionId })
+  const dynamicTbValResp = await getDynamicTbVal({ refId: workInstructionId, templateId })
   const dynamicTb: any = dynamicTbValResp.data
   instId.value = dynamicTb?.dynamicTbInsRespVO?.id || ''
   for (let i = 0; i < dynamicTb.dynamicTbValRespVOList.length; i++) {

+ 4 - 4
src/pages/equipment/detail/components/BoilerInspectProject.vue

@@ -367,7 +367,7 @@
                       class="action-btn record-btn"
                       @click="handleRouteToInputWebview(item)"
                     >
-                      <text class="action-btn-text">记录录入</text>
+                      <text class="action-btn-text">检验录入</text>
                     </view>
 
                     <view
@@ -379,7 +379,7 @@
                       class="action-btn re-input-btn"
                       @click="handleRouteToInputWebview(item)"
                     >
-                      <text class="action-btn-text">重新录入</text>
+                      <text class="action-btn-text">检验录入</text>
                     </view>
 
                     <view
@@ -390,13 +390,13 @@
                       <text class="action-btn-text">提交校核</text>
                     </view>
 
-                    <view
+                    <!-- <view
                       v-if="isEditable(item) && shouldShowSubmitReport(item.taskStatus)"
                       class="action-btn submit-report-btn"
                       @click="showSelectReportUserPopup(item)"
                     >
                       <text class="action-btn-text">提交报告</text>
-                    </view>
+                    </view> -->
                   </template>
 
                   <template v-else>

+ 4 - 4
src/pages/equipment/detail/components/PipeInspectProject.vue

@@ -148,7 +148,7 @@
                     class="action-btn re-input-btn"
                     @click="handleRouteToInputWebview(item)"
                   >
-                    <text class="action-btn-text">重新录入</text>
+                    <text class="action-btn-text">检验录入</text>
                   </view>
 
                   <view
@@ -159,13 +159,13 @@
                     <text class="action-btn-text">提交校核</text>
                   </view>
 
-                  <view
+                  <!-- <view
                     v-if="isEditable(item) && shouldShowSubmitReport(item.taskStatus)"
                     class="action-btn submit-report-btn"
                     @click="showSelectReportUserPopup(item)"
                   >
                     <text class="action-btn-text">提交报告</text>
-                  </view>
+                  </view> -->
                 </template>
 
                 <template v-else>
@@ -179,7 +179,7 @@
                     @click="handleRouteToInputWebview(item)"
                   >
                     <text class="action-btn-text">
-                      {{ !item.localReportUrl ? '记录录入' : '重新录入' }}
+                      {{ !item.localReportUrl ? '记录录入' : '检验录入' }}
                     </text>
                   </view>
 

+ 7 - 3
src/pages/equipment/detail/equipmentDetail.vue

@@ -97,7 +97,7 @@
       </view> -->
 
       <!-- 记录文件 Tab -->
-      <view v-if="currentTab === 3" class="tab-content">
+      <view v-if="(currentTab === 3 && isInspectMode) || (currentTab === 2 && !isInspectMode)" class="tab-content">
         <OtherReport
           :refresh-detail="refreshDetail"
           :other-report-list="dataSource?.otherReportList"
@@ -302,7 +302,7 @@ const initTabList = () => {
   // }
 
   // 记录文件 Tab
-  tabs.push({ value: '记录文件', id: 'OTHER_REPORT' })
+  tabs.push({ value: '项目文件', id: 'OTHER_REPORT' })
   tabList.value = tabs
 
   // 根据 pageType 计算初始 Tab 索引
@@ -383,7 +383,11 @@ const fetchGetOnlineEquipmentDetail = async () => {
       // console.log('taskInfo......', taskInfo)
       dataSource.value = taskInfo
       if (reportDic?.otherReportList?.length && pageType !== 'OTHER_REPORT') {
-        tabList.value[3] = { value: '项目文件', id: 'OTHER_REPORT' }
+        if(isInspectMode.value === true) {
+          tabList.value[3] = { value: '项目文件', id: 'OTHER_REPORT' }
+        } else {
+          tabList.value[2] = { value: '项目文件', id: 'OTHER_REPORT' }
+        }
       }
     }
   } catch (error) {

+ 2 - 2
src/pages/pendingVerification/preViewReport/index.vue

@@ -13,8 +13,8 @@
   <view class="preview-container">
     <ReportNavBar>
       <template #right>
-        <button class="nav-btn btn-grey" @click="lookFile">附件</button>
-        <button class="nav-btn btn-grey" @click="lookReport">档案</button>
+        <!-- <button class="nav-btn btn-grey" @click="lookFile">附件</button> -->
+        <!-- <button class="nav-btn btn-grey" @click="lookReport">档案</button> -->
         <button class="nav-btn btn-orange" @click="showGoBackPopupFn">退回</button>
         <button class="nav-btn btn-blue" @click="showApprovePopupFn">通过</button>
       </template>

+ 10 - 8
src/pages/sign/index.vue

@@ -81,7 +81,7 @@
       </view>
 
       <!-- 联系信息表单(服务单/受理单类型) -->
-      <view v-if="routeType === 'FWD'" class="form-section">
+      <!-- <view v-if="routeType === 'FWD'" class="form-section">
         <view class="form-item">
           <text class="form-label">接收人手机号:</text>
           <input
@@ -92,7 +92,7 @@
             placeholder="请输入接收人手机号"
           />
         </view>
-      </view>
+      </view> -->
     </scroll-view>
 
     <!-- 底部按钮 -->
@@ -143,7 +143,7 @@
             placeholder="请输入接收人手机号"
           />
         </view>
-        <view v-if="routeType !== 'ZXXX'" class="input-row">
+        <!-- <view v-if="routeType !== 'ZXXX'" class="input-row">
           <text class="row-label">电子邮箱:</text>
           <input
             class="row-input"
@@ -151,7 +151,7 @@
             type="text"
             placeholder="请输入电子邮箱(选填)"
           />
-        </view>
+        </view> -->
         <view class="popup-actions">
           <button class="action-btn cancel-btn" @click="closeInputPopup">取消</button>
           <button class="action-btn confirm-btn" @click="handlePushOrderSubmit">确定</button>
@@ -550,7 +550,7 @@ const submitConfirm = async () => {
     let result: any
     if (routeType.value === 'FWD') {
       params.receiverPhone = fwdInputPhone.value
-      params.orderReportId = orderReportId.value
+      params.orderItemId = orderReportId.value
       result = await requestFunc(SignFuncName.SubmitSign, equipType, params)
     } else if (routeType.value === 'AQJC') {
       params.securityCheckId = securityCheckId.value
@@ -561,6 +561,8 @@ const submitConfirm = async () => {
         params: reportData.value,
         instId: reportDataInstId.value,
       })
+    } else {
+      result = await requestFunc(SignFuncName.SubmitSign, equipType, params)
     }
 
     if (result?.code === 0) {
@@ -615,10 +617,10 @@ const handleActionSelect = (item: any) => {
     let url = ''
     if (routeType.value === 'FWD') {
       url = `/pages/editor/serviceOrderEditor?templateId=${templateId.value}&refId=${refId.value}`
-    } else if (routeType.value === 'JYRS') {
-      uni.showToast({ title: '更新检验结果告知表单暂未实现', icon: 'none' })
+    } else if (routeType.value === 'AQJC') {
+      url = `/pages/editor/securityCheckEditor?templateId=${templateId.value}&orderId=${orderId.value}&securityCheckId=${refId.value}&mode=edit`
     } else {
-      uni.showToast({ title: '系统错误,不能更新', icon: 'none' })
+      uni.showToast({ title: '不支持更新操作', icon: 'none' })
     }
     uni.navigateTo({ url })
   }

+ 1 - 0
src/pages/taskOnline/TaskOnlinePipeEquipmentList.vue

@@ -894,6 +894,7 @@ const handleRouteToEquipmentDetail = async (item: any, pageType: string) => {
 .list-scroll {
   flex: 1;
   overflow: hidden;
+  padding: 10px;
 }
 
 .pipe-set-header {