Merge remote-tracking branch 'origin/master'

8fea83a0 · 陈浩建 · dd1a116d · 11a039cc · 8fea83a0 · 8fea83a0
Commit 8fea83a0 authored Mar 03, 2021 by 陈浩建
5 changed files
--- a/src/api/school-center/PartnerManagementAPI.js
+++ b/src/api/school-center/PartnerManagementAPI.js
@@ -31,7 +31,14 @@ let deleteUser = (params) => postAction(prefix + "/school/partner/deleteUser" , 
 // 导出用户清单
 let exportUserList = (params) => downFilePost(prefix + "/school/partner/exportUserList" , params);
+// 解锁账户
+let unlockUser = (params) => postAction(prefix + "/userDeploy/unlockUser" , params);
+// 锁定账户
+let lockUser = (params) => postAction(prefix + "/userDeploy/lockUser" , params);
 export {
    findByList,modify,getlistysm,addPartner,getSubstList,getSchoolList,getXzUserList,
-    getRoleList,exportUserList,deleteUser
+    getRoleList,exportUserList,deleteUser,unlockUser,lockUser
 }
--- a/src/views/school-center/order/order.vue
+++ b/src/views/school-center/order/order.vue
@@ -303,8 +303,8 @@
                </div>
                <div>
                  <a-button v-show="orderInfo.orderStatus == '待配送'" @click="openKD" type="primary">填写快递单号</a-button>
-                  <a-button v-show="orderInfo.sendType == null || orderInfo.sendType == ''" @click="openConfigSendType()" type="primary">配送方式</a-button>
+                  <a-button v-show="orderInfo.orderStatus == '待处理' && (orderInfo.sendType == null || orderInfo.sendType == '')" @click="openConfigSendType()" type="primary">配送方式</a-button>
-                  <a-button v-show="(orderInfo.sendType != null && orderInfo.sendType != '') && (orderInfo.businessIccid == null || orderInfo.businessIccid == '')" @click="openConfigIccidFun" type="primary">配置iccid</a-button>
+                  <a-button v-show="orderInfo.orderStatus == '待选号'" @click="openConfigIccidFun" type="primary">配置iccid</a-button>
                  <a-button @click="showReview()" type="primary">审核学生证</a-button>
                  <a-button v-show="orderInfo.userType == '1' && orderInfo.orderStatus == '待受理'" @click="showUpgrade" type="primary">存量升级受理</a-button>
                </div>
@@ -980,7 +980,7 @@
                  } else {
                    this.$notification.error({
                      message: "更新失败！",
-                      description: "",
+                      description: res.msg,
                      duration: 4
                    });
                  }

--- a/src/views/school-center/productManagement/broadband.vue
+++ b/src/views/school-center/productManagement/broadband.vue
@@ -528,6 +528,13 @@ export default {
        this.chouti = item
      }
    },
+    HTMLEncode(text) {
+             let temp = document.createElement("div");
+              temp.innerHTML = text;
+             let output = temp.innerText || temp.textContent;
+             temp = null;
+             return output;
+           },
    regularsName(item) {
      if (item == '请选择') {
        this.modelData.productIntroductionPic2 = ''
@@ -543,7 +550,6 @@ export default {
        let that = this;
        // 查询添加数据
        universityBroadbandConfigData({universityId: data.university_id}).then(res => {
-          console.log(res);
          if (res.state == 'error') {
          }
@@ -552,9 +558,9 @@ export default {
          const schools = res.data.schoolsData
          that.modelData.schools = (schools == undefined ? [] : schools);
          that.modelData.universityId= university.universityId
-          that.productIntroduction = product.productIntroduction
+          that.productIntroduction =this.HTMLEncode(product.productIntroduction.replace(/&lt/g, '<').replace(/&gt/g, '>'));
-          that.productSetMealIntroduction = product.productSetMealIntroduction
+          that.productSetMealIntroduction = this.HTMLEncode(product.productSetMealIntroduction.replace(/&lt/g, '<').replace(/&gt/g, '>'));
-          that.productRf2 = product.productRf2
+          that.productRf2 =this.HTMLEncode(product.productRf2.replace(/&lt/g, '<').replace(/&gt/g, '>'));
          that.modelData.productMealPrice = product.productMealPrice
          that.modelData.productUniversity = product.productUniversity
          that.modelData.productRhPrice=product.productRhPrice
@@ -606,6 +612,9 @@ export default {
            'expenses': university.expenses
          });
        });
+        // that.productIntroduction=this.HTMLEncode(that.productIntroduction)
+        // that.productSetMealIntroduction=this.HTMLEncode(that.productSetMealIntroduction);
+        // that.productRf2=this.HTMLEncode(that.productRf2)
        this.add=false;
      }else{
        setTimeout(()=>{
@@ -654,6 +663,7 @@ export default {
        this.universityName = ''
        this.regularName = "";
      }
      this.modifyvisible=true;
    },
    createfunctionOk(){

--- a/src/views/school-center/schoolmanager/schoolmanagement.vue
+++ b/src/views/school-center/schoolmanager/schoolmanagement.vue
@@ -220,7 +220,7 @@
                    "Authorization":Vue.ls.get(ACCESS_TOKEN)
                },
                fileid:{},
-                brackgroundurl:"app/ciop/school/schoolManagement/qrcodeUpload",
+                brackgroundurl:"manager/ciop/school/schoolManagement/qrcodeUpload",
                // form
                Formtable: this.$form.createForm(this, {name: 'Formtable'}),
                titleName:"",
@@ -312,8 +312,8 @@
                        ]
                      },{
                        title: '优惠购机',
-                        value: 'yhgj',
+                        value: 'isShowyhgj',
-                        key: 'yhgj',
+                        key: 'isShowyhgj',
                      }
                    ],
                  },
@@ -653,8 +653,8 @@
                if (data.jiltKdy == 1) {
                  buttons.push({label: "是否甩单", value: "jiltKdy"});
                }
-                if (data.yhgj == 1) {
+                if (data.isShowyhgj == 1) {
-                  buttons.push({label: "优惠购机", value: "yhgj"});
+                  buttons.push({label: "优惠购机", value: "isShowyhgj"});
                }
                if (data.udBtn == 1) {
                  buttons.push({label: "线上线下", value: "udBtn"});
@@ -719,6 +719,7 @@
                        this.modifyForm.jiltKd = (this.modifyForm.buttons.indexOf("jiltKd") > -1) ? 1 : 0;
                        this.modifyForm.kdyBtn = (this.modifyForm.buttons.indexOf("kdyBtn") > -1) ? 1 : 0;
                        this.modifyForm.jiltKdy = (this.modifyForm.buttons.indexOf("jiltKdy") > -1) ? 1 : 0;
+                        this.modifyForm.status = (this.modifyForm.buttons.indexOf("status") > -1) ? 1 : 0;
                        this.modifyForm.isShowyhgj = (this.modifyForm.buttons.indexOf("isShowyhgj") > -1) ? 1 : 0;
                        this.modifyForm.udBtn = (this.modifyForm.buttons.indexOf("udBtn") > -1) ? 1 : 0;

--- a/src/views/school-center/userManager/PartnerManagement.vue
+++ b/src/views/school-center/userManager/PartnerManagement.vue
@@ -88,10 +88,8 @@
                   <span v-if="text==1">男</span>
                    <span v-else>女</span>
                </template>
-                <template slot="statusRender" slot-scope="text">
+                <template slot="statusRender" slot-scope="text, record" v-if="record.status != 3">
-                    <span v-if="text==1">启用</span>
+                    <a-switch checkedChildren="正常" @change="changeDongjie($event,record.id)" unCheckedChildren="冻结" :defaultChecked="record.status==2?false:true" />
-                    <span v-if="text==2">冻结</span>
-                    <span v-else></span>
                </template>
                <template slot="activeRender" slot-scope="text">
                    <span v-if="text==1">活跃</span>
@@ -299,7 +297,7 @@
    import {
        findByList,modify,getlistysm,getRoleList,
        addPartner,getSubstList,getSchoolList,getXzUserList,
-        exportUserList,deleteUser
+        exportUserList,deleteUser, lockUser, unlockUser
    } from "../../../api/school-center/PartnerManagementAPI"
    import {cloneObject,exportFile} from '@/utils/util'
    import treecheck from '@/components/sysmanage/treeCheck'
@@ -309,7 +307,7 @@
        userRoleTreeList,
    } from '@/api/system';
    import {getSchoolNames, initSubstName} from "../../../api/school-center/userManager/newUserAPI";
-    import { TreeSelect } from 'ant-design-vue';
+    import {notification, TreeSelect} from 'ant-design-vue';
    const SHOW_PARENT = TreeSelect.SHOW_PARENT;
    export default {
@@ -395,7 +393,7 @@
                    {dataIndex: 'account', width: 200, title: '账号 ', align: "center"},
                    {dataIndex: 'substName', width: 100, title: '县分 ', align: "center"},
                    {dataIndex: 'roleName', width: 200, title: '角色 ', align: "center"},
-                    {dataIndex: 'status', width: 200, title: '状态', align: "center",scopedSlots: {customRender: 'statusRender'},},
+                    { dataIndex: 'status',width:100,fixed: 'right', sort: true, title: '状态',  scopedSlots: { customRender: 'statusRender' } },
                    {dataIndex: 'isActive', width: 200, title: '活跃状态', align: "center",scopedSlots: {customRender: 'activeRender'},},
                    {dataIndex: 'sex', width: 100, title: '性别 ', align: "center",scopedSlots: {customRender: 'genderoperation'},},
                    {
@@ -832,6 +830,28 @@
                    this.modifyForm.parentId = '';
                }
            },
+            changeDongjie(event,id){
+              if(event){
+                unlockUser({userId:id}).then(res =>{
+                  console.log(res);
+                  if(res.state == 'success'){
+                    notification.success({ message: '系统提示', description: '解冻成功'})
+                  }else{
+                    notification.error({ message: '系统提示', description: '解冻失败'})
+                  }
+                });
+              }else{
+                lockUser({userId:id}).then(res =>{
+                  console.log(res);
+                  if(res.state == 'success'){
+                    notification.success({ message: '系统提示', description: '冻结成功'})
+                  }else{
+                    notification.error({ message: '系统提示', description: '冻结失败'})
+                  }
+                });
+              }
+            },
            exportList() {
                exportFile(exportUserList(this.queryParam),'用户清单.xlsx');
            },