sale-client 3.6.227 → 3.6.228

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.227",
+  "version": "3.6.228",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -207,7 +207,7 @@
         }
         console.log('查询。。。', this.f_orgid)
         if (this.f_orgid) {
-          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+          args.condition = `${args.condition} and (f_orgid  in ${this.f_orgid} or s.f_filialeid  in ${this.f_orgid}) `
         }
         this.model.search(args.condition, args.model)
       },

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPaymentConstrast.vue

@@ -5,6 +5,16 @@
         <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
+              <div
+                class="col-sm-2  form-group">
+                <label class="font_normal_body">组织机构</label>
+                <res-select :initresid='$parent.$parent.curorgid'
+                            @res-select="$parent.$parent.getorg"
+                            class="select select_list"
+                            restype='organization'
+                            style="width: 60%">
+                </res-select>
+              </div>
               <div class="col-sm-2  form-group">
                 <label for="f_payment"  class="font_normal_body">付款方式:</label>
                 <v-select id="f_payment"
@@ -220,12 +230,17 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch (args) {
-
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
         this.model.params.startDate = this.$refs.paged.$refs.cri.model.startDate
         this.model.params.endDate = this.$refs.paged.$refs.cri.model.endDate
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         this.model.params.f_payment = this.model.f_payment
         this.model.params.f_bank_name = this.model.f_bank_name
+        if (this.f_orgid) {
+          args.condition = `${args.condition} and (f_orgid  in ${this.f_orgid} or f_filialeid  in ${this.f_orgid}) `
+        }
         this.condition2 = args.condition
         this.model.search(args.condition, args.model)
       },

package/src/components/revenue/stopairmanage/stopairList.vue

@@ -79,6 +79,7 @@
             <th style="text-align: center;">客户地址</th>
             <th style="text-align: center;">客户类型</th>
             <th style="text-align: center;">表具类型</th>
+            <th style="text-align: center;">机表阀门状态</th>
             <th style="text-align: center;">入户时间(最新记录)</th>
             <th style="text-align: center;">用户状态(最新记录)</th>
             <th style="text-align: center;">安检类型(最新记录)</th>
@@ -95,6 +96,7 @@
           <td style="text-align: center;">{{row.f_address}}</td>
           <td style="text-align: center;">{{row.f_user_type}}</td>
           <td style="text-align: center;">{{row.f_meter_classify}}</td>
+          <td style="text-align: center;">{{row.f_bqf_state}}</td>
           <td style="text-align: center;">{{row.f_in_time}}</td>
           <td style="text-align: center;">{{row.f_user_state}}</td>
           <td style="text-align: center;">{{row.f_check_type}}</td>

package/src/components/revenue/stopairmanage/stopairListRecord.vue

@@ -11,6 +11,7 @@
           <th style="text-align: center;">用户状态</th>
           <th style="text-align: center;">防盗卡号</th>
           <th style="text-align: center;">所属阀井</th>
+          <th style="text-align: center;">机表阀门状态</th>
           <th style="text-align: center;">安检类型</th>
           <th style="text-align: center;">上次时间</th>
           <th style="text-align: center;">操作人</th>
@@ -29,6 +30,7 @@
           <td style="text-align: center;">{{row.f_user_state}}</td>
           <td style="text-align: center;">{{row.f_fdcard_id}}</td>
           <td style="text-align: center;">{{row.f_valve_wall}}</td>
+          <td style="text-align: center;">{{row.f_bqf_state}}</td>
           <td style="text-align: center;">{{row.f_check_type}}</td>
           <td style="text-align: center;">{{row.f_last_time}}</td>
           <td style="text-align: center;">{{row.f_operator}}</td>

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -350,7 +350,7 @@ export default {
     export (row) {
       this.row = row
       this.getotherfooter(row)
-      this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
+      this.getCondition = {condition: `p.f_civill_id = '${row.id}'`}
       this.excelhead = []
       let headData = []
       headData.push(this.starthead)