manage-client 4.1.16 → 4.1.17-jingyang

package/build/dev-server.js

@@ -19,9 +19,9 @@ var qtx = 'http://36.103.222.144:6300/'
 // var bendi = 'http://203.57.101.233:9001/'
 // var bendi = 'http://121.36.106.17:8400/'
 // var fuwu = 'http://203.57.101.233:9001'
-var bendi = 'http://192.168.50.67:30785/'
+var bendi = 'http://www.jytrq.cn:8800/'
 // var bendi = 'http://119.187.112.234:8400/'
-var wode = 'http://192.168.50.67:30785/'
+var wode = 'http://www.jytrq.cn:8800/'
 // 192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
@@ -33,52 +33,18 @@ var proxyTable = {
     target: 'http://203.57.101.233:9001/'
 
   },
-  '/api/af-revenue/sql/WeChatPaydetail': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/WeChatPayment': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/getGasInspection': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/inspectList_sellinggas': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
-  '/api/af-revenue/sql/inspectList': {
-    pathRewrite: {
-      '^/api/af-revenue': '/rs'
-    },
-    target: 'http://127.0.0.1:8080/'
-  },
+
   '/api': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://www.jytrq.cn:8800/'
 
   },
-  '/rs/sql/chargeQuery_by_gasproperties': {
-    target: 'http://localhost:8084/'
-  },
-  '/rs/logic/chargeQuery_by_gasproperties_line': {
-    target: 'http://localhost:8084/'
-  },
+
   '/files': {
     target: bendi
   },
   // 查找资源服务数据
   '/rs/search': {
-    target: 'http://192.168.50.67:30785/'
+    target: 'http://www.jytrq.cn:8800/'
   },
   // 查找资源服务数据
   '/rs/logic/getLogin': {
@@ -120,7 +86,7 @@ var proxyTable = {
     target: bendi
   },
   '/rs/vue': {
-    target: 'http://192.168.50.67:31567/'
+    target: 'http://www.jytrq.cn:8800/'
   },
   '/rs/file': {
     target: bendi

package/package.json

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

package/src/components/SellReport/GasPriceGroup.vue

@@ -91,7 +91,7 @@
         <thead>
         <tr>
           <th colspan='9' style="font-weight: normal; text-align: left;">
-            <h3 style="text-align: center">气价分组汇总表</h3>
+            <h3 style="text-align: center">天然气销售报表</h3>
           </th>
         </tr>
         <tr>

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

@@ -0,0 +1,177 @@
+<template >
+  <div class="flex-row">
+    <div @keyup.enter="search1" class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2">
+                <res-select-group :show-component="['company']" :initres="$parent.$parent.org" @re-res="$parent.$parent.getorg" style="width:60%"></res-select-group>
+              </div>
+              <div style="float:right">
+                <button @click="search()" class="button_search" v-el:cba>查询</button>
+                <button @click="$parent.$parent.clearmsg" class="button_clear">清空</button>
+                <export-excel
+                  :choose-col="true"
+                  :data="{condition: $parent.$parent.condition,
+                          f_orgid: $parent.$parent.f_orgid
+                          }"
+                  :field="$parent.$parent.getfield" sql-name="residentialAreaUserStateQuery" sqlurl="api/af-revenue/logic/openapi/exportfile"
+                  template-name='小区用户统计查询'></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></div>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' :modelval="$parent.$parent.modelval" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th style="text-align:center">
+                <nobr>小区名称</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>总用户数</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>正常用户数</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>销户用户数</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>停用用户数</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>预备用户数</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align:center">
+                {{row.total_users}}
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.zhengchang_users}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.xiaohu_users}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.tinyong_users}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.yubei_users}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from '../../../Util'
+
+let readyGen = async function (self) {
+  await self.$MagLoadParams.loadParam()
+  self.getfield = self.config.excelHeaders
+}
+export default {
+  title: '小区用户统计查询',
+  data () {
+    return {
+      model: new PagedList('api/af-revenue/sql/residentialAreaUserStateQuery', 50),
+      row: null,
+      isLoading: true,
+      searchshow: true,
+      criteriaShow:false,
+      org:{
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
+      },
+      orgcondition:'',
+      show: false,
+      imgShow: false,
+      condition:'',
+      f_orgid:'',
+      getfield: {},
+      config: {
+        excelHeaders: {
+          'f_residential_area': '小区名称','total_users': '总用户数','zhengchang_users': '正常用户数',
+          'xiaohu_users': '销户用户数','tinyong_users': '停用用户数','yubei_users': '预备用户数'
+        }
+      },
+      modelval: [
+        '小区名称','总用户数','正常用户数','销户用户数','停用用户数','预备用户数',
+      ]
+    }
+  },
+  ready () {
+    readyGen(this)
+    this.$refs.paged.$refs.grid.modelval = this.modelval
+  },
+  methods: {
+    hidden(){
+      this.criteriaShow = !this.criteriaShow
+    },
+    getorg(condition,obj) {
+      this.orgcondition = condition.replace('f_orgid','ua.f_orgid')
+      this.orgcondition = this.orgcondition.replace('f_depid','ua.f_depid')
+      this.orgcondition = this.orgcondition.replace('f_operatorid','ua.f_operatorid')
+      this.orgname = obj.orgnames[0]
+    },
+    clearmsg () {
+      this.$refs.paged.$refs.criteria.model = {}
+    },
+    clickshow () {
+      this.searchshow = !this.searchshow
+    },
+    dealmsg (val) {
+      val.model = this.model.model
+      this.$emit('deal-msg', val)
+    },
+    async search (args) {
+      // this.obj.resids = this.obj.resids.replace(/\./g, ''),
+      args.condition =  `${args.condition}`+this.orgcondition
+      console.log(args.condition+"args.condition")
+      this.condition = args.condition
+      if(this.f_orgid_new == '' || this.f_orgid_new == null){
+        this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
+        this.f_orgid = `'${this.$login.f.orgid}'`;
+      }else{
+        this.model.params.f_orgid = `'${this.f_orgid_new}'`;
+        this.f_orgid = `'${this.f_orgid_new}'`;
+      }
+      await this.model.search(args.condition, args.model)
+      await this.$refs.paged.$refs.grid.InitializedData()
+      await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
+
+    },
+
+  },
+  computed: {
+  }
+}
+</script>
+<style>
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+  padding: 10px 30px 10px 30px;
+  border-radius:15px;
+}
+</style>

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

@@ -32,6 +32,9 @@
     <tabs header="非民用用气设备查询" v-if="permission('非民用用气设备查询')">
       <fmy-gas-device-query v-if="show.includes('非民用用气设备查询')"></fmy-gas-device-query>
     </tabs>
+    <tabs header="小区用户统计查询" v-if="permission('小区用户统计查询')">
+      <residential-area-userstate-query v-if="show.includes('小区用户统计查询')"></residential-area-userstate-query>
+    </tabs>
   </tab-button>
 
 </template>

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

@@ -40,13 +40,15 @@
 
                     <export-excel :data="$parent.$parent.getCondition" :field="$parent.$parent.getExportField"
                                   :footer="$parent.$parent.footer" :header="$parent.$parent.other"
+                                  :defaultfield="$parent.$parent.defaultfield"
                                   v-if="$parent.$parent.authArr.includes('档案查询导出')" sqlurl="api/af-revenue/logic/openapi/exportfile"
                                   sql-name="meterQuery"
                                   template-name='表具查询导出' :choose-col="true"></export-excel>
                     <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model"
                                 :field="$parent.$parent.getExportField" :defaultfield="$parent.$parent.defaultfield"
                                 titletable="客户查询" :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-
+                    <button class="button_new" style="margin-right: 10px" @click="$parent.$parent.showUploadCodeCondition()">导入编号</button>
+                    <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.clearUserInfoId()">清空编号</button>
 
                     <div style="float: right" class="button_spacing"
                          :class="{ 'button_shrink_top': $parent.$parent.criteriaShow, 'button_shrink_bottom': !$parent.$parent.criteriaShow }"
@@ -219,6 +221,22 @@
                            condition="f_gas_person like '%{}%' " placeholder="通气人">
                   </div>
                 </div>
+                <modal :show.sync="$parent.$parent.excelUserCondtion" width="500px" v-ref:modal>
+                  <div slot="modal-header" class="modal-header">
+                    <h4 class="modal-title">
+                      导入用户表号
+                    </h4>
+                  </div>
+                  <div slot="modal-body" class="modal-body">
+                    <div class="row">
+                      <file-upload class="my-file-uploader btn" name="UploadFile" style="border-radius: 2px;"
+                                   action="rs/file/uploadFile" tagname="档案信息导入" v-ref:file :headers="headers" multiple></file-upload>
+                      <img src="../../../../static/Excelformat.png" style="width: 100%"/>
+                    </div>
+                  </div>
+                  <footer slot="modal-footer" class="modal-footer">
+                  </footer>
+                </modal>
               </div>
             </criteria>
 
@@ -260,6 +278,12 @@
                   <th>
                     <nobr>表上余额</nobr>
                   </th>
+                  <th>
+                    <nobr>系统余额</nobr>
+                  </th>
+                  <th>
+                    <nobr>上报日期</nobr>
+                  </th>
                   <th>
                     <nobr>客户类型</nobr>
                   </th>
@@ -283,6 +307,9 @@
                   <th>
                     <nobr>气价详情</nobr>
                   </th>
+                  <th>
+                    <nobr>气表类型</nobr>
+                  </th>
                   <th>
                     <nobr>气表品牌</nobr>
                   </th>
@@ -349,6 +376,12 @@
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_balance_amount }}</nobr>
                 </td>
+                <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{ row.f_jval }}</nobr>
+                </td>
+                <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{ row.f_hand_date }}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_user_type }}</nobr>
                 </td>
@@ -374,6 +407,9 @@
                 <th :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.value }}</nobr>
                 </th>
+                <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{ row.f_meter_classify }}</nobr>
+                </td>
                 <td :class="row.f_table_state !== '正常' ? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{ row.f_meter_brand }}</nobr>
                 </td>
@@ -458,7 +494,7 @@
 </template>
 
 <script>
-import {PagedList} from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
 import exportConfig from '../config/exportConfig'
 
 let cardBtnGen = async function (self, val) {
@@ -552,12 +588,23 @@ export default {
       allorgid: [],
       tempfalg: false,
       lastorgstr: '',
+      excelUserCondtion: false,
+      uploadCodeCondition:'',
       issecond: [{label: '是', value: " = '二次挂表'"}, {label: '否', value: " <> '二次挂表'"}],
       usetype: this.$appdata.getParam('使用类型'),
       networkvalves: this.$appdata.getParam('自动阀控') ? [{
         label: '全部',
         value: ''
       }, ...this.$appdata.getParam('自动阀控')] : [],
+      defaultfield: [
+        'f_userinfo_code',    // 客户编号
+        'f_user_name',        // 客户名称
+        'f_user_phone',       // 客户电话
+        'f_address',          // 客户地址
+        'f_meternumber',      // 表号
+        'f_card_id',          // 卡号
+        // ... 添加更多你想默认勾选的字段
+      ]
     }
   },
   ready() {
@@ -663,6 +710,9 @@ export default {
       if (this.IdCardInfo != '') {
         args.condition += ` and f_idnumber='${this.IdCardInfo}'`
       }
+      if(this.uploadCodeCondition){
+        args.condition +=` and ${this.uploadCodeCondition}`
+      }
       this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
       this.card = ''
@@ -789,7 +839,35 @@ export default {
       }
 
       this.search()
-    }
+    },
+    showUploadCodeCondition() {
+      console.log('点击了导入编号按钮');
+      this.excelUserCondtion = true;
+      console.log('excelUserCondtion:', this.excelUserCondtion);
+    },
+    //清空用户编号
+    clearUserInfoId(){
+      this.uploadCodeCondition=''
+      Vue.showMessage("已清空用户编号")
+    },
+
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      //tag)
+      //tag)
+      let data = {
+        filepath: res.f_downloadpath
+      }
+      new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+        resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
+        rejectMsg: '导入失败'
+      }).then((res) => {
+        this.uploadCodeCondition=res.data.condition
+        this.excelUserCondtion = false
+      })
+    },
+
   },
   watch: {
     'model.rows.length'() {

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

@@ -493,6 +493,18 @@
                       condition="f_network_valve='{}'">
                     </v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">阀门状态</label>
+                    <v-select
+                      placeholder='阀门状态'
+                      :value.sync="model.f_valve_state"
+                      style="width:60%"
+                      v-model="model.f_valve_state"
+                      :options='$parent.$parent.valvestate'
+                      close-on-select
+                      condition="f_valve_state='{}'">
+                    </v-select>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -1341,6 +1353,9 @@
       },
     },
     computed:{
+      valvestate() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('阀门状态')]
+      },
       bandstates () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('微信绑定')]
       },

package/src/filiale/fugou/WebHandplanQuery.vue

@@ -43,7 +43,7 @@
                               :value.sync="model.handStartDate"
                               :format="'yyyy-MM-dd 00:00:00'"
                               :show-reset-button="true"
-                              condition="f_hand_date >= '{}'">
+                              condition="f_input_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -53,7 +53,7 @@
                               :value.sync="model.handEndDate"
                               :format="'yyyy-MM-dd 23:59:59'"
                               :show-reset-button="true"
-                              condition="f_hand_date <= '{}'">
+                              condition="f_input_date <= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -382,7 +382,7 @@
               </td>
 
               <td style="text-align: center;">
-                <nobr>{{row.f_hand_date}}</nobr>
+                <nobr>{{row.f_input_date}}</nobr>
               </td>
               <td>
                 <nobr>{{row.belongmonth}}</nobr>

package/src/filiale/haile/sale/businessquery/ChargeQuery.vue

@@ -969,6 +969,7 @@
         allorgid:[],
         tempfalg :false,
         lastorgstr:'',
+        excel_condition:'',
         // pos设备列表
         posEquipment: [{label: '全部',value: ''}],
         showbottomsum:false, //页面下方是否有合计: 默认为false, 在watch修改
@@ -1144,6 +1145,7 @@
         if(this.IdCardInfo!=''){
           args.condition +=` and f_idnumber='${this.IdCardInfo}'`
         }
+        this.excel_condition = args.condition
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
         this.card=''
@@ -1313,7 +1315,7 @@
         return {
           startDate: this.$refs.paged.$refs.cri.model.startDate,
             endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          condition: this.excel_condition,
           orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
         }
       },

package/src/filiale/haile/sale/businessquery/HandplanQuery.vue

@@ -873,6 +873,7 @@ export default {
       imgshow: false,
       imgfilename: '',
       percent: 0,
+      excel_condition: '',
       progressShow: false,
       uuida: '',
       timer: '',
@@ -1123,6 +1124,7 @@ export default {
       }
 
       args.condition = `${args.condition} ` + this.orgCondtionStr
+      this.excel_condition = args.condition
       this.model.search(args.condition, args.model)
       this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
     },
@@ -1283,7 +1285,7 @@ export default {
       return {
         startDate: this.$refs.paged.$refs.cri.model.startDate,
         endDate: this.$refs.paged.$refs.cri.model.endDate,
-        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        condition: this.excel_condition,
         orderitem: this.orderitem ? `${this.orderitem}` : "  z "
       }
     },