manage-client 3.2.125 → 3.2.126

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/package.json

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

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

@@ -57,6 +57,9 @@
     <tabs header="抄表册统计" v-if="permission('抄表册统计')">
       <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
     </tabs>
+    <tabs header="抄表册统计2" v-if="permission('抄表册统计2')">
+      <hand-book-two-query v-if="show.includes('抄表册统计2')"  @deal-msg="dealMsg"></hand-book-two-query>
+    </tabs>
     <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
       <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
     </tabs>

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

@@ -124,6 +124,14 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
@@ -163,6 +171,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
                 <th>
                   <nobr>停用原因</nobr>
                 </th>
@@ -221,6 +232,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_disable_reason}}</nobr>
               </td>
@@ -289,7 +303,7 @@
     // await self.$refs.paged.$refs.cri.search()
     //self.$refs.paged.$refs.cri.model.f_sendsuccess = ['有效']
     await self.$MagLoadParams.loadParam()
-
+    self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -332,7 +346,8 @@
         },
         //合计数据
         sumsmodel: {},
-        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}]
+        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}],
+        meterbrands: []
       }
     },
     ready() {
@@ -459,8 +474,18 @@
         }
 
         this.search()
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       }
-
     },
     watch: {
       'all'(val) {

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

@@ -110,6 +110,14 @@
                             condition="f_meter_brand = '{}'"
                             close-on-select></v-select>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价名称</label>
+                  <v-select :value.sync="model.f_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.pricenames" placeholder='气价名称'
+                            condition="f_price_name in {}"
+                  ></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">补气状态</label>
                   <v-select :value.sync="model.f_state"
@@ -309,6 +317,7 @@
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     self.initParams()
     await self.$MagLoadParams.loadParam()
+    self.getPricenames()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -343,6 +352,7 @@
         show:false,
         rowdata:{},
         meterbrands: [],
+        pricenames:[],
         filltype: [],
         initres: {
           org:[this.$login.f.orgid],
@@ -424,6 +434,17 @@
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         this.filltype = [{label: '全部', value: ''}, ...typeArr]
       },
+      getPricenames() {
+        this.pricenames = []
+        let priceArr = []
+        this.$MagGetSaleParam.prices.forEach((item) => {
+          let temp = {}
+          temp.label = item.f_price_name
+          temp.value = item.f_price_name
+          priceArr.push(temp)
+        })
+        this.pricenames  = [{label: '全部', value: ''}, ...priceArr]
+      },
       selfSearch(args) {
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate