朱鑫波 3 éve
szülő
commit
c81df264cf

+ 2 - 2
src/utils/request.js

@@ -21,9 +21,9 @@ else if (process.env.NODE_ENV === 'debug') {
 else if (process.env.NODE_ENV === 'production') {
 	// axios.defaults.baseURL = 'http://apipre.tjyourong.com.cn/jeecg-boot'; // 预生产
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot';//测试
-	axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
+	// axios.defaults.baseURL = 'http://api.tjyourong.com.cn/jeecg-boot'; // 生产环境
 	// axios.defaults.baseURL = 'http://gateway.tjyourong.com.cn/jeecg-boot'; // 测试环境
-	// axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
+	axios.defaults.baseURL = 'http://192.168.0.195:9999/jeecg-boot'; // 测试环境
 	// axios.defaults.baseURL = 'http://192.168.1.134:9999/jeecg-boot'; // 泽宇环境
 
 }

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

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

+ 4 - 4
src/views/modules/policy-management/policy-management.vue

@@ -484,7 +484,7 @@
         <!-- 作废原因 -->
         <a-modal
             v-if="voidOperationStatus"
-            title="作废原因"
+            title="政策作废"
             dialog-class="rejection-reason-class"
             :visible="voidOperationStatus"
             @ok="handleVoidOk"
@@ -494,7 +494,7 @@
             "
         >
             <div>
-                <div class="reason-class-header">请输入作废原因:</div>
+                <div class="reason-class-header" style="color:red;font-size:20px;font-weight:bold">是否将该条政策作废,一经作废不可恢复!</div>
                 <a-form-model
                     ref="rejectRuleForm"
                     :model="reasonForm"
@@ -991,7 +991,7 @@ export default {
                 },
                 {
                     id: 5,
-                    name: '作废'
+                    name: '作废'
                 }
             ],
             subTitleMsgStatus: false,
@@ -1347,7 +1347,7 @@ export default {
                 pageNo: this.tablePag.page,
                 pageSize: this.tablePag.size
             };
-            downFile(urlAcount + '/finance/cwjsPolicyInfo/list', paramsData).then(res => {
+            downFile(urlAcount + '/finance/cwjsPolicyInfo/exportPolicy', paramsData).then(res => {
                     // console.log(res)
                     this.exportLoading=false;
                     let blob = new Blob([res], {

+ 2 - 2
src/views/modules/settlement-account/settlement-account-server.js

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 // export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-// export const urlAcount = 'http://192.168.0.195:9999'; // 学超
+export const urlAcount = 'http://192.168.0.195:9999'; // 学超
  

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

@@ -3,9 +3,9 @@
  * @author jiayufei
  */
 
- export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
+//  export const urlAcount = 'http://api.tjyourong.com.cn'; // 线上
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
 //  export const urlAcount = 'http://192.168.1.43:9999'; // 子安
 //  export const urlAcount = 'http://gateway.tjyourong.com.cn'; // 测试
-// const urlAcount = 'http://192.168.0.195:9999'; // 学超
+const urlAcount = 'http://192.168.0.195:9999'; // 学超