冲突解决

7c4fec56 · 董有沛 · 7fb44195 · bf9dd993 · 7c4fec56 · 7c4fec56
Commit 7c4fec56 authored May 20, 2020 by 董有沛
14 changed files
--- a/src/api/school-center/salesCensusAPI.js
+++ b/src/api/school-center/salesCensusAPI.js
+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+//获取县分下拉列表
+let initSubstName = (params) => postAction(prefix + "/saleCensus/initSubstName" , params);
+//获取学校下拉列表
+let getSchoolNames  = (params) => postAction(prefix + "/saleCensus/getSchoolNames" , params);
+// 获取充值达标列表
+let getList = (params) => postAction(prefix + "/saleCensus/list" , params);
+// 导出放号充值达标清单
+let exportOut= (params) => downFilePost(prefix + "/saleCensus/exportList" , params);
+export {
+    initSubstName,
+    getSchoolNames,
+    getList,
+    exportOut
+}
--- a/src/api/school-center/salesOrderAPI.js
+++ b/src/api/school-center/salesOrderAPI.js
+import {postAction,downFilePost} from '@/api/manage'
+const prefix = '/manager/ciop';
+//获取县分下拉列表
+let initSubstName = (params) => postAction(prefix + "/salesOrder/initSubstName" , params);
+//获取学校下拉列表
+let getSchoolNames  = (params) => postAction(prefix + "/salesOrder/getSchoolNames" , params);
+// 获取充值达标列表
+let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
+// 导出放号充值达标清单
+let exportOut= (params) => downFilePost(prefix + "/salesOrder/exportList" , params);
+// 删除
+let deleteOrder = (params) => postAction(prefix + "/salesOrder/deleteOrder" , params);
+// 下载导入结果清单
+let downloadResult = (params) => downFilePost(prefix + "/salesOrder/exportResult" , params);
+export {
+    initSubstName,
+    getSchoolNames,
+    getList,
+    deleteOrder,
+    downloadResult,
+    exportOut
+}
--- a/src/api/school-center/zjlSalaryManagerAPI.js
+++ b/src/api/school-center/zjlSalaryManagerAPI.js
@@ -4,7 +4,7 @@ const prefix = '/manager/ciop';
 // 楼长KPI管理
 let initSubstName = (params) => postAction(prefix + "/zjlWage/initSubstName" , params);
 let getSchoolNames  = (params) => postAction(prefix + "/zjlWage/getSchoolNames" , params);
-let uploadExcel = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params);
+let excelOut = (params) => downFilePost(prefix + "/zjlWage/excelOut" , params);
 let downloadMoBan = (params) => downFilePost(prefix + "/zjlWage/downloadMoBan" , params);
 let zjlSalaryList = (params) => postAction(prefix + "/zjlWage/list" , params);
 let zjlSalaryDelete = (params) => postAction(prefix + "/zjlWage/delete", params);
@@ -16,7 +16,7 @@ let createSalary = (params) => postAction(prefix + "/zjlWage/createSalary",param
 export {
    initSubstName,
    getSchoolNames,
-    uploadExcel,
+    excelOut,
    downloadMoBan,
    zjlSalaryList,
    zjlSalaryDelete,

--- a/src/views/school-center/louZhang/louZhangKPI.vue
+++ b/src/views/school-center/louZhang/louZhangKPI.vue
@@ -97,6 +97,9 @@
            <template slot="productCreateTime" slot-scope="text">
                {{ text | dayjs}}
            </template>
+            <template slot="minGanZi" slot-scope="text">
+                {{ text.substring(0,2)+'**'}}
+            </template>
            <template slot="operation" slot-scope="text,record">
                <span>
                  <a @click="modifyfunction(record)">KPI打分</a>
@@ -108,7 +111,7 @@
            </template>
        </s-table>
        <!----弹框-->
-        <a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
+        <a-modal :title="add ?'添加楼长KPI': 'KPI打分'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
            <a-form :form="Formtable">
                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="姓名：">
                    <a-input placeholder="姓名" v-decorator="[ 'sysuName', {rules: [{ required: true, message: '姓名不能为空！' }]} ]" :disabled="isdisabled"/>
@@ -233,8 +236,8 @@
                    isDel: '0'
                },
                columns: [
-                    {dataIndex: 'sysuName', width: 25, title: '姓名'},
+                    {dataIndex: 'sysuName', width: 25, title: '姓名',},
-                    {dataIndex: 'account', width: 40, title: '账号'},
+                    {dataIndex: 'account', width: 40, title: '账号',scopedSlots: {customRender: 'minGanZi'}},
                    {dataIndex: 'substName', width: 20, title: '县分'},
                    {dataIndex: 'schoolName', width: 70, title: '学校'},
                    {dataIndex: 'reportDaily', width: 25, title: '汇总任务量'},

--- a/src/views/school-center/louZhang/lzSalary.vue
+++ b/src/views/school-center/louZhang/lzSalary.vue
@@ -116,6 +116,9 @@
                <p v-if="text=='0'">正常</p>
                <p v-else=""></p>
            </template>
+            <template slot="minGanZi" slot-scope="text">
+                {{ text.substring(0,2)+'**'}}
+            </template>
            <template slot="operation" slot-scope="text,record">
                <span>
                  <a v-show="false" @click="modifyfunction(record)">编辑</a>
@@ -225,7 +228,7 @@
                },
                columns: [
                    {dataIndex: 'month', width: 20, title: 'KPI月份 '},
-                    {dataIndex: 'sysuName', width: 25, title: '姓名'},
+                    {dataIndex: 'sysuName', width: 25, title: '姓名',scopedSlots: {customRender: 'minGanZi'}},
                    {dataIndex: 'substName', width: 20, title: '县分'},
                    {dataIndex: 'schoolName', width: 70, title: '学校'},
                    {dataIndex: 'rechargeNum', width: 25, title: '放号充值数'},

--- a/src/views/school-center/louZhang/managerKpi.vue
+++ b/src/views/school-center/louZhang/managerKpi.vue
@@ -89,6 +89,9 @@
                <p v-if="text=='0'">正常</p>
                <p v-else=""></p>
            </template>
+            <template slot="minGanZi" slot-scope="text">
+                {{ text.substring(0,2)+'**'}}
+            </template>
            <!--<template slot="operation" slot-scope="text,record">
                <span>
                  <a v-show="false" @click="modifyfunction(record)">编辑</a>
@@ -107,10 +110,10 @@
    import ImportBtn from "../../../components/sysmanage/ImportBtn";
    import { zjlKpiList, uploadExcel, downloadMoBan } from "@/api/school-center/managerKpiAPI"
    import {cloneObject, exportFile} from '@/utils/util';
+    import ConstantActivity from "@/constant/ConstantActivity";
    import Vue from 'vue';
-    import {DatetimePicker} from 'vant';
    import moment from "moment";
-    import ConstantActivity from "@/constant/ConstantActivity";
+    import {DatetimePicker} from 'vant';
    Vue.use(DatetimePicker);
@@ -147,7 +150,7 @@
                columns: [
                    {dataIndex: 'month', width: 20, title: '月份 '},
                    {dataIndex: 'county', width: 20, title: '县分'},
-                    {dataIndex: 'name', width: 25, title: '督导'},
+                    {dataIndex: 'name', width: 25, title: '督导',},
                    {dataIndex: 'totalPerformance', width: 30, title: '绩效奖金合计'},
                    {dataIndex: 'performanceBase', width: 25, title: '绩效基数'},
                    {dataIndex: 'yfPerformance', width: 25, title: '应发绩效'},

--- a/src/views/school-center/louZhang/zjlSalary.vue
+++ b/src/views/school-center/louZhang/zjlSalary.vue
@@ -107,7 +107,7 @@
    import STable from '@/components/table';
    import ImportBtn from "../../../components/sysmanage/ImportBtn";
    import {
-        zjlSalaryList, zjlSalaryDelete, uploadExcel, downloadMoBan,createSalary
+        zjlSalaryList, zjlSalaryDelete, excelOut, downloadMoBan,createSalary
    } from "@/api/school-center/zjlSalaryManagerAPI"
    import {cloneObject, exportFile} from '@/utils/util';
    import Vue from 'vue';
@@ -256,7 +256,7 @@
                let nowdate = moment().format("YYYY-MM-DD");
                //导出
                exportFile(
-                    uploadExcel(Object.assign(params, obj)),
+                    excelOut(Object.assign(params, obj)),
                    "总经理薪酬管理信息" + nowdate + ".xlsx",
                );

--- a/src/views/school-center/salesList/saleCensus.vue
+++ b/src/views/school-center/salesList/saleCensus.vue
--- a/src/views/school-center/schoolmanager/schoolAllocation.vue
+++ b/src/views/school-center/schoolmanager/schoolAllocation.vue
--- a/src/views/school-center/verCodes/codeManage.vue
+++ b/src/views/school-center/verCodes/codeManage.vue
--- a/src/views/school-center/orderView/orderView.vue
+++ b/src/views/school-center/orderView/orderView.vue
--- a/src/views/school-center/product/product.vue
+++ b/src/views/school-center/product/product.vue
@@ -125,13 +125,10 @@
                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="正则验证名：">
                    <a-select v-model="regularName" style="width: 330px">
                        <a-select-option @click="regularsName('请选择')" value="请选择">请选择</a-select-option>
-                        <a-select-option @click="regularsName(item)" v-for="item in regulars" :value="item.regularId">
+                        <a-select-option @click="regularsName(item)" v-for="item in regulars" :value="item.regularId">{{item.regularName}}</a-select-option>
-                            {{item.regularName}}
-                        </a-select-option>
                    </a-select>
-                    <a @click="visibleT2 = true">详情</a>
                </a-form-item>
-                <div v-show="!add">
+                <div>
                    <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="状态">
                        <a-select placeholder="状态" v-decorator="[ 'productState']">
                            <a-select-option key="0">正常</a-select-option>
@@ -362,7 +359,6 @@
                    this.universityName = '请选择'
                    this.regularName = "请选择";
                }
                this.modifyvisible = true;
            },
            createfunctionOk() {
@@ -430,6 +426,9 @@
                that.modelData.productUniversity = ''
                that.modelData.universityId = ''
                that.modelData.productIntroductionPic2 = ''
+                that.productIntroduction = ''
+                that.productSetMealIntroduction= ''
+                that.productRf2=''
                this.Formtable.setFieldsValue({
                    productMeal: '',
                    productTitle: '',

--- a/src/views/school-center/yxtManager/exchangeCoupon.vue
+++ b/src/views/school-center/yxtManager/exchangeCoupon.vue
@@ -84,8 +84,7 @@
            </a-row>
        </a-modal>
        <!--列表-->
-        <s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"
+        <s-table :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling" :locale="emptyText">
-                 :locale="emptyText">
            <!--拦截器-->
            <template slot="updateDate" slot-scope="text">
                {{ text | dayjs}}
@@ -117,8 +116,7 @@
            </template>
        </s-table>
        <!----弹框-->
-        <a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk"
+        <a-modal :title="add ?'添加正则配置': '编辑正则配置'" :visible="modifyvisible" @ok="createfunctionOk" @cancel="createfunctionCancel" html-type="submit" width="1024px">
-                 @cancel="createfunctionCancel" html-type="submit" width="1024px">
            <a-form :form="Formtable">
                <a-form-item :labelCol="{span: 5}" :wrapperCol="{span: 9, offset: 1}" label="兑换券账号：">
                    <a-input placeholder="兑换券账号"

--- a/src/views/system/modal/roleModal.vue
+++ b/src/views/system/modal/roleModal.vue
@@ -126,7 +126,9 @@ export default {
    },
    handleOk() {
      let that = this
+      if(that.modelData.num == null || that.modelData.num == undefined){
+        that.modelData.num == ''
+      }
      if (that.modelData.id == '') {
        userAdd(that.modelData).then(() => {
          that.visible = false