sale-client 3.5.28 → 3.5.31

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -186,6 +186,7 @@
           <div class="col-sm-4 form-group">
             <label class="font_normal_body">表具使用年限</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   :value.sync="row.f_use_limit"
                    placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group">
@@ -202,6 +203,7 @@
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
+                        @change="gasDateChange"
                         :value.sync="row.f_gas_date"
                         :format="'yyyy-MM-dd HH:mm:ss'"
             ></datepicker>
@@ -568,7 +570,7 @@
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       console.log('看看meter里面的数据', this.meter, this.row)
-      this.row = Object.assign(this.row, this.meter, {})
+      this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if(this.row.f_meter_classify){
         if(this.row.f_meter_classify==='物联网表'){
           this.isiot=true
@@ -586,6 +588,16 @@
       co(meterBookGen(this))
     },
     methods: {
+      gasDateChange () {
+        if (!this.row.f_scrap_date && this.row.f_gas_date) {
+          if (this.row.f_use_limit) {
+            let date = new Date(this.row.f_gas_date)
+            let year = date.getFullYear() + (this.row.f_use_limit / 1)
+            this.$set('row.f_scrap_date', year + this.row.f_gas_date.slice(4))
+
+          }
+        }
+      },
       // 获取集中器下拉框
       async getConcentrators () {
         let condition = {
@@ -794,18 +806,6 @@
         } else {
           this.ratioshow = false
         }
-      },
-      'row.f_gas_date' (val) {
-        if (!this.row.f_use_limit) {
-          this.row.f_use_limit = this.$appdata.getSingleValue('使用年限')
-        }
-        if (!this.row.f_scrap_date && this.row.f_gas_date) {
-          if (this.row.f_use_limit !== undefined) {
-            let date = new Date(this.row.f_gas_date)
-            let year = date.getFullYear() + (this.row.f_use_limit / 1)
-            this.row.f_scrap_date = year + this.row.f_gas_date.slice(4)
-          }
-        }
       }
     },
     computed: {

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -582,7 +582,8 @@ export default {
           devicesinfo: [], // 设备信息
           f_hand_month: '', // 抄表月份
           fireinfo: {}, // 用气信息
-          f_meter_book_num: ''
+          f_meter_book_num: '',
+          f_use_limit:''
         }],
         devicesinfo: []
       }

package/src/components/charge/ChargeManage.vue

@@ -56,14 +56,14 @@ export default {
         f_orgid: '',
         row: null,
         cardInfo: null,
-        warningInfo:null,
+        warningInfo: null,
         modalrow: null,
         showModal: false,
         rowData: {},
         dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
         show: [true],
-        selectFiled:'其他信息',
-        worktype:'其他信息'
+        selectFiled: '其他信息',
+        worktype: '其他信息'
       }
     },
     ready () {
@@ -73,8 +73,8 @@ export default {
       setsustainMoney () {
         this.sustainMoney = window.localStorage.getItem('sustainMoney')
       },
-      setField(type){
-        this.selectFiled=type
+      setField (type) {
+        this.selectFiled = type
         this.worktype = type
       },
       async toBusiness (obj) {
@@ -83,7 +83,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -109,13 +109,13 @@ export default {
         console.log('查看传进来的参数:', obj)
         this.warningInfo = await this.$resetpost('rs/logic/getWarningMsg',
           {data: {
-              f_userfiles_id: obj.f_userfiles_id,
-              f_userinfo_code: obj.f_userinfo_code,
-              f_userinfo_id: obj.f_userinfo_id
-            }
+            f_userfiles_id: obj.f_userfiles_id,
+            f_userinfo_code: obj.f_userinfo_code,
+            f_userinfo_id: obj.f_userinfo_id
+          }
           }
           , {resolveMsg: '', rejectMsg: '获取提示失败'})
-        if (this.warningInfo.data.warningNum>0 && obj.f_user_state !== '预备') {
+        if (this.warningInfo.data.warningNum > 0 && obj.f_user_state !== '预备') {
           this.modalrow = obj
           this.showModal = true
           return false
@@ -190,8 +190,8 @@ export default {
         this.$refs.list.searchNoData()
         this.$refs.card.search()
       },
-      'resflushvalue'(){
-        this.$refs.info.$refs.valueaddinfo.reflush();
+      'resflushvalue' () {
+        this.$refs.info.$refs.valueaddinfo.reflush()
       },
       'refreshrow' (val) {
         console.log(val)

package/src/components/chargeBatch/ChargeManageBatch.vue

@@ -56,7 +56,7 @@ export default {
         // 对此数据进行验证
         if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card  in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
           console.log('获取未写卡记录', getUnWriteSell)
           if (getUnWriteSell.data.length > 1) {
             this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/components/chargeBatch/ChargeManageGroup.vue

@@ -56,7 +56,7 @@ export default {
         // 对此数据进行验证
         if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+          let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card  in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
           console.log('获取未写卡记录', getUnWriteSell)
           if (getUnWriteSell.data.length > 1) {
             this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/components/chargeNew/ChargeManageNew.vue

@@ -70,7 +70,7 @@ export default {
         // 对此数据进行验证
           if (await this.validateRow(obj)) {
           // 获取未写卡或者写卡失败记录
-            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+            let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
             console.log('获取未写卡记录', getUnWriteSell)
             if (getUnWriteSell.data.length > 1) {
               this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -426,8 +426,8 @@ let readyGen = async function (self) {
 let downGen = function* (type, condition, data, self) {
   self.condition = condition
   self.msg = '确认下发计划'
-  let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
-    condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
+  // let getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {data: {startDate: self.startDate,
+  //   condition: self.condition}}, {resolveMsg: null, rejectMsg: '获取待审核数据异常!!'})
   // if (type === 'single') {
   //   getUnhand = yield Vue.resetpost('rs/sql/getUnhand', {
   //     data: {
@@ -461,19 +461,19 @@ let downGen = function* (type, condition, data, self) {
   //   console.log('========================================================================================')
   //   self.unhandplan.push(temp)
   // }
-  for (let i = 0; i < getUnhand.data.length; i++) {
-    let temp = {
-      id: getUnhand.data[i].id,
-      f_user_id: getUnhand.data[i].f_user_id,
-      f_userfiles_id: getUnhand.data[i].f_userfiles_id
-    }
-    self.unhandplan.push(temp)
-  }
-  if (getUnhand.data.length > 0) {
-    self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
-  } else {
-    self.unhandplan = []
-  }
+  // for (let i = 0; i < getUnhand.data.length; i++) {
+  //   let temp = {
+  //     id: getUnhand.data[i].id,
+  //     f_user_id: getUnhand.data[i].f_user_id,
+  //     f_userfiles_id: getUnhand.data[i].f_userfiles_id
+  //   }
+  //   self.unhandplan.push(temp)
+  // }
+  // if (getUnhand.data.length > 0) {
+  //   self.msg = self.msg + `, 警告: 之前有 ${getUnhand.data.length} 条待审核数据`
+  // } else {
+  //   self.unhandplan = []
+  // }
   // console.log('1111111:',self.msg)
   self.show = true
 }

package/src/components/revenue/invoiceuse/InvoiceEntry.vue

@@ -1,7 +1,7 @@
 <template>
   <div id='InvoiceEntry' class="flex-row binary">
     <div class="binary-left" v-if="sellgas">
-      <charge-list v-ref:charge_list></charge-list>
+      <invoice-charge-list v-ref:charge_list></invoice-charge-list>
     </div>
     <div class="binary-right" v-if="sellgas">
       <information-input v-if="InformationInputShow"></information-input>
@@ -13,14 +13,13 @@
 </template>
 
 <script>
-  import ChargeList from './ChargeList'
   import InformationInput from './InformationInput'
   import InvoiceInformationInput from './InvoiceInformationInput'
 
   export default {
     name: 'InvoiceEntry',
     props: ['sellgas'],
-    components: {InformationInput, ChargeList, InvoiceInformationInput},
+    components: {InformationInput, InvoiceInformationInput},
     title: '发票信息录入',
     data () {
       return {

package/src/components/webMeter/paramSave/ParamSet.vue

@@ -4,7 +4,7 @@
       <criteria :model='model' partial='criteria' v-ref:criteria @condition-changed='$parent.selfSearch'>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body" >气表协议类型</label>
               <v-select style="width:60%" title="气表协议类型"
                         placeholder='气表协议类型'
@@ -15,7 +15,7 @@
                         close-on-select
                         :value-single="true" v-ref:brand>  </v-select>
             </div>
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">气表品牌</label>
               <v-select
                 placeholder='气表品牌'
@@ -26,7 +26,7 @@
                 condition="f_gasbrand_id = '{}'"
                 close-on-select></v-select>
             </div>
-            <div class="col-sm-3 form-group">
+            <div class="col-sm-2 form-group">
               <label class="font_normal_body">气表型号</label>
               <v-select :value.sync="model.f_meter_style"
                         v-model="model.f_meter_style"
@@ -34,7 +34,7 @@
                         condition="f_gasmodel_id = '{}'"
                         close-on-select></v-select>
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">客户编号</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search "
                      v-model="model.f_userinfo_code"
@@ -52,7 +52,7 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">表&emsp;号&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_meternumber"
@@ -60,7 +60,7 @@
                      condition="f_meternumber like '%{}%'"
               >
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">客户姓名</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_user_name"
@@ -68,7 +68,7 @@
                      condition="f_user_name like '%{}%'"
               >
             </div>
-            <div class="col-sm-3 ">
+            <div class="col-sm-2 ">
               <label class="font_normal_body">小&emsp;区&emsp;</label>
               <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                      v-model="model.f_residential_area"
@@ -76,7 +76,7 @@
                      condition="f_residential_area like '%{}%'"
               >
             </div>
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">用户类型</label>
               <v-select
                 placeholder='用户类型'
@@ -89,7 +89,7 @@
               </v-select>
             </div>
 
-            <div class="col-sm-3">
+            <div class="col-sm-2">
               <label class="font_normal_body">用气性质</label>
               <v-select
                 placeholder='用气性质'
@@ -104,14 +104,14 @@
           </div>
         </div>
       </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" :optional="true">
         <template partial='head'>
           <tr>
-            <th style="text-align:center">
-              <nobr>全选</nobr>
-              <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1'
-                     @click="$parent.$parent.$parent.checkedALL()">
-            </th>
+<!--            <th style="text-align:center">-->
+<!--              <nobr>全选</nobr>-->
+<!--              <input @keyup.enter="search" style="width:60%" type="checkbox" v-model='checked1'-->
+<!--                     @click="$parent.$parent.$parent.checkedALL()">-->
+<!--            </th>-->
             <!--<th >操作</th>-->
             <th style="text-align:center">
               <nobr>客户编号</nobr>
@@ -150,11 +150,8 @@
 
           </tr>
         </template>
-        <template partial='body' partial='list' v-ref:grid>
+        <template partial='body'>
           <tr>
-            <td style="text-align:center">
-              <input @keyup.enter="search" style="width:60%" type="checkbox" name="opertioninput"
-                     @click="$parent.$parent.$parent.checked(row)"></td>
             <!--<td>-->
             <!--<button type="button" name="button" class="btn btn-link" v-if="row.f_user_state === '正常'"-->
             <!--@click.stop="$parent.$parent.$parent.paramSet(row)">参数设置-->
@@ -354,8 +351,10 @@ export default {
     },
     showParam () {
       this.conditionMsg = ''
-      if (!this.user) {
+      if (this.$refs.paged.$refs.grid.getRowData().length === 0) {
         this.user = []
+      } else {
+        this.user = this.$refs.paged.$refs.grid.getRowData()
       }
       if (this.user.length === 0) {
         this.$showMessage('是否要设置查询出来的所有表参数', ['confirm', 'cancel']).then((res) => {
@@ -400,19 +399,19 @@ export default {
     closeParam () {
       // this.$refs.form.row={}
       this.showParame = !this.showParame
-      if (this.isCheckAll) {
-        this.map.clear()
-        this.user = []
-      }
-      this.isCheckAll = false
+      // if (this.isCheckAll) {
+      this.map.clear()
+      this.user = []
+      // }
+      // this.isCheckAll = false
     },
     clear () {
       this.$refs.form.paramtype = ''
-      this.isCheckAll = false
+      // this.isCheckAll = false
       this.showParame = false
       this.map.clear()
       this.user = []
-      this.unCheckAll()
+      // this.unCheckAll()
       this.search()
     },
     selfSearch (args) {
@@ -422,14 +421,14 @@ export default {
         this.condition = args.condition
         this.model.search(args.condition, args.model)
       }
-      this.isCheckAll = false
+      // this.isCheckAll = false
     },
     showparam (setable) {
       this.setable = setable
       if (!setable) {
         this.map.clear()
         this.user = []
-        this.isCheckAll = false
+        // this.isCheckAll = false
       }
     },
     search () {
@@ -467,42 +466,42 @@ export default {
     getRes (obj) {
       this.orgcondition = obj
     },
-    unCheckAll () {
-      let box = document.getElementsByName('opertioninput')
-      for (var i = 0; i < box.length; i++) {
-        box[i].checked = false
-      }
-    },
-    checkedALL () {
-      this.checked1 = !this.checked1
-      let box = document.getElementsByName('opertioninput')
-      for (var i = 0; i < box.length; i++) {
-        box[i].checked = this.checked1
-      }
-    },
-    checked (val) {
-      let userid = val.f_userfiles_id
-      if (this.map.has(userid)) {
-        this.map.delete(userid)
-        /* 遍历数组，然后根据选中的状态获取对应的下标，然后进行删除 */
-        for (let i = 0; i < this.user.length; i++) {
-          if (val.f_userfiles_id === this.user[i].f_userfiles_id) {
-            this.user.splice(i, 1)
-          }
-        }
-      } else {
-        this.user.push(val)
-        this.map.set(userid, {
-          id: null,
-          f_user_id: userid,
-          f_alias: val.f_alias,
-          f_userinfo_id: val.f_userinfo_id,
-          f_orgname: val.f_orgname,
-          f_orgid: val.f_orgid,
-          f_meternumber: val.f_meternumber
-        })
-      }
-    },
+    // unCheckAll () {
+    //   let box = document.getElementsByName('opertioninput')
+    //   for (var i = 0; i < box.length; i++) {
+    //     box[i].checked = false
+    //   }
+    // },
+    // checkedALL () {
+    //   this.checked1 = !this.checked1
+    //   let box = document.getElementsByName('opertioninput')
+    //   for (var i = 0; i < box.length; i++) {
+    //     box[i].checked = this.checked1
+    //   }
+    // },
+    // checked (val) {
+    //   let userid = val.f_userfiles_id
+    //   if (this.map.has(userid)) {
+    //     this.map.delete(userid)
+    //     /* 遍历数组，然后根据选中的状态获取对应的下标，然后进行删除 */
+    //     for (let i = 0; i < this.user.length; i++) {
+    //       if (val.f_userfiles_id === this.user[i].f_userfiles_id) {
+    //         this.user.splice(i, 1)
+    //       }
+    //     }
+    //   } else {
+    //     this.user.push(val)
+    //     this.map.set(userid, {
+    //       id: null,
+    //       f_user_id: userid,
+    //       f_alias: val.f_alias,
+    //       f_userinfo_id: val.f_userinfo_id,
+    //       f_orgname: val.f_orgname,
+    //       f_orgid: val.f_orgid,
+    //       f_meternumber: val.f_meternumber
+    //     })
+    //   }
+    // },
     showModal (val) {
       this.val1 = val
       this.isShowUserException = true
@@ -559,16 +558,16 @@ export default {
         this.$refs.paged.$refs.criteria.model.f_gasbrand_id = val[0]
         this.search()
       }
-    },
-    'checked1' (val) {
-      if (val) {
-        this.user = this.model.rows
-        this.mapset(this.model.rows)
-      } else {
-        this.map.clear()
-        this.user = []
-      }
     }
+    // 'checked1' (val) {
+    //   if (val) {
+    //     this.user = this.model.rows
+    //     this.mapset(this.model.rows)
+    //   } else {
+    //     this.map.clear()
+    //     this.user = []
+    //   }
+    // }
   }
 }
 </script>

package/src/components/webMeter/paramSave/ParamSetForm.vue

@@ -237,6 +237,7 @@ export default {
                   let data = {}
                   data.param_group = this.newmeterinfo[i].name
                   data.param_name = this.newmeterinfo[i].params[j].name
+                  data.tag = this.newmeterinfo[i].params[j].tag
                   data.param_value = this.row[key] ? (this.row[key].code ? this.row[key].code : this.row[key]) : null
                   data.param_content = this.row[key] ? (this.row[key].content ? this.row[key].content : this.row[key]) : null
                   data.param_lname = this.newmeterinfo[i].params[j].title

package/src/filiale/fugu/MeterinfoTest.vue

@@ -324,9 +324,9 @@
             &ensp;<span class="glyphicon glyphicon-map-marker" @click="openModal" ></span>
           </div>
           <div class="col-sm-4 form-group" v-if="config.overduesetShow">
-            <label class="font_normal_body">滞纳金规则</label>
+            <label class="font_normal_body">违约金规则</label>
             <v-select :value.sync="row.f_overdue_set" v-model="row.f_overdue_set"
-                      :options='overdueset' placeholder='滞纳金规则'
+                      :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
 

package/src/filiale/gaomi/components/charge/ChargeManage.vue

@@ -53,7 +53,7 @@ export default {
         listpage: true,
         f_orgid: '',
         row: null,
-        state:'已领',
+        state: '已领',
         cardInfo: null,
         modaldata: null,
         modaldata2: null,
@@ -77,7 +77,7 @@ export default {
               this.$showMessage(msg, ['confirm', 'cancel']).then((res) => {
                 if (res === 'confirm') {
           // 获取未写卡或者写卡失败记录
-                  this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
+                  this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`).then((getUnWriteSell) => {
                     console.log('获取未写卡记录', getUnWriteSell)
                     if (getUnWriteSell.data.length > 1) {
                       this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -94,7 +94,7 @@ export default {
               })
             } else {
         // 获取未写卡或者写卡失败记录
-              let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card = '未写卡' and f_userfiles_id = '${obj.f_userfiles_id}'`)
+              let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and f_write_card  in ('未写卡','写卡失败') and f_userfiles_id = '${obj.f_userfiles_id}'`)
               console.log('获取未写卡记录', getUnWriteSell)
               if (getUnWriteSell.data.length > 1) {
                 this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
@@ -120,9 +120,9 @@ export default {
     this.$refs.list.search()
     // this.$refs.card.search()
   },
-  setstate(state){
+  setstate (state) {
     console.log('-----------state----')
-    this.state=state?'已领':'未领'
+    this.state = state ? '已领' : '未领'
   },
   async validateRow (obj) {
     console.log('查看传进来的参数:', obj)