v2.0

src/components/searchBoxNew.vue

@@ -403,6 +403,8 @@
           <!-- 自定义select -->
           <el-select
             :clearable="item.noClear === false ? false : true"
+            :filterable="item.filterable ? true : false"
+            :multiple="item.multiple ? true : false"
             v-else-if="item.scope === 'select'"
             v-model="formData[item.prop]"
             :placeholder="item.placeholder"

src/components/tableList.vue

@@ -982,7 +982,7 @@
           <div v-else-if="item.scope === 'formatPrice'">
             {{ scope.row[item.prop] | formatPrice }}
           </div>
-          <span v-else>
+          <span v-else :style="item.style">
             {{ scope.row[item.prop] }}
             {{
               (scope.row[item.prop] || scope.row[item.prop] === 0) && item.ch

src/views/financed/components/dislogOrderDetails.vue

@@ -12,7 +12,7 @@
           refundStatus(detailInfo.refundStatus)
         }}</span>
         <i v-if="orderFrom === 3" style="font-style: normal"
-          >审核状态：<span>{{ checkStatus(detailInfo.checkStatus) }}</span></i
+          >订单状态：<span>{{ checkStatus(detailInfo.checkStatus) }}</span></i
         >
         <i
           v-if="ShowStatus && detailInfo.checkStatus === 0"
@@ -44,11 +44,10 @@
             <div v-if="desc.type">
               <el-link
                 :underline="false"
-                :disabled="detailInfo['link'] ? false : true"
                 v-if="desc.type === 'dowm'"
                 :href="detailInfo['link']"
                 target="_blank"
-                >资料下载</el-link
+                ><span v-if="detailInfo['link']">资料下载</span></el-link
               >
               <div v-if="desc.type === 'image'">
                 <el-image
@@ -164,7 +163,6 @@ export default {
           type: "reduce",
         },
         { label: "下单企业", key: "purchaseOrg" },
-        { label: "转账开户名", key: "openingName" },
         { label: "转账凭证", key: "attachmentList", type: "image" },
         {
           label: "发票状态",
@@ -181,9 +179,10 @@ export default {
             },
           ],
         },
-        { label: "备注", key: "remark" },
         { label: "附件", type: "dowm" },
         { label: "佣金", key: "pretax", type: "pretax" },
+        { label: "下单备注", key: "remark" },
+        { label: "审核意见", key: "financeRemark" },
       ],
       detailInfo: {
         attachmentList: [],

src/views/financed/components/studentDetails.vue

@@ -52,7 +52,9 @@
             >查询</el-button
           >
           <el-button size="small" @click="search('init')">重置</el-button>
-          <el-button size="small" type="success" @click="exportData">导出</el-button>
+          <el-button size="small" type="success" @click="exportData"
+            >导出</el-button
+          >
 
           <el-button
             v-if="ShowStatus && isShow"
@@ -189,6 +191,11 @@ export default {
           prop: "goodsName",
           hidden: true,
         },
+        {
+          label: "年份",
+          prop: "year",
+          hidden: true,
+        },
         {
           label: "专业",
           prop: "majorName",
@@ -244,6 +251,17 @@ export default {
             },
           ],
         },
+        {
+          label: "发起原因",
+          prop: "refundReason",
+          hidden: true,
+        },
+        {
+          label: "审核意见",
+          prop: "checkReason",
+          hidden: true,
+          style: { color: "red" },
+        },
       ],
       tableData1: [],
       tableSet2: [

src/views/financed/orderManageList/index.vue

@@ -381,10 +381,6 @@ export default {
             { label: "出纳", value: 2 },
           ],
         },
-        {
-          prop: "orderOrg",
-          placeholder: "订单来源",
-        },
 
         // {
         //   prop: "businessFullName",
@@ -409,7 +405,7 @@ export default {
         },
         {
           prop: "checkStatus",
-          placeholder: "审核状态",
+          placeholder: "订单状态",
           scope: "select",
           options: [
             { label: "待审核", value: 0 },
@@ -420,7 +416,7 @@ export default {
         },
         {
           prop: "tenantId",
-          placeholder: "请选择机构",
+          placeholder: "选择机构",
           scope: "systemtenantlist",
         },
         {
@@ -482,6 +478,10 @@ export default {
           scope: "moreDataPicker",
           Diszing: true,
         },
+        {
+          prop: "orderOrg",
+          placeholder: "订单来源",
+        },
         {
           prop: "keyword",
           placeholder: "订单号/业务号/下单企业",
@@ -542,7 +542,7 @@ export default {
           ],
         },
         {
-          label: "审核状态",
+          label: "订单状态",
           prop: "checkStatus",
           scope: "isOptions",
           hidden: true,

src/views/systemManagement/functional/dislog.vue

@@ -0,0 +1,306 @@
+<template>
+  <div>
+    <BaseDialog
+      width="800px"
+      :isShow.sync="isShow"
+      :title="activeData.tenantId ? '修改' : '新增'"
+      @submit="submitForm"
+      @close="close"
+    >
+      <el-form
+        :model="formData"
+        :rules="rules"
+        ref="formData"
+        label-width="100px"
+        class="demo-ruleForm"
+      >
+        <el-form-item label="机构名称：" prop="tenantName">
+          <el-input
+            clearable
+            v-model="formData.tenantName"
+            placeholder="输入机构名称"
+          ></el-input> </el-form-item
+        ><el-form-item label="h5域名：" prop="hostH5"
+          ><el-input
+            clearable
+            v-model="formData.hostH5"
+            placeholder="输入h5域名"
+          ></el-input></el-form-item
+        ><el-form-item label="PC域名：" prop="hostPc"
+          ><el-input
+            clearable
+            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-item label="教务电话：" prop="eduPhone">
+          <el-input
+            clearable
+            v-model="formData.eduPhone"
+            placeholder="输入教务电话"
+          ></el-input> </el-form-item
+        >
+      </el-form>
+    </BaseDialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false,
+    },
+    activeData: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      formData: {
+        accountList: [{}],
+        invoiceBo: {},
+        tenantName: "",
+        billType: "",
+        billDay: "",
+        openingName: "",
+        openingBank: "",
+        proceedsAccount: "",
+        invoiceType: "",
+        invoice: "",
+        taxpayer: "",
+        eduPhone:""
+      },
+      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" },
+        ],
+        eduPhone: [
+          { required: true, message: "请输入教务电话", trigger: "blur" },
+        ],
+      },
+      days: [],
+    };
+  },
+  mounted() {
+    this.getDays();
+  },
+
+  methods: {
+    //获取天数 从第6天算起 至31日
+    getDays() {
+      for (let i = 6; i <= 31; i++) {
+        this.days.push({ label: i + "日", value: i });
+      }
+    },
+    init() {
+      this.formData = JSON.parse(JSON.stringify(this.activeData));
+      if (this.formData.tenantId) {
+        this.formData.accountList = this.formData.accountList || [{}];
+        this.formData.invoiceBo = this.formData.invoiceBo || {};
+      } else {
+        this.formData = {
+          tenantName: "",
+          eduPhone:"",
+          billType: "",
+          billDay: "",
+          openingName: "",
+          openingBank: "",
+          proceedsAccount: "",
+          invoiceType: "",
+          invoice: "",
+          taxpayer: "",
+          accountList: [{}],
+          invoiceBo: {},
+        };
+      }
+    },
+    close() {
+      this.$refs["formData"].resetFields();
+    },
+    submitForm() {
+      this.$refs["formData"].validate((valid) => {
+        if (valid) {
+          this.$api[
+            this.activeData.tenantId ? "systemtenantedittop" : "systemtenantadd"
+          ](this.formData).then((res) => {
+            this.$message.success("成功");
+            this.$store.commit("TENANTLIST");
+            this.isShow = false;
+            this.$emit("search");
+          });
+        } 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>
+.el-input {
+  width: 220px;
+  margin-right: 10px;
+}
+.el-select {
+  width: 220px;
+  margin-right: 10px;
+}
+</style>

src/views/systemManagement/functional/index.vue

@@ -0,0 +1,321 @@
+<template>
+  <div id="functional">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="init"
+    />
+    <table-list
+      rowKey="tenantId"
+      ref="tableList"
+      :tableSets="tableSet"
+      :tableData="tableData"
+      :navText="navText"
+      :loading="loading"
+      @addClick="addClick"
+    >
+      <template slot="customize">
+        <el-button type="warning" @click="remove" v-if="false"> 批量删除 </el-button>
+        <el-button type="warning" @click="excelPort"> Excel导出 </el-button>
+      </template>
+      <template slot="status" slot-scope="props">
+        <el-popover placement="right" width="650" trigger="click">
+          <el-table border :data="props.scope.row.accountList">
+            <el-table-column
+              type="index"
+              label="序号"
+              width="70"
+              align="center"
+              header-align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              width="120"
+              property="openingBank"
+              label="开户银行"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              width="180"
+              property="openingName"
+              label="开户名称"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              property="proceedsAccount"
+              label="收款账号"
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-button
+            slot="reference"
+            type="text"
+            :disabled="
+              !props.scope.row.accountList ||
+              props.scope.row.accountList.length === 0
+            "
+            >查看</el-button
+          >
+        </el-popover>
+      </template>
+      <template slot="domainName" slot-scope="props">
+        <p>移动端：{{ props.scope.row.hostH5 }}</p>
+        <p>电脑端：{{ props.scope.row.hostPc }}</p>
+      </template>
+      <template slot="accountPeriodSetting" slot-scope="props">
+        <p>
+          {{ getBillType(props.scope.row.billType) }}，次月{{
+            props.scope.row.billDay || " "
+          }}日
+        </p>
+      </template>
+      <template slot="invoiceInformation" slot-scope="props">
+        <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 v-if="false" type="text" @click="addClick(props.scope.row)"
+          >修改</el-button
+        ><el-button type="text" @click="del(props.scope.row)">删除</el-button>
+      </template>
+    </table-list>
+    <pagination
+      :total="total"
+      :pageSize.sync="formData.pageSize"
+      :currentPage.sync="formData.pageNum"
+      @search="search"
+    />
+    <dislog
+      :dialogVisible.sync="dialogVisible"
+      @search="search"
+      :activeData="activeData"
+    ></dislog>
+  </div>
+</template>
+
+<script>
+import dislog from "./dislog.vue";
+import searchBoxNew from "@/components/searchBoxNew";
+import tableList from "@/components/tableList";
+import pagination from "@/components/pagination";
+export default {
+  name: "Functional",
+  components: { searchBoxNew, tableList, pagination, dislog },
+  data() {
+    return {
+      loading: false,
+      navText: {
+        title: "职能管理",
+        index: 0,
+        ch: "条",
+        num: true,
+        choice: true,
+        addHide: false,
+        custom: false,
+        openCheckMore: true,
+      },
+      formList: [
+        {
+          prop: "tenantid",
+          placeholder: "请选择机构名称",
+          scope: "systemtenantlist",
+        },
+      ],
+      formData: {},
+      tableSet: [
+        {
+          label: "机构名称",
+          prop: "tenantName",
+          hidden: true,
+        },
+        {
+          label: "网站域名",
+          prop: "address",
+          hidden: true,
+          scope: "solt",
+          soltName: "domainName",
+        },
+        {
+          label: "账期设置",
+          prop: "address",
+          hidden: true,
+          scope: "solt",
+          soltName: "accountPeriodSetting",
+        },
+        {
+          label: "教务电话",
+          prop: "eduPhone",
+          hidden: true,
+        },
+        {
+          label: "是否有商户号",
+          prop: "commercialTenant",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "是",
+              value: 1,
+            },
+            {
+              label: "否",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "银行账号信息",
+          prop: "accountList",
+          hidden: true,
+          scope: "solt",
+          soltName: "status",
+        },
+        {
+          label: "发票信息",
+          prop: "address",
+          hidden: true,
+          scope: "solt",
+          soltName: "invoiceInformation",
+        },
+      ],
+      tableData: [],
+      total: 0,
+      dialogVisible: false,
+      activeData: {},
+    };
+  },
+  created() {
+    this.search(2);
+  },
+  methods: {
+    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;
+      if (v === 2) {
+        this.formData = {
+          pageSize: 10,
+          pageNum: 1,
+        };
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
+      }
+      if (v === 3) {
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
+      }
+      this.$api
+        .systemtenantlist(this.formData)
+        .then((res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+          this.navText.index = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    init() {
+      this.search(2);
+    },
+    del(v) {
+      this.$confirm("确定删除此内容？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .systemtenantdeletetop({ tenantIds: [v.tenantId] })
+            .then((res) => {
+              this.$message.success("删除成功");
+              this.$store.commit("TENANTLIST");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
+    },
+    excelPort(){
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.warning("请勾选数据");
+        return;
+      }
+
+    },
+    remove() {
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.warning("请勾选数据");
+        return;
+      }
+      this.$confirm("确定批量删除选中的数据吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .systemtenantdeletetop({
+              tenantIds: this.$refs.tableList.allCheckData.map(
+                (i) => i.tenantId
+              ),
+            })
+            .then(() => {
+              this.$message.success("批量删除成功");
+              this.$store.commit("TENANTLIST");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/systemManagement/mechanism/dislog.vue

@@ -147,6 +147,13 @@
               ></el-input> </el-form-item
           ></el-col>
         </el-form-item>
+        <el-form-item label="教务电话：" prop="eduPhone">
+          <el-input
+            clearable
+            v-model="formData.eduPhone"
+            placeholder="输入教务电话"
+          ></el-input> </el-form-item
+        >
       </el-form>
     </BaseDialog>
   </div>
@@ -181,6 +188,7 @@ export default {
         invoiceType: "",
         invoice: "",
         taxpayer: "",
+        eduPhone:""
       },
       rules: {
         tenantName: [
@@ -210,6 +218,9 @@ export default {
         taxpayer: [
           { required: true, message: "请输入纳税人", trigger: "blur" },
         ],
+        eduPhone: [
+          { required: true, message: "请输入教务电话", trigger: "blur" },
+        ],
       },
       days: [],
     };
@@ -233,6 +244,7 @@ export default {
       } else {
         this.formData = {
           tenantName: "",
+          eduPhone:"",
           billType: "",
           billDay: "",
           openingName: "",

src/views/systemManagement/mechanism/index.vue

@@ -17,7 +17,8 @@
       @addClick="addClick"
     >
       <template slot="customize">
-        <el-button type="warning" @click="remove"> 批量删除 </el-button>
+        <el-button type="warning" @click="remove" v-if="false"> 批量删除 </el-button>
+        <el-button type="warning" @click="excelPort"> Excel导出 </el-button>
       </template>
       <template slot="status" slot-scope="props">
         <el-popover placement="right" width="650" trigger="click">
@@ -95,7 +96,7 @@
         </p>
       </template>
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="addClick(props.scope.row)"
+        <el-button v-if="false" type="text" @click="addClick(props.scope.row)"
           >修改</el-button
         ><el-button type="text" @click="del(props.scope.row)">删除</el-button>
       </template>
@@ -163,6 +164,11 @@ export default {
           scope: "solt",
           soltName: "accountPeriodSetting",
         },
+        {
+          label: "教务电话",
+          prop: "eduPhone",
+          hidden: true,
+        },
         {
           label: "是否有商户号",
           prop: "commercialTenant",
@@ -276,9 +282,16 @@ export default {
         })
         .catch(() => {});
     },
+    excelPort(){
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.warning("请勾选数据");
+        return;
+      }
+
+    },
     remove() {
       if (this.$refs.tableList.allCheckData.length === 0) {
-        this.$message.error("请勾选数据");
+        this.$message.warning("请勾选数据");
         return;
       }
       this.$confirm("确定批量删除选中的数据吗？", "提示", {