Merge remote-tracking branch 'origin/master'

src/api/system.js

@@ -20,6 +20,10 @@ let roleTreeList2 = (params) => postAction(prefix+"/role/roleTreeListByUserId/"+
 let userFreeze= (params) => postAction(prefix+"/mgr/freeze", params);
 let userUnFreeze= (params) => postAction(prefix+"/mgr/unfreeze", params);
 let changeOtherPwd= (params) => postAction(prefix+"/mgr/changeOtherPwd", params);//修改密码
+
+// 用户解锁
+let unlock= (params) => postAction("app/ciop/codesManager/unlock", params);//修改密码
+
 //部门管理
 const departmentList = (params) => getAction(prefix+"/dept/departmentList", params);
 let deptAdd = (params) => postAction(prefix+"/dept/add", params);
@@ -76,6 +80,7 @@ export {
     userFreeze,
     userUnFreeze,
     changeOtherPwd,
+    unlock,
     // 角色管理
     userManage,
     userRoleTreeList,

src/views/school-center/productManagement/product.vue

@@ -327,6 +327,13 @@
                     this.regular = item
                 }
             },
+             HTMLEncode(text) {
+             let temp = document.createElement("div");
+              temp.innerHTML = text;
+             let output = temp.innerText || temp.textContent;
+             temp = null;
+             return output;
+           },
             search() {
                 this.$refs.table.refresh({search: true})
             },
@@ -339,6 +346,7 @@
                 })
             },
             modifyfunction(data) {
+                console.log(data);
                 universitySchool().then(res => {
                     this.universitySchool = res.data;
                     if (data != undefined) {
@@ -348,12 +356,11 @@
                         }
                       })
                     }
-                    //console.log(this.universitySchool)
                 })
                 if (data != undefined) {
-                    this.productIntroduction = data.productIntroduction
-                    this.productSetMealIntroduction = data.productSetMealIntroduction
-                    this.productRf2 = data.productRf2
+                    this.productIntroduction = data.productIntroduction.replace(/&lt/g, '<').replace(/&gt/g, '>')
+                    this.productSetMealIntroduction = data.productSetMealIntroduction.replace(/&lt/g, '<').replace(/&gt/g, '>')
+                    this.productRf2 = data.productRf2.replace(/&lt/g, '<').replace(/&gt/g, '>')
                     this.modelData.productMealPrice = data.productMealPrice
                     this.modelData.productUniversity = data.productUniversity
                     this.modelData.productRhPrice=data.productRhPrice
@@ -382,6 +389,9 @@
                     this.universityName = '请选择'
                     this.regularName = "请选择";
                 }
+                this.productIntroduction=this.HTMLEncode(this.productIntroduction)
+                this.productSetMealIntroduction=this.HTMLEncode(this.productSetMealIntroduction);
+                this.productRf2=this.HTMLEncode(this.productRf2)
                 this.modifyvisible = true;
             },
             createfunctionOk() {

src/views/system/systemUser.vue

@@ -73,6 +73,8 @@
             </template>
           <template slot="operation" slot-scope="text, record" v-if="record.status != 3">
             <span>
+              <a @click="unlock(record.id)">解锁</a>
+              <a-divider type="vertical"/>
               <a @click="toggle(record.id)">修改</a>
               <a-divider type="vertical"/>
               <a-popconfirm title="是否要删除此行？" @confirm="remove(record.id)">
@@ -250,7 +252,8 @@ import {
   getEditUser,
   userFreeze,
   userUnFreeze,
-  changeOtherPwd
+  changeOtherPwd,
+  unlock
 } from '@/api/system'
 
 export default {
@@ -303,7 +306,7 @@ export default {
           dataIndex: 'center',
           toolbar: '#tableBar',
           title: '操作',
-          width: 200,
+          width: 220,
           fixed: 'right',
           scopedSlots: { customRender: 'operation' }
         }
@@ -618,8 +621,15 @@ export default {
         that.$refs.tree4.setValue2(user.roleid);
 
       })
-
-
+    },
+    unlock(userId) {
+      unlock({userId}).then(res => {
+        if (res.state == "success") {
+          this.$notification.success({message: "解除锁定成功！", description: "", duration: 4})
+        }else{
+          this.$notification.error({message: "解锁失败！", description: "", duration: 4});
+        }
+      })
     },
     handleUpdata() {
       this.visible = false