Merge remote-tracking branch 'origin/stable' into stable

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -107,7 +107,7 @@
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
           <el-descriptions-item label="总金额">
-            {{ taskOrderDetail.payAmount || 0 }}
+            {{ taskOrderDetail.totalAmount || 0 }}
           </el-descriptions-item>
           <el-descriptions-item label="减免比例">
             {{ taskOrderDetail.reductionRadio ? Big(taskOrderDetail.reductionRadio).times(100).toString() : 0}}%
@@ -124,8 +124,14 @@
           <el-descriptions-item label="免征费用">
             {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
-          <el-descriptions-item label="是否已交费">
-            {{ taskOrderDetail.isPay === 1?'是':'否' }}
+          <el-descriptions-item label="结算状态">
+            {{ taskOrderDetail.paymentStatus === 1 ? '已结算' : taskOrderDetail.paymentStatus === 2 ? '部分结算' : '未结算' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算金额">
+            {{ taskOrderDetail.payAmount || 0}}
+          </el-descriptions-item>
+          <el-descriptions-item label="非税状态">
+            {{ taskOrderDetail.isPay === 1?'已缴费':'未缴费' }}
           </el-descriptions-item>
 
           <el-descriptions-item label="业务受理人">

yudao-ui-admin-vue3/src/views/pressure2/orderConfirm/pipeDetail.vue

@@ -608,7 +608,7 @@
         <!-- <div v-for="equip in selectedRows" :key="equip.id" class="mb-2">
           工程号：{{ equip.projectNo }}
         </div> -->
-        管道数量: {{ selectedRows?.length || 0 }}
+        管道数量: {{ selectedDetailRows?.length || 0 }}
       </div>
       
       <div class="mb-4">

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -107,7 +107,10 @@
             {{ PressureFeeTypeMap[taskOrderDetail.feeType] || '-' }}
           </el-descriptions-item>
           <el-descriptions-item label="总金额">
-            {{ taskOrderDetail.payAmount || 0 }}
+            {{ taskOrderDetail.totalAmount || 0 }}
+          </el-descriptions-item>
+          <el-descriptions-item label="结算金额">
+            {{ taskOrderDetail.payAmount || 0}}
           </el-descriptions-item>
           <el-descriptions-item label="减免比例">
             {{ taskOrderDetail.reductionRadio ? Big(taskOrderDetail.reductionRadio).times(100).toString() : 0}}%
@@ -124,9 +127,12 @@
           <el-descriptions-item label="免征费用">
             {{ taskOrderDetail.reduceFee || 0 }}
           </el-descriptions-item>
-<!--          <el-descriptions-item label="是否已交费">-->
-<!--            {{ taskOrderDetail.isPay === 1?'是':'否' }}-->
-<!--          </el-descriptions-item>-->
+          <el-descriptions-item label="结算状态">
+            {{ taskOrderDetail.paymentStatus === 1 ? '已结算' : taskOrderDetail.paymentStatus === 2 ? '部分结算' : '未结算' }}
+          </el-descriptions-item>
+          <el-descriptions-item label="非税状态">
+            {{ taskOrderDetail.isPay === 1?'已缴费':'未缴费' }}
+          </el-descriptions-item>
 
 <!--          <el-descriptions-item label="业务受理人">-->
 <!--            <el-tag v-if="taskOrderDetail.acceptUser" effect="light" :closable="false">-->
@@ -1606,21 +1612,21 @@ const handleConfirmSetPipeInfo = async () => {
 
 const handleConfirm = async () => {
   // 检查检验日期是否在三天内
-  if (taskOrderDetail.value?.checkDate) {
-    const checkDate = taskOrderDetail.value.checkDate;
-
-    if (checkDate) {
-      const inspectionStartDate = dayjs(checkDate);
-      const now = dayjs();
-      const daysDiff = now.diff(inspectionStartDate, 'day', true); // 精确计算天数差（包含小数）
-
-      // 如果当前时间不在检验日期开始后的 3 天内，则不允许认领
-      if (daysDiff < 0 || daysDiff > 3) {
-        ElMessage.warning('只能在检验日期开始后的 3 天内进行认领操作');
-        return;
-      }
-    }
-  }
+  // if (taskOrderDetail.value?.checkDate) {
+  //   const checkDate = taskOrderDetail.value.checkDate;
+  //
+  //   if (checkDate) {
+  //     const inspectionStartDate = dayjs(checkDate);
+  //     const now = dayjs();
+  //     const daysDiff = now.diff(inspectionStartDate, 'day', true); // 精确计算天数差（包含小数）
+  //
+  //     // 如果当前时间不在检验日期开始后的 3 天内，则不允许认领
+  //     if (daysDiff < 0 || daysDiff > 3) {
+  //       ElMessage.warning('只能在检验日期开始后的 3 天内进行认领操作');
+  //       return;
+  //     }
+  //   }
+  // }
   
   //taskOrderDetail.value.id
   try {