manage-client 4.0.44-1 → 4.0.45

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Nov 04 18:30:03 CST 2024
+gradle.version=8.5

package/package.json

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

package/src/filiale/tongchuan/InspectListGas.vue

@@ -180,22 +180,6 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code like '%{}%' " placeholder="客户编号">
                 </div>
-
-
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
-                </div>
-
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&emsp;客户地址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
@@ -291,7 +275,6 @@
                 <th><nobr>表号</nobr></th>
                 <th><nobr>客户名称</nobr></th>
                 <th><nobr>客户状态</nobr></th>
-                <th><nobr>小区</nobr></th>
                 <th><nobr>地址</nobr></th>
                 <th><nobr>用户类型</nobr></th>
                 <th><nobr>用气性质</nobr></th>
@@ -327,7 +310,6 @@
               <td style="text-align: center;"><nobr>{{row.f_meternumber}}</nobr></td>
               <th style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_user_state}}</nobr></th>
-              <th style="text-align: center;"><nobr>{{row.f_residential_area}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_address}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></th>
               <th style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></th>
@@ -369,7 +351,7 @@
   /**
    *用户档案查询列表以及添加操作组件
    */
-  import {HttpResetClass, PagedList} from 'vue-client'
+  import { PagedList } from 'vue-client'
   import Vue from 'vue'
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
@@ -392,9 +374,6 @@
         meterbrands: [],
         other:[],
         footer:[],
-        //小区
-        residentialArea: [],
-        pcdslist:[],
         org:[this.$login.f.orgid],
         criteriaShow: false,
         meter_classify:'卡表',
@@ -406,7 +385,7 @@
         prices:[],
         source: `tool.getFullTree(this.getRights().where(row.getType() == $organization$))`,
         getfield:{"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
-          "f_user_name":"客户名称","f_user_state":"客户状态","f_residential_area":"小区","f_address":"地址","f_user_type":"用户类型",
+          "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
           "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
           "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
           "f_changemeter_date":"最后一次换表时间","sellcishu":"期间购气次数","sellpregas":"期间购气量","f_orgname":"组织机构"},
@@ -441,7 +420,7 @@
           this.url = 'api/af-revenue/sql/inspectList_sellinggas'
           this.sqlName = 'inspectList_sellinggas'
           this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","f_residential_area":"小区","f_address":"地址","f_user_type":"用户类型",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
@@ -450,7 +429,7 @@
           this.url = 'api/af-revenue/sql/getwulw_listgas'
           this.sqlName = 'getwulw_listgas'
           this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","f_residential_area":"小区","f_address":"地址","f_user_type":"用户类型",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后购气日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
@@ -460,7 +439,7 @@
           this.url = 'api/af-revenue/sql/handinspectList_sellinggas'
           this.sqlName = 'handinspectList_sellinggas'
           this.getfield = {"f_userinfo_code":"客户编号","f_olduserinfo_code":"档案编号","f_meternumber":"表号",
-            "f_user_name":"客户名称","f_user_state":"客户状态","f_residential_area":"小区","f_address":"地址","f_user_type":"用户类型",
+            "f_user_name":"客户名称","f_user_state":"客户状态","f_address":"地址","f_user_type":"用户类型",
             "f_gasproperties":"用气性质","f_table_state":"表具状态","f_meter_brand":"气表品牌","f_price_name":"气价名称",
             "delivery_date":"最后抄表日期","f_meter_style":"气表类型","f_open_date":"开户日期","f_pcd":"区域","f_gasproperties2":"二级用气性质",
             "f_changemeter_date":"最后一次换表时间",
@@ -470,7 +449,7 @@
       }
     },
     ready () {
-      this.getaddress()
+
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -531,44 +510,6 @@
           this.filialeCodeStr= " and f_orgid = " + this.$login.f.orgid
         }
       },
-      async  getaddress(){
-        console.log('开始获取小区')
-        let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
-          data: {
-            condition: `1=1 `
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-        console.log('小区',data)
-        let house = []
-        for (let row of data.data){
-          console.log('开始保存小区')
-          house.push({label: row.f_residential_area, value: row.f_residential_area})
-        }
-        this.residentialArea = house
-
-        console.log('开始获取区域')
-        var req = await HttpReset.load('POST','api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
-          data: {
-            items: '*',
-            tablename: 't_pcd',
-            orderitem: 'id',
-            condition: `1=1`
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        console.log('区域是：',req)
-        req.data.forEach((row, n) => {
-          redata[n] = {
-            label: row.f_pcd,
-            value: row.id,
-            data: row,
-            id: row.id
-          }
-        })
-        console.log('获取到的小区',redata)
-        this.pcdslist = redata
-      },
       userTypeChange () {
         this.gasproperties=[]
         console.log("查气价")

package/src/filiale/tongchuan/UserQuery.vue

@@ -641,7 +641,7 @@
         let HttpReset = new HttpResetClass()
         var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
           data: {
-            condition: `1=1 `
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
           }
         }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
         console.log('小区',data)