sale-client 3.5.76 → 3.5.78

package/package.json

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

package/src/components/revenue/base/leftview/meterinfodetail.vue

@@ -5,6 +5,10 @@
         <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
       </div>
       <div class="auto ">
+        <div class="row">
+          <label class = "col-sm-5 " style="color: brown">团缴编号</label>
+          <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
+        </div>
         <div class="row">
           <label class = "col-sm-5 " >气表类型</label>
           <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -882,6 +882,9 @@ export default {
       this.commitflag = true
       // 气量转金额 或者 金额转气量的时候对气量和金额不做限制， 可以修改， 但是只变单价
       this.model.f_remanent_price = ((this.model.f_remanent_money) / (this.model.f_remanent_gas)).toFixed(4)
+      if (this.model.f_remanent_price == 'NaN') {
+        this.model.f_remanent_price = 0
+      }
     },
 
     async validateOwe () {

package/src/components/revenue/comprehen/handAudit/MeterReadAudit.vue

@@ -143,13 +143,13 @@
           <td style="text-align:center">{{ row.f_user_id }}</td>
           <td style="text-align:center">{{ row.f_user_name }}</td>
           <td style="text-align:center">{{ row.f_address }}</td>
-          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_last_tablebase }}
           </td>
-          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_tablebase }}
           </td>
-          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base || row.f_last_tablebase === row.f_tablebase }">
+          <td style="text-align:center" :class="{'meterbasehaserr' : row.f_last_tablebase !== row.f_meter_base}">
             {{ row.f_meter_base }}
           </td>
           <td style="text-align:center">{{ parseFloat(row.f_tablebase - row.f_last_tablebase).toFixed(2) }}</td>
@@ -168,7 +168,7 @@
           <td style="text-align:center">{{ row.f_audit_date }}</td>
           <td style="text-align: center" v-if="row.f_meter_state === '待审核' && row.f_hand_state === '有效'">
             <button type="button" class="button_search button_spacing width-60"
-                    v-if="row.f_last_tablebase === row.f_meter_base && row.f_last_tablebase !== row.f_tablebase "
+                    v-if="row.f_last_tablebase === row.f_meter_base"
                     @click.stop="$parent.$parent.$parent.success(row)">通过
             </button>
             <br>
@@ -216,7 +216,7 @@ let readyGen = async function (self) {
 
 export default {
   title: '自报表数审核',
-  data() {
+  data () {
     return {
       initres: {
         org: [this.$login.f.orgid],
@@ -236,24 +236,24 @@ export default {
       meterbooks: [{label: '全部', value: ''}]
     }
   },
-  ready() {
+  ready () {
     readyGen(this)
     this.$refs.paged.$refs.cri.model.f_hand_state[0] = ` f_meter_state = '待审核'`
   },
   methods: {
-    loadMeterBooks() {
+    loadMeterBooks () {
       this.meterbooks = [...this.meterbooks, ...this.$GetSaleParam.getMeterBooks()]
     },
-    getRes(obj) {
+    getRes (obj) {
       this.orgCondtionStr = obj
     },
-    hidden() {
+    hidden () {
       this.criteriaShow = !this.criteriaShow
     },
-    search() {
+    search () {
       this.$refs.paged.$refs.cri.search()
     },
-    selfSearch(args) {
+    selfSearch (args) {
       if (!this.orgCondtionStr) {
         args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
       } else {
@@ -261,23 +261,25 @@ export default {
       }
       this.model.search(args.condition, args.model)
     },
-    async allsuccess() {
+    async allsuccess () {
       let res = await this.$showMessage('确定通过全部抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       let condition = []
       if (res === 'confirm') {
         if (this.model.rows.length >= 0) {
           if (this.model.model.f_hand_state[0] == `'待审核'`) {
             for (let i = 0; i < this.model.rows.length; i++) {
-              let temp = {
-                f_hand_id: this.model.rows[i].id,
-                // 本次表底数
-                f_tablebase: this.model.rows[i].f_tablebase,
-                // 表类型
-                f_meter_classify: this.model.rows[i].f_meter_classify,
-                // 气表品牌
-                f_meter_brand: this.model.rows[i].f_meter_brand
+              if (this.model.rows[i].f_last_tablebase === this.model.rows[i].f_meter_base) {
+                let temp = {
+                  f_hand_id: this.model.rows[i].id,
+                  // 本次表底数
+                  f_tablebase: this.model.rows[i].f_tablebase,
+                  // 表类型
+                  f_meter_classify: this.model.rows[i].f_meter_classify,
+                  // 气表品牌
+                  f_meter_brand: this.model.rows[i].f_meter_brand
+                }
+                condition.push(temp)
               }
-              condition.push(temp)
             }
             let uuid = this.$login.guid()
             let data = {
@@ -295,7 +297,7 @@ export default {
         }
       }
     },
-    async success(row) {
+    async success (row) {
       let res = await this.$showMessage('确定通过该条抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       if (res === 'confirm') {
         let data = {
@@ -313,7 +315,7 @@ export default {
         this.search()
       }
     },
-    async allfaild() {
+    async allfaild () {
       let res = await this.$showMessage('确定作废全部抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       let condition = '('
       if (res === 'confirm') {
@@ -335,7 +337,7 @@ export default {
         }
       }
     },
-    async faild(row) {
+    async faild (row) {
       let res = await this.$showMessage('确定作废该条抄表吗?操作后将不可取消', ['confirm', 'cancel'])
       if (res === 'confirm') {
         // this.row = row
@@ -346,7 +348,7 @@ export default {
         this.search()
       }
     },
-    async confirm() {
+    async confirm () {
       await this.$resetpost('rs/logic/weixinHanPlanAudit', this.row, {resolveMsg: '操作成功', rejectMsg: '操作失败'})
       await this.$resetpost('http://www.hunanhongdaranqi.com/weixin/rs/logic/meterReadFailed', this.pushdata, {
         resolveMsg: null,
@@ -357,7 +359,7 @@ export default {
     }
   },
   computed: {
-    inputtores() {
+    inputtores () {
       // 获取抄表员
       console.log('获取抄表员', this.$login.f)
       let rs = []