manage-client 3.2.29 → 3.2.33

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

@@ -73,10 +73,15 @@
                 </div>
 
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </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="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表品牌</label>
                   <v-select :value.sync="model.f_meter_brand"

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

@@ -80,10 +80,15 @@
                 </div>
 
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;卡号&nbsp;&nbsp;&nbsp;</label>
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </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="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
                   <v-select :value.sync="model.f_meter_type" multiple

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

@@ -23,8 +23,9 @@
                         close-on-select >
               </v-select>
             </div>
-            <div   v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未购天数</label>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap">
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)" >未购天数</label>
+              <label class="font_normal_body" v-else>未抄天数</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.diffdaymin"
                        condition="diffday >= {} " placeholder="">
@@ -33,17 +34,6 @@
                        condition="diffday <= {} " placeholder="">
               </div>
 
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap">
-              <label class="font_normal_body">未抄天数</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handdiffdaymin"
-                       condition="diffday >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handdiffdaymax"
-                       condition="diffday <= {} " placeholder="">
-              </div>
-
             </div>
             <div class="col-sm-2 ">
               <label class="font_normal_body">截止时间</label>
@@ -76,12 +66,11 @@
             <div class="col-sm-2 ">
               <label for="f_meter_classify"class="font_normal_body">气表类型</label>
               <v-select id="f_meter_classify"
-                        v-model="model.f_meter_classify"
+                        v-model="$parent.$parent.meter_classify"
                         placeholder='气表类型'
                         style="width:70%"
-                        :value.sync="model.f_meter_classify"
+                        :value.sync="$parent.$parent.meter_classify"
                         :options='$parent.$parent.f_meter_classify'
-                        condition="f_meter_classify = '{}'"
                         :value-single="true"
                         close-on-select >
               </v-select>
@@ -99,8 +88,9 @@
                         close-on-select >
               </v-select>
             </div>
-            <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label   class="font_normal_body">总购次数</label>
+            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+              <label class="font_normal_body" v-if="['卡表','物联网表'].includes($parent.$parent.meter_classify)">总购次数</label>
+              <label class="font_normal_body" v-else>抄表次数</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.cishumin"
                        condition="cishu >= {} " placeholder="">
@@ -109,21 +99,10 @@
                        condition="cishu <= {} " placeholder="">
               </div>
             </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">抄表次数</label>
-
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.handmin"
-                       condition="cishu >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.handmax"
-                       condition="cishu <= {} " placeholder="">
-              </div>
-
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '卡表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label  class="font_normal_body">总购气量</label>
-
+            <div class="col-sm-2 flex-row" style="white-space: nowrap" >
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '卡表'">总购气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '机表'">总用气量</label>
+              <label class="font_normal_body" v-if="$parent.$parent.meter_classify === '物联网表'">总购金额</label>
               <div class="row">
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasmin"
                        condition="pregas >= {} " placeholder="">
@@ -131,18 +110,6 @@
                 <input type="text" style="width:30%" class="input_search" v-model="model.pregasmax"
                        condition="pregas <= {} " placeholder="">
               </div>
-
-
-            </div>
-            <div v-if="$parent.$parent.meter_classify == '机表'" class="col-sm-2 flex-row" style="white-space: nowrap" >
-              <label class="font_normal_body">总用气量</label>
-              <div class="row">
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasusemin"
-                       condition="pregas >= {} " placeholder="">
-                <label   class="font_normal_body">  ≤ x ≤ </label>
-                <input type="text" style="width:30%" class="input_search" v-model="model.pregasusemax"
-                       condition="pregas <= {} " placeholder="">
-              </div>
             </div>
 
             <div class="col-sm-2">
@@ -200,14 +167,15 @@
             <th><nobr>气表品牌</nobr></th>
             <th><nobr>气价名称</nobr></th>
             <th><nobr>最后购气日期</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气次数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总抄表次数</nobr></th>
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>总购气次数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总抄表次数</nobr></th>
 
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>总购气量</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>总用气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '卡表'"><nobr>总购气量</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '物联网表'"><nobr>总购金额</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>总用气量</nobr></th>
 
-            <th v-show="$parent.$parent.$parent.meter_classify == '卡表'"><nobr>累计未购气天数</nobr></th>
-            <th v-show="$parent.$parent.$parent.meter_classify == '机表'"><nobr>累计未抄表天数</nobr></th>
+            <th v-show="['卡表','物联网表'].includes($parent.$parent.$parent.meter_classify)"><nobr>累计未购气天数</nobr></th>
+            <th v-show="$parent.$parent.$parent.meter_classify === '机表'"><nobr>累计未抄表天数</nobr></th>
             <th><nobr>组织机构</nobr></th>
           </tr>
         </template>
@@ -229,8 +197,6 @@
 
           <th style="text-align: center;"><nobr>{{row.cishu}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.pregas}}</nobr></th>
-<!--          <th style="text-align: center;"><nobr>{{row.sellcishu}}</nobr></th>-->
-<!--          <th style="text-align: center;"><nobr>{{row.sellpregas}}</nobr></th>-->
           <th style="text-align: center;"><nobr>{{row.diffday}}</nobr></th>
           <th style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></th>
         </template>
@@ -239,10 +205,9 @@
         <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 v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段购气量合计:&emsp;&emsp;{{sumsmodel.sellpregas}}</td>-->
-            <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
-            <!--      <td v-if="meter_classify == '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">阶段抄表气量合计:&emsp;{{sumsmodel.sellpregas}}</td>-->
+            <td v-if="meter_classify === '卡表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '机表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总抄表气量合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
+            <td v-if="meter_classify === '物联网表'" style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">总购金额合计:&emsp;&emsp;{{sumsmodel.pregas}}</td>
           </tr>
         </table>
   </div>
@@ -298,22 +263,34 @@
     },
     watch:{
       meter_classify(val){
-        if(val == '卡表') {
-          this.url = 'rs/sql/inspectList'
+        if (val === '卡表') {
+          this.model.url = this.url = 'rs/sql/inspectList'
           this.sqlName = 'inspectList'
           this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","cishu":"总购气次数","pregas":"总购气量",
             "diffday":"累计未购气天数"}
-        }else{
-          this.url = 'rs/sql/handinspectList'
+        }else if (val === '机表') {
+          this.model.url = this.url = 'rs/sql/handinspectList'
           this.sqlName = 'handinspectList'
           this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","cishu":"总抄表次数","pregas":"抄表气量",
             "diffday":"累计未抄表天数"}
+        } else if (val === '物联网表') {
+          this.model.url = this.url = 'rs/sql/getWebMeterList'
+          this.sqlName = 'getWebMeterList'
+          this.getfield = {"f_userinfo_code":"客户编号","f_meternumber":"表号","f_user_name":"客户名称","f_user_phone":"客户电话","f_address":"地址","f_user_type":"用户类型",
+            "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
+            "delivery_date":"最后购气日期","cishu":"总购气次数","f_collection":"总购金额",
+            "diffday":"累计未购气天数"}
         }
         this.clear()
+        this.model.rows = []
+        for(let key in this.model.sums){
+          this.model.sums[key] = 0
+        }
+
       },
       sumsmodel:{
         handler: function(val) {
@@ -378,9 +355,11 @@
         this.$refs.paged.$refs.cri.search()
       },
       selfSearch (args) {
-        this.model.url = this.meter_classify === '卡表' ? 'rs/sql/inspectList': 'rs/sql/handinspectList'
+        if (!this.meter_classify) {
+          this.$showMessage('请选择气表类型。。。')
+          return
+        }
         args.condition = args.condition+ ` ${this.filialeCodeStr}`
-        // console.log("拼接的condition", args.condition, this.model)
         this.model.search(args.condition, args.model)
       },
       hidden(){
@@ -405,7 +384,7 @@
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
       },
       f_meter_classify(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]
+        return [{label: '机表', value: '机表'},{label: '卡表', value: '卡表'},{label: '物联网表', value: '物联网表'}]
         // return [{label: '卡表', value: '卡表'}]
       },