safecheck-client 3.0.39-80 → 3.0.39-81

package/src/filiale/jiaocheng/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
   'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) }

package/src/filiale/jiaocheng/pc/CheckSearchUser.vue

@@ -179,6 +179,17 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">用户标签</label>
+              <v-select class="select_list select"
+                        placeholder='用户标签' style="width: 60%"
+                        :value.sync="model.f_user_nature" v-model="model.f_user_nature"
+                        :options='$parent.$parent.user_natures'
+                        close-on-select clear-button
+                        condition="f_user_nature = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -363,6 +374,9 @@
             <th>
               <nobr>建档日期</nobr>
             </th>
+            <th>
+              <nobr>用户标签</nobr>
+            </th>
             <th>
               <nobr>通气日期</nobr>
             </th>
@@ -390,6 +404,7 @@
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_nature }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
@@ -470,7 +485,8 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期',
-        'f_gas_date': '通气日期'
+        'f_gas_date': '通气日期',
+        'f_user_nature': '用户标签'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
@@ -482,6 +498,7 @@ export default {
       checkersid: [],
       checkStates:[],
       SafeCheckXZ: '',
+      user_natures: this.$appdata.getParam('用户标签'),
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
       SafeCheckXZs: [{label: '全部', value: ''}, {label: '未安检', value: '未安检'}, {label: '已安检', value: '已安检'}], // 安检筛选选项