Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/utils/request.js

@@ -9,7 +9,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 // export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = "http://192.168.1.222:7077/";
+export const baseURL = "http://192.168.1.7:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/arap/index.vue

@@ -668,7 +668,7 @@ export default {
     },
     openDialog(data, type) {
       this.activeOrderInfo = data;
-      this.activeOrderInfo.checkFrom = type + 1;
+      this.activeOrderInfo.checkFrom = this.type + 1;
       this[
         ["tip", "examine", "remark", "order", "badBill"][type] + "DialogVisible"
       ] = true;

src/views/financed/components/audit/dislogSet.vue

@@ -185,7 +185,11 @@ export default {
       this.resetForm();
       this.$api[
         this.info.orderSn ? "systemtoporderdividedetail" : "dividelogdata"
-      ](this.info.orderSn ? {orderSn:this.info.orderSn,checkFrom:this.info.checkFrom} : this.info.id).then((res) => {
+      ](
+        this.info.orderSn
+          ? { orderSn: this.info.orderSn, checkFrom: this.info.checkFrom }
+          : this.info.id
+      ).then((res) => {
         this.form = res.data;
         this.$api.systemtenantbankId(res.data.tenantId).then((e) => {
           this.bankList = e.data || [];
@@ -193,9 +197,7 @@ export default {
       });
     },
     close() {
-      this.$refs[
-        this.info.orderSn? "formData" : "rulesPay"
-      ].resetFields();
+      this.$refs[this.info.orderSn ? "formData" : "rulesPay"].resetFields();
     },
     resetForm() {
       this.form = {
@@ -218,7 +220,7 @@ export default {
             })
               .then(() => {
                 let c = {
-                  divideModel: this.form.divideModel,
+                  divideModel: this.info.checkFrom - 1,
                   divideLogId: this.form.id,
                   tenantId: this.form.tenantId,
                   ...this.formPay,
@@ -248,13 +250,13 @@ export default {
             this.disabledBtn = true;
             this.$api
               .checkorderlogeditDivide({
-                checkFrom: this.form.divideModel+1,
+                checkFrom: this.info.checkFrom,
                 orderSn: this.form.orderSn,
                 ...this.formData,
               })
               .then((res) => {
                 this.isShow = false;
-                this.$emit("update",this.info.divideLogId)
+                this.$emit("update", this.info.divideLogId);
                 this.$emit("search");
               })
               .finally(() => {

src/views/financed/components/studentDetails.vue

@@ -347,7 +347,7 @@ export default {
         if (this.checkStatus === 1) {
           return true;
         } else {
-          return true;
+          return false;
         }
       },
     },

src/views/financed/orderManageList/index.vue

@@ -151,6 +151,7 @@
       :orderSn="orderSn"
       :orderFrom="orderFrom"
       :ShowStatus="ShowStatus"
+      @search="search"
     ></dislogOrderDetails>
     <dislog-set-cost
       :dialogVisible.sync="dialogVisiblecost"