Explorar el Código

审核不通过的可以再次提交

chenjj hace 3 meses
padre
commit
7698a7e6bd

+ 8 - 3
src/views/finance/settlement/useRegional.js

@@ -330,7 +330,12 @@ export default ({ proxy, jlzj_area_type }) => {
             label: '收款人',
             prop: 'areaPayeeName',
              width:'150px'
-        }
+        },
+        {
+            label: '备注',
+            prop: 'areaAuditorRemark',
+            width: '150px'
+        },
        
     ])
     return {
@@ -352,7 +357,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 +404,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
                 }
             },
             {

+ 3 - 3
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) 
                 }
             },
             {
@@ -255,7 +255,7 @@ export default ({ proxy, jlzj_area_type }) => {
             },
             {
                 label: '备注',
-                prop: 'serviceCentreSettlementTime',
+                prop: 'serviceCentreAuditorRemark',
                 width: '150px'
             },
         ]),
@@ -270,7 +270,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)
                 }
             },
             {

+ 2 - 2
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/, '')
         },