manage-client 3.3.120 → 3.3.121

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.3.120",
+  "version": "3.3.121",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -1001,9 +1001,12 @@
       })
     },
     methods: {
-      async batchPrintBill(row, type){
+      async batchPrintBill(row, type) {
         this.operate_type = type
-        if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] === '有效') {
+        console.log('this.$refs.paged.$refs.cri.model.f_state', this.$refs.paged.$refs.cri.model.f_state)
+        console.log(this.$refs.paged.$refs.cri.model.f_state.length === 1)
+        console.log(this.$refs.paged.$refs.cri.model.f_state[0] == '有效')
+        if (this.$refs.paged.$refs.cri.model.f_state.length === 1 && this.$refs.paged.$refs.cri.model.f_state[0] == '有效') {
           if (type === '票据补打') {
             this.batchPrintData.push(row)
             this.$showMessage(`您确定补打本张票据吗？？？`, ['confirm', 'cancel']).then(async (res) => {
@@ -1022,7 +1025,8 @@
             } else {
               this.$showMessage(`请先查询数据！！！`, ['confirm'])
             }
-        }
+          }
+        } else {
           this.$showMessage(`请选择有效的收费记录进行票据补打！！！`, ['confirm'])
         }
       },

package/src/components/sale/businessquery/FMYGasQuery.vue

@@ -137,10 +137,12 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
                             :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="f_gasproperties = '{}'"
-                            close-on-select></v-select>
+                            :multiple="true"
+                            condition="f_gasproperties in {}">
+                  </v-select>
                 </div>
                 <!--表册片区-->
                 <div class="col-sm-2 form-group">
@@ -175,12 +177,12 @@
                          condition="f_oughtamount <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="startHandDate" class="font_normal_body">开户时间</label>
+                  <label for="startHandDate" class="font_normal_body">通气时间</label>
                   <datepicker id="startHandDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startOpenDate"
-                              :value.sync="model.startOpenDate"
+                              v-model="model.startGasDate"
+                              :value.sync="model.startGasDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_open_date >= '{}'"
+                              condition="f_gas_date >= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -188,10 +190,10 @@
                 <div class="col-sm-2 form-group">
                   <label for="endHandDate" class="font_normal_body">&emsp;&emsp;&emsp;至</label>
                   <datepicker id="endHandDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endOpenDate"
-                              :value.sync="model.endOpenDate"
+                              v-model="model.endGasDate"
+                              :value.sync="model.endGasDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
-                              condition="f_open_date <= '{}'"
+                              condition="f_gas_date <= '{}'"
                               :show-reset-button="true"
                   >
                   </datepicker>
@@ -200,9 +202,10 @@
                   <label class="font_normal_body">&nbsp;抄&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
                             v-model="model.f_inputtor"
+                            :multiple="true"
                             :options='$parent.$parent.inputtores' placeholder='请选择'
-                            condition="f_inputtor = '{}'"
-                            close-on-select :search="false">
+                            condition="f_inputtor in {}"
+                            :search="false">
                   </v-select>
                 </div>
               </div>
@@ -293,7 +296,7 @@
                   <nobr>期末底数</nobr>
                 </th>
                 <th>
-                  <nobr>建档日期</nobr>
+                  <nobr>通气时间</nobr>
                 </th>
               </tr>
             </template>
@@ -386,7 +389,7 @@
                 <nobr>{{row.f_tablebase}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_createfile_date}}</nobr>
+                <nobr>{{row.f_gas_date}}</nobr>
               </td>
             </template>
             <template partial='foot'></template>
@@ -480,7 +483,7 @@ import exportConfig from '../config/exportConfig'
         printshow: false,
         all: false,
         fields: {},
-        inputtores: [],
+        inputtores:[{label: '全部',value: ''}],
         thead: '',
         tfoot: '',
         //表册片区
@@ -502,6 +505,7 @@ import exportConfig from '../config/exportConfig'
     },
     ready () {
       readySomething(this)
+      this.getinputtores()
     },
     methods: {
       initParams(){
@@ -531,16 +535,19 @@ import exportConfig from '../config/exportConfig'
           })
         }
       },
-      async updateParams() {
-        await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: '全部', value: ''})
-        this.initSlice(this.f_filialeid)
-        if (this.allorgid != null) {
-          this.allorgid.forEach((res) => {
-            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
-          })
+      async getinputtores () {
+        // 获取抄表员
+        let rs = []
+        if (this.$login.f.f_gasman.length > 0) {
+          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
+            let temp = {
+              label: this.$login.f.f_gasman[i].name,
+              value: this.$login.f.f_gasman[i].name
+            }
+            rs.push(temp)
+          }
         }
+        this.inputtores = [{label: '全部', value: ''}, ...rs]
       },
       //表册片区和抄表册关联
       async inputtorchange(){
@@ -623,7 +630,7 @@ import exportConfig from '../config/exportConfig'
       userTypeChange () {
         this.gasproperties = []
         if (this.$refs.paged.$refs.cri.model !== null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
+          this.$refs.paged.$refs.cri.model.f_gasproperties = []
 
           console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
           this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -451,19 +451,19 @@
                               condition="f_table_state in {}"></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">档案抄表员</label>
+                    <label class="font_normal_body">表册抄表员</label>
                     <v-select :value.sync="model.f_book_inputtor" v-model='model.f_book_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
-                    <label class="font_normal_body">表册抄表员</label>
+                    <label class="font_normal_body">档案抄表员</label>
                     <v-select :value.sync="model.f_inputtor" v-model='model.f_inputtor'
                               style="width:60%"
                               multiple
-                              :options='$parent.$parent.inputtores' placeholder='表册抄表员'
+                              :options='$parent.$parent.inputtores' placeholder='档案抄表员'
                               v-el:cc></v-select>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/filiale/lixianV3/GasAnalysisQuery.vue

@@ -173,7 +173,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date >= '{} 00:00:00'">
+                              condition="f_gas_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group" >
@@ -183,7 +183,7 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date <= '{} 23:59:59'">
+                              condition="f_gas_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
               </div>
@@ -274,6 +274,11 @@ import exportConfig from './config/exportConfig'
 let readySomething = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
+  //获取新的抄表册,先去清理所有的抄表册
+  self.$GetSaleParam.meterbooks = [];
+  //开始加载新的抄表册
+  await self.$LoadParams.loadMeterBook(self.f_filialeid)
+  self.initmeterbook()
 }
 export default {
   props: ['data'],
@@ -293,6 +298,7 @@ export default {
         org: [this.$login.f.orgid]
       },
       meterbrands: [],
+      meterbooks:[],
       gasproperties : [],
       inputtores: [{label: '全部',value: ''}],
       criteriaShow: false,
@@ -317,6 +323,9 @@ export default {
     })
   },
   methods: {
+    async initmeterbook(){
+      this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    },
     getotherfooter () {
       // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
       // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
@@ -433,9 +442,6 @@ export default {
     meterStyle () {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
     },
-    meterbooks(){
-      return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-    },
 
 
   }

package/src/filiale/lixianV3/config/exportConfig.js

@@ -2256,11 +2256,11 @@ export default {
     'f_orgname': '所属机构', 'f_depname': '部门', 'f_operator': '操作人'
   },
   useGasyearRatioConfig: {
-    'f_userinfo_id': '用户编号', 'f_user_name': '姓名',
+    'f_userinfo_code': '用户编号', 'f_user_name': '姓名',
     'f_user_type': '用户类型', 'f_user_phone': '电话',
     'f_address': '地址', 'f_inputtor': '抄表员',
-    'f_gasproperties': '用户性质', 'f_manufacturers': '气表品牌',
-    'f_meter_style': '气表厂家', 'f_book_name': '抄表册',
+    'f_gasproperties': '用户性质', 'f_meter_brand': '气表品牌',
+    'f_manufacturers': '气表厂家', 'f_book_name': '抄表册',
     'f_meternumber': '表号', 'f_oldgas': '往月用气',
     'f_newgas': '本月用气',
     'f_gasdiff': '增量', 'f_gasprec': '百分比'

package/src/filiale/lixianV3/useGasYearRatioQuery.vue

@@ -137,7 +137,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date >= '{} 00:00:00'">
+                              condition="f_gas_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group" >
@@ -147,9 +147,27 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date <= '{} 23:59:59'">
+                              condition="f_gas_date <= '{} 23:59:59'">
                   </datepicker>
                 </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_gasprec_small"
+                         condition="f_gasprec >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_gasprec_big"
+                         condition="f_gasprec <= '{}' " placeholder="小于等于">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;增量&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_gasdiff_small"
+                         condition="f_gasdiff >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_gasdiff_big"
+                         condition="f_gasdiff >= '{}' " placeholder="小于等于">
+                </div>
               </div>
             </div>
           </criteria>
@@ -157,7 +175,7 @@
           <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
             <template partial='head'>
               <tr>
-                <th colspan="11" style="text-align: center;"><nobr>用户信息</nobr></th>
+                <th colspan="13" style="text-align: center;"><nobr>用户信息</nobr></th>
                 <th colspan="13" style="text-align: center;"><nobr>查询年份</nobr></th>
                 <th colspan="13" style="text-align: center;"><nobr>对比年份</nobr></th>
               </tr>
@@ -195,6 +213,12 @@
                 <th style="text-align: center;">
                   <nobr>抄表册</nobr>
                 </th>
+                <th style="text-align: center;">
+                  <nobr>增量</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>百分比</nobr>
+                </th>
                 <th style="text-align: center;">
                   <nobr>一月</nobr>
                 </th>
@@ -289,6 +313,8 @@
                 <td style="text-align: center;">{{ row.f_meternumber }}</td>
                 <td style="text-align: center;">{{ row.f_inputtor }}</td>
                 <td style="text-align: center;">{{ row.f_book_name }}</td>
+                <td style="text-align: center;">{{ row.f_gasdiff }}</td>
+                <td style="text-align: center;">{{ row.f_gasprec }}%</td>
                 <td style="text-align: center;">{{ row.jan }}</td>
                 <td style="text-align: center;">{{ row.feb }}</td>
                 <td style="text-align: center;">{{ row.mar }}</td>
@@ -332,6 +358,11 @@ import exportConfig from './config/exportConfig'
 let readySomething = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
+  //获取新的抄表册,先去清理所有的抄表册
+  self.$GetSaleParam.meterbooks = [];
+  //开始加载新的抄表册
+  await self.$LoadParams.loadMeterBook(self.f_filialeid)
+  self.initmeterbook()
 }
 export default {
   props: ['data'],
@@ -350,6 +381,7 @@ export default {
         org: [this.$login.f.orgid]
       },
       meterbrands: [],
+      meterbooks:[],
       gasproperties:[],
       inputtores: [{label: '全部',value: ''}],
       criteriaShow: false,
@@ -381,6 +413,9 @@ export default {
     })
   },
   methods: {
+    async initmeterbook(){
+      this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    },
     async downloadFiles() {
       if (this.getCondition) {
         let data = {
@@ -504,9 +539,7 @@ export default {
     meterStyle () {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
     },
-    meterbooks(){
-      return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-    },
+
 
 
   }

package/src/filiale/ningjin/GasStatistics.vue

@@ -24,7 +24,7 @@
                 <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_username" placeholder='客户名称'
-                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>