safecheck-client 3.0.33-13 → 3.0.33-132

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

@@ -1552,98 +1552,63 @@ export default {
         if (res.code == 200) {
           //tag
           if (!this.onlySave) {
-            let codata = this.getAllDefect()
-            //获取微信推送内容
-            // let WxResult = this.getWeixin(codata)
-            let haslivedispose = this.$androidUtil.bzLogic('getLiveDispose', {
-              f_check_item_id: this.data.f_check_item_id
-            })
-            //如果是转维修上传，则不做校验，上传完成后自动转维修
-            //tag
-            //tag
-            if (!this.isToRepair) {
-              if (haslivedispose.data.length > 0 && (this.livedispose == 'true' || this.livedispose == true)) {
-                //tag
-                //tag
-                if (!this.isSafeCheckToRepair) {
-
-                }
+            let day = this.$appdata.getSingleValue('到访不遇间隔限制') || 7
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+              data: {
+                items: 'count(0) as num',
+                tablename: 't_check_paper',
+                condition: `f_userinfoid = '${this.item.f_userinfoid}' and f_entry_status = '到访不遇' and f_offsite_time BETWEEN DATEADD(DAY, ${day * -1}, GETDATE()) AND GETDATE()`,
+                orderitem: '1'
               }
-            }
-            //tag
-            for (let key in codata) {
-              if (key.startsWith("device")) {
-                codata[key] = []
+            }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+              if (this.data.f_entry_status != '到访不遇' || res.data[0].num == 0){
+                let codata = this.getAllDefect()
+                let haslivedispose = this.$androidUtil.bzLogic('getLiveDispose', {
+                  f_check_item_id: this.data.f_check_item_id
+                })
+                for (let key in codata) {
+                  if (key.startsWith("device")) {
+                    codata[key] = []
+                  }
+                }
+                codata.f_devices = this.f_devices
+                if (this.rowCodata && this.rowCodata.istoRepair == '转维修') {
+                  this.rowCodata = Object.assign({}, this.rowCodata, codata)
+                } else {
+                  this.rowCodata = codata
+                }
+                let param = {
+                  f_check_item_id: this.data.f_check_item_id,
+                  f_checker_id: this.data.f_checker_id,
+                  row: this.rowCodata
+                }
+                let paramStr = JSON.stringify(param)
+                let subLength = 800
+                for (let i = 0; i < paramStr.length; i += subLength) {
+                  HostApp.param_cache(paramStr.substr(i, subLength))
+                }
+                HostApp.__this__ = this
+                HostApp.syncLogic({
+                  'logic': '上传安检信息',
+                  'callback': 'javascript:HostApp.__this__.uploadCallBack()',
+                  'backresult': 1
+                })
+              }else {
+                this.$showMessage('距上次到访不遇时间不足七天，请核实后重新上传')
               }
-            }
-            //tag}`)
-
-            //tag
-            // let isStart = true
-            // let res
-            // for (let i in this.f_devices){
-            //   res = HostApp.organizeJSON({isStart:isStart,isDevice:true,device:this.f_devices[i]})
-            //   if(res.code == 200){
-            //     isStart = false
-            //   }else{
-            //     this.$showMessage("上传失败!")
-            //     return
-            //   }
-            // }
-            // let result = HostApp.organizeJSON({
-            //   isStart:false,
-            //   isJSON:true,
-            //   jsonstr:{
-            //     f_check_item_id: this.data.f_check_item_id,
-            //     f_checker_id: this.data.f_checker_id,
-            //     row: codata
-            //   }
-            // })
-            codata.f_devices = this.f_devices
-            if (this.rowCodata && this.rowCodata.istoRepair == '转维修') {
-              this.rowCodata = Object.assign({}, this.rowCodata, codata)
-            } else {
-              this.rowCodata = codata
-            }
-            let param = {
-              f_check_item_id: this.data.f_check_item_id,
-              f_checker_id: this.data.f_checker_id,
-              // row: codata
-              row: this.rowCodata
-            }
-            //tag)
-            let paramStr = JSON.stringify(param)
-            // 多长截断一次
-            let subLength = 800
-            for (let i = 0; i < paramStr.length; i += subLength) {
-              HostApp.param_cache(paramStr.substr(i, subLength))
-            }
-            HostApp.__this__ = this
-            HostApp.syncLogic({
-              // logic别名，key必须为logic
-              'logic': '上传安检信息',
-              // 回调执行方法名，key必须为callback
-              'callback': 'javascript:HostApp.__this__.uploadCallBack()',
-              // 固定key，代表是否将logic执行结果作为参数传入回调方法，1代表true，0代表false，
-              // 执行回调方法传入key为backresult
-              // 如需额外拼接参数，写在logic返回值的params，例如xxlogic返回:{"params": "success"}
-              'backresult': 1
             })
           } else {
             this.$showMessage('保存成功！')
             if (this.clickBack) {
               this.isStrat = false
               this.$dispatch('confirm')
-              //this.$back()
             }
           }
         } else {
           this.$showMessage('保存失败！')
-          return
         }
       } else {
         this.$showMessage('服务器内部错误,保存失败！')
-        return
       }
     },
     uploadCallBack(jo) {
@@ -2080,74 +2045,74 @@ export default {
                   ]
                 })
               } else if (this.devices[de].device == "燃气表") {
-                  this.data['device' + this.devices[de].n].push({
-                    f_device_type: "燃气表",
-                    f_items: [
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "基表编号",
-                        f_item_value: this.item.f_plan_meters[i].f_meter_no,
-                        f_path: "",
-                        type: "number"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "气表型号",
-                        f_item_value: this.item.f_plan_meters[i].f_diaphgram_size,
-                        f_path: "",
-                        type: "string"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "气表品牌",
-                        f_item_value: this.item.f_plan_meters[i].f_aliasname,
-                        f_path: "",
-                        type: "string"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "进气方向",
-                        f_item_value: this.item.f_plan_meters[i].f_flow_direction,
-                        f_path: "",
-                        type: "string"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "上期表读数",
-                        f_item_value: this.item.f_plan_meters[i].f_prior_reading,
-                        f_path: "",
-                        type: "number"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "表箱号",
-                        f_item_value: this.item.f_plan_meters[i].f_metertitles,
-                        f_path: "",
-                        type: "string"
-                      },
-                      {
-                        f_defect_level: null,
-                        f_device_id: "",
-                        f_is_defect: "",
-                        f_item_name: "系统表底数",
-                        f_item_value: this.item.f_plan_meters[i].f_meter_base,
-                        f_path: "",
-                        type: "string"
-                      }
-                    ]
-                  })
+                this.data['device' + this.devices[de].n].push({
+                  f_device_type: "燃气表",
+                  f_items: [
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "基表编号",
+                      f_item_value: this.item.f_plan_meters[i].f_meter_no,
+                      f_path: "",
+                      type: "number"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "气表型号",
+                      f_item_value: this.item.f_plan_meters[i].f_diaphgram_size,
+                      f_path: "",
+                      type: "string"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "气表品牌",
+                      f_item_value: this.item.f_plan_meters[i].f_aliasname,
+                      f_path: "",
+                      type: "string"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "进气方向",
+                      f_item_value: this.item.f_plan_meters[i].f_flow_direction,
+                      f_path: "",
+                      type: "string"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "上期表读数",
+                      f_item_value: this.item.f_plan_meters[i].f_prior_reading,
+                      f_path: "",
+                      type: "number"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "表箱号",
+                      f_item_value: this.item.f_plan_meters[i].f_metertitles,
+                      f_path: "",
+                      type: "string"
+                    },
+                    {
+                      f_defect_level: null,
+                      f_device_id: "",
+                      f_is_defect: "",
+                      f_item_name: "系统表底数",
+                      f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                      f_path: "",
+                      type: "string"
+                    }
+                  ]
+                })
               }
               if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
                 this.data['device' + this.devices[de].n].forEach(device => {
@@ -2164,123 +2129,123 @@ export default {
                   if (this.item.f_plan_meters[i].f_collection_type == '按金额') {
                     if (this.item.f_plan_meters[i].f_meter_type.indexOf('物联网') !==-1 ){
                       if (!this.data.f_collection_type) {
-                      this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                      delete this.config['燃气表']['items']['累购气量']
-                      delete this.config['燃气表']['items']['已用金额']
-                      delete this.config['燃气表']['items']['剩余气量']
-                      delete this.config['燃气表']['items']['气量异常差值']
-                      device.f_items.push(
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "初始表底",
-                          isshow: false,
-                          f_item_value: '',
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "累购金额",
-                          f_item_value: this.item.f_plan_meters[i].f_total_fee,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "已用气量",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "剩余金额",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "金额异常差值",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        }
-                      )
-                      //tag)
-                    }
+                        this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
+                        delete this.config['燃气表']['items']['累购气量']
+                        delete this.config['燃气表']['items']['已用金额']
+                        delete this.config['燃气表']['items']['剩余气量']
+                        delete this.config['燃气表']['items']['气量异常差值']
+                        device.f_items.push(
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "初始表底",
+                            isshow: false,
+                            f_item_value: '',
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "累购金额",
+                            f_item_value: this.item.f_plan_meters[i].f_total_fee,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "已用气量",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "剩余金额",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "金额异常差值",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          }
+                        )
+                        //tag)
+                      }
                     }
                     else {
                       if (!this.data.f_collection_type) {
-                      this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
-                      delete this.config['燃气表']['items']['累购气量']
-                      delete this.config['燃气表']['items']['已用气量']
-                      delete this.config['燃气表']['items']['剩余气量']
-                      delete this.config['燃气表']['items']['气量异常差值']
-                      device.f_items.push(
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "初始表底",
-                          isshow: false,
-                          f_item_value: '',
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "累购金额",
-                          f_item_value: this.item.f_plan_meters[i].f_total_fee,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "已用金额",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "剩余金额",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        },
-                        {
-                          f_defect_level: null,
-                          f_device_id: "",
-                          f_is_defect: "",
-                          f_item_name: "金额异常差值",
-                          f_item_value: null,
-                          f_path: "",
-                          type: "number"
-                        }
-                      )
-                      //tag)
-                    }
+                        this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
+                        delete this.config['燃气表']['items']['累购气量']
+                        delete this.config['燃气表']['items']['已用气量']
+                        delete this.config['燃气表']['items']['剩余气量']
+                        delete this.config['燃气表']['items']['气量异常差值']
+                        device.f_items.push(
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "初始表底",
+                            isshow: false,
+                            f_item_value: '',
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "累购金额",
+                            f_item_value: this.item.f_plan_meters[i].f_total_fee,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "已用金额",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "剩余金额",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          },
+                          {
+                            f_defect_level: null,
+                            f_device_id: "",
+                            f_is_defect: "",
+                            f_item_name: "金额异常差值",
+                            f_item_value: null,
+                            f_path: "",
+                            type: "number"
+                          }
+                        )
+                        //tag)
+                      }
                     }
                   }
                   else if (this.item.f_plan_meters[i].f_collection_type == '按气量') {
-                      if (!this.data.f_collection_type) {
+                    if (!this.data.f_collection_type) {
                       this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
                       delete this.config['燃气表']['items']['累购金额']
                       delete this.config['燃气表']['items']['已用金额']

package/src/filiale/yongzhou/pc/CheckPlan.vue

@@ -0,0 +1,59 @@
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+<!--    <section>-->
+
+    <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
+          <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
+        </div>
+    <div  class="binary-right" v-show="showItem">
+      <div class="flex">
+          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
+                        v-ref:detail></check-detail>
+        </div>
+    </div>
+
+<!--    </section>-->
+  </div>
+</template>
+
+<script>
+    import SelectCheckPlan from './SelectCheckPlan'
+    import CheckDetail from './../../../components/checkplan/CheckDetail'
+
+    export default {
+        title: '安检员考核',
+        props: ['f'],
+        components: {SelectCheckPlan, CheckDetail},
+        data() {
+            return {
+                showItem: false,
+                checkstatus: null,
+              style:'col-sm-2 form-group',
+              style2:'col-sm-4 form-group'
+            }
+        },
+        methods: {
+          selected(row) {
+            // //tag
+            this.showItem = true
+          },
+          checkstatusChange(val){
+            this.checkstatus = val
+          }
+        }
+    }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+    padding: 5px 7px 5px 7px;
+    border-radius: 10px;
+  }
+</style>

package/src/filiale/yongzhou/pc/CheckSearchUser.vue

@@ -197,7 +197,7 @@
                      style="width: 60%" placeholder="距上次安检天数" >
             </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">到访不遇次数</label>
+              <label class="font_normal_body">到访次数</label>
               <input type="number" class="input_search" v-model="model.f_check_version"
                      style="width: 60%" placeholder="到访不遇次数">
             </div>