sale-client 3.4.157 → 3.4.158

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.4.157",
+  "version": "3.4.158",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/ChargeOper.vue

@@ -1,230 +1,230 @@
-<template>
-    <div class="form-inline" style="height: auto">
-      <div class="form-group" v-for="btn in operBtns">
-        <button :id="btn.name" type="button" :style="btn.name=='其他欠费' ?'color:red':'color:black'" :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)" :disabled="noButton" ><span :style="btn.name=='其他欠费' ?'color:red':'color:black'">{{btn.name}}</span></button>
-
-      </div>
-    </div>
-    <div v-show="isBusiness" style="height: auto" class="select-overspread">
-      <route v-ref:route></route>
-    </div>
-</template>
-
-<script>
-  import { HttpResetClass } from 'vue-client'
-  let getNewmetermsg = async function (self, row) {
-    if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
-      // 获取用户信息
-      let getUser = await self.$resetpost('rs/sql/sale_getUser', {
-        data: {
-          condition: `u.f_userfiles_id='${row.f_userfiles_id}' `,
-          orderitem: `u.f_userfiles_id Desc`
-        }
-      }, {resolveMsg: '读卡新的用户成功', rejectMsg: '读卡新的用户失败'})
-      if (getUser.data.length > 0) {
-        await self.$showAlert('换表成功', 'success', 200)
-        self.data = getUser.data[0]
-      }
-    }
-  }
-  let getBtnsGen = async function (self) {
-    let http = new HttpResetClass()
-    let param = {
-      f_userfiles_id: self.data.f_userfiles_id
-    }
-    if (self.cardInfo) {
-      param.cardInfo = self.cardInfo
-    }
-    let res = await http.load('POST', 'rs/logic/getOperBtns', {
-      data: param
-    }, {
-      resolveMsg: null,
-      rejectMsg: '获取业务按钮失败!!'
-    })
-    let getBtns = res.data
-    console.log('获取的业务按钮', getBtns)
-    console.log('有没有用户信息', self.data)
-    if (self.$login.r.length === 0) {
-      self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
-    } else {
-      self.temp = []
-      for (let i = 0; i < getBtns.length; i++) {
-        if (self.$login.r.includes(getBtns[i].name)) {
-          // 进行权限验证
-          self.temp.push(getBtns[i])
-        }
-      }
-      // 如果有未写卡记录，添加线下写卡按钮
-      if (self.data.unWriteSell) {
-        if (self.data.unWriteSell.length > 0) {
-          self.temp.push({name: '线下写卡',
-            value: {
-              'weight': 0,
-              'routeName': 'un-write-card-center'
-  }})
-        }
-      }
-      if (self.data.f_user_nature == '单位') {
-        self.temp.push({name: '维管收费',
-          value: {
-            'weight': 5,
-            'routeName': 'repair-charge'
-  }})
-      }
-      if (self.data.f_meter_type == '物联网表') {
-        if (self.data.f_hascard == '是') {
-          if (self.data.f_whether_hairpin == '未发') {
-            if(self.data.f_share_times != '' && self.data.f_share_times == '是' && self.data.f_times>0){
-              self.temp.push({
-                name: '补卡',
-                value: {
-                  'weight': 2,
-                  'routeName': 'replace-card-manage'
-                }
-              })
-            }else{
-            }
-
-          }
-        }
-      }
-      // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase == '是')) {
-        self.temp.push({name: '购气撤销',
-          value: {
-            'weight': 0,
-            'routeName': 'card-meter-charge-cancel'
-  }})
-      }
-/*      // 如果是预备户,删除发卡售气按钮
-      if (self.data.f_user_state == '预备') {
-        self.temp.splice(self.temp.findIndex(item => item.name === '发卡售气'), 1)
-      } */
-
-      // 根据权重将业务按钮排序
-      self.operBtns = self.temp.sort((a, b) => {
-        return a.value.weight - b.value.weight
-      })
-
-      // 当有调价补差时,只展示调价补差按钮
-      let adjustSenders = self.operBtns.find((row) => {
-        return row.name == '调价补差'
-      })
-      if (adjustSenders) {
-        self.operBtns = []
-        self.operBtns.push(adjustSenders)
-      }
-
-      if (self.operBtns.length > 0) {
-        self.isBusiness = true
-        self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo})
-        self.styleChange(self.operBtns[0])
-      }
-    }
-  }
-
-  export default {
-    title: '业务操作',
-    data () {
-      return {
-        operBtns: [],
-        isBusiness: false,
-        noButton: false // 业务请求时禁止按钮点击
-      }
-    },
-    props: ['data', 'cardInfo'],
-    ready () {
-      getBtnsGen(this)
-      console.log('data,cardInfo', this.data, this.cardInfo)
-
-    },
-    methods: {
-      business (btn) {
-        // // 处理按钮样式
-        // this.styleChange(btn.name)
-        // this.isBusiness = true
-        // this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
-        if(this.$refs.route.cards.length>0){
-          if(this.$refs.route.cards[0].title == '增值服务管理'){
-            this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?',['confirm','cancel']).then(res=>{
-              if(res == 'cancel'){
-                return;
-              }else{
-                // 处理按钮样式
-                this.styleChange(btn.name)
-                this.isBusiness = true
-                this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
-              }
-            })
-          }else{
-            // 处理按钮样式
-            this.styleChange(btn.name)
-            this.isBusiness = true
-            this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
-          }
-        }
-      },
-
-      styleChange (name) {
-        this.operBtns.forEach((res) => {
-          if (res.name === name) {
-            if (document.getElementById(res.name)) {
-              document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
-              document.getElementById(res.name).style.color = 'white'
-            }
-          } else {
-            if (document.getElementById(res.name)) {
-              document.getElementById(res.name).style.backgroundColor = 'white'
-              document.getElementById(res.name).style.color = 'black'
-            }
-          }
-        })
-      }
-    },
-    watch: {
-      'data' () {
-        getBtnsGen(this)
-      }
-    },
-    events: {
-      'no-button' () {
-        this.noButton = true
-      },
-      'has-button' () {
-        this.noButton = false
-      },
-      'get-new-row' (row) {
-        console.log('xxxxxx', row)
-      // 发生换表成功
-        getNewmetermsg(this, row)
-      },
-      'button-specifies' (buttonObj, data) {
-        console.log('指定按钮。。', buttonObj)
-        // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}
-        if (buttonObj) {
-          this.styleChange(buttonObj.name)
-          this.$refs.route.init(buttonObj.value, {row: data})
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-  .btn-click{
-    background-color: #6aa6e2;
-    border-radius: 5px;
-    color: white;
-    /*border-color: black;*/
-    border: solid 1px #c7c7c7;
-  }
-
-  .btn-un-click{
-    background-color: white;
-    border-radius: 5px;
-    color: black;
-    /*border-color: black;*/
-    border: solid 1px #c7c7c7;
-  }
-</style>
+<template>
+    <div class="form-inline" style="height: auto">
+      <div class="form-group" v-for="btn in operBtns">
+        <button :id="btn.name" type="button" :style="btn.name=='其他欠费' ?'color:red':'color:black'" :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)" :disabled="noButton" ><span :style="btn.name=='其他欠费' ?'color:red':'color:black'">{{btn.name}}</span></button>
+
+      </div>
+    </div>
+    <div v-show="isBusiness" style="height: auto" class="select-overspread">
+      <route v-ref:route></route>
+    </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+  let getNewmetermsg = async function (self, row) {
+    if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
+      // 获取用户信息
+      let getUser = await self.$resetpost('rs/sql/sale_getUser', {
+        data: {
+          condition: `u.f_userfiles_id='${row.f_userfiles_id}' `,
+          orderitem: `u.f_userfiles_id Desc`
+        }
+      }, {resolveMsg: '读卡新的用户成功', rejectMsg: '读卡新的用户失败'})
+      if (getUser.data.length > 0) {
+        await self.$showAlert('换表成功', 'success', 200)
+        self.data = getUser.data[0]
+      }
+    }
+  }
+  let getBtnsGen = async function (self) {
+    let http = new HttpResetClass()
+    let param = {
+      f_userfiles_id: self.data.f_userfiles_id
+    }
+    if (self.cardInfo) {
+      param.cardInfo = self.cardInfo
+    }
+    let res = await http.load('POST', 'rs/logic/getOperBtns', {
+      data: param
+    }, {
+      resolveMsg: null,
+      rejectMsg: '获取业务按钮失败!!'
+    })
+    let getBtns = res.data
+    console.log('获取的业务按钮', getBtns)
+    console.log('有没有用户信息', self.data)
+    if (self.$login.r.length === 0) {
+      self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
+    } else {
+      self.temp = []
+      for (let i = 0; i < getBtns.length; i++) {
+        if (self.$login.r.includes(getBtns[i].name)) {
+          // 进行权限验证
+          self.temp.push(getBtns[i])
+        }
+      }
+      // 如果有未写卡记录，添加线下写卡按钮
+      if (self.data.unWriteSell) {
+        if (self.data.unWriteSell.length > 0) {
+          self.temp.push({name: '线下写卡',
+            value: {
+              'weight': 0,
+              'routeName': 'un-write-card-center'
+  }})
+        }
+      }
+      if (self.data.f_user_nature == '单位') {
+        self.temp.push({name: '维管收费',
+          value: {
+            'weight': 5,
+            'routeName': 'repair-charge'
+  }})
+      }
+      if (self.data.f_meter_type == '物联网表') {
+        if (self.data.f_hascard == '是') {
+          if (self.data.f_whether_hairpin == '未发') {
+            if(self.data.f_share_times != '' && self.data.f_share_times == '是' && self.data.f_times>0){
+              self.temp.push({
+                name: '补卡',
+                value: {
+                  'weight': 2,
+                  'routeName': 'replace-card-manage'
+                }
+              })
+            }else{
+            }
+
+          }
+        }
+      }
+      // 如果卡上有气，添加购气撤销按钮
+      if (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase == '是')) {
+        self.temp.push({name: '购气撤销',
+          value: {
+            'weight': 0,
+            'routeName': 'card-meter-charge-cancel'
+  }})
+      }
+/*      // 如果是预备户,删除发卡售气按钮
+      if (self.data.f_user_state == '预备') {
+        self.temp.splice(self.temp.findIndex(item => item.name === '发卡售气'), 1)
+      } */
+
+      // 根据权重将业务按钮排序
+      self.operBtns = self.temp.sort((a, b) => {
+        return a.value.weight - b.value.weight
+      })
+
+      // 当有调价补差时,只展示调价补差按钮
+      let adjustSenders = self.operBtns.find((row) => {
+        return row.name == '调价补差'
+      })
+      if (adjustSenders) {
+        self.operBtns = []
+        self.operBtns.push(adjustSenders)
+      }
+
+      if (self.operBtns.length > 0) {
+        self.isBusiness = true
+        self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo})
+        self.styleChange(self.operBtns[0])
+      }
+    }
+  }
+
+  export default {
+    title: '业务操作',
+    data () {
+      return {
+        operBtns: [],
+        isBusiness: false,
+        noButton: false // 业务请求时禁止按钮点击
+      }
+    },
+    props: ['data', 'cardInfo'],
+    ready () {
+      getBtnsGen(this)
+      console.log('data,cardInfo', this.data, this.cardInfo)
+
+    },
+    methods: {
+      business (btn) {
+        // // 处理按钮样式
+        // this.styleChange(btn.name)
+        // this.isBusiness = true
+        // this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+        if(this.$refs.route.cards.length>0){
+          if(this.$refs.route.cards[0].title == '增值服务管理'){
+            this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?',['confirm','cancel']).then(res=>{
+              if(res == 'cancel'){
+                return;
+              }else{
+                // 处理按钮样式
+                this.styleChange(btn.name)
+                this.isBusiness = true
+                this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+              }
+            })
+          }else{
+            // 处理按钮样式
+            this.styleChange(btn.name)
+            this.isBusiness = true
+            this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+          }
+        }
+      },
+
+      styleChange (name) {
+        this.operBtns.forEach((res) => {
+          if (res.name === name) {
+            if (document.getElementById(res.name)) {
+              document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
+              document.getElementById(res.name).style.color = 'white'
+            }
+          } else {
+            if (document.getElementById(res.name)) {
+              document.getElementById(res.name).style.backgroundColor = 'white'
+              document.getElementById(res.name).style.color = 'black'
+            }
+          }
+        })
+      }
+    },
+    watch: {
+      'data' () {
+        getBtnsGen(this)
+      }
+    },
+    events: {
+      'no-button' () {
+        this.noButton = true
+      },
+      'has-button' () {
+        this.noButton = false
+      },
+      'get-new-row' (row) {
+        console.log('xxxxxx', row)
+      // 发生换表成功
+        getNewmetermsg(this, row)
+      },
+      'button-specifies' (buttonObj, data) {
+        console.log('指定按钮。。', buttonObj)
+        // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}
+        if (buttonObj) {
+          this.styleChange(buttonObj.name)
+          this.$refs.route.init(buttonObj.value, {row: data})
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  .btn-click{
+    background-color: #6aa6e2;
+    border-radius: 5px;
+    color: white;
+    /*border-color: black;*/
+    border: solid 1px #c7c7c7;
+  }
+
+  .btn-un-click{
+    background-color: white;
+    border-radius: 5px;
+    color: black;
+    /*border-color: black;*/
+    border: solid 1px #c7c7c7;
+  }
+</style>

package/src/components/charge/business/OtherChargeByPay.vue

@@ -190,6 +190,11 @@
           }
         })
       }
+      let localeSustainMoney = window.localStorage.getItem('sustainMoney')
+      if (localeSustainMoney != null) {
+        localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
+        window.localStorage.setItem('sustainMoney', localeSustainMoney)
+      }
       // // 转燃气改装工程单
       // if (self.config.modificationList && parameter) {
       //   let printSheet = {

package/src/components/charge/business/OtherChargeNew.vue

@@ -260,6 +260,11 @@
           }
         })
       }
+      let localeSustainMoney = window.localStorage.getItem('sustainMoney')
+      if (localeSustainMoney != null) {
+        localeSustainMoney = (localeSustainMoney - 0) + (self.model.f_collection - 0)
+        window.localStorage.setItem('sustainMoney', localeSustainMoney)
+      }
       // // 转燃气改装工程单
       // if (self.config.modificationList && parameter) {
       //   let printSheet = {
@@ -418,8 +423,8 @@
           // f_brand_spec: model.f_brand_spec[0],
           f_userinfo_id: this.row.f_userinfo_id,
           f_service_person: this.model.f_service_person[0],
-          f_operat_type: '其他收费',
-          f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行其他收费操作`,
+          f_operat_type: '其他收费欠费登记',
+          f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行其他收费欠费登记操作`,
           f_state: '有效',
           f_operator: this.$login.f.name,
           f_operatorid: this.$login.f.id,

package/src/components/meterBook/MeterManger.vue

@@ -1,61 +1,61 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div :class="{'basic-main':!meterShow,'binary-left':meterShow}">
-      <meter-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids" :refresh="refresh"></meter-list>
-    </div>
-    <div v-if="meterShow" style="width: 60%" class="binary-right">
-      <div class="flex">
-        <meter-msg v-ref:addareamsg :bookinfo="bookinfo"></meter-msg>
-      </div>
-    </div>
-    <div v-if="addShow" style="width: 60%" class="binary-right">
-      <div class="flex">
-        <add-meter-book v-ref:addareamsg :changeinfo="changeinfo" :dowhat="dowhat"></add-meter-book>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    title: '表册管理',
-    components: {
-    },
-    data () {
-      return {
-        // 分公司id串
-        width: '100%',
-        f_filialeids: this.$login.f.f_orgids,
-        meterShow: false,
-        addShow: false,
-        bookinfo: {},
-        style: 'col-sm-2 ',
-        changeinfo: {},
-        dowhat: '',
-        refresh: 1
-      }
-    },
-    ready () {
-
-    },
-    props: {
-
-    },
-    methods: {
-      selected (obj) {
-        this.style = 'col-sm-3 '
-        this.bookinfo = obj.val
-        this.dowhat = 'add'
-        this.meterShow = true
-        this.addShow = false
-      },
-      refresh () {
-        this.meterShow = false
-      }
-    },
-    events: {
-
-    }
-  }
-</script>
-
+<template>
+  <div id="unit" class="flex-row">
+    <div :class="{'basic-main':!meterShow,'binary-left':meterShow}">
+      <meter-list @select-changed="selected" v-ref:arealist   :style="style" :f_filialeids.sync="f_filialeids" :refresh="refresh"></meter-list>
+    </div>
+    <div v-if="meterShow" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <meter-msg v-ref:addareamsg :bookinfo="bookinfo"></meter-msg>
+      </div>
+    </div>
+    <div v-if="addShow" style="width: 60%" class="binary-right">
+      <div class="flex">
+        <add-meter-book v-ref:addareamsg :changeinfo="changeinfo" :dowhat="dowhat"></add-meter-book>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    title: '表册管理',
+    components: {
+    },
+    data () {
+      return {
+        // 分公司id串
+        width: '100%',
+        f_filialeids: this.$login.f.f_orgids,
+        meterShow: false,
+        addShow: false,
+        bookinfo: {},
+        style: 'col-sm-2 ',
+        changeinfo: {},
+        dowhat: '',
+        refresh: 1
+      }
+    },
+    ready () {
+
+    },
+    props: {
+
+    },
+    methods: {
+      selected (obj) {
+        this.style = 'col-sm-3 '
+        this.bookinfo = obj.val
+        this.dowhat = 'add'
+        this.meterShow = true
+        this.addShow = false
+      },
+      refresh () {
+        this.meterShow = false
+      }
+    },
+    events: {
+
+    }
+  }
+</script>
+