safecheck-client 3.0.34-55 → 3.0.34-57

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

@@ -6,12 +6,14 @@
           <div class="row">
             <div class="col-sm-4 form-group">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
             <div class="col-sm-2 form-group">

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

@@ -74,12 +74,14 @@
             </div>
             <div :class="$parent.$parent.style2" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&nbsp;检&nbsp;员&nbsp;"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
 
@@ -222,12 +224,14 @@
 
             <div :class="$parent.$parent.style2" style="margin: 0">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&nbsp;检&nbsp;员&nbsp;"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
           </div>

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

@@ -6,12 +6,14 @@
           <div class="row">
             <div class="col-sm-4 form-group">
               <role-selector-safe
+                :value-multiple="true"
+                :value-close="false"
                 role-name="安检员"
                 role-lable="安&ensp;检&ensp;员"
                 @re-res="$parent.$parent.getRes"
                 :value.sync="model.f_checker_id"
                 v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
+                condition="f_checker_name in {}">
               </role-selector-safe>
             </div>
             <div class="col-sm-2 form-group">

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

@@ -549,11 +549,6 @@ export default {
   },
   methods: {
     devicesCollect() {
-      //tag
-      //tag)
-      //tag)
-      //tag
-
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
@@ -577,26 +572,22 @@ export default {
               if ((items.type === 'selector' || items.type === 'radio' || items.type === 'checkbox') && items.f_item_value != null && items.f_item_value instanceof Array) {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
-
-                  //tag)
-                  //tag)
-                  //tag)
-                  //tag)
-                  if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]) {
-                    continue
-                  }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  for (let option in options) {
-                    if (options[option].data == f_item_value) {
-                      if (options[option].isdefect == 'true' || options[option].isdefect == true) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects = `${defects}:${options[option].data}/`
-                        // let level = options[option].level
+                  for (let j = 0; j < this.config[this.data[device][item].f_device_type].items.length; j++) {
+                    if(this.config[this.data[device][item].f_device_type].items[j].lname===items.f_item_name){
+                      if(this.config[this.data[device][item].f_device_type].items[j].options){
+                        let options = this.config[this.data[device][item].f_device_type].items[j].options
+                        for (let option in options) {
+                          if (options[option].data === f_item_value) {
+                            if (options[option].isdefect === 'true' || options[option].isdefect === true) {
+                              checkResult = '有隐患'
+                              this.result = '有隐患'
+                              defects = `${defects}:${options[option].data}/`
+                            }
+                          }
+                        }
                       }
                     }
                   }
-                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)