safecheck-client 3.0.34-9 → 3.0.34-90

package/src/filiale/yangchunboneng/pc/PaperDefectMain.vue

@@ -32,7 +32,7 @@
                               progress="safeGetExportProgress"
                               sqlurl="rs/logic/SafeExportExcel" sql-name="defectDetails" template-name='安检隐患明细'></export-excel-safe>
                 <button class="button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
-                <button class="button_search"  @click="$parent.$parent.toRepair" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
+                <button class="button_search"  @click="$parent.$parent.toRepair">转维修</button>
                 <button class="button_search" @click="search()">查询</button>
                 <div class="button_spacing"
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -170,10 +170,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">通气开始</label>
+                <label class="font_normal_body">首次通气开始</label>
                 <datepicker
                   :value.sync="model.f_gas_start"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='首次通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -182,10 +182,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">通气结束</label>
+                <label class="font_normal_body">首次通气结束</label>
                 <datepicker
                   :value.sync="model.f_gas_end"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='首次通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -193,6 +193,20 @@
                   condition="f_uservent_date <=  '{} 23:59:59'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">回访状态</label>
+                <v-select :value.sync="model.f_is_visit"
+                          v-model='model.f_is_visit'
+                          style="width: 60%"
+                          class="select_list select"
+                          :options='$parent.$parent.is_visits' placeholder='请选择'
+                          close-on-select :value-single="true"></v-select>
+              </div>
+              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">回访备注</label>
+                <input type="text" class="input_search" v-model="model.f_bz"
+                       style="width: 60%" placeholder="回访备注" condition="f_bz like '%{}%'">
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal>
               <div slot="modal-header" class="modal-header">
@@ -213,7 +227,9 @@
         <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' v-ref:grid>
           <template partial='head'>
             <tr>
-              <th v-if="$parent.$parent.$parent.canToRepair=='是'"><nobr>选择</nobr></th>
+              <th>
+                <nobr><input type="checkbox" v-model="$parent.$parent.$parent.selectAll"></input>全选</nobr>
+              </th>
               <th>
                 <nobr>检查项</nobr>
               </th>
@@ -239,7 +255,7 @@
                 <data-order field="f_address" name="客户地址"></data-order>
               </th>
               <th>
-                <nobr>通气时间</nobr>
+                <nobr>首次通气时间</nobr>
               </th>
               <th>
                 <data-order field="f_offsite_time" name="安检时间"></data-order>
@@ -268,10 +284,19 @@
               <th>
                 <nobr>接收人</nobr>
               </th>
+              <th>
+                <nobr>回访状态</nobr>
+              </th>
+              <th>
+                <nobr>回访备注</nobr>
+              </th>
+              <th>
+                <nobr>回访</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
-            <td v-if="$parent.$parent.$parent.canToRepair=='是'" style="text-align: center;white-space:nowrap;"><input type="checkbox" v-if="['用户自行整改', '现场已处理', '维修已处理', '转维修'].indexOf(row.f_is_repaired) == -1" @click="$event.cancelBubble=true" :checked="$parent.$parent.$parent.isChecked(row)" @change="$parent.$parent.$parent.setCheckes(row)"></input></td>
+            <td style="text-align: center;white-space:nowrap;"><input type="checkbox" v-if="['用户自行整改', '现场已处理', '维修已处理', '转维修'].indexOf(row.f_is_repaired) == -1" @click="$event.cancelBubble=true" :checked="$parent.$parent.$parent.isChecked(row)" @change="$parent.$parent.$parent.setCheckes(row)"></input></td>
             <td style="text-align: center">{{row.f_device_type}}</td>
             <td style="text-align: center">{{row.f_item_name}}/{{row.f_item_value}}</td>
             <td style="text-align: center">{{row.f_defect_level}}</td>
@@ -291,6 +316,11 @@
             <td style="text-align: center">{{row.f_service_id}}</td>
             <td style="text-align: center">{{row.f_handlingtype}}</td>
             <td style="text-align: center">{{row.f_order_man}}</td>
+            <td style="text-align: center">{{row.f_is_visit}}</td>
+            <td style="text-align: center">{{row.f_bz}}</td>
+            <td style="text-align: center">
+              <button-link v-if="row.f_is_repaired == '用户自行整改'" type="button" class="btn btn-link" @click="$parent.$parent.$parent.playWav(row.f_user_phone, row)">回访
+            </button-link></td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -412,6 +442,15 @@
           <button class="button_search" @click="cancelsolveDefect">取消</button>
         </div>
       </modal>
+      <modal :show.sync="showVisit" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <safe-visit-info v-if="showVisit" :row="visitrow" :phone="wavflie" @show-obj="watchShow"></safe-visit-info>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
     </div>
   </div>
 </template>
@@ -487,9 +526,13 @@
       model.f_check_type=''
       model.f_filialeid = `('${this.$login.f.orgid}')`
       return {
+        showVisit: false,
+        visitrow: {},
+        wavflie: '',
         audioshow:false,
-
+        selectAll:false,
         model: model,
+        is_visits:[{label:'全部',value:''},{label:'已回访',value:'已回访'},{label:'未回访',value:'未回访'}],
         deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'}],
         repairStateOptions: this.getSafeParam('隐患状态'),
         //searchData:searchData,
@@ -501,7 +544,7 @@
           'f_user_phone': '客户电话',
           'f_residential_area': '小区',
           'f_address': '客户地址',
-          'f_uservent_date': '通气时间',
+          'f_uservent_date': '首次通气时间',
           'f_offsite_time': '安检时间',
           'f_checker_name': '安检员',
           'f_deal_dispose': '处理方式',
@@ -562,7 +605,31 @@
         return {condition: this.model.condition}
       }
     },
+    watch:{
+      'selectAll'(val){
+        if(!val){
+          this.checkes=[]
+        }else {
+          this.checkes=[]
+          for (let row of this.model.rows){
+            if (['用户自行整改', '现场已处理', '维修已处理', '转维修'].indexOf(row.f_is_repaired) == -1){
+              this.checkes.push(row)
+            }
+          }
+        }
+      }
+    },
     methods: {
+      watchShow() {
+        this.visitrow = {}
+        this.showVisit = false
+        this.selfSearch()
+      },
+      playWav(val, val2) {
+        this.wavflie = val
+        this.visitrow = val2
+        this.showVisit = true
+      },
       isChecked(row) {
         return this.checkes.findIndex(item => item.f_defect_id == row.f_defect_id) != -1
       },
@@ -738,6 +805,7 @@
         this.showModal3=false
         this.cancel1()
         this.$showMessage('本次转维修成功'+successCount+'单')
+        this.$refs.paged.$refs.criteria.search()
       },
       getDefectInfoConfig(val){
         try {
@@ -922,6 +990,12 @@
       },
       selfSearch(args) {
         ////tag
+        this.selectAll = false
+        if (args.model.f_is_visit == '已回访'){
+          args.condition += ` and f_is_visit = '是'`
+        }else if (args.model.f_is_visit == '未回访'){
+          args.condition += ` and f_is_visit is null`
+        }
         args.condition += ` and f_filialeid in ${this.model.f_filialeid}`
         this.model.search(args.condition, args.model, args.condValue)
       },

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

@@ -242,10 +242,10 @@
                 </v-select>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">通气开始</label>
+                <label class="font_normal_body">首次通气开始</label>
                 <datepicker
                   :value.sync="model.f_gas_start"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='首次通气开始时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -254,10 +254,10 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
-                <label class="font_normal_body">通气结束</label>
+                <label class="font_normal_body">首次通气结束</label>
                 <datepicker
                   :value.sync="model.f_gas_end"
-                  placeholder='首次通气时间' style="width: 60%"
+                  placeholder='首次通气结束时间' style="width: 60%"
                   :disabled-days-of-week="[]"
                   :format="'yyyy-MM-dd'"
                   :show-rest-button="reset"
@@ -304,7 +304,7 @@
                 <nobr>客户地址</nobr>
               </th>
               <th>
-                <nobr>通气时间</nobr>
+                <nobr>首次通气时间</nobr>
               </th>
               <th>
                 <nobr>安检状态</nobr>
@@ -476,7 +476,7 @@ export default {
         'f_check_type': '客户类型',
         'f_residential_area': '小区',
         'f_address': '客户地址',
-        'f_uservent_date': '通气时间',
+        'f_uservent_date': '首次通气时间',
         'f_entry_status': '安检状态',
         'f_offsite_time': '安检时间',
         'f_checker_name': '安检员',

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

@@ -713,7 +713,6 @@ export default {
       //tag ===> ' + Math.abs(this.f_items[this.f_gas_aberrant_number.index].f_item_value))
       //tag ===> ' + JSON.stringify(Number(this.gasDeviation)))
       // 计算差值是否在范围内
-
       if (Math.abs(this.f_items[this.f_meter_aberrant_number2.index].f_item_value) > Number(this.gasDeviation)) {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
@@ -721,6 +720,17 @@ export default {
         this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
         this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
       }
+      if( this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true){
+        this.$showMessage(`表底数异常差值为:${this.f_items[this.f_meter_aberrant_number2.index].f_item_value},是否为隐患？`, ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = true
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = '未处理'
+          }else{
+            this.f_items[this.f_meter_aberrant_number2.index].f_is_defect = null
+            this.f_items[this.f_meter_aberrant_number2.index].f_deal_dispose = null
+          }
+        })
+      }
     },
 
     getGasAberrantNumber(val) {

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

@@ -689,8 +689,16 @@ export default {
                     deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
                   }
                 }
+              } else if (items.f_item_name === '表底数异常差值') {
+                var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
+                  if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                  }
+                }
               }
-
               //tag)
               //tag
               //tag
@@ -839,7 +847,7 @@ export default {
     },
     isred(val1, val2) {
       //tag
-      if (val2 == '气量异常差值' || val2 == '金额异常差值') {
+      if (val2 === '气量异常差值' || val2 === '金额异常差值') {
         return
       }
       for (let i = 0; i < this.devicesAll.length; i++) {

package/src/main-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.js

@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import { system } from 'system-clients'
+import safecheckAndroid from './safecheck-page'
+// import VueClipboard from 'vue-clipboard2'
+// Vue.use(VueClipboard)
+Vue.config.silent = true
+/** **************************通用组件******************************/
+all()
+// system(false,'shiquan')
+safecheckAndroid()
+// 打开热力系统登陆
+Vue.$heatCompatibility = false
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('system-clients/src/styles/less/aofeng/expandcss.less')
+Vue.component('load-data', (resolve) => { require(['./components/LoadData'], resolve) })
+// 测试
+// Vue.component('test', (resolve) => { require(['./components/Test'], resolve) });
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/main.js

@@ -1,33 +1,34 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('siyang')
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('siyang')
+// safecheck('jingyang');
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/safecheck-android.js

@@ -5,11 +5,19 @@ export default function (filiale) {
   // register check-paper asynchronosly
 // 登录
   Vue.component('android_login', (resolve) => { require(['./components/android/Login'], resolve) })
+  Vue.component('check-plan-select', (resolve) => { require(['./components/android/CheckPlanSelect'], resolve) })
+  Vue.component('area-select-safe', (resolve) => { require(['./components/android/AreaSelect'], resolve) })
+  Vue.component('userinfo-select', (resolve) => { require(['./components/android/UserinfoSelect'], resolve) })
+  Vue.component('building-select', (resolve) => { require(['./components/android/BuildingSelect'], resolve) })
+  Vue.component('user-examples', (resolve) => { require(['./components/android/examples/UserExamples'], resolve) })
+  Vue.component('safe-list-examples', (resolve) => { require(['./components/android/examples/SafeListExamples'], resolve) })
   Vue.component('img-self-android', (resolve) => {
     require(['./components/android/ImgSelfAndroid'], resolve)
   })
 // 安检员导航
   Vue.component('checker', (resolve) => { require(['./components/android/Checker'], resolve) })
+  Vue.component('qr-code-page', (resolve) => { require(['./components/android/QRCode/QRCodePage'], resolve) })
+  Vue.component('qr-code-binding', (resolve) => { require(['./components/android/QRCode/QRCodeBinding'], resolve) })
 // 维修员
   Vue.component('repairman', (resolve) => { require(['./components/android/Repairman'], resolve) })
 // 所长
@@ -127,6 +135,7 @@ export default function (filiale) {
   Vue.component('upload-page', (resolve) => { require(['./components/android/UploadPage'], resolve) })
 // 无计划安检
   Vue.component('add-plan-item', (resolve) => { require(['./components/android/AddPlanItem'], resolve) })
+  Vue.component('add-plan-item-yy', (resolve) => { require(['./components/android/AddPlanItemYy'], resolve) })
   // 在线复检
   Vue.component('reload-check', (resolve) => { require(['./components/android/recheck/Recheck'], resolve) })
   //记录查看
@@ -151,6 +160,7 @@ export default function (filiale) {
   Vue.component('device-item', (resolve) => { require(['./components/android/DevicesItem'], resolve) })
   // 临时安检计划
   Vue.component('current-create', (resolve) => { require(['./components/android/CurrentCreate'], resolve) })
+  Vue.component('current-create-yy', (resolve) => { require(['./components/android/CurrentCreateYy'], resolve) })
   // 安检待办---民用
   Vue.component('civil-current-create', (resolve) => { require(['./components/android/CivilCurrentCreate'], resolve) })
   // 安检待办---非民用
@@ -192,6 +202,7 @@ export default function (filiale) {
   // 安检用户信息查看
   Vue.component('safecheck-userinfo', (resolve) => { require(['./components/android/userinfo/SafecheckUserInfo'], resolve) })
   Vue.component('android-defect-deal', (resolve) => { require(['./components/android/AndroidDefectDeal'], resolve) })
+  Vue.component('android-defect-deal-before-safe', (resolve) => { require(['./components/android/AndroidDefectDealBeforeSafe'], resolve) })
   // 在线用户档案核对
    //Vue.component('user-safe-app', (resolve) => { require(['../examples/UserFiles/App'], resolve) })
   //手机报表查询

package/src/safecheck-page.js

@@ -0,0 +1,12 @@
+import Vue from 'vue'
+import { all } from 'vue-client'
+
+export default function (filiale) {
+  // register check-paper asynchronosly
+  Vue.component('user-examples', (resolve) => { require(['./components/android/examples/UserExamples'], resolve) })
+  Vue.component('safe-list-examples', (resolve) => { require(['./components/android/examples/SafeListExamples'], resolve) })
+  Vue.component('view-details-examples', (resolve) => { require(['./components/android/examples/ViewDetailsExamples.vue'], resolve) })
+  Vue.component('img-self-android', (resolve) => { require(['./components/android/ImgSelfAndroid'], resolve)
+  })
+}
+

package/src/safecheck.js

@@ -331,6 +331,9 @@ export default function (filiale) {
   Vue.component('repair-annual-detail', (resolve) => {
     require(['./components/task/RepairAnnualDetail'], resolve)
   })
+  Vue.component('safe-visit-info', (resolve) => {
+    require(['./components/pc/SafeVisitInfo'], resolve)
+  })
 // 月度任务追踪
   Vue.component('repair-monthly', (resolve) => {
     require(['./components/task/RepairMonthly'], resolve)