驳回理由

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -4,11 +4,13 @@
         <div class="condition">
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.jwcode') }}</el-text>
-                <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.jwcode" :placeholder="t('common.jwcodePlaceholder')" style="width:9vw;"
+                    clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.customerName') }}</el-text>
-                <el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')" style="width:9vw;" clearable />
+                <el-input v-model="searchForm.name" :placeholder="t('common.customerNamePlaceholder')"
+                    style="width:9vw;" clearable />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.productName') }}</el-text>
@@ -16,8 +18,8 @@
             </div>
             <div class="item1" v-if="isHeadquarters">
                 <el-text size="large" style="width:4vw;">{{ t('common.market') }}</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" :placeholder="t('common.marketPlaceholder')"
-                    clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market"
+                    :placeholder="t('common.marketPlaceholder')" clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">{{ t('common.orderStatus') }}</el-text>
@@ -41,9 +43,10 @@
             </div>
             <div class="item2" style="width: 29.3vw;">
                 <el-text size="large" style="width:4vw;">{{ t('common.payTime') }}</el-text>
-                <el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')" :start-placeholder="t('common.startTime')"
-                    :end-placeholder="t('common.endTime')" style="width:22vw;" @change="handleDatePickerChange" clearable
-                    :disabled-date="disabledDate" :default-time="defaultTime" />
+                <el-date-picker v-model="dateRange" type="datetimerange" :range-separator="t('common.to')"
+                    :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
+                    style="width:22vw;" @change="handleDatePickerChange" clearable :disabled-date="disabledDate"
+                    :default-time="defaultTime" />
             </div>
             <div>
                 <el-button type="primary" @click="getRefund">{{ t('common.search') }}</el-button>
@@ -62,23 +65,26 @@
                 </template>
             </el-table-column>
             <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
-            <el-table-column prop="name" :label="t('common_list.name')" width="120" fixed="left" show-overflow-tooltip />
+            <el-table-column prop="name" :label="t('common_list.name')" width="120" fixed="left"
+                show-overflow-tooltip />
             <el-table-column prop="marketName" :label="t('common_list.market')" width="120" />
             <el-table-column prop="goodsName" :label="t('common_list.productName')" width="130" show-overflow-tooltip />
             <el-table-column prop="goodsNum" :label="t('common_list.productNum')" width="130px">
-                            <template #default="scope">
-                                <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
-                                    scope.row.permanentGold }} {{ t('cash.unit') }}</span>
-                                <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
-                            </template>
+                <template #default="scope">
+                    <span v-if="scope.row.goodsName == t('common_list.goldRecharge')">{{
+                        scope.row.permanentGold }} {{ t('cash.unit') }}</span>
+                    <span v-else>{{ scope.row.goodsNum }} {{ scope.row.numUnit }}</span>
+                </template>
             </el-table-column>
             <el-table-column prop="refundModel" :label="t('common_list.refundModel')" width="120">
                 <template #default="scope">
-                    {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
+                    {{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll')
+                    }}
                 </template>
             </el-table-column>
             <el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" />
-            <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip />
+            <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120"
+                show-overflow-tooltip />
             <el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
             <el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
                 <template #default="scope">
@@ -120,14 +126,16 @@
                     <el-option :label="t('common_add.refundModelPart')" :value="1"></el-option>
                 </el-select>
             </div>
-                <div class="top-item">
-                    <el-text style="width:4vw;" size="small">{{ t('common_add.permanentGold') }}</el-text>
-                    <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{ t('cash.unit') }}</span>
-                </div>
-                <div class="top-item">
-                    <el-text style="width:4vw;" size="small">{{ t('common_add.freeGold') }}</el-text>
-                    <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{ t('cash.unit') }}</span>
-                </div>
+            <div class="top-item">
+                <el-text style="width:4vw;" size="small">{{ t('common_add.permanentGold') }}</el-text>
+                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{
+                    t('cash.unit') }}</span>
+            </div>
+            <div class="top-item">
+                <el-text style="width:4vw;" size="small">{{ t('common_add.freeGold') }}</el-text>
+                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled /><span>&nbsp;{{
+                    t('cash.unit') }}</span>
+            </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.refundReason') }}</el-text>
                 <el-input v-model="auditRow.refundReason" size="small" style="width:10vw;" :rows="3" maxlength="100"
@@ -214,8 +222,8 @@
             <el-button class="smallTitle" size="small" v-show="showReject">{{ t('common.reject') }}</el-button>
             <div class="bottom-item" v-show="showReject">
                 <el-text style="width:4vw;" size="small">{{ t('common_add.rejectReason') }}</el-text>
-                <el-input v-model="addForm.remark" :placeholder="t('common_add.rejectReasonPlaceholder')" size="small" style="width:10vw;" :row="3"
-                    maxlength="100" type="textarea" show-word-limit clearable />
+                <el-input v-model="addForm.remark" :placeholder="t('common_add.rejectReasonPlaceholder')" size="small"
+                    style="width:10vw;" :row="3" maxlength="100" type="textarea" show-word-limit clearable />
             </div>
             <div style="text-align: center;" v-show="!showReject">
                 <el-button type="default" @click="showReject = true">{{ t('common.reject') }}</el-button>
@@ -228,7 +236,7 @@
         </div>
     </el-dialog>
 
-    <el-dialog v-model="showSteps"  overflow draggable width="1206px" height="506px" :style="{
+    <el-dialog v-model="showSteps" overflow draggable width="1206px" height="506px" :style="{
         backgroundImage: `url(${RefundFinanceBackground})`,
         backgroundSize: 'cover',
         backgroundPosition: 'center'
@@ -250,13 +258,17 @@
                     <el-step>
                         <template #title>
                             <div>
-                                {{ t('cash.progress.areaFinance') }}<br>{{ areaFinance || t('common.noAuditorRecorded') }}
+                                {{ t('cash.progress.areaFinance') }}<br>{{ areaFinance || t('common.noAuditorRecorded')
+                                }}
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 2" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 1" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
-                            <img v-else-if="currentStep > 2" src="@/assets/images/refund-approved.png" :alt="t('common.passed')">
+                            <img v-if="currentStep === 2" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 1" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
+                            <img v-else-if="currentStep > 2" src="@/assets/images/refund-approved.png"
+                                :alt="t('common.passed')">
                         </template>
                     </el-step>
 
@@ -267,26 +279,33 @@
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 4" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 3" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
+                            <img v-if="currentStep === 4" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 3" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
                             <img v-else-if="currentStep > 3 && currentStep != 4"
                                 src="@/assets/images/refund-approved.png" :alt="t('common.passed')">
-                            <img v-else-if="currentStep < 3" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-else-if="currentStep < 3" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </el-step>
 
                     <el-step>
                         <template #title>
                             <div>
-                                {{ t('cash.progress.headFinance') }}<br>{{ headFinance || t('common.noAuditorRecorded') }}
+                                {{ t('cash.progress.headFinance') }}<br>{{ headFinance || t('common.noAuditorRecorded')
+                                }}
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 6" src="@/assets/images/refund-rejected.png" :alt="t('common.rejected')">
-                            <img v-else-if="currentStep === 5" src="@/assets/images/refund-approving.png" :alt="t('common.pendingAudit')">
+                            <img v-if="currentStep === 6" src="@/assets/images/refund-rejected.png"
+                                :alt="t('common.rejected')">
+                            <img v-else-if="currentStep === 5" src="@/assets/images/refund-approving.png"
+                                :alt="t('common.pendingAudit')">
                             <img v-else-if="currentStep > 5 && currentStep != 6"
                                 src="@/assets/images/refund-approved.png" :alt="t('common.passed')">
-                            <img v-else-if="currentStep < 5" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-else-if="currentStep < 5" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </el-step>
 
@@ -297,12 +316,16 @@
                             </div>
                         </template>
                         <template #icon>
-                            <img v-if="currentStep === 7" src="@/assets/images/refund-approving.png" :alt="t('common_list.pending')">
-                            <img v-else-if="currentStep === 8" src="@/assets/images/refund-approved.png" :alt="t('common.completed')">
-                            <img v-else-if="currentStep < 7" src="@/assets/images/refund-waiting.png" :alt="t('common_list.activityStatus.notStarted')">
+                            <img v-if="currentStep === 7" src="@/assets/images/refund-approving.png"
+                                :alt="t('common_list.pending')">
+                            <img v-else-if="currentStep === 8" src="@/assets/images/refund-approved.png"
+                                :alt="t('common.completed')">
+                            <img v-else-if="currentStep < 7" src="@/assets/images/refund-waiting.png"
+                                :alt="t('common_list.activityStatus.notStarted')">
                         </template>
                     </el-step>
                 </el-steps>
+                            <div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}：{{ rejectReason }}</div>
             </div>
             <div class="steps-btn">
                 <el-button type="primary" @click="showSteps = false">{{ t('common.confirm') }}</el-button>
@@ -360,6 +383,7 @@ import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 
 const currentStep = ref(0)// 进度图
+const rejectReason = ref('')// 驳回理由，进度图
 const searchForm = ref({
     jwcode: '',
     markets: []
@@ -512,6 +536,7 @@ const handlePass = async function () {
     }
     try {
         const params = {
+            rejectReason: addForm.value.remark,
             id: auditRow.value.id,
             status: 20,
             areaFinance: adminData.value.adminName,
@@ -598,6 +623,7 @@ const showStep = function (row) {
         return
     }
 
+        rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -903,6 +929,15 @@ onMounted(() => {
         justify-content: center;
     }
 
+    .reject-reason {
+        margin-top: 2vh;
+        width: 40%;
+        margin-left: 30%;
+        background-color: white;
+        padding: 1vh;
+        border-radius: 10px;
+    }
+
     .steps-btn {
         height: 15vh;
         display: flex;

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -315,7 +315,9 @@
                         </template>
                     </el-step>
                 </el-steps>
+                            <div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}：{{ rejectReason }}</div>
             </div>
+            
             <div class="steps-btn">
                 <el-button type="primary" @click="showSteps = false">{{ t('common.confirm') }}</el-button>
             </div>
@@ -387,6 +389,7 @@ const searchForm = ref({
     statuses: []
 })
 const isReject = ref(false)// 进度图有没有驳回状态
+const rejectReason = ref('')// 驳回理由，进度图
 const addForm = ref({
     remark: ''
 })
@@ -574,6 +577,7 @@ const handlePass = async function () {
     }
     try {
         const params = {
+                        rejectReason: addForm.value.remark,
             id: auditRow.value.id,
             executor: addForm.value.executor,
             status: 40,
@@ -798,6 +802,7 @@ const showStep = function (row) {
         return
     }
 
+            rejectReason.value = row.rejectReason || ''
     isReject.value = false
     submitter.value = row.submitter || ''
     areaFinance.value = row.areaFinance || ''
@@ -975,6 +980,15 @@ onMounted(() => {
         justify-content: center;
     }
 
+        .reject-reason {
+        margin-top: 2vh;
+        width: 40%;
+        margin-left: 30%;
+        background-color: white;
+        padding: 1vh;
+        border-radius: 10px;
+    }
+
     .steps-btn {
         height: 15vh;
         display: flex;