system-clients 3.2.65-1 → 3.2.65-wuhai

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.65-1",
+  "version": "3.2.65-wuhai",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/Main.vue

@@ -202,217 +202,197 @@ let createWaterMark = function (userName) {
   (document.head.append || document.head.appendChild).apply(document.head, [style]);
 }
 
-  window.onunload = () => {
-    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
-  }
-  window.onbeforeunload = () => {
-    vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
-  }
-  export default {
-    title: '主界面',
-    props: ['functions', 'userid', 'config'],
-    data() {
-      return {
-        // 页面提示信息定时器
-        interval: null,
-        intervaltx: null,
-        newTipShow: false,
-        newTipContextShow: false,
-        AppDaiBan: '',
-        OrderDaiBan: '',
-        // 左侧树下部三个小图标
-        imgs: {
-          open: '/images/lefticon/菜单伸缩.png',
-          set: '/images/lefticon/系统设置.png',
-          out: '/images/lefticon/退出系统.png',
-          img1: '/images/newStyle/login-user.png',
-          logoimg: '/static/newStyle/fife.png'
-          // img2: '/images/lefticon/退出系统.png',
-        },
-        treeOrIcon: false,
-        qrCode:false,
-        isManger: false,
-        show: false,
-        orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
-        systemname: '客服系统',
-        date: this.$login.toStandardDateString(),
-        tabs: [],       //已初始化页签数组
-        selecttab: '',
-        setting: true,
-        srcsetting: '../../static/newStyle/setting.png',
-        showwatermakeflag: false,
-        // headerHint: true, // 右侧顶部提示信息
-        // value: 25645.26,
-        // AddChangeMsgShow: false,
-        // showsum: false
+window.onunload = () => {
+  vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+}
+window.onbeforeunload = () => {
+  vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
+}
+export default {
+  title: '主界面',
+  props: ['functions', 'userid', 'config'],
+  data() {
+    return {
+      // 页面提示信息定时器
+      interval: null,
+      newTipShow: false,
+      newTipContextShow: false,
+      AppDaiBan: '',
+      OrderDaiBan: '',
+      // 左侧树下部三个小图标
+      imgs: {
+        open: '/images/lefticon/菜单伸缩.png',
+        set: '/images/lefticon/系统设置.png',
+        out: '/images/lefticon/退出系统.png',
+        img1: '/images/newStyle/login-user.png',
+        logoimg: '/static/newStyle/fife.png'
+        // img2: '/images/lefticon/退出系统.png',
+      },
+      treeOrIcon: false,
+      qrCode:false,
+      isManger: false,
+      show: false,
+      orgpathnames: `${this.$login.f.orgs}-${this.$login.f.deps}-${this.$login.f.name}`,
+      systemname: '客服系统',
+      date: this.$login.toStandardDateString(),
+      tabs: [],       //已初始化页签数组
+      selecttab: '',
+      setting: true,
+      srcsetting: '../../static/newStyle/setting.png',
+      showwatermakeflag: false,
+      // headerHint: true, // 右侧顶部提示信息
+      // value: 25645.26,
+      // AddChangeMsgShow: false,
+      // showsum: false
+    }
+  },
+  ready() {
+    getwartermakr(this);
+    let component = this.$login.getUrlCompileParames('component')
+    if (component) {
+      this.isManger = true
+      this.$refs.route.init(component, {data: this.functions.functions})
+    }
+    if (this.$login.f.password == '1') {
+      this.$showMessage('本地登录系统为此账户的初始密码，请确认修改密码！！！', ['confirm', 'cancel']).then((res) => {
+        if (res == 'confirm')
+          this.show = true
+      })
+    }
+    console.log("系统名称", this.$appdata.getSingleValue("系统名称"))
+    this.systemname = this.$appdata.getSingleValue("系统名称") ? this.$appdata.getSingleValue("系统名称") : '客服系统'
+    //   let oBox = this.getElement("box")
+    // 	let	oTop = this.getElement("top")
+    // 	let	oBottom = this.getElement("bottom")
+    // 	let oLine = this.getElement("line")
+    //   let that = this
+    // 			oLine.onmousedown = function(e) {
+    // 				let disX = (e || event).clientX
+    // 				oLine.left = oLine.offsetLeft
+    // 				document.onmousemove = function(e) {
+    // 					let iT = oLine.left + ((e || event).clientX - disX)
+    //           var e = e || window.event
+    // 					let tarnameb = e.target || e.srcElement
+    // 					let maxT = oBox.clientWight - oLine.offsetWidth
+    // 					oLine.style.margin = 0
+    // 					iT < 0 && (iT = 0)
+    // 					iT > maxT && (iT = maxT)
+    // 					oLine.style.left = oTop.style.width = iT + "px"
+    // 					oBottom.style.width = oBox.clientWidth - iT + "px"
+    //           that.$set('treeWidth', iT)
+    // 					return false
+    // 				}
+    // 				document.onmouseup = function() {
+    // 					document.onmousemove = null
+    // 					document.onmouseup = null
+    // 					oLine.releaseCapture && oLine.releaseCapture()
+    // 				}
+    // 				oLine.setCapture && oLine.setCapture()
+    // 				return false
+    // 			}
+    this.changeShow()
+    this.gotoWorkOrderSite()
+    // 获取预约列表
+    this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
+  },
+  methods: {
+    getOrderList(){
+      let times = this.config.times * 60 * 1000
+      console.log("=定时提示间隔=", times)
+      try {
+        this.interval = setInterval(() => {
+          this.getDaiBan()
+        }, times)
+      } catch (error) {
+        console.log('捕获到异常', error)
       }
     },
-    ready() {
-      getwartermakr(this);
-      let component = this.$login.getUrlCompileParames('component')
-      if (component) {
-        this.isManger = true
-        this.$refs.route.init(component, {data: this.functions.functions})
-      }
-      if (this.$login.f.password == '1') {
-        this.$showMessage('本地登录系统为此账户的初始密码，请确认修改密码！！！', ['confirm', 'cancel']).then((res) => {
-          if (res == 'confirm')
-            this.show = true
+    async getDaiBan(){
+      this.OrderDaiBan  = ''
+      this.AppDaiBan  = ''
+      let http = new HttpResetClass()
+      await http.load('POST', '/rs/sql/singleTable', {data: {
+          tablename:'t_order_center',
+          condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
+        }}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
+          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+          OrderDaiBan[item.f_ordertype].push(item)
         })
-      }
-      console.log("系统名称", this.$appdata.getSingleValue("系统名称"))
-      this.systemname = this.$appdata.getSingleValue("系统名称") ? this.$appdata.getSingleValue("系统名称") : '客服系统'
-      //   let oBox = this.getElement("box")
-      // 	let	oTop = this.getElement("top")
-      // 	let	oBottom = this.getElement("bottom")
-      // 	let oLine = this.getElement("line")
-      //   let that = this
-      // 			oLine.onmousedown = function(e) {
-      // 				let disX = (e || event).clientX
-      // 				oLine.left = oLine.offsetLeft
-      // 				document.onmousemove = function(e) {
-      // 					let iT = oLine.left + ((e || event).clientX - disX)
-      //           var e = e || window.event
-      // 					let tarnameb = e.target || e.srcElement
-      // 					let maxT = oBox.clientWight - oLine.offsetWidth
-      // 					oLine.style.margin = 0
-      // 					iT < 0 && (iT = 0)
-      // 					iT > maxT && (iT = maxT)
-      // 					oLine.style.left = oTop.style.width = iT + "px"
-      // 					oBottom.style.width = oBox.clientWidth - iT + "px"
-      //           that.$set('treeWidth', iT)
-      // 					return false
-      // 				}
-      // 				document.onmouseup = function() {
-      // 					document.onmousemove = null
-      // 					document.onmouseup = null
-      // 					oLine.releaseCapture && oLine.releaseCapture()
-      // 				}
-      // 				oLine.setCapture && oLine.setCapture()
-      // 				return false
-      // 			}
-      this.changeShow()
-      const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
-      if(istelRemindTimes=='是'){
-        this.getTimesgotoWorkOrderSite()
-      }
-      const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
-      const times =this.$appdata.getSingleValue("提示间隔分钟")
-      if(isapplyRemind=='是'){
-        this.config.isTip = true
-        this.config.times = times
-      }
-      // 获取预约列表
-      this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
-    },
-    methods: {
-      getOrderList(){
-        let times = this.config.times * 60 * 1000
-        console.log("=定时提示间隔=", times)
-        try {
-          this.interval = setInterval(() => {
-            this.getDaiBan()
-          }, times)
-        } catch (error) {
-          console.log('捕获到异常', error)
+        if (res.data.length> 0){
+          this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
         }
-      },
-      getTimesgotoWorkOrderSite(){
-        let teltimes = 2*60*1000 // 两分钟
-        try {
-          this.intervaltx =setInterval(()=>{
-            this.gotoWorkOrderSite()
-          },teltimes)
-        }catch (e) {
-          console.log('捕获到异常', e)
-        }
-      },
-      async getDaiBan(){
-        this.OrderDaiBan  = ''
-        this.AppDaiBan  = ''
-        let http = new HttpResetClass()
-        await http.load('POST', '/rs/sql/singleTable', {data: {
-            tablename:'t_order_center',
-            condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
-          }}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          let OrderDaiBan = {}
-          res.data.forEach(item=>{
-            OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-            OrderDaiBan[item.f_ordertype].push(item)
-          })
-          if (res.data.length> 0){
-            this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-            this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-          }
-        })
-        let data = {
-          condition: '1 = 1',
-          data: {
-            orgid: this.$login.f.orgid,
-            id: this.$login.f.id
-          }
+      })
+      let data = {
+        condition: '1 = 1',
+        data: {
+          orgid: this.$login.f.orgid,
+          id: this.$login.f.id
         }
-        await http.load('POST', '/rs/sql/checkuser', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
-          let AppDaiBan = {}
-          res.data.forEach(item=>{
-            AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
-            AppDaiBan[item.defname].push(item)
-          })
-          if (res.data.length> 0){
-            this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
-            this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
-          }
-        }).catch((e)=>{
-          console.error(e)
+      }
+      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let AppDaiBan = {}
+        res.data.forEach(item=>{
+          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+          AppDaiBan[item.defname].push(item)
         })
-        if(this.AppDaiBan || this.OrderDaiBan){
-          this.newTipShow = true
+        if (res.data.length> 0){
+          this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
         }
-      },
-      // 提醒框被点击
-      tipClick(){
-        this.newTipShow = false
-        this.newTipContextShow = true
-      },
-      gotoWorkOrderSite(){
-        const isRemind =this.$appdata.getSingleValue("站点工单提醒")
-        console.log('站点工单是否提醒',isRemind)
-        if(isRemind && isRemind !== '是'){
-          return
+      }).catch((e)=>{
+        console.error(e)
+      })
+      if(this.AppDaiBan || this.OrderDaiBan){
+        this.newTipShow = true
+      }
+    },
+    // 提醒框被点击
+    tipClick(){
+      this.newTipShow = false
+      this.newTipContextShow = true
+    },
+    gotoWorkOrderSite(){
+      const isRemind =this.$appdata.getSingleValue("站点工单提醒")
+      console.log('站点工单是否提醒',isRemind)
+      if(isRemind && isRemind !== '是'){
+        return
+      }
+      if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
+        const data = {
+          "condition":
+            {
+              "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
+              "sign":"1=1"
+            },
+          "userid":this.functions.name
         }
-        if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('派单员') !== -1){
-          const data = {
-            "condition":
-              {
-                "condition":" 1=1  and processins.activities[ state='开始活动' and (defname in('站点接单'))].count(*) > 0 ",
-                "sign":"1=1"
-              },
-            "userid":this.functions.name
+        new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          if(res.data && res.data.n !== 0){
+             this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
-          new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-            if(res.data && res.data.n !== 0){
-              this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
-            }
-          })
-        }
-      },
-      openUrl() {
-        var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
-        window.open(url, '_blank')
-      },
-      hindsetting() {
-        this.setting = !this.setting
-        if (this.setting) {
-          this.srcsetting = '../../static/newStyle/setting.png'
-        } else {
-          this.srcsetting = '../../static/newStyle/setting1.png'
-        }
+        })
+      }
+    },
+    openUrl() {
+      var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+      window.open(url, '_blank')
+    },
+    hindsetting() {
+      this.setting = !this.setting
+      if (this.setting) {
+        this.srcsetting = '../../static/newStyle/setting.png'
+      } else {
+        this.srcsetting = '../../static/newStyle/setting1.png'
+      }
 
     },
     hindsetting1() {

package/src/filiale/qianneng/ModifyPw.vue

@@ -1,107 +1,107 @@
-<template>
-  <div>
-    <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="rest"><span>&times;</span></button>
-          <h4 class="modal-title">修改密码</h4>
-        </header>
-        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
-          'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
-            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
-              <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
-            </div>
-          </div>
-          <div class="has-feedback form-group"
-               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
-          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
-            </div>
-          </div>
-        </article>
-
-        <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
-        </footer>
-      </modal>
-    </validator>
-  </div>
-
-
-</template>
-<script>
-  import co from 'co'
-  import validator from '../../plugins/validation';
-
-  let saveGen = function * (self) {
-    self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
-    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
-    //  Util.f.password = self.deliver.newpassword
-    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
-    self.$login.f.password = self.deliver.newpassword
-    if (res.data) {
-      self.deliver.password = ''
-      self.deliver.newpassword = ''
-      self.deliver.affirmpassword = ''
-      self.show = false
-    }
-  }
-  export default {
-    title: '系统管理-密码修改',
-    data () {
-      return {
-        deliver: {
-          password: '',
-          newpassword: '',
-          affirmpassword: ''
-        },
-        functions: this.$login.f
-      }
-    },
-    props: ['show'],
-    methods: {
-      confirm () {
-        let gen = saveGen(this)
-        co(gen)
-      },
-      rest () {
-        this.show = false
-        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
-      }
-    }
-  }
-</script>
-<style>
-  /*修改密码body界面样式*/
-  .modifystyle {
-    background: #FCFEEE;
-  }
-  .modifystyle span{
-    color: red;
-  }
-</style>
+<template>
+  <div>
+    <validator name="v">
+      <modal :show.sync="show" v-ref:modal  backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="rest"><span>&times;</span></button>
+          <h4 class="modal-title">修改密码</h4>
+        </header>
+        <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
+          'has-success':!$v.password.required}">
+            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
+              <span v-if="$v.password.required">不能为空</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
+              <span v-if="$v.newpassword.required">不能为空</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合</span>
+              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+            </div>
+          </div>
+          <div class="has-feedback form-group"
+               :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
+          'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
+            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
+            <div class="col-sm-4">
+              <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
+              <span v-if="$v.affirmpassword.required">不能为空</span>
+              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+            </div>
+          </div>
+        </article>
+
+        <footer slot="modal-footer" class="modal-footer">
+          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+
+
+</template>
+<script>
+  import co from 'co'
+  import validator from '../../plugins/validation';
+
+  let saveGen = function * (self) {
+    self.deliver.ename = self.functions.ename
+    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
+    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
+    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
+    //  Util.f.password = self.deliver.newpassword
+    let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
+    self.$login.f.password = self.deliver.newpassword
+    if (res.data) {
+      self.deliver.password = ''
+      self.deliver.newpassword = ''
+      self.deliver.affirmpassword = ''
+      self.show = false
+    }
+  }
+  export default {
+    title: '系统管理-密码修改',
+    data () {
+      return {
+        deliver: {
+          password: '',
+          newpassword: '',
+          affirmpassword: ''
+        },
+        functions: this.$login.f
+      }
+    },
+    props: ['show'],
+    methods: {
+      confirm () {
+        let gen = saveGen(this)
+        co(gen)
+      },
+      rest () {
+        this.show = false
+        this.deliver = {password: '', newpassword: '', affirmpassword: ''}
+      }
+    }
+  }
+</script>
+<style>
+  /*修改密码body界面样式*/
+  .modifystyle {
+    background: #FCFEEE;
+  }
+  .modifystyle span{
+    color: red;
+  }
+</style>

package/src/filiale/qianneng/system.js

@@ -1,8 +1,8 @@
-// 分公司特殊组件页面注册
-
-let specialComp = {
-  // 潜能密码改下
-  // 'modify-pw': (resolve) => { require(['./ModifyPw.vue'], resolve) },
-  'home-page': (resolve) => require(['./Main'], resolve)
-}
-exports.specialComp = specialComp
+// 分公司特殊组件页面注册
+
+let specialComp = {
+  // 潜能密码改下
+  'modify-pw': (resolve) => { require(['./ModifyPw.vue'], resolve) },
+  'home-page': (resolve) => require(['./Main'], resolve)
+}
+exports.specialComp = specialComp