manage-client 4.1.165-tcls → 4.1.165

package/package.json

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

package/src/filiale/tongchuan/GasPrice.vue

@@ -24,14 +24,7 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <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>
+            <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>
             <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">
@@ -64,9 +57,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>
@@ -91,7 +84,6 @@
 
 <script>
 import {DataModel, HttpResetClass} from 'vue-client'
-import ResSelectUserGroup from './ResSelectUserGroup.vue'
   import co from 'co'
   let saveFile = function * (self) {
   }
@@ -107,12 +99,6 @@ import ResSelectUserGroup from './ResSelectUserGroup.vue'
           dep:[],
           user:[]
         },
-        userInitres: {
-          org: [],
-          dep: [],
-          user: []
-        },
-        userOrgConditionStr: '',
         userresid: [],
         f_orgid: this.$login.f.orgid,
         f_depid: this.$login.f.depids,
@@ -131,9 +117,6 @@ import ResSelectUserGroup from './ResSelectUserGroup.vue'
         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'
@@ -166,8 +149,7 @@ import ResSelectUserGroup from './ResSelectUserGroup.vue'
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
         let orgstr = this.orgCondtionStr
-        let usercondition = this.userOrgConditionStr
-        orgcondition = orgcondition + orgstr + usercondition
+        orgcondition = orgcondition + orgstr
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition + ' and ' + args.condition
         if (this.reportStyle == '1') {
           let load = new HttpResetClass()
@@ -215,11 +197,6 @@ import ResSelectUserGroup from './ResSelectUserGroup.vue'
         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/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/tongchuan/sale'
+import ShanXianSaleManage from './filiale/xinjiangdexin/sale'
  // import ShanXianwebSaleManage from './filiale/rongcheng/webmeterManage'
 import webmeterManage from './webmeterManage'
 import reportManage from './reportManage'