manage-client 3.2.69 → 3.2.70-wuan

package/src/components/SellReport/ManageBusSummary.vue

@@ -28,24 +28,28 @@
               <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
               <right-tree @re-res="$parent.$parent.getRes" style="width: 60%"></right-tree>
             </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='department'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getdep"
-                          :parentresid="$parent.$parent.depresid"
-                          :initresid='$parent.$parent.depid'>
-              </res-select>
+            <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-2 form-group">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
-              <res-select restype='user'
-                          is-mul="false"
-                          @res-select="$parent.$parent.getuser"
-                          :parentresid="$parent.$parent.userresid"
-                          :initresid='$parent.$parent.operatorid'>
-              </res-select>
+            <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="false"
+                        @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="span" style = "float:right;">
@@ -89,7 +93,7 @@
             <div>
               <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
               <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
-              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.operatorname">人员：{{$parent.operatorname}}</span>
             </div>
           </th>
         </tr>
@@ -107,16 +111,40 @@
         </tr>
         </tfoot>
       </table>
-      {{{ $parent.reportStr}}}
     </div>
   </criteria-paged>
   </div>
 </template>
 
 <script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-
+import {DataModel, HttpResetClass} from 'vue-client'
+import co from 'co'
+let getorg = async function (self) {
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_department',
+        condition: `1=1`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.depresid = res.data
+    })
+  new HttpResetClass().load("POST",'rs/sql/singleTableParam',
+    {
+      data: {
+        items: 'name label,id value',
+        tablename: 't_user',
+        condition: `state = '在职' and f_department_name is not null`
+      }
+    },
+    {resolveMsg: null, rejectMsg: null})
+    .then((res) => {
+      self.userresid = res.data
+    })
+}
   export default {
     title: '收费结账报表',
     props: ['data'],
@@ -135,7 +163,7 @@
         criteriaShow: false,
         operatorname: '',
         orgCondtionStr: '1=1',
-        f_state:['有效'],
+        f_state:'',
         model: new DataModel('rs/report/getmoneyall', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
@@ -148,6 +176,7 @@
       }
     },
     ready () {
+      getorg(this)
       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'
       console.log(this.$login.f)
@@ -158,20 +187,14 @@
       },
       selfSearch (args) {
         this.printTime = this.$login.toStandardTimeString()
-        let orgcondition ='1=1'
-        if (this.f_orgid && this.f_orgid[0]) {
-          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
-        }
-        if (this.f_depid && this.f_depid[0]) {
-          orgcondition += ' and f_depid in (' + this.f_depid + ')'
-        }
-        if(this.f_operatorid && this.f_operatorid[0]) {
-          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+        let orgcondition = ''
+        if (this.f_orgid[0]) {
+          orgcondition += ` and f_orgid in ('${this.f_orgid.toString().replace(/,/g, "','")}')`
         }
         if(this.f_state && this.f_state[0]) {
           orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
         }
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.$refs.criteria.model.f_orgid = args.condition + orgcondition
         this.$refs.paged.search(args)
       },
 
@@ -180,18 +203,16 @@
       },
       getRes (obj) {
         this.orgname = obj.res[0]
-        this.depresid = obj.resids
         this.f_orgid = obj.resids
       },
-      getdep (obj, val) {
-        this.depname = val[0]
-        this.userresid = obj
-        this.f_depid = obj
+      getDep(val){
+        this.depname = this.depresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+        console.log('dep',this.depname )
+      },
+      getOpe(val){
+        this.operatorname = this.userresid.filter(x => val.includes(x.value)).map(x=>x.label).toString()
+        console.log('operatorname',this.operatorname )
       },
-      getuser ( obj, val) {
-        this.operatorname = val[0]
-        this.f_operatorid = obj
-      }
     },
     watch: {
       'model.data' (val) {