manage-client 4.1.164 → 4.1.165-tcls

package/package.json

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

package/src/filiale/tongchuan/GasPrice.vue

@@ -24,7 +24,14 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <res-select-group :show-component="['company','department','operator']" :initres="$parent.$parent.initres" :selectin="true" :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+            <res-select-user-group
+              :operator-initres="$parent.$parent.initres"
+              :user-initres="$parent.$parent.userInitres"
+              :show-component="['company','department','operator','slicearea','user_company','user_department']"
+              @re-res="$parent.$parent.getRes"
+              @re-us-res="$parent.$parent.getUserRes"
+              v-ref:usersel>
+            </res-select-user-group>
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" for="oper1">格式一</label>
               <input type="radio" name="reportStyle" id="oper1" v-model="$parent.$parent.reportStyle" value="1">
@@ -57,9 +64,9 @@
           <tr>
             <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
               <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+                <span v-show="$parent.orgname.trim()!=''">操作人公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 操作人部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">操作人：{{$parent.operatorname}}</span>
               </div>
             </th>
           </tr>
@@ -84,6 +91,7 @@
 
 <script>
 import {DataModel, HttpResetClass} from 'vue-client'
+import ResSelectUserGroup from './ResSelectUserGroup.vue'
   import co from 'co'
   let saveFile = function * (self) {
   }
@@ -99,6 +107,12 @@ import {DataModel, HttpResetClass} from 'vue-client'
           dep:[],
           user:[]
         },
+        userInitres: {
+          org: [],
+          dep: [],
+          user: []
+        },
+        userOrgConditionStr: '',
         userresid: [],
         f_orgid: this.$login.f.orgid,
         f_depid: this.$login.f.depids,
@@ -117,6 +131,9 @@ import {DataModel, HttpResetClass} from 'vue-client'
         show: false
       }
     },
+    components: {
+      'res-select-user-group': ResSelectUserGroup
+    },
     ready () {
       this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
       this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
@@ -149,7 +166,8 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         let orgstr = this.orgCondtionStr
-        orgcondition = orgcondition + orgstr
+        let usercondition = this.userOrgConditionStr
+        orgcondition = orgcondition + orgstr + usercondition
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + args.condition
         if (this.reportStyle == '1') {
           let load = new HttpResetClass()
@@ -197,6 +215,11 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
       },
+      getUserRes (condition, obj) {
+        this.userOrgname = obj.orgnames[0]
+        this.userDepname = obj.depnames[0]
+        this.userOrgConditionStr = condition
+      },
       getdep (obj, val) {
         // this.depname = val[0]
         this.userresid = obj

package/src/filiale/wuhai/UserGasEchartsList.vue

@@ -115,7 +115,7 @@
                 }
               },
               {
-                'name': '再用户数',
+                'name': '在用户数',
                 'icon': 'circle',
                 'textStyle': {
                   'color': '#8a9e64',
@@ -228,7 +228,7 @@
               'barGap': '0'
             },
             {
-              'name': '再用户数',
+              'name': '在用户数',
               nameTextStyle: {
                 fontSize: 10
               },

package/src/filiale/xinjiangdexin/UserGasEchartsListIndex.vue

@@ -101,7 +101,7 @@ export default {
               }
             },
             {
-              'name': '再用户数',
+              'name': '在用户数',
               'icon': 'circle',
               'textStyle': {
                 'color': '#8a9e64',
@@ -214,7 +214,7 @@ export default {
             'barGap': '0'
           },
           {
-            'name': '再用户数',
+            'name': '在用户数',
             nameTextStyle: {
               fontSize: 10
             },

package/src/main.js

@@ -6,7 +6,7 @@ import { all } from 'vue-client'
 import { system } from 'system-clients'
 import { ldap } from 'ldap-clients'
 import saleManage from './saleManage'
-import ShanXianSaleManage from './filiale/xinjiangdexin/sale'
+import ShanXianSaleManage from './filiale/tongchuan/sale'
  // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Jun 04 15:26:04 CST 2026
-gradle.version=9.3.0