Merge remote-tracking branch 'origin/master'

src/views/components/ListPage/Search.vue

@@ -8,7 +8,7 @@
                 </el-form-item>
 
                 <!-- 时间选择 -->
-                <el-form-item :label="item.label" v-if="item.type === 'date'" :prop="item.prop">
+                <el-form-item :label="item.queryLabel||item.label" v-if="item.type === 'date'" :prop="item.prop">
                     <el-date-picker v-model="formInline[item.prop]" value-format="YYYY-MM-DD" type="daterange"
                         range-separator="-" start-placeholder="开始日期" clearable end-placeholder="结束日期"></el-date-picker>
                 </el-form-item>

src/views/finance/examine/useData.js

@@ -20,7 +20,10 @@ export default ({proxy,jlzj_area_type}) => {
                 name: item.value
             }
         })
-        return data || [];
+        return [{
+            title: '全部',
+           name: ''
+        },...data] || [];
     })
      //打开弹窗
      const openDialog = (ids) => {
@@ -70,7 +73,8 @@ export default ({proxy,jlzj_area_type}) => {
     const list_quyu = ref([
         {
             label: jlzj_area_type.value === '0'?'区域中心':'服务中心',
-            prop: 'areaName',
+            prop: 'applicant',
+            tableProp: jlzj_area_type.value === '0'?'areaName':'serviceCentreName',
             type: 'input',
             isSearch: true,
             width:'150px'
@@ -84,25 +88,22 @@ export default ({proxy,jlzj_area_type}) => {
         },
         {
             label: '订单编号',
-            prop: 'outTradeNo',
+            prop: 'orderNo',
+            tableProp:'outTradeNo',
             type: 'input',
             isSearch: true,
             width:'200px',
         },
-       
-        {
-            label: '申请时间',
-            prop: 'applyTime',
-            width:'160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['applyTimeStart', 'applyTimeEnd'],
-        },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
-            width:'160px',
+            width: '160px',
+            isSearch: true,
+            type: 'date',
+            keys: ['startTime', 'endTime'],
         },
+
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
@@ -192,12 +193,25 @@ export default ({proxy,jlzj_area_type}) => {
             label: '收款人',
             prop: 'areaPayeeName',
              width:'150px'
-        }
+        },
+        {
+            label: '审核原因说明',
+            prop: 'auditorRemark',
+             width:'150px'
+        },
+        {
+            label: '审核状态',
+            prop: 'auditorStatus',
+            type: 'dict',
+            dict: settlement_application_auditor_status,
+            width:'150px',
+        },
     ])
     const list_fuwu = ref([
         {
             label: jlzj_area_type.value === '0'?'区域中心':'服务中心',
-            prop: jlzj_area_type.value === '0'?'areaName':'serviceCentreName',
+            prop: 'applicant',
+            tableProp: jlzj_area_type.value === '0'?'areaName':'serviceCentreName',
             type: 'input',
             isSearch: true,
             width:'150px'
@@ -216,19 +230,14 @@ export default ({proxy,jlzj_area_type}) => {
             isSearch: true,
             width:'200px',
         },
-       
-        {
-            label: '申请时间',
-            prop: 'applyTime',
-            width:'160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['applyTimeStart', 'applyTimeEnd'],
-        },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
-            width:'160px',
+            width: '160px',
+            isSearch: true,
+            type: 'date',
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',
@@ -324,7 +333,19 @@ export default ({proxy,jlzj_area_type}) => {
             label: '服务中心结算时间',
             prop: 'serviceCentreSettlementTime',
             width:'150px',
-        }
+        },
+        {
+            label: '审核原因说明',
+            prop: 'auditorRemark',
+             width:'150px'
+        },
+        {
+            label: '审核状态',
+            prop: 'auditorStatus',
+            type: 'dict',
+            dict: settlement_application_auditor_status,
+            width:'150px',
+        },
     ])
     return {
         dialogFormRef,

src/views/finance/settlement/useRegional.js

@@ -111,33 +111,35 @@ export default ({ proxy, jlzj_area_type }) => {
     const list_pingtai = ref([
         {
             label: '区域中心',
-            prop: 'areaName',
+            prop: 'applicant' ,
+            tableProp:'areaName',
             type: 'input',
             isSearch: true,
             width: '180px',
         },
         {
             label: '订单编号',
-            prop: 'outTradeNo',
+            prop: 'orderNo',
+            tableProp:'outTradeNo',
             type: 'input',
             isSearch: true,
             width: '200px',
         },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
+
             prop: 'orderTime',
             width: '160px',
             isSearch: true,
             type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
             width: '160px',
             isSearch: false,
-            type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
         },
         {
             label: '用户名称',
@@ -225,26 +227,26 @@ export default ({ proxy, jlzj_area_type }) => {
     const list_quyu = ref([
         {
             label: '订单编号',
-            prop: 'outTradeNo',
+            prop: 'orderNo',
+            tableProp:'outTradeNo',
             type: 'input',
             isSearch: true,
             width: '200px',
         },
         {
             label: '订单开始时间',
+            queryLabel: '订单时间',
             prop: 'orderTime',
             width: '160px',
             isSearch: true,
             type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
+            keys: ['startTime', 'endTime'],
         },
         {
             label: '订单完成时间',
             prop: 'serviceEndTime',
             width: '160px',
             isSearch: false,
-            type: 'date',
-            keys: ['serviceCompleteStartTime', 'serviceCompleteEndTime'],
         },
         {
             label: '用户名称',
@@ -330,7 +332,12 @@ export default ({ proxy, jlzj_area_type }) => {
             label: '收款人',
             prop: 'areaPayeeName',
              width:'150px'
-        }
+        },
+        {
+            label: '备注',
+            prop: 'areaAuditorRemark',
+            width: '150px'
+        },
        
     ])
     return {
@@ -352,7 +359,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 // hasPermi:["finance:apply"] 
                 show: (tabsValue) => {
 					console.log("TCL: tabsValue",jlzj_area_type.value, tabsValue)
-                    return jlzj_area_type.value !== PING_TAI &&  tabsValue === '10'
+                    return jlzj_area_type.value !== PING_TAI && [ '10','30'].includes(tabsValue)
                 } 
             },
             {
@@ -399,7 +406,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 },
                 hasPermi: ["finance:apply"],
                 show: (row) => {
-                    return row.areaSettlementStatus === '10' && jlzj_area_type.value !== PING_TAI
+                    return [ '10','30'].includes(row.areaSettlementStatus) && jlzj_area_type.value !== PING_TAI
                 }
             },
             {

src/views/finance/settlement/useService.js

@@ -129,7 +129,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 key: 'applicant',
                 type: 'primary',
                 show: (tabsValue) => {
-                    return jlzj_area_type.value === FU_WU_ZHONG_XIN &&  tabsValue === '10'
+                    return jlzj_area_type.value === FU_WU_ZHONG_XIN && [ '10','30'].includes(tabsValue) 
                 }
             },
             {
@@ -165,26 +165,27 @@ export default ({ proxy, jlzj_area_type }) => {
         tableColumn: ref([
             {
                 label: '订单号',
-                prop: 'outTradeNo',
+                prop: 'orderNo',
+                tableProp:'outTradeNo',
                 type: 'input',
                 isSearch: true,
                 width: '180px',
             },
             {
                 label: '订单开始时间',
+                queryLabel: '订单时间',
+    
                 prop: 'orderTime',
                 width: '160px',
                 isSearch: true,
                 type: 'date',
-                keys: ['orderTimeStart', 'orderTimeEnd'],
+                keys: ['startTime', 'endTime'],
             },
             {
                 label: '订单完成时间',
                 prop: 'serviceEndTime',
                 width: '160px',
-                isSearch: true,
-                type: 'date',
-                keys: ['serviceEndTimeStart', 'serviceEndTimeEnd'],
+                isSearch: false,
             },
             {
                 label: '用户名称',
@@ -255,7 +256,7 @@ export default ({ proxy, jlzj_area_type }) => {
             },
             {
                 label: '备注',
-                prop: 'serviceCentreSettlementTime',
+                prop: 'serviceCentreAuditorRemark',
                 width: '150px'
             },
         ]),
@@ -270,7 +271,7 @@ export default ({ proxy, jlzj_area_type }) => {
                 },
                 // hasPermi: ["finance:apply"],
                 show: (row) => {
-                    return jlzj_area_type.value === FU_WU_ZHONG_XIN && row.serviceCentreSettlementStatus === '10'
+                    return jlzj_area_type.value === FU_WU_ZHONG_XIN && [ '10','30'].includes(row.serviceCentreSettlementStatus)
                 }
             },
             {

vite.config.js

@@ -37,10 +37,10 @@ export default defineConfig(({ mode, command }) => {
         },
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://192.168.100.139:9527',
+          // target: 'http://192.168.100.139:9527',
           // target: 'https://zybooks.tech/prod-api', 
           // target: 'http://192.168.100.127:9527',
-          // target: 'http://192.168.100.122:9527',
+          target: 'http://192.168.100.122:9527',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         },