apply-clients 3.5.5-10 → 3.5.5-101

package/src/filiale/fugou/pc/addressAndUserinfoManagement.vue

@@ -43,7 +43,7 @@
               <nobr>{{row.f_pcd}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
+              <nobr>{{row.f_community}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_street}}</nobr>

package/src/filiale/fugou/pc/chargeReport.vue

@@ -4,6 +4,45 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
           <div class="row">
+            <div class="col-sm-2">
+              <label class="font_normal_body">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                :is-mul="false"
+              ></res-select>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">部&emsp;&emsp;门：</label>
+              <res-select
+                restype='department'
+                :parentresid="$parent.$parent.curorgid"
+                :initresid='$parent.$parent.curdepid'
+                @res-select="$parent.$parent.getdep"
+                :is-mul="true"
+              ></res-select>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">人&emsp;&emsp;员：</label>
+              <res-select
+                restype='user'
+                :parentresid="$parent.$parent.curdepid"
+                :initresid='$parent.$parent.curuserid'
+                @res-select="$parent.$parent.getuser"
+                :is-mul="true"></res-select>
+            </div>
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">分组项:</label>
+              <v-select
+                     :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1'
+                        placeholder='请选择'
+                        close-on-select
+              ></v-select>
+            </div>
             <div class="col-sm-2" >
               <label class="font_normal_body" for="startDate">开始日期:</label>
               <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
@@ -54,7 +93,7 @@
             </th>
           </tr>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+            <th :colspan='$par ent.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>
@@ -70,9 +109,9 @@
           </tr>
           <tfoot>
           </tfoot>
-        </table>
+      </table>
       </div>
-    </criteria-paged>
+    </criteria-page d>
   </div>
 </template>
 <script>
@@ -83,6 +122,9 @@ export default {
   data () {
     return {
       printTime: this.$login.toStandardTimeString(),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      curuserid: [],
       depresid: [],
       userresid: [],
       f_orgid: this.$login.f.orgid,
@@ -98,40 +140,70 @@ export default {
       orgCondtionStr: '1=1',
       model: new DataModel('rs/report/fgChargeRecord', {
         startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'
+        f_orgid: 'this.model.f_orgid',
+        f_public_group1: 'this.model.f_public_group1[0]',
+        group1Name: 'this.model.group1Name'
       }),
       reportStr: null,
       spans: 0,
+      f_public_group1: '',
+      group1Name: ''
     }
   },
   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'
-    this.searchData()
   },
   created () {
   },
   methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
     selfSearch(args) {
-      console.log(args)
+      this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+      if (this.curuserid.length > 0) {
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
+      }
       let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      let name1 = args.model.f_public_group1
+      if (name1 == null || name1 == ''){
+        alert("请选择分组项！！！")
+        return
+      }
       this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
       this.$refs.paged.search(args)
     },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
+    getuser (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curuserid = val
+    },
+    getdep (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curdepid = val
+      this.curuserid = []
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.curdepid = []
+      this.curuserid = []
+    },
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
     }
   },
+  computed: {
+      group1() {
+        return [{label:'报建类型', value:'f_apply_type'}, {label:'报建性质', value:'f_apply_nature'}]
+      }
+  },
   watch: {
     'model.data' (val) {
       this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
-    },
-    'this.$refs.paged.$refs.criteria.model.f_insurance_company' (val) {
-      console.log(val)
     }
   }
 }