safecheck-client 4.0.2-6 → 4.0.2-60

package/src/filiale/taiyuan/android.js

@@ -8,6 +8,7 @@ let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'PhoneUpUserinfo': (resolve) => { require(['./android/PhoneUpUserinfo'], resolve) },
   'area-plan': (resolve) => { require(['./android/AreaPlan.vue'], resolve) },
+  'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices.vue'], resolve) },
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) }
 }
 

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

@@ -68,8 +68,8 @@
                 </datepicker>
               </div>
 
-              <div style="float: left;width:60%" class="form-group" v-if="!show && row.type == 'number'" v-show="row.isshow">
-                <input type="text" class="form-control" maxlength="100" v-model="row.f_item_value"  onkeyup="value=value.replace(/[^\d\.]/g,'')" :readonly="row.readonly">
+              <div style="float: left;width:60%" class="form-group" v-if="row.type == 'number'" v-show="row.isshow">
+                <input type="number" class="form-control" maxlength="100" v-model="row.f_item_value"  :readonly="row.readonly">
               </div>
               <!--<input type="text" class="form-control" v-model="row.f_content" v-if="!show && row.type == 'string' && row.f_project != '表号'" :disabled="(!(ischecked == '有')) || issee" :readonly="issee">-->
               <!--<input type="text" class="form-control" v-model="meternum" v-if="!show && row.type == 'string' && row.f_project == '表号' " :disabled="(!(ischecked == '有')) || issee" :readonly="issee" >-->

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

@@ -1812,7 +1812,7 @@ export default {
                       f_device_id: "",
                       f_is_defect: "",
                       f_item_name: "是否自闭阀",
-                      f_item_value: this.item.f_plan_meters[i].f_whether_zbf,
+                      f_item_value: "是",
                       f_path: "",
                       type: "selector"
                     },
@@ -1893,7 +1893,7 @@ export default {
                       f_device_id: "",
                       f_is_defect: "",
                       f_item_name: "是否自闭阀",
-                      f_item_value: this.item.f_plan_meters[i].f_whether_zbf,
+                      f_item_value: "是",
                       f_path: "",
                       type: "selector"
                     },
@@ -1960,6 +1960,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_meter_base,
                           f_path: "",
                           type: "number"
@@ -1969,6 +1970,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "液晶总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                           f_path: "",
                           type: "number"
@@ -2063,6 +2065,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           isshow: true,
                           f_item_value: '',
                           f_path: "",
@@ -2171,6 +2174,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "机械数总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_meter_base,
                           f_path: "",
                           type: "number"
@@ -2180,6 +2184,7 @@ export default {
                           f_device_id: "",
                           f_is_defect: "",
                           f_item_name: "液晶总用量（方）",
+                          checkmust: true,
                           f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                           f_path: "",
                           type: "number"
@@ -2282,6 +2287,7 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "机械数总用量（方）",
+                        checkmust: true,
                         f_item_value: this.item.f_plan_meters[i].f_meter_base,
                         f_path: "",
                         type: "number"
@@ -2291,6 +2297,7 @@ export default {
                         f_device_id: "",
                         f_is_defect: "",
                         f_item_name: "液晶总用量（方）",
+                        checkmust: true,
                         f_item_value: this.item.f_plan_meters[i].f_total_lcd,
                         f_path: "",
                         type: "number"

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

@@ -635,44 +635,20 @@ export default {
             for (let i in this.data[device][item].f_items) {
               let defects = ''
               let items = this.data[device][item].f_items[i]
-              console.log('items.f_item_name', items.f_item_name)
-              console.log('items', items)
-
+              if (!this.item.f_defect_content.includes(items.f_item_name)){
+                continue
+              }
               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] && (items.isdefect && (items.isdefect=='true' || items.isdefect==true))) {
                     continue
                   }
-                  // if(items.f_is_defect != true && items.f_is_defect != 'true'){
-                  //   continue
-                  // }
                   if (items.f_is_defect == 'true' || items.f_is_defect == true) {
                     checkResult = '有隐患'
                     this.result = '有隐患'
                     defects = `${defects}:${f_item_value}/`
                   }
-                  // let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  // if(items.f_item_name == '是否开放式厨房') {
-                  //   console.log('是否开放式厨房', options)
-                  //   console.log('f_item_value', f_item_value)
-                  // }
-                  // for (let option in options) {
-                  //   if (options[option].data == f_item_value) {
-                  //     if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
-                  //       checkResult = '有隐患'
-                  //       this.result = '有隐患'
-                  //       defects = `${defects}:${options[option].data}/`
-                  //       // let level = options[option].level
-                  //     }
-                  //   }
-                  // }
-                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -752,14 +728,6 @@ export default {
         }
       }
       this.ajresult = JSON.parse(this.data.f_defect_content).result
-      if (this.deviceCollects.length > 0) {
-        this.hasDevice = true
-        for (let i = 0; i < this.deviceCollects.length; i++) {
-          if(this.deviceCollects[i].value==='有隐患'){
-            this.ajresult='有隐患'
-          }
-        }
-      }
       this.showimg3 = this.data.f_noanswer_path
       this.showimg4 = this.data.f_rejectcheck_path
       this.paperdata = this.data
@@ -870,23 +838,26 @@ export default {
       }
     },
     isred(val1, val2) {
-      //tag
       let f_is_defect = false
-      for (let i = 0; i < this.devicesAll.length; i++) {
-        for (let j = 0; j < this.devicesAll[i].length; j++) {
-          if (this.devicesAll[i][j].f_device_type == val1) {
-            for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
-              if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
-                if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
-                  f_is_defect =  false
-                } else {
-                  f_is_defect =  true
+      if (this.item.f_defect_content.includes(val2)){
+        for (let i = 0; i < this.devicesAll.length; i++) {
+          for (let j = 0; j < this.devicesAll[i].length; j++) {
+            if (this.devicesAll[i][j].f_device_type == val1) {
+              for (let k = 0; k < this.devicesAll[i][j].f_items.length; k++) {
+                if (this.devicesAll[i][j].f_items[k].f_item_name == val2) {
+                  if (!this.devicesAll[i][j].f_items[k].f_is_defect) {
+                    f_is_defect =  false
+                  } else {
+                    f_is_defect =  true
+                  }
                 }
               }
-            }
 
+            }
           }
         }
+      }else {
+        f_is_defect =  false
       }
       // console.log("333",val2)
       if(this.level1.findIndex(item=>item == val2)!=-1 && f_is_defect){