浏览代码

合并 work-jyf 代码

jiayufei 3 年之前
父节点
当前提交
ddb1eec65c

+ 2 - 2
src/views/modules/policy-management/policy-management-server.js

@@ -6,6 +6,6 @@
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
  // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
- export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-//  export const urlAcount = 'http://192.168.1.8:9999'; // 学超
+//  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
+ export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 15 - 3
src/views/modules/policy-management/policy-management.vue

@@ -155,12 +155,21 @@
                 <span slot="updateApprovedStatus" slot-scope="text">
                     <a>{{ text }}</a>
                 </span>
+                <span slot="dianPayCompanyName" slot-scope="text">
+                    <span>{{ text ? text : '-' }}</span>
+                </span>
+                <span slot="dianPayCompanyRebateRate" slot-scope="text">
+                    <span>{{ text ? text : '-' }}</span>
+                </span>
                 <span slot="accountingPeriod" slot-scope="text">
                     <span>{{ text }}</span>
                 </span>
                 <span slot="policyStartDate" slot-scope="text, record">
                     <span>{{ text }} 至 {{ record.policyEndDate }}</span>
                 </span>
+                <span slot="remarks" slot-scope="text">
+                    <span>{{ text ? text : '-' }}</span>
+                </span>
                 <span slot="action" slot-scope="text, record">
                     <a v-if="record.updateOperation.includes('查看')" @click="handleDetail(record)">查看</a>
                     <a-divider v-if="record.updateOperation.includes('提交审核')" type="vertical"/>
@@ -745,13 +754,15 @@ export default {
                     title: '垫付公司',
                     align: 'center',
                     dataIndex: 'dianPayCompanyName',
-                    width: 150
+                    width: 150,
+                    scopedSlots: {customRender: 'dianPayCompanyName'}
                 },
                 {
                     title: '垫付公司返点',
                     align: 'center',
                     dataIndex: 'dianPayCompanyRebateRate',
-                    width: 150
+                    width: 150,
+                    scopedSlots: {customRender: 'dianPayCompanyRebateRate'}
                 },
                 {
                     title: '运营方式',
@@ -771,7 +782,8 @@ export default {
                     title: '备注',
                     align: 'center',
                     dataIndex: 'remarks',
-                    width: 190
+                    width: 190,
+                    scopedSlots: {customRender: 'remarks'}
                 },
                 {
                     title: '操作',

+ 1 - 1
src/views/modules/settlement-information/settlement-information-server.js

@@ -5,7 +5,7 @@
 
 //  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
- // export const urlAcount = 'http://192.168.1.43:8808'; // 子安
+ export const urlAcount = 'http://192.168.1.43:8808'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.8:9999'; // 学超
  

+ 2 - 2
src/views/modules/user-manage-operation/user-manage-operation-server.js

@@ -3,8 +3,8 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://118.24.244.213:8808'; // 线上
+//  export const urlAcount = 'http://118.24.244.213:8808'; // 线上
  // export const urlAcount = 'http://apipre.tjyourong.com.cn'; // 预生产
 //  export const urlAcount = 'http://192.168.1.43:8080'; // 子安
-//  export const urlAcount = 'http://139.186.165.84:8808'; // 测试
+ export const urlAcount = 'http://139.186.165.84:8808'; // 测试
 //  export const urlAcount = 'http://192.168.1.8:8080'; // 学超

+ 2 - 2
vue.config.js

@@ -86,9 +86,9 @@ module.exports = {
 				//  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
 				// target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
 				// target:'http://118.24.244.213:8804',
-				// target: 'http://192.168.1.43:9090', // 子安
+				target: 'http://192.168.1.43:9090', // 子安
 				// target: 'http://192.168.1.8:9999', // 学超
-				target:'http://gateway.tjyourong.com.cn', //测试
+				// target:'http://gateway.tjyourong.com.cn', //测试
 				// target:'http://apipre.tjyourong.com.cn', //预生产
 
 				ws: false,