safecheck-client 3.0.39-8 → 3.0.39-81

package/src/filiale/hanzhong/pc/CheckHiddenDanger.vue

@@ -248,8 +248,8 @@
         },
         echartswidth: '95%',
         barshowid: '1',
-        model:new PagedList(),
-        model1:new PagedList(),
+        model:new PagedList('rs/sql/QueryCheckStatus', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{rh:'',dfby:'',wsy:'',jj:''}),
+        model1:new PagedList('rs/sql/QueryHiddenLevel', 20, {startDate: 'this.startDate',endDate: 'this.endDate', orgid: 'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'},{a:'',b:'',c:'',ac:'',bc:'',cc:''}),
         orgid: `('${this.$login.f.orgid}')`,
         f: this.$login.f,
         chosenOrg: {

package/src/filiale/hanzhong/pc/CheckNumberStatistics.vue

@@ -146,7 +146,7 @@
           countxq:0,
         },
 
-        model: new PagedList(),
+        model: new PagedList('rs/sql/CountPeople', 20, {endDate: 'this.endDate', orgid: 'this.orgid'}),
         orgid: `('${this.$login.f.orgid}')`,
         f: this.$login.f,
         chosenOrg: {

package/src/filiale/hanzhong/pc/CheckSafeDetail.vue

@@ -216,7 +216,12 @@ export default {
         wsy: 0,
         checkrate: '0.00%',
       },
-      model: new PagedList(),
+      model: new PagedList('rs/sql/YearCountRate', 20, {
+        year: 'this.year',
+        orgid: 'this.orgid',
+        plan_type: 'this.plan_type',
+        f_safecheck_type: 'this.f_safecheck_type'
+      }),
       orgid: `('${this.$login.f.orgid}')`,
       //测试
       // orgid:'2586252.6314787',

package/src/filiale/hanzhong/pc/CheckSafeStatus.vue

@@ -151,7 +151,7 @@
           yijian:0,
           checkrate:'0.00%',
         },
-        model:new PagedList(),
+        model:new PagedList('rs/sql/CheckComplete',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_safecheck_type: 'this.f_safecheck_type'}),
         orgid: `('${this.$login.f.orgid}')`,
         startDate:(new Date()).getFullYear()+'-01-01',
         endDate: Util.toStandardDateString(),

package/src/filiale/hanzhong/pc/CheckerSafeDetail.vue

@@ -196,7 +196,7 @@
           wsy:0,
           checkrate:'0.00%',
         },
-        model:new PagedList(),
+        model:new PagedList('rs/sql/YearCheckerCountRate',20, {year:'this.year',orgid:'this.orgid',plan_type:'this.plan_type',f_start_time:'this.f_start_time',f_end_time:'this.f_end_time',f_safecheck_type: 'this.f_safecheck_type'}),
         orgid:`('${this.$login.f.orgid}')`,
         //测试
         // orgid:'2586252.6314787',

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

@@ -555,10 +555,10 @@ export default {
       let prefix = '用户基本信息：'
       if(Util.required(this.data.f_user_name))
         return prefix + '用户名必须输入'
-      if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
+      /*if(!(/^\d{11}$/.test(this.data.f_user_phone))) {
 
         return '请输入正确的电话号码'
-      }
+      }*/
       // if(Util.required(this.data.f_residential_area))
       //   return prefix + '小区名称必须输入'
       if(Util.required(this.data.f_address))

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

@@ -114,6 +114,21 @@
                           close-on-select clear-button></v-select>
               </div>
             </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户标签：</label>
+              </div>
+              <div class="col-xs-8" >
+                <v-select class="input-font"
+                          placeholder='请选择用户标签'
+                          :value.sync="model.f_user_nature"
+                          v-model="model.f_user_nature"
+                          :options='$parent.$parent.user_natures'
+                          condition="ui.f_user_nature='{}'"
+                          close-on-select clear-button></v-select>
+              </div>
+            </div>
 <!--            <div class="row app-row">
               <div class="col-xs-4">
                 <img src="../../../assets/安检状态.png" style="width: 20px;margin-bottom: 5px" alt="">
@@ -195,6 +210,10 @@
                   <p class="panel-title col-xs-4 text-left font">黑名单用户</p>
                   <p class="panel-title col-xs-8 text-left input-font">{{ row.f_parameter_key=='blackList'?'是':'否' }}</p>
                 </div>
+                <div class="row">
+                  <p class="panel-title col-xs-4 text-left font">用户标签</p>
+                  <p class="panel-title col-xs-8 text-left input-font">{{ row.f_user_nature }}</p>
+                </div>
               </div>
             </div>
 
@@ -227,6 +246,7 @@
       return {
         model: model,
         cbc:[],
+        user_natures: this.$appdata.getParam('用户标签'),
         showModal:false,
         signs: [
           {label:'请选择录入状态', value:''},