修改变更带上租户id

src/views/changes/ChangeFood/AddForm.vue

@@ -28,7 +28,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
             <el-form-item label="原餐饮标准" prop="itemName">
               <el-input v-model="dataForm.itemName" disabled />
             </el-form-item>
@@ -40,7 +40,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+          <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
             <el-form-item prop="changeDate">
               <template #label>
                 变更生效日期
@@ -54,6 +54,14 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :xs="12" :sm="12" :md="12" :lg="12" :xl="12">
+            <el-form-item prop="changeDate">
+              <template #label>
+                原餐饮费
+              </template>
+              <el-input v-model="dataForm.oldActualAmount" disabled />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row align="top">
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
@@ -77,7 +85,7 @@
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
             <div style="display: flex; flex-direction: row; align-items: center; height: 34px">
-              <span style="color: #666; font-size: 14px; margin-left: 3vw">餐饮费原价</span>
+              <span style="color: #666; font-size: 14px; margin-left: 3vw">新餐饮费原价</span>
               <span style="color: #e2ac57; font-size: 14px; margin-left: 5px"
                 >¥{{ formatNum(dataForm.amount) }}元/月</span
               >
@@ -99,17 +107,17 @@
         <el-row v-if="dataForm.isDiscount">
           <el-col :xs="24" :sm="24" :md="24" :lg="9" :xl="9">
             <el-form-item label="折扣金额(元)" prop="discountAmount">
-              <TgInput v-model="discountAmount" append-text="¥" @blur="handleBlur(dataForm, 1)" />
+              <TgInput v-model="discountAmount" append-text="¥" @="handleBlur(dataForm, 1)" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="9" :xl="9">
             <el-form-item label="折扣率" prop="discount">
-              <TgInputNumber v-model="discount" @blur="handleBlur(dataForm, 2)" />
+              <TgInputNumber v-model="discount" @blur="handleBlur(dataForm, 2)" disabled/>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="6" :xl="6">
             <el-form-item label="折后价格" prop="actualAmount">
-              <span class="price">¥{{ formatNum(dataForm.actualAmount) }}</span>
+              <span class="price">¥{{ dataForm.amount-discountAmount }}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,6 +197,7 @@ let dataForm = ref({
   elderName: '',
   originalName: '',
   discountAmount: '',
+  oldActualAmount: '',
   actualAmount: 0,
   amount: 0,
   discount: undefined,
@@ -251,6 +260,7 @@ const elderUp = (e: any) => {
   dataForm.value.elderlyId = e.id
   dataForm.value.idCard = e.idCard
   dataForm.value.originalAmount = e.actualAmount
+  dataForm.value.oldActualAmount = e.actualAmount
   //overheadChargeId = e.overheadChargeId
 }
 
@@ -342,12 +352,14 @@ const open = async (tId, id?: any, detail: boolean = false, status) => {
       dataForm.value = res
       dataForm.value.itemName = res.originalName
       dataForm.value.type = 6
-      searchElRef.value.upData(res.elderName)
+      await searchElRef.value.upData(res.elderName)
       dataForm.value.type = parseInt(res.type) //注意要用int类型才会正常展示
       dataForm.value.bedName = res.bedName
       dataForm.value.changeFiles = JSON.parse(res.changeFiles)
       if(!res.startTenantId){
         dataForm.value.startTenantId = getTenantId()
+      }else if(!dataForm.value.tenantId){
+        dataForm.value.tenantId = dataForm.value.startTenantId
       }
     } catch (err) {}
   }
@@ -361,6 +373,14 @@ const submitForm = async () => {
   if(formLoading.value){
     return
   }
+
+  // 二次确认
+  try {
+    await message.confirm('请认真核对变更生效日期，以及原餐饮价格和新餐饮价格！餐饮变更会影响餐饮费用！', '提示')
+  } catch {
+    return
+  }
+
   formLoading.value = true
 
   try {

src/views/elderly/elder/nurse-change/Form.vue

@@ -44,6 +44,15 @@ const submitForm = async () => {
   if(formLoading.value){
     return
   }
+
+  // 二次确认
+  try {
+    await message.confirm('请认真核对变更生效日期，以及原护理价格和新护理价格！护理变更会影响护理费用！', '提示')
+  } catch {
+    return
+  }
+
+
   formLoading.value = true
   try {
     let { valid, dataForm } = await processFormRef.value.submitForm()

src/views/elderly/elder/nurse-change/ProcessForm.vue

@@ -28,13 +28,16 @@
             <TgInput v-model="dataForm.bedName" disabled />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-col :span="12" :xs="24">
-            <el-form-item label="变更生效日期" prop="changeDate">
-              <!--  :disabledDate="(arg) => disabledDate(arg)" -->
-              <TgDatePicker v-model="dataForm.changeDate" type="date" placeholder="变更生效日期" />
-            </el-form-item>
-          </el-col>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="变更生效日期" prop="changeDate">
+            <!--  :disabledDate="(arg) => disabledDate(arg)" -->
+            <TgDatePicker v-model="dataForm.changeDate" type="date" placeholder="变更生效日期" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="原护理费价格" prop="actualAmount">
+            <TgInput v-model="dataForm.oldActualAmount" disabled />
+          </el-form-item>
         </el-col>
         <el-col :span="12" :xs="24">
           <el-form-item label="阶段评估" prop="associateId">
@@ -75,7 +78,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="护理费原价">
+          <el-form-item label="新护理费原价">
             <span class="price">¥{{ formatNum(dataForm.amount) }}元/月</span>
           </el-form-item>
         </el-col>
@@ -93,14 +96,15 @@
           </el-form-item>
         </el-col>
         <template v-if="dataForm.isDiscount==1">
-          <el-col :span="9" :xs="24">
+          <el-col :span="12" :xs="24">
             <el-form-item label="折扣金额(元)" prop="discountAmount">
-              <TgInput v-model="discountAmount" append-text="¥" @blur="handleBlur(dataForm, 1)" />
+              <TgInput v-model="discountAmount" append-text="¥" @blur="handleBlur(dataForm, 1)" style="width: 10vw;"/>
+              <el-text style="color: red;margin-left: 2vw">折后金额：{{dataForm.amount-discountAmount}}</el-text>
             </el-form-item>
           </el-col>
-          <el-col :span="9" :xs="24">
+          <el-col :span="12" :xs="24">
             <el-form-item label="折扣率" prop="discount">
-              <TgInputNumber v-model="discount" @blur="handleBlur(dataForm, 2)" />
+              <TgInputNumber v-model="discount" @blur="handleBlur(dataForm, 2)" disabled/>
             </el-form-item>
           </el-col>
         </template>
@@ -318,6 +322,7 @@ const isDetail = ref(false)
 /** 打开弹窗 */
 const init = async (id, detail, status) => {
   dataForm.value.startTenantId = getTenantId()
+  dataForm.value.tenantId = getTenantId()
   await getTreeData()
   await getNurseLevelList()
   isDetail.value = detail
@@ -333,6 +338,8 @@ const init = async (id, detail, status) => {
     active.value = getSyntheticAbilityName(res.totalScore)
     if(!res.startTenantId){
       dataForm.value.startTenantId = getTenantId()
+    }else {
+      dataForm.value.tenantId = dataForm.value.startTenantId
     }
 
   }
@@ -506,6 +513,7 @@ const handleSelectElder = (item) => {
   dataForm.value.associateId = '' // 清空评估表
   dataForm.value.elderName = item.elderName
   dataForm.value.originalAmount = item.actualAmount
+  dataForm.value.oldActualAmount = item.actualAmount
   //overheadChargeId = item.overheadChargeId
   getEvaluation()
 }

src/views/elderly/elder/types.ts

@@ -403,6 +403,7 @@ export interface nurseChangeFormType {
     associateId: string
     isDiscount: string
     amount: number
+    oldActualAmount: number
     discountAmount: string
     discount: undefined | number
     actualAmount: number