manage-client 4.1.140 → 4.1.141

package/package.json

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

package/src/filiale/tongchuan/DepartmentPrick.vue

@@ -26,30 +26,38 @@
                           :show-reset-button="reset">
               </datepicker>
             </div>
-            <res-select-group :show-component="['company']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
-              <v-select id="dep" style="width: 60%"
-                        :multiple="true"
-                        @change="$parent.$parent.getDep"
-                        :value.sync="model.f_depid"
-                        v-model="model.f_depid"
-                        :options='$parent.$parent.depresid' placeholder='请选择'
-                        condition="f_depid in {}">
-              </v-select>
+            <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']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>-->
+<!--            <div class="col-sm-3 form-group">-->
+<!--              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>-->
+<!--              <v-select id="dep" style="width: 60%"-->
+<!--                        :multiple="true"-->
+<!--                        @change="$parent.$parent.getDep"-->
+<!--                        :value.sync="model.f_depid"-->
+<!--                        v-model="model.f_depid"-->
+<!--                        :options='$parent.$parent.depresid' placeholder='请选择'-->
+<!--                        condition="f_depid in {}">-->
+<!--              </v-select>-->
 
-            </div>
-            <div class="col-sm-3 form-group">
-              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>
-              <v-select id="oper" style="width: 60%"
-                        :multiple="true"
-                        @change="$parent.$parent.getOpe"
-                        :value.sync="model.f_operatorid"
-                        v-model="model.f_operatorid"
-                        :options='$parent.$parent.userresid' placeholder='请选择'
-                        condition="f_operatorid in {}">
-              </v-select>
-            </div>
+<!--            </div>-->
+<!--            <div class="col-sm-3 form-group">-->
+<!--              <label class="font_normal_body" for="oper">人&emsp;&emsp;员:</label>-->
+<!--              <v-select id="oper" style="width: 60%"-->
+<!--                        :multiple="true"-->
+<!--                        @change="$parent.$parent.getOpe"-->
+<!--                        :value.sync="model.f_operatorid"-->
+<!--                        v-model="model.f_operatorid"-->
+<!--                        :options='$parent.$parent.userresid' placeholder='请选择'-->
+<!--                        condition="f_operatorid in {}">-->
+<!--              </v-select>-->
+<!--            </div>-->
             <div class="col-sm-3 form-group">
               <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
               <v-select :value.sync="model.f_payment" multiple
@@ -83,9 +91,9 @@
           <tr>
             <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
               <div>
-                <span v-show="$parent.orgname[0]">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname[0]"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname[0]">人员：{{$parent.operatorname}}</span>
+                <span v-show="$parent.orgname[0]">操作人公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname[0]"> 操作人部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname[0]">操作人：{{$parent.operatorname}}</span>
               </div>
             </th>
           </tr>
@@ -125,6 +133,7 @@
 
 <script>
 import {DataModel, HttpResetClass} from 'vue-client'
+import ResSelectUserGroup from './ResSelectUserGroup.vue'
   import co from 'co'
   let saveFile = function * (self) {
     // 线验证文件是否重名
@@ -175,6 +184,9 @@ import {DataModel, HttpResetClass} from 'vue-client'
   export default {
     title: '营业厅收款结账单',
     props: ['data'],
+    components: {
+      'res-select-user-group': ResSelectUserGroup
+    },
     data () {
       return {
         initres: {
@@ -182,6 +194,13 @@ import {DataModel, HttpResetClass} from 'vue-client'
           dep: [],
           user: []
         },
+        userInitres: {
+          org: [],
+          dep: [],
+          user: []
+        },
+        operatornames: [],
+        userOrgConditionStr: '1=1',
         printTime: this.$login.toStandardTimeString(),
         depresid: [],
         userresid: [],
@@ -195,8 +214,10 @@ import {DataModel, HttpResetClass} from 'vue-client'
         depname: '',
         operatorname: '',
         orgCondtionStr: '1=1',
+        userOrgname: '',
+        userDepname: '',
         model: new DataModel('api/af-revenue/report/DepPrick', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
+          f_orgid: 'this.model.f_orgid', u_orgid: 'this.model.u_orgid'}),
         reportStr: null,
         show: false,
       }
@@ -222,12 +243,14 @@ import {DataModel, HttpResetClass} from 'vue-client'
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
         let orgcondition = '1=1'
+        let usercondition = '1=1'
         let orgstr = this.orgCondtionStr
         if (this.f_orgid[0]) {
           orgcondition += orgstr
         }
-
+        usercondition += this.userOrgConditionStr
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.$refs.criteria.model.u_orgid = usercondition
         this.$refs.paged.search(args)
       },
       // 根据文件路径获取储存的报表内容
@@ -251,6 +274,12 @@ import {DataModel, HttpResetClass} from 'vue-client'
         this.orgCondtionStr = condition
         this.orgname = obj.orgnames[0]
         this.depname = obj.depnames[0]
+        this.operatorname = obj.operatornames[0]
+      },
+      getUserRes (condition, obj) {
+        this.userOrgname = obj.orgnames[0]
+        this.userDepname = obj.depnames[0]
+        this.userOrgConditionStr = condition
       },
       // 将报表保存成文件
       confirmReport () {