manage-client 3.2.239 → 3.2.241

package/package.json

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

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

@@ -108,7 +108,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户表号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber like '%{}%'" placeholder='客户表号'>
                 </div>
                 <div class="col-sm-2 form-group">

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

@@ -125,7 +125,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">燃气表号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                            condition="f_meternumber like '%{}%'" placeholder='燃气表号'>
                   </div>
 
@@ -148,7 +148,7 @@
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">表&emsp;&emsp;号</label>
-                    <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meter_number"
+                    <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
                            condition="f_meternumber = '{}'" placeholder='表号'>
                   </div>
                   <div class="col-sm-2 form-group">
@@ -396,7 +396,7 @@
                   </div>
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">气表表号</label>
-                    <input  type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                    <input  type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                             condition="f_meternumber like '%{}%'" placeholder='气表表号'>
                   </div>
                   <div class="col-sm-2 form-group">

package/src/filiale/WEINAN/CancellationQuery.vue

@@ -68,6 +68,41 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </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.getPricenames"
+                            condition="f_price_name = '{}'"
+                            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_meter_brand" multiple
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand in {}"
+                            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_residential_area"
+                            class="select_list select"
+                            enter-push
+                            multiple = "true"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">小区名称</label>-->
+<!--                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"-->
+<!--                         condition="f_residential_area like '%{}%'" placeholder="小区名称">-->
+<!--                </div>-->
 <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body">操作类型</label>-->
 <!--                  <v-select :value.sync="model.f_operat_type"-->
@@ -127,6 +162,15 @@
                 <th>
                   <nobr>公司</nobr>
                 </th>
+                <th>
+                  <nobr>气价名称</nobr>
+                </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
+                <th>
+                  <nobr>小区名称</nobr>
+                </th>
                 <th>
                   <nobr>操作</nobr>
                 </th>
@@ -179,6 +223,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_orgname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
               <td style="text-align: center;" v-else>
                 <nobr><a href="#" @click="$parent.$parent.$parent.enable(row)">启用</a> | <a href="#" @click="$parent.$parent.$parent.modifyAddress(row)">修改地址</a></nobr>
               </td>
@@ -219,15 +272,16 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <modal :show.sync="enbaleShow" v-if="enbaleShow" width="50%" style="width:auto;">
+  </div>
+    <modal :show.sync="enbaleShow" v-if="enbaleShow"  width="50%" style="width:auto;" v-ref:modal backdrop="false">
       <article slot="modal-body" class="modal-body">
         <div class="auto">
           <validator name='v'>
             <form class="form-horizontal">
               <p class="bg-info text-center" style="padding: 8px;">启用信息</p>
               <div class="form-group" style="margin-top:10px;">
-                  <label for="f_reason" class=" font_normal_body">销户原因:</label>
-                  <input class="input_search" style="width:80%" v-model="enableData.f_comments" disabled="">
+                <label for="f_reason" class=" font_normal_body">销户原因:</label>
+                <input class="input_search" style="width:80%" v-model="enableData.f_comments" disabled="">
               </div>
               <div class="form-group" style="margin-top:10px;">
                 <div  :class="[$v.f_reason.required ? 'has-error' : 'has-success']">
@@ -250,7 +304,7 @@
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import defaultPrint from './config/DefaultPrint'
   import exportConfig from './config/exportConfig'
 
@@ -261,7 +315,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 {
@@ -281,6 +335,13 @@
         f_filialeids: this.$login.f.orgid,
         useraddressShow: false,
         addressId: '',
+        // 下拉框
+        meterbrands: [],
+        f_price_name: [],
+        pricenames: [],
+        prices: [],
+        //小区
+        residentialArea: [],
         rowdata:{},
         enableData: {
           f_reason: ''
@@ -315,6 +376,7 @@
       }
     },
     ready() {
+      this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -322,6 +384,44 @@
       })
     },
     methods: {
+      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]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_name = []
+      },
+      async  getaddress(){
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
+      //把数据库查询数据转换为下拉数据
+      calculate(rows){
+        let data = []
+        rows.forEach((row, n) => {
+          data[n] = {label: row.f_residential_area, value: row.id}
+        })
+        return data
+      },
       modifyAddress(obj) {
         this.addressId=obj.addrid
         this.useraddressShow=true
@@ -344,7 +444,14 @@
         }
       },
       enable(row) {
+        let obj = {data: {name: ''}}
+        if (this.$refs.paged.$refs.grid.selectStore.selected==null){
+          this.$refs.paged.$refs.grid.selectStore.selected = obj
+        }else if(this.$refs.paged.$refs.grid.selectStore.selected.data==null){
+          Object.assign(this.$refs.paged.$refs.grid.selectStore.selected, obj)
+        }
         Object.assign(this.enableData, row)
+
         this.enbaleShow = true
       },
       confirmEnable() {
@@ -507,6 +614,35 @@
       },
     },
     computed: {
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.f_filialeid,
+              prices: this.prices
+            }
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+            })
+            rs = [{label: '全部', value: ''}, ...priceArr]
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.cri.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
           orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}

package/src/filiale/huayin/ChangeMeterQuery.vue

@@ -166,7 +166,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber = '{}'" placeholder='表号'>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -176,7 +176,7 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">旧&emsp;表&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model.trim="model.f_meternumber"
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
                          condition="f_meternumber_old = '{}'" placeholder='旧表号'>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/filiale/qianneng/QnJgqReport.vue

@@ -21,6 +21,9 @@
     <tabs header="销售结构报表" v-if="permission('结构气销售结构报表')">
       <qn-jgq-xsjgbb v-if="show.includes('销售结构报表')" @deal-msg="dealMsg" :data="data"></qn-jgq-xsjgbb>
     </tabs>
+    <tabs header="销售结构报表" v-if="permission('结构气销售结构报表汶上')">
+      <qn-jgq-xsjgbbws v-if="show.includes('销售结构报表')" @deal-msg="dealMsg" :data="data"></qn-jgq-xsjgbbws>
+    </tabs>
     <tabs header="用户数报表" v-if="permission('结构气用户数报表')"> <!-- 成武使用 -->
       <qn-jgq-yhsbb v-if="show.includes('用户数报表')" @deal-msg="dealMsg" :data="data"></qn-jgq-yhsbb>
     </tabs>