xuzhancheng 1 bulan lalu
induk
melakukan
c694df7498

+ 33 - 16
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/detail.vue

@@ -175,6 +175,24 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <!-- 定期检查&超年限检查 -->
+            <el-form-item label="检验性质" prop="checkType" label-width="120px" v-if="orderDetail?.checkType">
+              <span>{{ PressurePipeCheckTypeMap[orderDetail.checkType] }}</span>
+            </el-form-item>
+            <!-- 收费性质 feeNature -->
+            <el-form-item prop="feeNature" >
+              <template #label>
+                <div class="flex flex-col text-right">
+                  <span>收费性质</span>
+                  <span>(行政事业收费)</span>
+                </div>
+              </template>
+              <el-radio-group v-model="formData.feeNature">
+                <el-radio v-for="(item, key) in PressureFeeNatureMap" :key="key" :value="key" :label="item"/>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <!-- 收费形式 feeType -->
             <el-form-item label="收费形式" prop="feeType">
@@ -185,22 +203,20 @@
           </el-col>
           <el-col :span="24">
             <!-- 收费金额 actualAmount -->
-            <el-form-item label="收费金额" prop="actualAmount" class="actualAmountFormItem">
-              <el-input-number
-                :controls="false" v-model="formData.actualAmount" placeholder="请输入收费金额" :precision="2"
-                :step="0.01"/>
-              <div style="padding-left: 8px;">大写({{numberToChinese(formData.actualAmount)}})含税</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <!-- 年度检查 -->
-            <el-form-item label="" prop="feeDate" label-width="30" v-if="orderDetail?.checkType == 200">
-              <div class="feeDate_box">
-                甲方在本服务单签订之日起
-                <el-input-number :controls="false" v-model="formData.feeDate" placeholder="请输入"/>
-                日内一次性支付。
-              </div>
-            </el-form-item>
+            <!--            <el-form-item label="收费金额" prop="actualAmount" class="actualAmountFormItem">
+                          <el-input-number
+                            :controls="false"
+                            v-model="formData.actualAmount"
+                            placeholder="请输入收费金额"
+                            :min="0"
+                          />
+                          <div style="padding-left: 8px;">大写({{numberToChinese(formData.actualAmount)}})含税</div>
+                        </el-form-item>-->
+            <div class="flex items-center gap-32 ml-40px text-14px">
+              <span>应收法定金额: {{ formData.shouldAmount }}</span>
+              <span>服务收费金额:{{ formData.serviceAmount }}</span>
+              <span>免征费用: {{ formData.reduceFee }}</span>
+            </div>
           </el-col>
         </el-row>
       </el-form>
@@ -509,6 +525,7 @@ import {getUnitContacts, getUnitNewList} from "@/api/laboratory/unit";
 import {numberToChinese} from "@/utils/formatter";
 import {Icon} from "@/components/Icon";
 import {useUserStoreWithOut} from "@/store/modules/user";
+import {PressurePipeCheckTypeMap} from "../../../utils/constants";
 
 const route = useRoute()
 const orderDetail = ref()

+ 25 - 17
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/detail.vue

@@ -168,8 +168,18 @@
         <div class="check-info-label-title">检验收费</div>
         <el-row class="form-group" :gutter="24">
           <el-col :span="24">
+            <!-- 定期检查&超年限检查 -->
+            <el-form-item label="检验性质" prop="checkType" label-width="120px" v-if="orderDetail?.checkType">
+              <span>{{ PressurePipeCheckTypeMap[orderDetail.checkType] }}</span>
+            </el-form-item>
             <!-- 收费性质 feeNature -->
-            <el-form-item label="收费性质" prop="feeNature" v-if="orderDetail?.checkType != 200">
+            <el-form-item prop="feeNature" >
+              <template #label>
+                <div class="flex flex-col text-right">
+                  <span>收费性质</span>
+                  <span>(行政事业收费)</span>
+                </div>
+              </template>
               <el-radio-group v-model="formData.feeNature">
                 <el-radio v-for="(item, key) in PressureFeeNatureMap" :key="key" :value="key" :label="item"/>
               </el-radio-group>
@@ -185,22 +195,20 @@
           </el-col>
           <el-col :span="24">
             <!-- 收费金额 actualAmount -->
-            <el-form-item label="收费金额" prop="actualAmount" class="actualAmountFormItem">
-              <el-input-number
-                :controls="false" v-model="formData.actualAmount" placeholder="请输入收费金额" :precision="2"
-                :step="0.01"/>
-              <div style="padding-left: 8px;">大写({{numberToChinese(formData.actualAmount)}})含税</div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <!-- 年度检查 -->
-            <el-form-item label="" prop="feeDate" label-width="30" v-if="orderDetail?.checkType == 200">
-              <div class="feeDate_box">
-                甲方在本服务单签订之日起
-                <el-input-number :controls="false" v-model="formData.feeDate" placeholder="请输入"/>
-                日内一次性支付。
-              </div>
-            </el-form-item>
+            <!--            <el-form-item label="收费金额" prop="actualAmount" class="actualAmountFormItem">
+                          <el-input-number
+                            :controls="false"
+                            v-model="formData.actualAmount"
+                            placeholder="请输入收费金额"
+                            :min="0"
+                          />
+                          <div style="padding-left: 8px;">大写({{numberToChinese(formData.actualAmount)}})含税</div>
+                        </el-form-item>-->
+            <div class="flex items-center gap-32 ml-40px text-14px">
+              <span>应收法定金额: {{ formData.shouldAmount }}</span>
+              <span>服务收费金额:{{ formData.serviceAmount }}</span>
+              <span>免征费用: {{ formData.reduceFee }}</span>
+            </div>
           </el-col>
         </el-row>
       </el-form>