添加用户院校配置、单移产品修改、添加羊城通、存量升级、学校管理套餐添加收起按钮、修改统一证件审核

ff859a2b · 罗承锋 · 22421249 · ff859a2b · ff859a2b · ff859a2b
Commit ff859a2b authored Jan 13, 2021 by 罗承锋
13 changed files
--- a/config/local.env.js
+++ b/config/local.env.js
@@ -12,7 +12,7 @@ const local = {
                    '^/api/auth/ciop': '/auth/ciop'
                }
            },
-            '/api/api/ciop': {
+            '/api/ciop': {
                target: 'http://localhost:11091',
                //target: 'http://132.97.54.60:58334',
                ws: false,

--- a/public/images/wxts.png
+++ b/public/images/wxts.png
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,7 +31,6 @@
                    that.$store.commit('TOGGLE_DEVICE', 'desktop')
                    that.$store.dispatch('setSidebar', true)
                }
            })
        }
    }

--- a/src/api/school-center/packageManagementAPI.js
+++ b/src/api/school-center/packageManagementAPI.js
@@ -10,6 +10,9 @@ let choosepages = (params) => postAction(prefix + "/packageManagement/package/ch
 // 编辑
 let modify = (params) => postAction(prefix + "/productManagement/package/update" , params);
+// 批量下架
+let batchUpdate = (params) => postAction(prefix + "/packageManagement/package/batchUpdate", params);
 //新增
 let insert= (params) => postAction(prefix + "/packageManagement/package/insert" , params);
@@ -18,5 +21,5 @@ let delet= (params) => postAction(prefix + "/packageManagement/package/delete" ,
 //套餐全称列表
 let packageAllList= () => postAction(prefix + "/packageManagement/package/packageAllList" );
 export {
-    findByList,choosepages,modify,insert,packageAllList,delet
+    findByList,choosepages,modify,insert,packageAllList,delet, batchUpdate
 }
--- a/src/views/school-center/order/broadBandOrder.vue
+++ b/src/views/school-center/order/broadBandOrder.vue
--- a/src/views/school-center/order/clsjSalesList.vue
+++ b/src/views/school-center/order/clsjSalesList.vue
--- a/src/views/school-center/order/order.vue
+++ b/src/views/school-center/order/order.vue
@@ -111,7 +111,7 @@
                            </a-menu>
                            <a-button style="margin-left: 8px">导入<a-icon type="down"/></a-button>
                        </a-dropdown>
-                        <a-button @click="handleSubmit3" style="margin-left: 8px"><a-icon type="arrow-up"/>预制卡批量填号</a-button>
+                        <a-button @click="handleSubmit3" style="margin-left: 8px"><a-icon type="arrow-up"/>iccid批量填号</a-button>
                    </a-col>
                </a-row>
            </a-form>

--- a/src/views/school-center/order/salesList.vue
+++ b/src/views/school-center/order/salesList.vue
@@ -111,10 +111,10 @@
                                      <a-icon type="arrow-up" />充值审核
                                  </a-menu-item>
                                  <a-menu-item key="3">
-                                    <a-icon type="arrow-up" />批量修改导入
+                                    <a-icon type="arrow-up" />批量修改
                                  </a-menu-item>
                                  <a-menu-item key="4">
-                                    <a-icon type="arrow-up" />锁定导入
+                                    <a-icon type="arrow-up" />锁定
                                  </a-menu-item>
                              </a-menu>
                            <a-button style="margin-left: 8px">
@@ -230,7 +230,7 @@
    import moment from 'dayjs'
    import {
        getList,
-        deleteOrder,getSubstList,getSchoolList,
+        deleteOrder,
        downloadTemplateFH,downloadTemplateCZ,downloadTemplatePL, downloadTemplateSD,
        downloadResult,exportList,customRemark
    } from "@/api/school-center/salesListAPI"
@@ -369,8 +369,6 @@
                    //表示
                    let obj = cloneObject(this.queryParam)
                    return getList(Object.assign(params, obj)).then(res => {
-                      console.log("列表数据");
-                      console.log(res);
                        let data = {}
                        if (res.state !== 'success') {
                            this.emptyText.emptyText = '查询失败！'
@@ -409,7 +407,6 @@
                this.customRemark = record.customRemark;
              }
              this.visible = true;
            },
            hideModal() {
              this.visible = false;

--- a/src/views/school-center/order/salesProblemList.vue
+++ b/src/views/school-center/order/salesProblemList.vue
--- a/src/views/school-center/order/yctSalesList.vue
+++ b/src/views/school-center/order/yctSalesList.vue
--- a/src/views/school-center/schoolmanager/schoolmanagement.vue
+++ b/src/views/school-center/schoolmanager/schoolmanagement.vue
@@ -189,9 +189,10 @@
                <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 15, offset: 1}" label="套餐选择">
                    <a-checkbox-group v-model="chosePages" @change="chosePagesfunction">
                        <a-row>
-                            <a-col :span="8"  v-for=" (data,index) in package" v-if="index < more"><a-checkbox :value="data.value"  >{{data.label}}</a-checkbox></a-col>
+                            <a-col :span="8"  v-for=" (p,index) in package" v-if="index < more"><a-checkbox :value="p.value" >{{p.label}}</a-checkbox></a-col>
                        </a-row>
                        <a-button @click="showMore" v-show="isShowMore">更多</a-button>
+                        <a-button @click="hideMore" v-show="!isShowMore">收起</a-button>
                    </a-checkbox-group>
                </a-form-item>
            </a-form>
@@ -466,6 +467,10 @@
              this.isShowMore = false;
              this.more = (this.packageName.length + 1);
            },
+            hideMore() {
+              this.isShowMore = true;
+              this.more = 6;
+            },
            onTreeChange(value) {
              const values = [];
              value.forEach(v => {
@@ -624,7 +629,8 @@
                            }
                            this.package = head;
                        }
-                        console.log(this.chosePages);
+                        console.log(this.package);
+                        console.log(this.packageName);
                    }
                })

--- a/src/views/school-center/uploadVerify/studentCardVerify.vue
+++ b/src/views/school-center/uploadVerify/studentCardVerify.vue
@@ -252,16 +252,21 @@
                    auditDate: ['', ''],
                },
                columns: [
-                    {dataIndex: 'userName', width: 100, title: '姓名'},
+                    {dataIndex: 'userName', width: 100, title: '用户姓名'},
                    {dataIndex: 'orderPhone', width: 100, title: '办理号码'},
                    {dataIndex: 'linkPhone', width: 100, title: '联系号码'},
+                    {dataIndex: 'idCard', width: 100, title: '身份证'},
+                    {dataIndex: 'uploadDate', width: 100, title: '上传时间', scopedSlots: {customRender: "uploadDate"}},
+                    {dataIndex: 'isFirstUpload', width: 100, title: '是否首次上传', ellipsis: true, scopedSlots: {customRender: "isFirstUpload"}},
+                    { dataIndex: 'auditState',width: 100,title: '是否通过审核',ellipsis: true,scopedSlots: {customRender: "auditState"}},
                    {dataIndex: 'auditName', width: 100, title: '审核人姓名'},
-                    {dataIndex: 'county', width: 80, title: '县分'},
-                    {dataIndex: 'school', width: 120, title: '学校'},
                    {dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}},
                    {dataIndex: 'otherImgUrl1', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "otherImgUrl1"}},
                    {dataIndex: 'otherImgUrl2', width: 180, title: '身份证照片', scopedSlots: {customRender: "otherImgUrl2"}},
                    {dataIndex: 'otherImgUrl3', width: 180, title: '补充照片', scopedSlots: {customRender: "otherImgUrl3"}},
+                    /*{dataIndex: 'county', width: 80, title: '县分'},
+                    {dataIndex: 'school', width: 120, title: '学校'},
                    {dataIndex: 'isComboMoney49', width: 100, title: '办理号码是否新49', ellipsis: true, scopedSlots: {customRender: "isComboMoney49"}},
                    {dataIndex: 'isFull', width: 100, title: '是否已上传学生证照片、学校等必填信息', ellipsis: true, scopedSlots: {customRender: "isFull"}},
                    {dataIndex: 'isClear', width: 100, title: '学生证照片是否清晰', ellipsis: true, scopedSlots: {customRender: "isClear"}},
@@ -269,13 +274,9 @@
                    {dataIndex: 'isStudentAccordance', width: 100, title: '号码被实名人员与上传学生证用户是否一致', ellipsis: true, scopedSlots: {customRender: "isStudentAccordance"}},
                    {dataIndex: 'isSchoolAccordance', width: 100, title: '学生证所属学校与号码所属学校是否一致', ellipsis: true, scopedSlots: {customRender: "isSchoolAccordance"}},
                    {dataIndex: 'isUploadBeforeActivate', width: 100, title: '资料上传时间是否早于CRM系统激活时间', ellipsis: true, scopedSlots: {customRender: "isUploadBeforeActivate"}},
-                    {dataIndex: 'uploadDate', width: 100, title: '上传时间', scopedSlots: {customRender: "uploadDate"}},
                    {dataIndex: 'crnActivateDate', width: 100, title: 'crm激活时间', scopedSlots: {customRender: "crnActivateDate"}},
-                    {dataIndex: 'isFirstUpload', width: 100, title: '是否首次上传', ellipsis: true, scopedSlots: {customRender: "isFirstUpload"}},
                    {dataIndex: 'agentBusinessman', width: 100, title: '代理商'},
-                    { dataIndex: 'auditState',width: 100,title: '是否通过审核',ellipsis: true,scopedSlots: {customRender: "auditState"}},
+                    {dataIndex: 'auditDate', width: 100, title: '审核时间', scopedSlots: {customRender: "auditDate"}}*/
-                    {dataIndex: 'auditDate', width: 100, title: '审核时间', scopedSlots: {customRender: "auditDate"}},
                ],
                rowdata: parameter => {
                    let params = {

--- a/src/views/school-center/userManager/PartnerManagement.vue
+++ b/src/views/school-center/userManager/PartnerManagement.vue
@@ -256,6 +256,20 @@
                        </a-select>
                    </a-form-item>
+                    <a-form-item :labelCol="{span: 6}" :wrapperCol="{span: 8, offset: 1}" label="院校配置">
+                        <template>
+                            <a-tree-select
+                                v-model="treeModelValue"
+                                style="width: 100%"
+                                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                                :tree-data="treeData"
+                                tree-checkable
+                                :show-checked-strategy="SHOW_PARENT"
+                                placeholder="Please select"
+                            />
+                          </template>
+                    </a-form-item>
                    <a-form-item :labelCol="{span: 6}" :style="leaderDisplay" :wrapperCol="{span: 8, offset: 1}" label="学子公司上级">
                        <a-select placeholder="请选择" v-model="modifyForm.parentId">
                            <a-select-option key="">请选择</a-select-option>
@@ -295,6 +309,8 @@
        userRoleTreeList,
    } from '@/api/system';
    import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
+    import { TreeSelect } from 'ant-design-vue';
+    const SHOW_PARENT = TreeSelect.SHOW_PARENT;
    export default {
        name: "PartnerManagement",
@@ -309,6 +325,9 @@
                Formtable: this.$form.createForm(this, {name: 'Formtable'}),
                addFormtable: this.$form.createForm(this, {name: 'addFormtable'}),
                titleName : "新增",
+                treeModelValue: [],
+                treeData: [],
+                SHOW_PARENT,
                queryParam: {
                    name: '',
                    account: '',
@@ -434,6 +453,11 @@
                userRoleTreeList:userRoleTreeList,
            }
        },
+        watch : {
+          treeModelValue(data) {
+              console.log(data);
+          }
+        },
        methods:{
            search() {
                this.$refs.table.refresh({search: true})
@@ -453,7 +477,12 @@
                        grade: data.grade,
                        ysm: data.ysm,
                    })
+                    console.log(data.schools);
+                    if (data.schools == undefined) {
+                      this.treeModelValue = [];
+                    }else{
+                      this.treeModelValue = data.schools.split(",");
+                    }
                    this.modifyForm.subName = data.substName;
                    this.modifyForm.roleId = data.roleid;
                    this.modifyForm.position = data.position;
@@ -479,7 +508,22 @@
                        this.modifyForm.sex=values.sex
                        this.modifyForm.ysm=values.ysm
                        this.modifyForm.password = values.password
+                        debugger
+                        const subNames = [];
+                        const schools = [];
+                        console.log(this.treeModelValue);
+                        console.log(this.subNames);
+                        out : for(let i = 0; i < this.treeModelValue.length; ++i) {
+                          for(let j = 0; j < this.subNames.length; ++j) {
+                              if (this.treeModelValue[i] == this.subNames[j].value) {
+                                subNames.push(this.subNames[j].value);
+                                continue out;
+                              }
+                          }
+                          schools.push(this.treeModelValue[i]);
+                        }
+                        this.modifyForm.subNames = subNames;
+                        this.modifyForm.schools = schools;
                        if(this.modifyForm.idCard.length != 18){
                            this.$message.error( '身份证不合法', 5);
                            return null;
@@ -524,7 +568,7 @@
                    parentId: '',
                    ysm: '',
                })
+                this.treeModelValue = [];
                this.addForm.subName = '';
                this.addForm.position = '';
                this.addForm.parentIds = '';
@@ -573,6 +617,21 @@
                        this.addForm.ysm=values.ysm
                        this.addForm.substName=""
+                        const subNames = [];
+                        const schools = [];
+                        out : for(let i = 0; i < this.treeModelValue.length; ++i) {
+                          for(let j = 0; j < this.subNames.length; ++j) {
+                            if (this.treeModelValue[i] == this.subNames[j].value) {
+                              subNames.push(this.subNames[j].value);
+                              continue out;
+                            }
+                          }
+                          schools.push(this.treeModelValue);
+                        }
+                        this.modifyForm.subNames = subNames;
+                        this.modifyForm.schools = schools;
                        if(this.addForm.idCard.length != 18){
                            this.$message.error( '身份证不合法', 5);
                            return null;
@@ -634,7 +693,7 @@
                    parentId: '',
                    ysm: '',
                })
+                this.treeModelValue = [];
                this.addForm.subName = '';
                this.addForm.position = '';
                this.addForm.parentIds = '';
@@ -755,7 +814,6 @@
                            this.keyRecord = ''
                            res.data.forEach((key) => {
                                this.xzUserList.push(key)
                            })
                            if(type == 1){
@@ -816,7 +874,32 @@
                                value: r.subName,
                                text: r.subName
                            })
+                            this.treeData.push({
+                              title: r.subName,
+                              value: r.subName,
+                              key: r.subName
+                            });
+                        })
+                      for (let i = 0;i < this.treeData.length; ++i) {
+                        getSchoolNames({"substName": this.treeData[i].value}).then((res) => {
+                          if (res.state == "success") {
+                            const temp = [];
+                            const result = res.data
+                            result.forEach((r) => {
+                              if (r.schoolName === 'null')
+                                return;
+                              temp.push({
+                                key: r.id,
+                                value: r.id,
+                                title: r.schoolName
+                              });
+                            })
+                            this.treeData[i].children = temp;
+                            console.log(this.treeData);
+                          }
                        })
+                      }
                    }
                })
            }