safecheck-client 3.0.39-67 → 3.0.39-69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.39-67",
+  "version": "3.0.39-69",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/rejectInspecCheck.vue

@@ -127,6 +127,20 @@
                        v-model=model.f_address condition="f_address like '%{}%'"/>
               </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 :value.sync="model.check" v-model='model.check'
+                          :value-single="true"
+                          class="select_list select"
+                          :options='$parent.$parent.checkers'
+                          placeholder='安检员'
+                          close-on-select width="100%"></v-select>
+              </div>
+            </div>
             <div class="row text-center" style="margin-top: 20px;">
               <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
                       @click="$parent.$parent.selfSearch">查询
@@ -177,10 +191,6 @@
                           style="background-color:#499edf;float: right;margin-right:10px;"
                           @click="$parent.$parent.$parent.Handle(row)">处理
                   </button>
-                  <button type="button" name="button" class="btn btn-primary"
-                          style="background-color:#499edf;float: right;margin-right:10px;"
-                          @click="$parent.$parent.$parent.reassign(row)">转单
-                  </button>
                 </div>
               </div>
             </div>
@@ -188,28 +198,6 @@
         </div>
       </list>
     </criteria-paged>
-    <modal :show.sync="showModal" v-ref:modal :backdrop="false">
-      <div slot="modal-header" class="modal-header">
-        <h4 class="modal-title">
-          选择安检员
-        </h4>
-      </div>
-      <div slot="modal-body" class="modal-body">
-        <div class="col-xs-12">
-          <div class="col-xs-4">
-            <v-select :value.sync="check" v-model='check'
-                      :value-single="true"
-                      class="select_list select"
-                      :options='checkers' placeholder='安检员'
-                      close-on-select width="100%"></v-select>
-          </div>
-        </div>
-      </div>
-      <div slot="modal-footer" class="modal-footer">
-        <button  class="btn btn-default" @click="iscancel()">取消</button>
-        <button  class="btn btn-default" @click="manyisok()">确认</button>
-      </div>
-    </modal>
   </div>
 </template>
 <script>
@@ -235,12 +223,11 @@ export default {
   data() {
     return {
       checkers: [],
-      check: '',
       showModal: false,
       f_filialeids: '',
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidGetcheckpaper`, 20, {
         condition: 'this.condition',
-        f_filialeids: `'${Vue.user.orgid}'`,
+        f_filialeid: `'${Vue.user.orgid}'`,
         f_checker_id: `'${Vue.user.id}'`
       }),
       criteriaShow: false,
@@ -270,7 +257,13 @@ export default {
           condition += " and f_address like '%" + this.$refs.paged.$refs.cri.model.f_address + "%'"
         }
       }
-      condition += `and ( f_checker_name='${Vue.user.name}' and  f_checker_reciver is null) or  ( f_checker_reciver='${Vue.user.name}' and f_checker_name!='${Vue.user.name}') `
+      if (this.$refs.paged.$refs.cri.model.check) {
+        if (this.$refs.paged.$refs.cri.model.check.toString().trim()) {
+          condition += " and f_checker_name like '%" + this.$refs.paged.$refs.cri.model.check + "%'"
+        }
+      }else{
+        condition += " and f_checker_name like '%" + Vue.user.name+ "%'"
+      }
       this.model.search(condition)
     },
     hidden() {
@@ -281,10 +274,14 @@ export default {
       if (row.f_userinfo_code) {
         let http = new HttpResetClass()
         http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, {data: {condition: "f_userinfo_code= '" + row.f_userinfo_code + "'",
-            groupitem:'', orderitem: 'f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room', f_check_type: '',f_filialeid:Vue.user.orgid,
+            groupitem:'', orderitem: 'f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room', f_check_type: '',f_filialeid:'',
             f_user_name: '', myCycle: '', fyCycle: '', f_user_type: '', f_sign: '', f_residential_area: '', f_address: '', f_user_state: '', f_orgids: '', f_unit: '', f_building: ''
           }}).then(
           (res) => {
+            if(res.data.length==0){
+              this.$showMessage('未查询到当前用户档案信息')
+              return
+            }
             let info = res.data[0]
             info.id = ''
             info.f_state = '未检'

package/src/filiale/BFshiye/pc.js

@@ -6,9 +6,9 @@ let specialComp = {
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper.vue'], resolve) },
   'check-plan-area-list': (resolve) => { require(['./pc/CheckPlanAreaList.vue'], resolve) },
-  'check-plan': (resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
-  'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
-  'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew.vue'], resolve) },
+  // 'check-plan': (resolve) => { require(['./pc/CheckPlan.vue'], resolve) },
+  // 'select-check-plan': (resolve) => { require(['./pc/SelectCheckPlan'], resolve) },
+  // 'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew.vue'], resolve) },
 }
 exports.specialComp = specialComp