manage-client 3.2.88 → 3.2.91-1

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

@@ -425,7 +425,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}, {f_money: 0,hushu:0}),
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {orderitem: this.orderitem?`${this.orderitem}`: " 'f_operate_date desc'"}, {f_money: 0,hushu:0}),
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],

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

@@ -29,8 +29,33 @@
                 <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_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                         condition="u.f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select :value.sync="model.metertypes" v-model="model.metertypes"
+                            @change="$parent.$parent.metertypeschange"
+                            condition="s.f_meter_type = '{}'" multiple
+                            placeholder='气表类型' :options="$parent.$parent.metertypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+
+                </div>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费类型</label>
+                  <v-select :value.sync="model.typesss" v-model="model.typesss"
+                            @change="$parent.$parent.typechangesss"
+                            condition="s.f_type = '{}'"
+                            placeholder='收费类型' :options="$parent.$parent.typesss"
+                            close-on-select v-ref:type>
+
+                  </v-select>
+                </div>
+
+
+
+
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
                   <read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
@@ -57,28 +82,29 @@
                 <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_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
-                </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_user_phone"
-                         condition="f_user_phone like '%{}%'" placeholder="客户电话">
-                </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_idnumber"
-                         condition="f_idnumber like '%{}%'" placeholder="身份证号">
-                </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_address"
-                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                         condition="s.f_user_name like '%{}%'" placeholder="客户名称">
                 </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_user_phone"-->
+<!--                         condition="f_user_phone like '%{}%'" placeholder="客户电话">-->
+<!--                </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_idnumber"-->
+<!--                         condition="f_idnumber like '%{}%'" placeholder="身份证号">-->
+<!--                </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_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.pricetype" v-model="model.pricetype"
+                  <v-select :value.sync="model.pricetypes" v-model="model.pricetypes"
                             @change="$parent.$parent.pricetypechanged"
+                            condition="sp.f_user_name like '%{}%'"
                             placeholder='气价类型' :options="$parent.$parent.pricetypes"
                             close-on-select v-ref:type>
                   </v-select>
@@ -87,13 +113,38 @@
 
                 <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"
-                            multiple
-                            :options="$parent.$parent.getPricenames"
+                  <v-select :value.sync="model.pricename"
+                            v-model="model.pricename"
+                            @change="$parent.$parent.pricenamechanged"
+                            :options="$parent.$parent.pricename"
                             condition="f_price_name in {}"
                   ></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_price"
+                         condition="c.f_price = '%{}%'" placeholder='单价'>
+                </div>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.usertypes" v-model="model.usertypes"
+                            @change="$parent.$parent.usertypechange"
+                            condition="s.f_user_type = '{}'"
+                            placeholder='客户类型' :options="$parent.$parent.usertypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">用气类型</label>
+                  <v-select :value.sync="model.gaspropertiestyps" v-model="model.gaspropertiestyps"
+                            @change="$parent.$parent.gaspropertieschange"
+                            condition="s.f_gasproperties = '{}'"
+                            placeholder='用气类型' :options="$parent.$parent.gaspropertiestyps"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+
 
 
 
@@ -114,9 +165,18 @@
                 <th>
                   <nobr>客户类型</nobr>
                 </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
+                <th>
+                  <nobr>气表类型</nobr>
+                </th>
                 <th>
                   <nobr>气价名称</nobr>
                 </th>
+                <th>
+                  <nobr>收费类型</nobr>
+                </th>
                 <th>
                   <nobr>单价</nobr>
                 </th>
@@ -138,9 +198,18 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_price}}</nobr>
               </td>
@@ -156,30 +225,6 @@
           </data-grid>
         </criteria-paged>
         <table class="table-hover">
-<!--          <tr style="position: relative" class="table-bordered">-->
-<!--            <td-->
-<!--              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">-->
-<!--              汇总信息-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}-->
-<!--            </td>-->
-<!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-<!--              三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}-->
-<!--            </td>-->
-<!--          </tr>-->
         </table>
       </div>
     </div>
@@ -322,22 +367,25 @@
     },
     methods: {
       pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_type = []
+      },
+      usertypechange(){
+        this.$refs.paged.$refs.cri.model.f_user_type = []
+      },
+      gaspropertieschange(){
+        this.$refs.paged.$refs.cri.model.f_gasproperties = []
+      },
+      metertypeschange(){
+        this.$refs.paged.$refs.cri.model.f_meter_type = []
+      },
+      typechangesss(){
+        this.$refs.paged.$refs.cri.model.f_type = []
+      },
+      pricenamechanged(){
         this.$refs.paged.$refs.cri.model.f_price_name = []
       },
-      // 获取设备下拉选
-      // async getEquipment () {
-      //   let HttpReset = new HttpResetClass()
-      //   let param = {
-      //     items: 'f_terminal_name',
-      //     tablename: 't_equipment',
-      //     condition: `f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.$login.f.orgid}'`,
-      //     orderitem: 'id'
-      //   }
-      //   var data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
-      //   for (let row of data.data) {
-      //     this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_name})
-      //   }
-      // },
+
+
       ReadIDCard(){
         this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
           console.log('======',msg)
@@ -400,21 +448,6 @@
         this.footer.push(footerData);
         this.other.push(otherInData);
       },
-      // 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) => {
@@ -656,7 +689,24 @@
       },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      }
+      },
+
+      pricename(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价名称')]
+      },
+      usertypes(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户类型')]
+      },
+      gaspropertiestyps(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类型')]
+      },
+      metertypes(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+      typesss(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      },
+
     }
   }
 </script>

package/src/components/sale/config/exportConfig.js

@@ -78,7 +78,7 @@ export default{
     'f_delaypay': '滞纳金', 'f_comments': '备注', 'f_operator': '操作员', 'f_depname': '部门', 'f_orgname': '公司',
     'f_yucun': '预存金额', 'f_card_id': '卡号', 'f_stairamount1': '一阶气量', 'f_stair1price': '一阶单价', 'f_stair1fee': '一阶气费',
     'f_stair2amount': '二阶气量', 'f_stair2price': '二阶单价', 'f_stair2fee': '二阶气费',
-    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员'
+    'f_stair3amount': '三阶气量', 'f_stair3price': '三阶单价', 'f_stair3fee': '三阶气费', 'f_inputtor': '抄表员','f_residential_area':'小区'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'
@@ -226,7 +226,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
     'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
     'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
-    'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '换表日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
+    'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_install_date': '换表日期', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
     'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   changemeterprintConfig: {

package/src/components/webmeter/gasStatistics/GasStatistics.vue

@@ -353,12 +353,8 @@
 
       search (args) {
         args.condition =  `${args.condition}`+this.orgcondition
-        console.log(args.condition+"args.condition")
         this.condition = args.condition
         this.model.search(args.condition, args.model)
-        console.log(this.$refs.paged.$refs.grid.model.sums+"--this.$refs.paged.$refs.grid.model.sums")
-        console.log(this.f_gas_state)
-
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         // args.condition = `${args.condition}`
         // if (this.orgcondition)
@@ -444,17 +440,17 @@
         ]
       },
       getCondition () {
-        var con = ""
-        if (this.orgCondtionStr) {
-          con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in  (${this.orgCondtionStr})`
-        }
-        else {
-          con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
-        }
+        // var con = ""
+        // if (this.orgCondtionStr) {
+        //   con = `${this.$refs.paged.$refs.criteria.condition} and m.f_orgid in  (${this.orgCondtionStr})`
+        // }
+        // else {
+        //   con = `${this.$refs.paged.$refs.criteria.condition}and m.f_orgid in ('${this.$login.f.orgid}' )`
+        // }
         return {
           startDate: this.$refs.paged.$refs.criteria.model.startDate,
           endDate: this.$refs.paged.$refs.criteria.model.endDate,
-          condition: con
+          condition: this.condition
         }
       }
     }