safecheck-client 3.0.35-1 → 3.0.35-10

package/src/filiale/bayan/pc/PlanManage.vue

@@ -488,6 +488,7 @@
             isSend:false,
             createPlan:{
               f_outlets:'',
+              f_class:'',
               f_end_time:'',
               f_start_time:'',
               f_plan_name:'',
@@ -638,6 +639,7 @@
             f_plan_name:'',
               f_plan_year:'',
               f_plan_month:'',
+            f_class:'',
             f_outlets:'',
               isShare:'否',
               f_issued:'否',

package/src/filiale/bayan/pc/SelectCheckPlan.vue

@@ -66,6 +66,30 @@
                         close-on-select
                         condition="f_check_type = '{}'"></v-select>
             </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >区&emsp;&emsp;域</label>
+              <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
+                        :options='$parent.$parent.quyus' placeholder='区域' class="select_list select" style="width: 60%"
+                        @change="$parent.$parent.quyuChange"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body" >营&ensp;业&ensp;厅</label>
+              <v-select :value.sync="model.f_bumen" :value-single="true" v-model="model.f_bumen"
+                        :options='$parent.$parent.bumens' placeholder='营业厅'
+                        @change="$parent.$parent.bumenChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">小&emsp;&emsp;组</label>
+              <v-select :value.sync="model.f_team" :value-single="true" v-model="model.f_team"
+                        :options='$parent.$parent.teams' placeholder='小组'
+                        @change="$parent.$parent.teamChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
             <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
             <!--<label class="font_normal_body">安检起始</label>-->
             <!--<datepicker-->
@@ -92,6 +116,7 @@
                                    progress="safeGetExportProgress"
                                    sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <button type="button" class="button_search button_spacing" @click="$parent.$parent.cleamsg()">清空</button>
               <!--<div class="button_spacing"-->
               <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
               <!--@click="$parent.$parent.hidden()">-->
@@ -185,6 +210,9 @@ export default {
     }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
     model.f_filialeids = '('+this.$login.f.orgid+')'
     return {
+      quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
+      bumens: [{label: '请选择', value: ''}],
+      teams: [{label: '请选择', value: ''}],
       checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
       excelHeaders:{
         'f_checker': '安检员',
@@ -228,6 +256,36 @@ export default {
     }
   },
   methods: {
+    cleamsg(){
+      this.$refs.paged.$refs.cri.model= {}
+    },
+    bumenChange(val) {
+      if (val) {
+        this.teams = this.$appdata.getParam(`工单-` + val) ? [{
+          label: '请选择',
+          value: ''
+        }, ...this.$appdata.getParam(`工单-` + val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
+    teamChange(val) {
+      if (val) {
+        this.checkers = this.$appdata.getParam(val) ? [...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
+    quyuChange(val) {
+      if (val) {
+        this.bumens = this.$appdata.getParam(val) ? [{
+          label: '请选择',
+          value: ''
+        }, ...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+      }else {
+        this.checkers = this.allCheckers
+      }
+    },
     hidden() {
       this.criteriaShow = !this.criteriaShow
     },

package/src/filiale/shanxian/android/AddPlanItem.vue

@@ -223,7 +223,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int) desc,f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int) desc,f_unit,CAST(floor1 as int) desc,f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]', f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',f_user_state: 'this.f_user_state[0]',f_orgids:'this.f_orgids',f_unit:'this.model.f_unit',f_building:'this.model.f_building',f_filialeid:'this.f_filialeid'})
       model.f_sign = ['']
       model.f_user_type = ''

package/src/filiale/shanxian/android/SafecheckOrderV.vue

@@ -507,7 +507,7 @@
         // 5秒后启用点击事件
         setTimeout(function () {
           $("#savebut").removeClass("noclickbut");
-        }, 5000);
+        }, 8000);
       },
       timeSet(val) {
         if (!val) {