manage-client 3.3.180 → 3.3.181

package/package.json

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

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

@@ -374,6 +374,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>客户电话</nobr>
+                </th>
                 <th>
                   <nobr>身份证号</nobr>
                 </th>
@@ -591,6 +594,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_idnumber}}</nobr>
               </td>

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -519,7 +519,9 @@
             getCondition() {
                 let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr
                 return {
-                    condition: condition
+                    condition: condition,
+                    startDate: this.$refs.paged.$refs.cri.model.startDate,
+                    endDate: this.$refs.paged.$refs.cri.model.endDate
                 }
             },
             usertypes() {

package/src/filiale/lixianV3/RecordInfoQuery.vue

@@ -493,6 +493,18 @@
                     <input  type="text" style="width:60%" class="input_search" v-model="model.f_comments"
                             condition="f_comments like '%{}%'" placeholder='备注信息'>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">有无备注</label>
+                    <v-select
+                      placeholder='有无备注'
+                      :value.sync="$parent.$parent.f_hasComments"
+                      style="width:60%"
+                      :value-single="true"
+                      v-model="$parent.$parent.f_hasComments"
+                      :options='$parent.$parent.hasComments'
+                      close-on-select>
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -512,7 +524,7 @@
                   <th colspan="6">
                     <nobr>燃气表</nobr>
                   </th>
-                  <th colspan="62">
+                  <th colspan="63">
                     <nobr>其他</nobr>
                   </th>
                 </tr>
@@ -972,6 +984,7 @@
           dep:[],
           user:[],
         },
+        f_hasComments: '',
         // 合计数据
         sumsmodel: {},
         //表册片区
@@ -979,6 +992,7 @@
         meterStyle:[{label: '全部',value: ''}],
         pricenames:[],
         dypayment:[{label:"全部",value:""},{label:"银行代扣",value:"银行代扣",},{label:"现金缴费",value:"现金缴费",}],
+        hasComments:[{label:"全部",value:""},{label:"有",value:"有",},{label:"无",value:"无",}],
         networkvalves: this.$appdata.getParam('自动阀控') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('自动阀控')] : [],
       }
     },
@@ -1150,6 +1164,13 @@
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
         console.log("查看条件",this.conditon2)
+        if (this.f_hasComments) {
+          if (this.f_hasComments === '有') {
+            args.condition +=` and f_comments != '' and f_comments is not null`
+          } else {
+            args.condition +=` and (f_comments = '' or f_comments is null)`
+          }
+        }
         if(this.card!=''){
           args.condition +=` and f_card_id='${this.card}'`
         }