sale-client 3.6.109 → 3.6.111

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.109",
+  "version": "3.6.111",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {
@@ -91,7 +91,7 @@
     "style-loader": "^0.20.3",
     "system-clients": "3.2.61",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.86",
+    "vue-client": "1.24.94",
     "vue-clipboard2": "0.3.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",

package/src/components/FilesManage/UserDeviceInfoTest.vue

@@ -336,17 +336,21 @@ export default {
       }
     },
     async initParams () {
-      let http = new HttpResetClass()
-      let data = {
-        items: 'id,f_brand',
-        tablename: 't_iot_device_brand',
-        condition: `1=1`,
-        orderitem: 'id'
-      }
-      let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备品牌失败!'})
-      this.brands = []
-      for (let row of res.data) {
-        this.brands.push({label: row.f_brand, value: `${row.id}`})
+      try {
+        let http = new HttpResetClass()
+        let data = {
+          items: 'id,f_brand',
+          tablename: 't_iot_device_brand',
+          condition: `1=1`,
+          orderitem: 'id'
+        }
+        let res = await http.load('post', 'rs/sql/saleSingleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取设备品牌失败!'})
+        this.brands = []
+        for (let row of res.data) {
+          this.brands.push({label: row.f_brand, value: `${row.id}`})
+        }
+      } catch (e) {
+        console.log(e)
       }
     },
     showTableBtn () {

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -44,6 +44,13 @@
 
               <div style="float: right">
                 <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                              :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport"
+                              :sql-name="$parent.$parent.isIot ? 'sale_WebChargeQuery' : 'sale_ChargeQuery'"
+                              template-name='用户收费查询导出'
+                              :choose-col="true">
+                </export-excel>
                 <print-data :defaultfield="$parent.$parent.defaultfield"
                             :field="$parent.$parent.isIot?$parent.$parent.iotFields:$parent.$parent.fields"
                             :is-selected="true" :model="$parent.$parent.printModel"
@@ -178,10 +185,10 @@
         <!--          应交合计:&emsp;{{model.sums.f_oughtfee}}-->
         <!--        </td>-->
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          气量合计:&emsp;{{model.sums.f_pregas}}
+          气量合计:&emsp;{{ sumsmodel.f_pregas}}
         </td>
         <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
-          实收合计:&emsp;{{ model.sums.f_collection }}
+          实收合计:&emsp;{{ sumsmodel.f_collection }}
         </td>
       </tr>
     </table>
@@ -245,6 +252,9 @@ export default {
       radio: [],
       // 选中的页
       all: [],
+      other: [],
+      footer: [],
+      sumsmodel: {},
       // row数据
       rowsdata: [],
       fields: {
@@ -291,10 +301,25 @@ export default {
     this.$refs.paged.$refs.criteria.search()
   },
   methods: {
+    getotherfooter () {
+      this.other = []
+      this.footer = []
+      let otherInData = []
+      otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+      let footerData = []
+      let exportfield = this.getExportFields
+      footerData.push('合计')
+      for (var field in this.sumsmodel) {
+        footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
+      }
+      this.footer.push(footerData)
+      this.other.push(otherInData)
+    },
     async search () {
       console.log('aaa:', this.$refs.paged.$refs.criteria.condition)
       this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}' and f_orgid = '${this.$login.f.orgid}'`
       this.model.search(this.condition, this.model)
+      this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       let http = new HttpResetClass()
       let res = await http.load('POST', `${this.row.f_meter_type === '物联网表' ? 'rs/sql/sale_WebChargeQuery' : 'rs/sql/sale_ChargeQuery'}`, {
         data: {
@@ -419,7 +444,77 @@ export default {
       }
     }
   },
+  watch: {
+    'model.rows' (val) {
+      if (val.length === 0) {
+        this.sumsmodel = {}
+      }
+    },
+    'sumsmodel': {
+      handler: function (val) {
+        this.getotherfooter()
+      },
+      deep: true
+    }
+  },
   computed: {
+    getCondition () {
+      return {
+        condition: this.condition,
+        f_user_id: this.row.f_user_id
+      }
+    },
+    getExportFields () {
+      let fields
+      if (this.isIot) {
+        fields = {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'type': '收费类型',
+          'f_hand_date': '收费区间',
+          'f_meternumber': '表号',
+          'f_last_tablebase': '上期指数',
+          'f_tablebase': '本期指数',
+          'f_pregas': '气量',
+          'f_price': '气价',
+          'f_preamount': '气费金额',
+          'f_delaypay': '滞纳金',
+          'f_jianmian': '减免金额',
+          'f_balance': '上期结余',
+          'f_oughtfee': '应交金额',
+          'f_collection': '实收金额',
+          'f_curbalance': '本期结余',
+          'f_payment': '付款方式',
+          'f_operator': '操作员',
+          'f_operate_date': '缴费时间',
+          'f_state': '缴费状态',
+          'f_depname': '网点',
+          'f_comments': '备注'
+        }
+      } else {
+        fields = {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'type': '收费类型',
+          'f_meternumber': '表号',
+          'f_pregas': '气量',
+          'f_price': '气价',
+          'f_preamount': '气费金额',
+          'f_delaypay': '滞纳金',
+          'f_jianmian': '减免金额',
+          'f_balance': '上期结余',
+          'f_collection': '实收金额',
+          'f_curbalance': '本期结余',
+          'f_payment': '付款方式',
+          'f_operator': '操作员',
+          'f_operate_date': '缴费时间',
+          'f_state': '缴费状态',
+          'f_depname': '网点',
+          'f_comments': '备注'
+        }
+      }
+      return fields
+    },
     ischecked () {
       return function (index, i) {
         if (!this.radio[index]) {

package/src/components/revenue/comprehen/Bill/paper/BillList.vue

@@ -175,6 +175,10 @@
       },
       selfSearch (args) {
         args.condition = `${args.condition} and f_orgid like '${this.$login.f.orgid}%'`
+        console.log('看看此用户是否限制查询全部票据', this.$login.r.includes('限制查看全部票据'))
+        if (this.$login.r.includes('限制查看全部票据')) {
+          args.condition = `${args.condition} and f_bill_user = '${this.$login.f.name}'`
+        }
         console.log(args.condition)
         this.model.search(args.condition, args.model)
       },

package/src/components/revenue/machineHandManage/ArrearsQuery.vue

@@ -192,10 +192,10 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">欠费金额</label>
-                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_all_small"
-                         condition="f_oughtfee_all >= '{}' " placeholder="大于等于">
-                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_all_big"
-                         condition="f_oughtfee_all <= '{}' " placeholder="小于等于">
+                  <input type="text" style="width:30%" class="input_search" title="大于等于" v-model="model.f_oughtfee_col_small"
+                         condition="f_oughtfee_col >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于" v-model="model.f_oughtfee_col_big"
+                         condition="f_oughtfee_col <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">欠费期数</label>
@@ -299,6 +299,12 @@
                 <th>
                   <nobr>用气金额</nobr>
                 </th>
+                <th>
+                  <nobr>合计欠费</nobr>
+                </th>
+                <th>
+                  <nobr>实际欠费</nobr>
+                </th>
                 <th>
                   <nobr>缴费时间</nobr>
                 </th>
@@ -320,12 +326,6 @@
                 <th>
                   <nobr>上期余额</nobr>
                 </th>
-                <th>
-                  <nobr>合计欠费</nobr>
-                </th>
-                <th>
-                  <nobr>实际欠费</nobr>
-                </th>
                 <th>
                   <nobr>抄表员</nobr>
                 </th>
@@ -393,6 +393,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_oughtfee}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtfee_all}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_oughtfee_col}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
@@ -414,12 +420,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_balance}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_all}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee_col}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_inputtor}}</nobr>
               </td>

package/src/components/revenue/machineHandManage/machineDown.vue

@@ -36,6 +36,13 @@
               <div class="span" style="float:right;">
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getExportFields" :header="$parent.$parent.other"
+                              sqlurl="rs/logic/saleExport"
+                              sql-name="getDownPlan"
+                              template-name='抄表计划下发导出'
+                              :choose-col="true">
+                </export-excel>
                 <button class="button_search button_spacing"
                         @click="$parent.$parent.batchDownHand()">计划下发
                 </button>
@@ -603,6 +610,7 @@
         uploadText: '抄表',
         showerr: false,
         err: '',
+        other: [],
         // 请求对象(批量导入,查询进度使用)
         HttpReset: new HttpResetClass()
       }
@@ -616,6 +624,20 @@
       document.getElementById(this.inputid).focus()
     },
     methods: {
+      getotherfooter () {
+        this.other = []
+        // this.footer = []
+        let otherInData = []
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`)
+        // let footerData = []
+        // let exportfield = this.getExportFields
+        // footerData.push('合计')
+        // for (var field in this.sumsmodel) {
+        //   footerData.push(`${exportfield[field]}合计:${this.sumsmodel[field]}`)
+        // }
+        // this.footer.push(footerData)
+        this.other.push(otherInData)
+      },
       // 获得本月的最后一天。
       getLastDayOfMonth (year, month) {
         let new_year = year    // 取当前的年份
@@ -1008,6 +1030,20 @@
       // },
     },
     computed: {
+      getExportFields () {
+        return {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_address': '用户地址',
+          'f_user_level': '用户等级',
+          'f_adjustable_name': '调压箱名称',
+          'f_inputtor': '抄表员',
+          'f_balance': '上期结余',
+          'f_meternumber': '表号',
+          'f_meter_base': '上期底数',
+          'f_book_name': '抄表册'
+        }
+      },
       getCondition () {
         // return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
         return {

package/src/filiale/liaoyuan/NewPriceAdjustment.vue

@@ -92,17 +92,17 @@
                             condition="f_change_price1 {}"
                             close-on-select></v-select>
                 </div>
-                <div class="form-group col-sm-2">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select id="f_source"
-                            v-model="model.f_source"
-                            placeholder='气表类型'
-                            style="width: 60%"
-                            :value.sync="model.f_source"
-                            :options='$parent.$parent.source'
-                            condition="f_source='{}'"
-                            close-on-select></v-select>
-                </div>
+<!--                <div class="form-group col-sm-2">-->
+<!--                  <label class="font_normal_body">气表类型</label>-->
+<!--                  <v-select id="f_source"-->
+<!--                            v-model="model.f_source"-->
+<!--                            placeholder='气表类型'-->
+<!--                            style="width: 60%"-->
+<!--                            :value.sync="model.f_source"-->
+<!--                            :options='$parent.$parent.source'-->
+<!--                            condition="f_source='{}'"-->
+<!--                            close-on-select></v-select>-->
+<!--                </div>-->
                 <div class="form-group col-sm-2">
                   <label class="font_normal_body">用户类型</label>
                   <v-select id="f_user_tye"
@@ -140,36 +140,36 @@
                             close-on-select></v-select>
                 </div>
 
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;员</label>
-                  <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
-                            style="width:60%"
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄&ensp;表&ensp;员</label>-->
+<!--                  <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'-->
+<!--                            style="width:60%"-->
 
-                            :options='$parent.$parent.inputtoreser' placeholder='抄表员'
-                            @change="$parent.$parent.inputtorchange"
-                            close-on-select
-                            v-el:cc></v-select>
-                </div>
-                <!--表册片区-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表册片区</label>
-                  <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"
-                            :options='$parent.$parent.bookSliceArea' placeholder='表册片区'
-                            multiple
-                            style="width:60%"
-                            @change="$parent.$parent.sliceChange"
-                            close-on-select
-                            condition="f_book_slice_area in {}"></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
-                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            multiple
-                            style="width:60%"
-                            close-on-select
-                            condition="f_meter_book_num in {}"></v-select>
-                </div>
+<!--                            :options='$parent.$parent.inputtoreser' placeholder='抄表员'-->
+<!--                            @change="$parent.$parent.inputtorchange"-->
+<!--                            close-on-select-->
+<!--                            v-el:cc></v-select>-->
+<!--                </div>-->
+<!--                &lt;!&ndash;表册片区&ndash;&gt;-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">表册片区</label>-->
+<!--                  <v-select :value.sync="model.f_book_slice_area" v-model="model.f_book_slice_area"-->
+<!--                            :options='$parent.$parent.bookSliceArea' placeholder='表册片区'-->
+<!--                            multiple-->
+<!--                            style="width:60%"-->
+<!--                            @change="$parent.$parent.sliceChange"-->
+<!--                            close-on-select-->
+<!--                            condition="f_book_slice_area in {}"></v-select>-->
+<!--                </div>-->
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>-->
+<!--                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"-->
+<!--                            :options='$parent.$parent.meterbooks' placeholder='抄表册'-->
+<!--                            multiple-->
+<!--                            style="width:60%"-->
+<!--                            close-on-select-->
+<!--                            condition="f_meter_book_num in {}"></v-select>-->
+<!--                </div>-->
               </div>
             </div>
           </criteria>
@@ -374,7 +374,13 @@
     self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.f_change_date = ''
-    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {
+    getPrice(self)
+    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.pricechange = false
+
+  }
+  let getPrice = async function(self) {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {
       resolveMsg: null,
       rejectMsg: null
     }).then((res) => {
@@ -391,9 +397,7 @@
       }
       console.log(rs)
       self.pricers = [ ...rs]
-      self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
-      self.pricechange = false
-      //self.$refs.paged.$refs.criteria.search()
+      self.priceTypeChange()
     })
   }
   let asyncReadyGen = async function (self) {
@@ -855,7 +859,7 @@
         this.$refs.paged.$refs.criteria.model.f_inputtor = []
         this.meterbooks = [{label: '全部', value: ''}]
         if (this.f_filialeid) {
-          this.updateParams()
+          getPrice(this)
         }
       }
     }

package/src/filiale/liaoyuan/NewPriceAdjustmentWebmeter.vue

@@ -143,13 +143,13 @@
                   <nobr>三阶气量</nobr>
                 </th>
                 <th>
-                  <nobr>一阶补差单价</nobr>
+                  <nobr>一阶单价</nobr>
                 </th>
                 <th>
-                  <nobr>二阶补差单价</nobr>
+                  <nobr>二阶单价</nobr>
                 </th>
                 <th>
-                  <nobr>三阶补差单价</nobr>
+                  <nobr>三阶单价</nobr>
                 </th>
                 <th>
                   <nobr>一阶补差单价</nobr>
@@ -303,8 +303,18 @@
   let readySomething = async function (self) {
     self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
     self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
-    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(res.data)
+    self.$refs.paged.$refs.criteria.model.f_change_date = ''
+    getPrice(self)
+    self.$showAlert('请输入[气价类型]后进行查询！', 'warning', 2000)
+    self.pricechange = false
+
+  }
+  let getPrice = async function(self) {
+    self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.f_filialeid}}, {
+      resolveMsg: null,
+      rejectMsg: null
+    }).then((res) => {
+      console.log('气价信息-------->',res.data)
       let rs = []
       for (let i = 0; i < res.data.length; i++) {
         let temp = {
@@ -317,7 +327,7 @@
       }
       console.log(rs)
       self.pricers = [ ...rs]
-      self.$refs.paged.$refs.criteria.search()
+      self.priceTypeChange()
     })
   }
 
@@ -572,6 +582,16 @@
     computed: {
     },
     watch: {
+      async 'f_filialeid' (val) {
+        // 更新抄表册
+        this.$refs.paged.$refs.criteria.model.f_meter_book = []
+        this.$refs.paged.$refs.criteria.model.f_book_slice_area = []
+        this.$refs.paged.$refs.criteria.model.f_inputtor = []
+        this.meterbooks = [{label: '全部', value: ''}]
+        if (this.f_filialeid) {
+          getPrice(this)
+        }
+      }
     }
   }
 </script>