Merge branch 'lihuilin/feature-20250923114949-现金' into milestone-20250913-现金管理

src/views/moneyManage/executor/executor.vue

@@ -140,7 +140,7 @@
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">所属地区</el-text>
-                    <el-input v-model="editRow.marketName" style="width:10vw;" disabled />
+                    <el-input v-model="editRow.market" style="width:10vw;" disabled />
                 </div>
                 <div class="dialog-item">
                     <el-text style="width:4vw;">产品名称</el-text>

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -105,18 +105,20 @@
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款类型</el-text>
-                <el-input v-model="auditRow.refundModel" placeholder="请输入退款类型" size="small" style="width:10vw;"
-                    clearable></el-input>
+                <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
+                    <el-option label="全部退款" :value="0"></el-option>
+                    <el-option label="部分退款" :value="1"></el-option>
+                </el-select>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款金额</el-text>
                 <el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
-                    clearable></el-input>
+                    clearable disabled></el-input>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款备注</el-text>
                 <el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
-                    :rows="3" maxlength="100" show-word-limit type="textarea" />
+                    :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
             </div>
         </div>
         <el-button @click="" class="smallTitle" size="small">原订单信息</el-button>
@@ -128,7 +130,7 @@
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">所属地区</el-text>
-                    <el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">产品名称</el-text>
@@ -814,7 +816,7 @@ onMounted(() => {
 
     .top {
         width: 30vw;
-        height: 17vh;
+        height: 19vh;
 
         .top-item {
             display: flex;

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -12,8 +12,8 @@
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
-                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" 
-                placeholder="请选择所属地区" clearable @change="handleMarketChange" />
+                <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
+                    clearable @change="handleMarketChange" />
             </div>
             <div class="item1">
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
@@ -105,11 +105,10 @@
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款类型</el-text>
-                <el-input v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
-                    <template #default="scope">
-                        {{ scope.row.refundModel === 0 ? '全部退款' : '部分退款' }}
-                    </template>
-                </el-input>
+                <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
+                    <el-option label="全部退款" :value="0"></el-option>
+                    <el-option label="部分退款" :value="1"></el-option>
+                </el-select>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款金额</el-text>
@@ -130,7 +129,7 @@
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">所属地区</el-text>
-                    <el-input v-model="auditRow.marketName" size="small" style="width:10vw;" disabled />
+                    <el-input v-model="auditRow.market" size="small" style="width:10vw;" disabled />
                 </div>
                 <div class="center-item">
                     <el-text style="width:4vw;" size="small">产品名称</el-text>
@@ -771,27 +770,27 @@ const showStep = function (row) {
     currentStep.value = 1;
     if (row.status === 41) {
         executor.value = row.executorName
-        console.log('执行人',executor.value)
+        console.log('执行人', executor.value)
         currentStep.value = 6;
     } else {
         if (row.areaServise !== null && row.areaServise !== '') {
             submitterName.value = row.areaServise
-            console.log('提交人',submitterName.value)
+            console.log('提交人', submitterName.value)
             currentStep.value = 2;
         }
         if (row.areaFinance !== null && row.areaFinance !== '') {
             areaFinance.value = row.areaFinance
-            console.log('地区财务',areaFinance.value)
+            console.log('地区财务', areaFinance.value)
             currentStep.value = 3;
         }
         if (row.areaCharge !== null && row.areaCharge !== '') {
             areaCharge.value = row.areaCharge
-            console.log('地区负责人',areaCharge.value)
+            console.log('地区负责人', areaCharge.value)
             currentStep.value = 4;
         }
         if (row.headFinance !== null && row.headFinance !== '') {
             headFinance.value = row.headFinance
-            console.log('总部财务',headFinance.value)
+            console.log('总部财务', headFinance.value)
             currentStep.value = 5;
         }
     }
@@ -870,7 +869,7 @@ onMounted(() => {
 
     .top {
         width: 30vw;
-        height: 17vh;
+        height: 19vh;
 
         .top-item {
             display: flex;

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -104,18 +104,20 @@
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款类型</el-text>
-                <el-input v-model="auditRow.refundModel" placeholder="请输入退款类型" size="small" style="width:10vw;"
-                    clearable></el-input>
+                <el-select v-model="auditRow.refundModel" size="small" style="width:10vw;" disabled>
+                    <el-option label="全部退款" :value="0"></el-option>
+                    <el-option label="部分退款" :value="1"></el-option>
+                </el-select>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款金额</el-text>
                 <el-input v-model="auditRow.paymentAmount" placeholder="请输入退款金额" size="small" style="width:10vw;"
-                    clearable></el-input>
+                    clearable disabled></el-input>
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款备注</el-text>
                 <el-input v-model="auditRow.refundReason" placeholder="请输入退款备注" size="small" style="width:10vw;"
-                    :rows="3" maxlength="100" show-word-limit type="textarea" />
+                    :rows="3" maxlength="100" show-word-limit type="textarea" disabled />
             </div>
         </div>
         <el-button @click="" class="smallTitle" size="small">原订单信息</el-button>
@@ -843,7 +845,7 @@ onMounted(() => {
 
     .top {
         width: 30vw;
-        height: 17vh;
+        height: 19vh;
 
         .top-item {
             display: flex;

src/views/moneyManage/refundDetail/refundService.vue

@@ -289,12 +289,12 @@ const getRefund = async function () {
                 payType: searchForm.value.payType,//支付方式
                 startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
                 endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
-                submitterId: isKF ? adminData.value.id : null
+                submitterId: adminData.value.id
             }
         }
 
         const result = await API({
-            url: '/Money/select',
+            url: '/Money/selecta',
             method: 'POST',
             data: params
         })