fix:暂存

.env.development

@@ -5,7 +5,6 @@ VUE_APP_TITLE =中正平台
 ENV = 'development'
 
 # 中正云教育管理后台/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.24:7077/'
 VUE_APP_BASE_API = 'http://192.168.1.24:7077/'
 VUE_APP_IMG_API = 'https://file-dev.xyyxt.net'
 

.env.staging

@@ -8,7 +8,7 @@ ENV = 'staging'
 
 # 中正云教育管理后台/预发布环境
 # 测试
-VUE_APP_BASE_API = 'http://120.79.166.78:19013/'
+VUE_APP_BASE_API = 'http://192.168.1.222:7077/'
 # 预发布
 VUE_APP_BASE_API1 = 'http://120.79.166.78:19007/'
 #图片

src/fxApi/orderManageList.js

@@ -141,6 +141,14 @@ export default {
             data
         })
     },
+    //订单退款支付
+    systemtoporderrefundpay(data) {
+        return request({
+            url: '/system/top/order/refund/pay',
+            method: 'post',
+            data
+        })
+    },
     //订单学员审核
     systemtopordercheckstudent(data) {
         return request({
@@ -149,5 +157,28 @@ export default {
             data
         })
     },
+    //获取分成记录详细信息
+    dividelogdata(data) {
+        return request({
+            url: '/divide/log/'+data,
+            method: 'get'
+        })
+    },
+    //总平台新增系统商户
+    systemtenantadd(data) {
+        return request({
+            url: '/system/tenant/add',
+            method: 'post',
+            data
+        })
+    },
+    //总平台修改系统商户
+    systemtenantedittop(data) {
+        return request({
+            url: '/system/tenant/edit/top',
+            method: 'post',
+            data
+        })
+    },
     
 }

src/utils/request.js

@@ -7,9 +7,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
+export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = "http://192.168.1.24: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

@@ -34,7 +34,6 @@
       @load="load"
     >
       <template slot="customize">
-        <el-button @click="() => {}" type="warning"> 批量支付 </el-button>
         <el-button @click="openDialog({}, 4)" type="success">
           坏账设置
         </el-button>
@@ -64,7 +63,13 @@
       </template>
       <template slot="divideCheckStatus" slot-scope="props">
         <div>
-          {{ divideCheckStatus(props.scope.row.checkStatus) }}
+          {{
+            divideCheckStatus(
+              props.scope.row.orderSn,
+              props.scope.row.payStatus,
+              props.scope.row.checkStatus
+            )
+          }}
           <span style="color: #409eff" v-if="props.scope.row.roleName">
             ({{ props.scope.row.roleName }})
           </span>
@@ -92,11 +97,22 @@
         <template v-else>
           <el-button
             type="text"
+            v-if="!props.scope.row.orderSn"
             :disabled="
-              props.scope.row.creditStatus == 1 ||
-              props.scope.row.divideCheckStatus == 3
+              !(
+                props.scope.row.payStatus === 0 ||
+                props.scope.row.payStatus === 4
+              )
             "
             @click="openDialog(props.scope.row, 1)"
+          >
+            点击支付
+          </el-button>
+          <el-button
+            v-else
+            type="text"
+            :disabled="props.scope.row.checkStatus !== 0"
+            @click="openDialog(props.scope.row, 1)"
           >
             点击审核
           </el-button>
@@ -136,9 +152,7 @@
     <dislog-set
       :dialogVisible.sync="examineDialogVisible"
       @search="search"
-      :type="1"
-      :orderSn="activeOrderInfo.orderSn"
-      :checkFrom="type + 1"
+      :info="activeOrderInfo"
     ></dislog-set>
     <!-- 坏账设置 -->
     <dislog-bad-bill
@@ -148,7 +162,7 @@
 </template>
 
 <script>
-import dislogSet from "@/components/audit/dislogSet.vue";
+import dislogSet from "../components/audit/dislogSet.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
@@ -577,27 +591,48 @@ export default {
     this.init();
   },
   methods: {
-    divideCheckStatus(e) {
+    divideCheckStatus(type, e1, e2) {
       var a = "";
-      switch (e) {
-        case -1:
-          a = "未通过";
-          break;
-        case 0:
-          a = "待审核";
-          break;
-        case 1:
-          a = "已通过";
-          break;
-        case 2:
-          a = "待支付";
-          break;
-        case 3:
-          a = "已支付";
-          break;
-
-        default:
-          break;
+      if (type) {
+        switch (e2) {
+          case -1:
+            a = "未通过";
+            break;
+          case 0:
+            a = "待审核";
+            break;
+          case 1:
+            a = "已通过";
+            break;
+          case 2:
+            a = "待支付";
+            break;
+          case 3:
+            a = "已支付";
+            break;
+          default:
+            break;
+        }
+      } else {
+        switch (e1) {
+          case 0:
+            a = "待支付";
+            break;
+          case 1:
+            a = "已打款";
+            break;
+          case 2:
+            a = "待审核";
+            break;
+          case 3:
+            a = "打款中";
+            break;
+          case 4:
+            a = "打款失败";
+            break;
+          default:
+            break;
+        }
       }
       return a;
     },

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

@@ -4,41 +4,24 @@
       :disabledBtn="disabledBtn"
       width="600px"
       :isShow.sync="isShow"
-      :title="ShowStatus() ? '付款审核' : '退款审核'"
+      title="付款审核"
       @close="close"
       @submit="submitForm"
-      :confirmName="
-        form.checkType === 3 || form.checkType === 6 ? '确定支付' : '确定'
-      "
+      :confirmName="info.orderSn ? '确定' : '确定支付'"
     >
-      <template
-        v-if="
-          form.checkType === 1 || form.checkType === 2 || form.checkType === 5
-        "
-      >
+      <template v-if="info.orderSn">
         <p style="margin-top: 0">
-          {{ type === 1 ? "下单时间" : "申请时间" }}：{{
-            $methodsTools.onlyForma(type === 1 ? form.buyTime : form.applyTime)
-          }}
-        </p>
-        <p style="margin-top: 0" v-if="ShowStatus()">
-          订单单号：{{ form.orderSn }}
+          下单时间：{{ $methodsTools.onlyForma(form.buyTime) }}
         </p>
+        <p style="margin-top: 0">订单单号：{{ form.orderSn }}</p>
         <p>
           <span class="color_1890ff">{{ form.applyName }}</span>
-          <span v-if="!ShowStatus()">,发起退款申请</span>
         </p>
-        <div class="bgc_pink" v-if="ShowStatus()">
+        <div class="bgc_pink">
           <p>
             待付账款：<span class="color_red">￥{{ form.payPrice }}</span>
           </p>
         </div>
-        <div class="bgc_pink" v-else>
-          <p>
-            本次退款金额：<span class="color_red">￥{{ form.refundFee }}</span>
-          </p>
-          <p>退款理由：{{ form.refundReason }}</p>
-        </div>
         <el-form
           :model="formData"
           :rules="rules"
@@ -66,7 +49,7 @@
           :checkLogVos="form.checkLogVos"
         ></audit-progress>
       </template>
-      <template v-if="form.checkType === 3 || form.checkType === 6">
+      <template v-else>
         <em>收款信息：</em>
         <el-form
           :model="formPay"
@@ -83,7 +66,9 @@
                 @click="fastInput(item)"
                 >{{ item.openingName }}</el-button
               >
-              <p style="margin: 0;">注：点击上方按钮可快速填入对应商户银行信息</p>
+              <p style="margin: 0">
+                注：点击上方按钮可快速填入对应商户银行信息
+              </p>
             </div></el-form-item
           >
           <el-form-item label="银行账号：" prop="toBankAcount">
@@ -104,56 +89,21 @@
           </el-form-item>
         </el-form>
         <el-divider></el-divider>
-        <template v-if="type === 1">
+        <template>
           <em>订单信息：</em>
           <p>
-            支付金额：<span
-              class="color_red"
-              style="font-size: 28px; font-weight: 400"
-              >¥
-              {{
-                checkFrom === 2
-                  ? form.divideCompanyMoney
-                  : checkFrom === 3
-                  ? form.divideSellerMoney
-                  : 0
-              }}</span
-            >
-          </p>
-          <p>
-            下单时间：<em>{{ $methodsTools.onlyForma(form.buyTime) }}</em>
+            机构名称：<em>{{ form.tenantName }}</em>
           </p>
           <p>
-            订单单号：<em>{{ form.orderSn }}</em>
+            待付时间：<em>{{ form.year + "-" + form.month }}</em>
           </p>
-        </template>
-        <template v-if="type === 2">
-          <em>订单信息：</em>
           <p>
-            支付金额：<span
+            待付金额：<span
               class="color_red"
               style="font-size: 28px; font-weight: 400"
-              >¥ {{ form.refundMoney }}</span
+              >¥ {{ form.payMoney.toFixed(2) }}</span
             >
           </p>
-          <p>
-            下单时间：<em>{{ $methodsTools.onlyForma(form.applyTime) }}</em>
-          </p>
-          <p>
-            订单单号：<em>{{ form.orderSn }}</em>
-          </p>
-          <p>
-            支付方式：<el-radio disabled v-model="form.payType" :label="1"
-              >微信支付</el-radio
-            >
-            <el-radio disabled v-model="form.payType" :label="2" v-if="!ShowStatus()"
-              >网银支付、对公转账</el-radio
-            >
-          </p>
-          <el-divider></el-divider>
-          <em>支付方式：</em>
-          <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
-          <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
         </template>
       </template>
     </BaseDialog>
@@ -161,7 +111,7 @@
 </template>
 
 <script>
-import auditProgress from "@/components/audit/auditProgress.vue";
+import auditProgress from "./auditProgress.vue";
 export default {
   name: "DislogSet",
   components: {
@@ -172,17 +122,11 @@ export default {
       type: Boolean,
       default: false,
     },
-    type: {
-      type: Number,
-      default: 0, //1付款  2退款
-    },
-    orderSn: {
-      type: String,
-      default: "",
-    },
-    checkFrom: {
-      type: Number,
-      default: 0, //1退款  2机构 3业务员
+    info: {
+      type: Object,
+      default: () => {
+        return {};
+      },
     },
   },
   data() {
@@ -194,6 +138,7 @@ export default {
         checkReason: "",
       },
       form: {
+        payMoney: 0,
         checkLogVos: [],
       },
       rules: {
@@ -236,16 +181,11 @@ export default {
         toBankTypeName: item.openingBank,
       };
     },
-    ShowStatus() {
-      return this.type === 1 ? true : false;
-    },
     init() {
       this.resetForm();
       this.$api[
-        this.type === 1
-          ? "systemtoporderdividedetail"
-          : "systemtoporderrefunddetail"
-      ](this.orderSn).then((res) => {
+        this.info.orderSn ? "systemtoporderdividedetail" : "dividelogdata"
+      ](this.info.orderSn ? this.info.orderSn : this.info.id).then((res) => {
         this.form = res.data;
         this.$api.systemtenantbankId(res.data.tenantId).then((e) => {
           this.bankList = e.data || [];
@@ -253,20 +193,14 @@ export default {
       });
     },
     close() {
-      if (
-        this.form.checkType === 1 ||
-        this.form.checkType === 2 ||
-        this.form.checkType === 5
-      ) {
-        this.$refs["formData"].resetFields();
-      }
-      if (this.form.checkType === 3 || this.form.checkType === 6) {
-        this.$refs["rulesPay"].resetFields();
-      }
+      this.$refs[
+        this.info.orderSn? "formData" : "rulesPay"
+      ].resetFields();
     },
     resetForm() {
       this.form = {
         checkLogVos: [],
+        payMoney: 0,
       };
       this.formData = {
         checkResult: "",
@@ -274,7 +208,7 @@ export default {
       };
     },
     submitForm() {
-      if (this.form.checkType === 3 || this.form.checkType === 6) {
+      if (!this.info.orderSn) {
         this.$refs["rulesPay"].validate((valid) => {
           if (valid) {
             this.$confirm("确定支付账款吗？", "提示", {
@@ -285,7 +219,7 @@ export default {
               .then(() => {
                 let c = {
                   divideModel: this.form.divideModel,
-                  orderSn: this.form.orderSn,
+                  divideLogId: this.form.id,
                   tenantId: this.form.tenantId,
                   ...this.formPay,
                 };
@@ -312,15 +246,12 @@ export default {
         this.$refs["formData"].validate((valid) => {
           if (valid) {
             this.disabledBtn = true;
-            this.$api[
-              this.type === 1
-                ? "checkorderlogeditDivide"
-                : "systemtoporderrefundcheck"
-            ]({
-              checkFrom: this.type === 1 ? this.checkFrom : undefined,
-              orderSn: this.orderSn,
-              ...this.formData,
-            })
+            this.$api
+              .checkorderlogeditDivide({
+                checkFrom: this.form.divideModel+1,
+                orderSn: this.form.orderSn,
+                ...this.formData,
+              })
               .then((res) => {
                 this.isShow = false;
                 this.$emit("search");

src/views/financed/components/dislogOrderDetails.vue

@@ -14,7 +14,10 @@
         <span v-if="orderFrom === 3"
           >审核状态：{{ checkStatus(detailInfo.checkStatus) }}</span
         >
-        <i v-if="ShowStatus && detailInfo.checkStatus === 0" style="float: right">
+        <i
+          v-if="ShowStatus && detailInfo.checkStatus === 0"
+          style="float: right"
+        >
           <el-button
             type="success"
             size="small"
@@ -41,8 +44,9 @@
             <div v-if="desc.type">
               <el-link
                 :underline="false"
+                :disabled="detailInfo['link'] ? false : true"
                 v-if="desc.type === 'dowm'"
-                href="https://element.eleme.io"
+                :href="detailInfo['link']"
                 target="_blank"
                 >资料下载</el-link
               >
@@ -53,6 +57,11 @@
                 :preview-src-list="detailInfo[desc.key]"
               >
               </el-image>
+              <div v-if="desc.type === 'pretax'">
+                <span style="margin-right: 20px"
+                  >税前佣金：{{ detailInfo["pretaxBrokerage"] }}</span
+                ><span>税占比：{{ detailInfo["pretaxStr"] }}</span>
+              </div>
               <div v-if="desc.type === 'time'">
                 {{ $methodsTools.onlyForma(detailInfo[desc.key]) }}
               </div>
@@ -128,7 +137,7 @@ export default {
         { label: "未收账款(元)", key: "orderUncollected" },
         { label: "实际账款(元)", key: "orderPractical" },
         { label: "下单企业", key: "tenantName" },
-        { label: "转账开户名", key: "123" },
+        { label: "转账开户名", key: "openingName" },
         { label: "转账凭证", key: "attachmentList", type: "image" },
         {
           label: "发票状态",
@@ -147,6 +156,7 @@ export default {
         },
         { label: "备注", key: "remark" },
         { label: "附件", type: "dowm" },
+        { label: "佣金", key: "pretax", type: "pretax" },
       ],
       detailInfo: {
         attachmentList: [],
@@ -209,9 +219,16 @@ export default {
     getOrderDetail() {
       this.$api.systemtoporderid(this.orderSn).then((res) => {
         if (res.data.attachmentList?.length > 0) {
-          res.data.attachmentList = res.data.attachmentList.map(
-            (i) => i.attachmentUrl
-          );
+          let a1 = [];
+          for (let i = 0; i < res.data.attachmentList.length; i++) {
+            if (res.data.attachmentList[i].attachmentType === 1) {
+              a1.push(res.data.attachmentList[i].attachmentUrl);
+            }
+            if (res.data.attachmentList[i].attachmentType === 2) {
+              res.data.link = res.data.attachmentList[i].attachmentUrl;
+            }
+          }
+          res.data.attachmentList = a1;
         } else {
           res.data.attachmentList = [];
         }

src/views/financed/components/refund/auditProgress.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <BaseDialog
+      width="700px"
+      :isShow.sync="isShow"
+      title="退款审核"
+      @close="close"
+      @submit="submitForm"
+      :appendToBody="true"
+      :confirmStatus="false"
+    >
+      <el-timeline>
+        <el-timeline-item
+          v-for="(item, index) in checkLogVos"
+          :timestamp="$methodsTools.onlyForma(item.checkTime)"
+          placement="top"
+          :color="
+            item.checkSign === 1
+              ? '#409EFF'
+              : item.checkStatus === 1
+              ? '#67C23A'
+              : item.checkStatus === -1
+              ? '#F56C6C'
+              : '#e4e4e4'
+          "
+        >
+          <el-card>
+            <h4>负责人：{{ item.roleName }}</h4>
+            <p>
+              审核状态：{{
+                item.checkStatus === 0
+                  ? "待审核"
+                  : item.checkStatus === 1
+                  ? "已通过"
+                  : item.checkStatus === -1
+                  ? "未通过"
+                  : ""
+              }}
+            </p>
+            <p>审核意见：{{ item.checkReason }}</p>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+export default {
+  // name: "DislogSet",
+  props: {
+    auditProgress: {
+      type: Boolean,
+      default: false,
+    },
+    checkLogVos: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      active: 2,
+    };
+  },
+
+  mounted() {},
+
+  methods: {
+    init() {
+      console.log(this.checkLogVos, "checkLogVos");
+    },
+    close() {},
+    submitForm() {
+      this.isShow = false;
+    },
+  },
+  computed: {
+    isShow: {
+      get() {
+        if (this.auditProgress) {
+          this.init();
+        }
+        return this.auditProgress;
+      },
+      set(val) {
+        this.$emit("update:auditProgress", false);
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.el-timeline {
+  padding: 0px 6px;
+  max-height: 600px;
+  overflow: auto;
+}
+</style>

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

@@ -0,0 +1,286 @@
+<template>
+  <div>
+    <BaseDialog
+      :disabledBtn="disabledBtn"
+      width="600px"
+      :isShow.sync="isShow"
+      title="'退款审核"
+      @close="close"
+      @submit="submitForm"
+      :confirmName="form.checkType === 3 ? '确定支付' : '确定'"
+    >
+      <template v-if="form.checkType === 2">
+        <p style="margin-top: 0">
+          申请时间：{{ $methodsTools.onlyForma(form.applyTime) }}
+        </p>
+        <p>
+          <span class="color_1890ff">{{ form.applyName }}</span>
+          <span>,发起退款申请</span>
+        </p>
+        <div class="bgc_pink">
+          <p>
+            本次退款金额：<span class="color_red">￥{{ form.refundFee }}</span>
+          </p>
+          <p>退款理由：{{ form.refundReason }}</p>
+        </div>
+        <el-form
+          :model="formData"
+          :rules="rules"
+          ref="formData"
+          label-width="100px"
+        >
+          <el-form-item prop="checkResult" label="审核结果：">
+            <el-radio-group v-model="formData.checkResult">
+              <el-radio label="1">同意</el-radio>
+              <el-radio label="-1">拒绝</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item prop="checkReason" label="审核意见：">
+            <el-input
+              type="textarea"
+              placeholder="请输入审核意见"
+              v-model="formData.checkReason"
+            ></el-input> </el-form-item
+        ></el-form>
+        <template slot="slotBtn">
+          <el-button @click="auditProgress = true">审核进度</el-button>
+        </template>
+        <audit-progress
+          :auditProgress.sync="auditProgress"
+          :checkLogVos="form.checkLogVos"
+        ></audit-progress>
+      </template>
+      <template v-if="form.checkType === 3">
+        <div v-if="form.payType === 2">
+          <em>收款信息：</em>
+          <el-form
+            :model="formPay"
+            :rules="rulesPay"
+            ref="rulesPay"
+            label-width="100px"
+            class="demo-ruleForm"
+          >
+            <el-form-item label="银行账号：" prop="toBankAcount">
+              <el-input
+                readonly
+                clearable
+                v-model="formPay.toBankAcount"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="账号名称：" prop="toBankName">
+              <el-input
+                readonly
+                clearable
+                v-model="formPay.toBankName"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="银行名称：" prop="toBankTypeName">
+              <el-input
+                readonly
+                clearable
+                v-model="formPay.toBankTypeName"
+              ></el-input>
+            </el-form-item>
+          </el-form>
+          <el-divider></el-divider>
+        </div>
+        <template>
+          <em>订单信息：</em>
+          <p>
+            支付金额：<span
+              class="color_red"
+              style="font-size: 28px; font-weight: 400"
+              >¥ {{ form.refundMoney.toFixed(2) }}</span
+            >
+          </p>
+          <p>
+            下单时间：<em>{{ $methodsTools.onlyForma(form.applyTime) }}</em>
+          </p>
+          <p>
+            订单单号：<em>{{ form.orderSn }}</em>
+          </p>
+          <p>
+            支付方式：<el-radio disabled v-model="form.payType" :label="1"
+              >微信支付</el-radio
+            >
+            <el-radio disabled v-model="form.payType" :label="2"
+              >网银支付、对公转账</el-radio
+            >
+          </p>
+          <el-divider></el-divider>
+          <em>支付方式：</em>
+          <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
+          <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
+        </template>
+      </template>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+import { baseURL } from "@/utils/request.js";
+import { getToken } from "@/utils/auth";
+import axios from "axios";
+import auditProgress from "./auditProgress.vue";
+export default {
+  name: "DislogSet",
+  components: {
+    auditProgress,
+  },
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    orderSn: {
+      type: String,
+      default: "",
+    },
+    checkRoleName: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      disabledBtn: false,
+      auditProgress: false,
+      formData: {
+        checkResult: "",
+        checkReason: "",
+      },
+      form: {
+        checkLogVos: [],
+      },
+      rules: {
+        checkResult: [
+          { required: true, message: "请选择审核结果", trigger: "change" },
+        ],
+        checkReason: [
+          { required: true, message: "请输入审核意见", trigger: "blur" },
+        ],
+      },
+      formPay: {
+        toBankAcount: "",
+        toBankName: "",
+        toBankTypeName: "",
+      },
+      rulesPay: {
+        toBankAcount: [
+          { required: true, message: "请输入银行账号", trigger: "blur" },
+        ],
+        toBankName: [
+          { required: true, message: "请输入账号名称", trigger: "blur" },
+        ],
+        toBankTypeName: [
+          { required: true, message: "请输入银行名称", trigger: "blur" },
+        ],
+      },
+    };
+  },
+
+  mounted() {},
+
+  methods: {
+    init() {
+      this.resetForm();
+      this.$api.systemtoporderrefunddetail(this.orderSn).then((res) => {
+        this.form = res.data;
+        this.formPay = {
+          toBankAcount: res.data.proceedsAccount,
+          toBankName: res.data.openingName,
+          toBankTypeName: res.data.openingBank,
+        };
+      });
+    },
+    close() {
+      this.$refs[
+        this.form.checkType === 2 ? "formData" : "rulesPay"
+      ].resetFields();
+    },
+    resetForm() {
+      this.form = {
+        checkLogVos: [],
+      };
+      this.formData = {
+        checkResult: "",
+        checkReason: "",
+      };
+      this.formPay = {
+        toBankAcount: "",
+        toBankName: "",
+        toBankTypeName: "",
+      };
+    },
+    submitForm() {
+      if (this.form.checkType === 3) {
+        this.$api
+          .systemtoporderrefundpay({
+            orderSn: this.orderSn,
+            payType: this.form.payType,
+            tenantId: this.form.tenantId,
+            ...this.formPay,
+          })
+          .then((res) => {
+            this.isShow = false;
+            this.$emit("search");
+          });
+      } else {
+        this.$refs["formData"].validate((valid) => {
+          if (valid) {
+            this.disabledBtn = true;
+            this.$api
+              .systemtoporderrefundcheck({
+                orderSn: this.orderSn,
+                ...this.formData,
+              })
+              .then((res) => {
+                this.isShow = false;
+                this.$emit("search");
+              })
+              .finally(() => {
+                this.disabledBtn = false;
+              });
+          } else {
+            return false;
+          }
+        });
+      }
+    },
+  },
+  computed: {
+    isShow: {
+      get() {
+        if (this.dialogVisible) {
+          this.init();
+        }
+        return this.dialogVisible;
+      },
+      set(val) {
+        this.$emit("update:dialogVisible", false);
+      },
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.bgc_pink {
+  padding: 10px;
+  background-color: rgb(252, 234, 236);
+  color: #000;
+}
+.color_red {
+  font-weight: bold;
+  color: rgb(235, 59, 59);
+}
+.color_1890ff {
+  color: #1890ff;
+  font-weight: bold;
+}
+em {
+  font-weight: bold;
+  color: #000;
+  font-style: unset;
+}
+</style>

src/views/financed/components/studentDetails.vue

@@ -351,7 +351,7 @@ export default {
               checkStatus: e,
               orderSn: this.orderSn,
               orderGoodsIds: this.$refs.tableList.allCheckData.map(
-                (i) => i.orderGoodsIds
+                (i) => i.orderGoodsId
               ),
             })
             .then((res) => {

src/views/financed/orderManageList/index.vue

@@ -139,6 +139,7 @@
       @search="search"
       :type="2"
       :orderSn="orderSn"
+      :checkRoleName="orderInfo.refundName"
     ></dislog-set>
     <remarks
       :dialogVisible.sync="remarksVisible"
@@ -163,7 +164,7 @@
 <script>
 import { exportFn } from "@/utils/index.js";
 import dislogSetCost from "../cost/dislogSet.vue";
-import dislogSet from "@/components/audit/dislogSet.vue";
+import dislogSet from "../components/refund/dislogSet.vue";
 import remarks from "../components/remarks.vue";
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
@@ -476,6 +477,7 @@ export default {
       dialogVisiblecost: false,
       tpId: "",
       type: null,
+      orderInfo:{}
     };
   },
   created() {
@@ -579,6 +581,7 @@ export default {
       } else {
         this.ShowStatus = false;
       }
+      this.orderInfo = data
       this.orderSn = data.orderSn;
       this.orderFrom = data.orderFrom;
       this.orderDialogVisible = true;

src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -238,6 +238,11 @@ export default {
           scope: "InfoMore",
           hidden: true,
         },
+        {
+          label: "(旧系统)业务层次名称",
+          prop: "oldBusinessName",
+          hidden: true,
+        },
         {
           label: "业务层次别名",
           prop: "aliasName",
@@ -276,6 +281,10 @@ export default {
           label: "业务层次名称",
           prop: "businessName",
         },
+        {
+          label: "(旧系统)业务层次名称",
+          prop: "oldBusinessName",
+        },
         {
           label: "学年",
           prop: "schoolYear",

src/views/systemManagement/mechanism/dislog.vue

@@ -3,8 +3,9 @@
     <BaseDialog
       width="800px"
       :isShow.sync="isShow"
-      title="新增"
+      :title="activeData.tenantId ? '修改' : '新增'"
       @submit="submitForm"
+      @close="close"
     >
       <el-form
         :model="formData"
@@ -13,90 +14,138 @@
         label-width="100px"
         class="demo-ruleForm"
       >
-        <el-form-item label="机构名称：" prop="name">
+        <el-form-item label="机构名称：" prop="tenantName">
           <el-input
             clearable
-            v-model="formData.name"
+            v-model="formData.tenantName"
             placeholder="输入机构名称"
           ></el-input> </el-form-item
-        ><el-form-item label="网站域名：" prop="name">
-          <div
-            v-for="(item, index) in formData.domain"
-            style="margin-bottom: 6px"
-          >
-            <el-input
-              clearable
-              v-model="item.name"
-              placeholder="输入备注"
-            ></el-input>
-            <el-input
-              clearable
-              v-model="item.name"
-              placeholder="输入主机名"
-            ></el-input>
-            <i
-              style="font-size: 24px; vertical-align: middle; margin-right: 4px"
-              class="el-icon-circle-plus"
-              v-if="index === formData.domain.length - 1"
-              @click="formData.domain.push({})"
-            ></i>
-            <i
-              style="font-size: 24px; vertical-align: middle"
-              class="el-icon-remove"
-              v-if="formData.domain.length > 1"
-              @click="formData.domain.splice(index, 1)"
-            ></i>
-          </div> </el-form-item
-        ><el-form-item label="账期设置：" prop="name">
-          <el-select
-            v-model="formData.years"
-            placeholder="选择账期类型"
+        ><el-form-item label="h5域名：" prop="hostH5"
+          ><el-input
             clearable
-          >
-            <el-option label="月度" :value="1"> </el-option
-            ><el-option label="季度" :value="2"> </el-option
-            ><el-option label="半年" :value="3"> </el-option>
-            <el-option label="年度" :value="4"> </el-option>
-          </el-select>
-          <el-select v-model="formData.days" placeholder="选择次月" clearable>
-            <el-option
-              v-for="(item, index) in days"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select> </el-form-item
-        ><el-form-item label="收款账号：" prop="name">
-          <el-input
-            clearable
-            v-model="formData.name"
-            placeholder="输入开户名"
-          ></el-input>
-          <el-input
-            clearable
-            v-model="formData.name"
-            placeholder="输入开户行"
-          ></el-input>
-          <el-input
-            style="margin-top: 10px"
-            clearable
-            v-model="formData.name"
-            placeholder="输入账号"
+            v-model="formData.hostH5"
+            placeholder="输入h5域名"
           ></el-input></el-form-item
-        ><el-form-item label="开票信息：" prop="name">
-          <el-select
-            v-model="formData.type"
-            placeholder="选择发票类型"
-            clearable
-          >
-            <el-option label="普票" :value="1"> </el-option
-            ><el-option label="专票" :value="2"> </el-option>
-          </el-select>
-          <el-input
+        ><el-form-item label="PC域名：" prop="hostPc"
+          ><el-input
             clearable
-            v-model="formData.name"
-            placeholder="输入发票抬头(企业或个人)"
-          ></el-input>
+            v-model="formData.hostPc"
+            placeholder="输入PC域名"
+          ></el-input
+        ></el-form-item>
+        <el-form-item label="账期设置：" required>
+          <el-col :span="9">
+            <el-form-item label="" prop="billType">
+              <el-select
+                v-model="formData.billType"
+                placeholder="选择账期类型"
+                clearable
+              >
+                <el-option label="月度" :value="1"> </el-option
+                ><el-option label="季度" :value="2"> </el-option
+                ><el-option label="半年" :value="3"> </el-option>
+                <el-option label="年度" :value="4"> </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+          <el-col :span="9"
+            ><el-form-item label="" prop="billDay">
+              <el-select
+                v-model="formData.billDay"
+                placeholder="选择次月"
+                clearable
+              >
+                <el-option
+                  v-for="(item, index) in days"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select> </el-form-item
+          ></el-col>
+        </el-form-item>
+        <el-form-item label="收款账号：" required>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'accountList.' + 0 + '.openingName'"
+              :rules="rules['openingName']"
+            >
+              <el-input
+                clearable
+                v-model="formData.accountList[0].openingName"
+                placeholder="输入开户名"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'accountList.' + 0 + '.openingBank'"
+              :rules="rules['openingBank']"
+            >
+              <el-input
+                clearable
+                v-model="formData.accountList[0].openingBank"
+                placeholder="输入开户行"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'accountList.' + 0 + '.proceedsAccount'"
+              :rules="rules['proceedsAccount']"
+            >
+              <el-input
+                style="margin-top: 20px"
+                clearable
+                v-model="formData.accountList[0].proceedsAccount"
+                placeholder="输入账号"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="开票信息：" required>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'invoiceBo.' + 'invoiceType'"
+              :rules="rules['invoiceType']"
+            >
+              <el-select
+                v-model="formData.invoiceBo.invoiceType"
+                placeholder="选择发票类型"
+                clearable
+              >
+                <el-option label="普票" :value="1"> </el-option
+                ><el-option label="专票" :value="2"> </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'invoiceBo.' + 'invoice'"
+              :rules="rules['invoice']"
+              ><el-input
+                clearable
+                v-model="formData.invoiceBo.invoice"
+                placeholder="输入发票抬头(企业或个人)"
+              ></el-input> </el-form-item
+          ></el-col>
+          <el-col :span="9">
+            <el-form-item
+              label=""
+              :prop="'invoiceBo.' + 'taxpayer'"
+              :rules="rules['taxpayer']"
+            >
+              <el-input
+                style="margin-top: 20px"
+                clearable
+                v-model="formData.invoiceBo.taxpayer"
+                placeholder="输入纳税人"
+              ></el-input> </el-form-item
+          ></el-col>
         </el-form-item>
       </el-form>
     </BaseDialog>
@@ -105,19 +154,54 @@
 
 <script>
 export default {
-  name: "remarks",
+  name: "",
   props: {
     dialogVisible: {
       type: Boolean,
       default: false,
     },
+    activeData: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
   },
   data() {
     return {
       formData: {
-        domain: [{}],
+        accountList: [{}],
+        invoiceBo: {},
+      },
+      rules: {
+        tenantName: [
+          { required: true, message: "请输入机构名称", trigger: "blur" },
+        ],
+        billType: [
+          { required: true, message: "请选择账期类型", trigger: "change" },
+        ],
+        billDay: [
+          { required: true, message: "请选择次月日期", trigger: "change" },
+        ],
+        openingName: [
+          { required: true, message: "请输入开户名", trigger: "blur" },
+        ],
+        openingBank: [
+          { required: true, message: "请输入开户行", trigger: "blur" },
+        ],
+        proceedsAccount: [
+          { required: true, message: "请输入账号", trigger: "blur" },
+        ],
+        invoiceType: [
+          { required: true, message: "请选择发票类型", trigger: "change" },
+        ],
+        invoice: [
+          { required: true, message: "请输入发票抬头", trigger: "blur" },
+        ],
+        taxpayer: [
+          { required: true, message: "请输入纳税人", trigger: "blur" },
+        ],
       },
-      rules: {},
       days: [],
     };
   },
@@ -132,11 +216,28 @@ export default {
         this.days.push({ label: i + "日", value: i });
       }
     },
-    init() {},
+    init() {
+      this.formData = JSON.parse(JSON.stringify(this.activeData));
+      this.formData.accountList = this.formData.accountList || [{}];
+      this.formData.invoiceBo = this.formData.invoiceBo || {};
+    },
+    close() {
+      this.$refs["formData"].resetFields();
+    },
     submitForm() {
-      this.$message.success("成功");
-      this.isShow = false;
-      this.$emit("search");
+      this.$refs["formData"].validate((valid) => {
+        if (valid) {
+          this.$api[
+            this.activeData.tenantId ? "systemtenantedittop" : "systemtenantadd"
+          ](this.formData).then((res) => {
+            this.$message.success("成功");
+            this.isShow = false;
+            this.$emit("search");
+          });
+        } else {
+          return false;
+        }
+      });
     },
   },
   computed: {

src/views/systemManagement/mechanism/index.vue

@@ -57,17 +57,44 @@
         </el-popover>
       </template>
       <template slot="domainName" slot-scope="props">
-        <p>移动端：</p>
-        <p>电脑端：</p>
+        <p>移动端：{{ props.scope.row.hostH5 }}</p>
+        <p>电脑端：{{ props.scope.row.hostPc }}</p>
       </template>
       <template slot="accountPeriodSetting" slot-scope="props">
-        <p>月度，次月5日</p>
+        <p>
+          {{ getBillType(props.scope.row.billType) }}，次月{{
+            props.scope.row.billDay || " "
+          }}日
+        </p>
       </template>
       <template slot="invoiceInformation" slot-scope="props">
-        <p>发票类型：</p>
-        <p>发票抬头：</p>
-        <p>企业名称：</p>
-        <p>企业ID：</p>
+        <p>
+          发票类型：<span v-if="props.scope.row.invoiceBo !== null">
+            {{
+              props.scope.row.invoiceBo["invoiceType"] === 1
+                ? "普票"
+                : props.scope.row.invoiceBo["invoiceType"] === 2
+                ? "专票"
+                : ""
+            }}</span
+          >
+        </p>
+        <p>
+          发票抬头：<span v-if="props.scope.row.invoiceBo !== null">{{
+            props.scope.row.invoiceBo["invoice"]
+          }}</span>
+        </p>
+        <p>企业名称：{{ props.scope.row.tenantName }}</p>
+        <p>
+          纳税人：<span v-if="props.scope.row.invoiceBo !== null">{{
+            props.scope.row.invoiceBo["taxpayer"]
+          }}</span>
+        </p>
+      </template>
+      <template slot="btn" slot-scope="props">
+        <el-button type="text" @click="addClick(props.scope.row)"
+          >修改</el-button
+        >
       </template>
     </table-list>
     <pagination
@@ -79,6 +106,7 @@
     <dislog
       :dialogVisible.sync="dialogVisible"
       @search="search"
+      :activeData="activeData"
     ></dislog>
   </div>
 </template>
@@ -102,12 +130,12 @@ export default {
         choice: false,
         addHide: false,
         custom: false,
-        tableHide: true,
       },
       formList: [
         {
-          prop: "tenantName",
-          placeholder: "请输入机构名称",
+          prop: "tenantid",
+          placeholder: "请选择机构名称",
+          scope: "systemtenantlist",
         },
       ],
       formData: {},
@@ -181,15 +209,37 @@ export default {
       tableData: [],
       total: 0,
       dialogVisible: false,
+      activeData: {},
     };
   },
   created() {
     this.search(2);
   },
   methods: {
-    addClick(){
-      this.dialogVisible = true
-      console.log(this.dialogVisible)
+    getBillType(e) {
+      var a = "";
+      switch (e) {
+        case 1:
+          a = "月份";
+          break;
+        case 2:
+          a = "季度";
+          break;
+        case 3:
+          a = "半年";
+          break;
+        case 4:
+          a = "年度";
+          break;
+
+        default:
+          break;
+      }
+      return a;
+    },
+    addClick(data) {
+      this.activeData = data || {};
+      this.dialogVisible = true;
     },
     search(v) {
       this.loading = true;
@@ -213,6 +263,22 @@ export default {
     init() {
       this.search(2);
     },
+    del(v) {
+      this.$alert(
+        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
+        "提示",
+        {
+          dangerouslyUseHTMLString: true,
+        }
+      )
+        .then(() => {})
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
   },
 };
 </script>