safecheck-client 3.0.34-6 → 3.0.34-61

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

@@ -6,6 +6,8 @@
           <div class="row">
             <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
@@ -223,8 +225,9 @@
           condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
         }
         if (this.$refs.paged.$refs.cri.model.f_checker_id){
-          condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
-          condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+          debugger
+          condition3 += ` AND f_checker in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
+          condition2 += ` AND f_checker_name in ${this.$refs.paged.$refs.cri.model.f_checker_id} `
         }
         this.model.f_start_time=this.f_start_time
         this.model.f_end_time=this.f_end_time

package/src/filiale/tongchuan/utils/EventListener.js

@@ -0,0 +1,29 @@
+const EventListener = {
+  /**
+   * Listen to DOM events during the bubble phase.
+   *
+   * @param {DOMEventTarget} target DOM element to register listener on.
+   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
+   * @param {function} callback Callback function.
+   * @return {object} Object with a `remove` method.
+   */
+  listen(target, eventType, callback) {
+    if (target.addEventListener) {
+      target.addEventListener(eventType, callback, false)
+      return {
+        remove() {
+          target.removeEventListener(eventType, callback, false)
+        }
+      }
+    } else if (target.attachEvent) {
+      target.attachEvent('on' + eventType, callback)
+      return {
+        remove() {
+          target.detachEvent('on' + eventType, callback)
+        }
+      }
+    }
+  }
+}
+
+export default EventListener

package/src/filiale/tongchuan/utils/coerceBoolean.js

@@ -0,0 +1,7 @@
+// Attempt to convert a string value to a Boolean. Otherwise, return the value
+// without modification so Vue can throw a warning.
+export default (val) => (typeof val !== "string" ? val :
+  val === "true" ? true :
+  val === "false" ? false :
+  val === "null" ? false :
+  val === "undefined" ? false : val)

package/src/filiale/weinan/android/SafecheckDevices.vue

@@ -997,7 +997,7 @@ export default {
         f_repair_department: this.config[this.device.device].items[item].repairDepartment ? this.config[this.device.device].items[item].repairDepartment : '',
         f_deal_dispose: this.config[this.device.device].items[item].dealDispose ? this.config[this.device.device].items[item].dealDispose : '',
         f_handle_date: '',
-        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : false,
+        f_block_pitfall: this.config[this.device.device].items[item].blockPitfall ? this.config[this.device.device].items[item].blockPitfall : '否',
         f_lose_efficacy: this.config[this.device.device].items[item].loseEfficacy ? this.config[this.device.device].items[item].loseEfficacy : '',
         isshow: this.config[this.device.device].items[item].isshow == false ? this.config[this.device.device].items[item].isshow : true,
         readonly: this.config[this.device.device].items[item].readonly == true ? true : false,

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

@@ -1082,7 +1082,7 @@ export default {
         let msg = ''
         for (let a = 0; a < checkResults.data.length; a++) {
           for (let datumKey in checkResults.data[a]) {
-            msg += datumKey + ':' + checkResults.data[a][datumKey] + ';'
+            msg += datumKey + ','
           }
         }
         this.data.f_defect_text = msg