safecheck-client 3.0.39-6 → 3.0.39-60

package/src/filiale/wenxi/pc/PaperList.vue

@@ -17,9 +17,14 @@
                        style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">客户电话</label>
-                <input type="text" class="input_search" v-model="model.f_user_phone"
-                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+
+                <label class="font_normal_body">客户类型</label>
+                <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
+                          :value-single="true" style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.check_types' placeholder='客户类型'
+                          close-on-select
+                          condition="f_check_type = '{}'"></v-select>
               </div>
               <div class="form-group col-sm-2">
                 <label class="font_normal_body">小&emsp;&emsp;区</label>
@@ -621,6 +626,7 @@ export default {
       f_entry_status: [{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')],
       user_states:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')],
       safecheck_type:[{label: '全部', value: ''}, ...this.$appdata.getParam('安检类型')],
+      check_types:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
       f_checkplans: this.$appdata.getParam('有无计划'),
       showcheckmsg: false,
       checkInfo: {},

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

@@ -1530,7 +1530,7 @@ export default {
       //tag
       // this.data.f_noplan_item_id =  this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()+""+this.S4()
       this.data.ename = Vue.user.ename
-      this.data.f_noanswers_path = []
+      // this.data.f_noanswers_path = []
       this.data.f_outlets = Vue.user.f_parentname
       this.data.f_meetunit = Vue.user.orgpathnames
       this.data.orgpathstr = Vue.user.orgpathstr

package/src/filiale/wuan/android/SafecheckUserInfo.vue

@@ -365,9 +365,8 @@ export default {
     },
     cameraCallBack(prop, fileName) {
       if (prop == 'f_noanswers_path') {
-        let f_noanswer_path = fileName + '?' + Math.random()
         HostApp.__this__.f_noanswers_path.push({
-          f_noanswer_path: f_noanswer_path
+          f_noanswer_path: fileName
         })
       } else {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())
@@ -404,12 +403,17 @@ export default {
         }
       })
     },
-    delfile(prop, fileName) {
-      if (fileName == Vue.nopic)
+    delfile (prop, fileName, index) {
+      if (fileName == Vue.nopic) {
         return
-      else {
-        HostApp.delfile(fileName)
-        this[prop] = Vue.nopic
+      } else {
+        if (prop == 'f_noanswers_path') {
+          this.f_noanswers_path.splice(index, 1)
+          HostApp.delfile(fileName)
+        } else {
+          HostApp.delfile(fileName)
+          this[prop] = Vue.nopic
+        }
       }
     },
     setEntryClass(val) {
@@ -503,7 +507,7 @@ export default {
         this.$set('f_rejectcheck_path', '')
 
       this.$watch('f_noanswers_path.length', () => {
-        for (let i = 0; i < 3; i++) {
+        for (let i = 0; i < 2; i++) {
           if (this.f_noanswers_path[i] && this.f_noanswers_path[i].f_noanswer_path) {
             //tag)
             if (i == 0) {

package/src/filiale/yangchunboneng/android/AndiroidSecurityAudit.vue

@@ -174,7 +174,7 @@ export default {
     },
     Nochange(row){
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/NoSecurityPass`, {
-        f_plan_id: row.f_plan_id,
+        id: row.itemid,
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         this.search()
       })
@@ -183,6 +183,7 @@ export default {
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/SecurityPass`, {
         f_newplan_id: row.f_newplan_id,
         f_plan_id: row.f_plan_id,
+        id:row.itemid
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
         this.search()
       })