Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

yudao-ui-admin-vue3/src/components/DynamicReport/SpreadViewer.vue

@@ -407,7 +407,7 @@ const openPdf = async () => {
        formData.append('manualUrl', props.initData.manualUrl)
        response = await getPDFByInspectionLocal(formData)
      }else{
-       response = await getPDF(formData)
+       response = await getPDF2(formData)
      }
    }
     if (response) {

yudao-ui-admin-vue3/src/views/pressure2/NonTaxBilling/detail.vue

@@ -88,7 +88,7 @@
             label-class-name="w-135px"
             class-name="w-380px"
             label="收费总额"
-            >{{ isEmpty(item.shouldAmount) ? '-' : item.shouldAmount }}</el-descriptions-item
+            >{{ isEmpty(item.serviceAmount) ? '-' : item.serviceAmount }}</el-descriptions-item
           >
         </el-descriptions>
       </template>
@@ -211,8 +211,8 @@ const init = () => {
         formData.value.contactPhone = firstItem.recipientPhone
         formData.value.email = firstItem.recipientEmail
         const total = res.list
-          .filter((item) => !isEmpty(item.shouldAmount))
-          .reduce((pre, cur) => new Decimal(pre).add(new Decimal(cur.shouldAmount)), new Decimal(0)).toString()
+          .filter((item) => !isEmpty(item.serviceAmount))
+          .reduce((pre, cur) => new Decimal(pre).add(new Decimal(cur.serviceAmount)), new Decimal(0)).toString()
           console.log('total:', total)
         formData.value.totalAmount = total
         formData.value.actualAmount = total

yudao-ui-admin-vue3/src/views/pressure2/NonTaxBilling/index.vue

@@ -142,9 +142,9 @@
           {{ row.creatorUser ? row.creatorUser?.nickname : '-' }}
         </template>
       </el-table-column>
-       <el-table-column label="收费金额 （元）" align="center" prop="shouldAmount" min-width="150px">
+       <el-table-column label="收费金额 （元）" align="center" prop="serviceAmount" min-width="150px">
         <template #default="{ row }">
-          {{ row.shouldAmount ? row.shouldAmount : '-' }}
+          {{ row.serviceAmount ? row.serviceAmount : '-' }}
         </template>
       </el-table-column>
       <el-table-column label="已拆单金额 （元）" align="center" prop="splitAmount" min-width="150px">