safecheck-client 4.0.1-7 → 4.0.1-70

package/src/components/pc/DefectDeal.vue

@@ -985,6 +985,7 @@
       selfSearch(args) {
         ////tag
         // args.condition += ` and f_is_repaired = '未处理'`
+        args.condition += ` and f_filialeid='${this.$login.f.orgid}'`
         this.model.search(args.condition, args.model, args.condValue)
       }
     },

package/src/components/pc/DefectMaterialLook.vue

@@ -0,0 +1,98 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">规格、型号</th>
+          <th class="textNoLineBreak">单价</th>
+          <th class="textNoLineBreak">数量</th>
+          <th class="textNoLineBreak">金额</th>
+          <th class="textNoLineBreak">操作人</th>
+          <th class="textNoLineBreak">操作时间</th>
+          <th class="textNoLineBreak">备注</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_typenumber}}</nobr>
+          </td>
+
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_price}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_fee}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_operator}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_date}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_remarks}}</nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  name: '隐患明细材料查看',
+  props: {
+    selectdata: {
+      type: Object
+    }
+  },
+  data () {
+    return {
+      onetomany: {
+        rows: []
+      }
+    }
+  },
+  ready(){
+    this.getOnetoManyData()
+  },
+  methods: {
+    /*获取工单收费添加的材料*/
+    async getOnetoManyData () {
+      let http = new HttpResetClass()
+      let data = {
+        items: '*',
+        tablename: 't_material_service',
+        condition: `f_process_id = '${this.selectdata.f_defect_id}'`,
+        orderitem: 'id'
+      }
+      http.load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: '获取数据失败'
+      }).then(res => {
+        this.onetomany.rows = res.data
+      })
+    }
+  },
+  events: {
+  },
+}
+
+</script>
+
+<style scoped>
+
+</style>

package/src/components/pc/PaperDefectMain.vue

@@ -258,6 +258,9 @@
               <th>
                 <nobr>接收人</nobr>
               </th>
+              <th v-if="$parent.$parent.$parent.canlook">
+                <nobr>材料明细</nobr>
+              </th>
             </tr>
           </template>
           <template partial='body'>
@@ -279,6 +282,9 @@
             <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 class="flex-around" v-if="$parent.$parent.$parent.canlook">
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.lookMateril(row)">查看材料</button>
+            </td>
           </template>
         </data-grid>
       </criteria-paged>
@@ -366,6 +372,16 @@
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
       </modal>
+      <modal :show.sync="showmaterial"  backdrop="false" style="overflow: scroll;height: 100%">
+        <header slot="modal-header" class="modal-header text-center">
+          <button type="button" class="close" @click="close2"><span>&times;</span></button>
+          <h4 class="modal-title">材料查看</h4>
+        </header>
+        <article slot="modal-body">
+          <defect-material-look v-if="showmaterial"  :selectdata = "selectdata" ></defect-material-look>
+        </article>
+        <footer slot="modal-footer"></footer>
+      </modal>
     </div>
   </div>
 </template>
@@ -423,7 +439,8 @@
       model.f_filialeid = `('${this.$login.f.orgid}')`
       return {
         audioshow:false,
-
+        showmaterial: false,
+        selectdata: {},
         model: model,
         deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'}],
         repairStateOptions: this.getSafeParam('隐患状态'),
@@ -477,6 +494,7 @@
         showModal3: false,
         progressbarWidth:'0',
         canToRepair: this.$appdata.getSingleValue('隐患明细转维修'),
+        canlook: this.$appdata.getSingleValue('隐患明细查看材料')?true:false,
         checkes: []
       }
     },
@@ -486,6 +504,13 @@
       }
     },
     methods: {
+      lookMateril(row){
+        this.selectdata=row
+        this.showmaterial=true
+      },
+      close2(){
+        this.showmaterial=false
+      },
       delConfigKey(obj){
         // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
         Object.keys(obj).forEach(key =>{

package/src/components/phonestate/MonthlyTraffic.vue

@@ -1,66 +1,66 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <div novalidate class="form-inline auto" partial>
-          <div class="form-group">
-            <label class="col-sm-12 control-label">选择年月：</label>
-            <div class="col-sm-12">
-              <datepicker placeholder="请选择年月"
-                :value.sync="$parent.$parent.model.f_ym"
-                :disabled-days-of-Week="[]"
-                :format="'yyyy-MM'">
-              </datepicker>
-              <button class="btn btn-default" @click="search()">查询</button>
-              <div class="form-group">
-                部门:
-                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
-              </div>
-              {{$parent.$parent.model.chosenOrg.fullname}}
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>手机使用者</th>
-            <th>流量Mb</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
-          <td>{{row.f_traffic}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-import { PagedList } from 'vue-client'
-import * as Util from '../Util'
-
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  data () {
-    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
-    model.f_ym = Util.toStandardYearMonth()
-    model.chosenOrg = {id:0}
-    return {
-      model: model,
-    }
-  },
-  methods: {
-    dailyTraffic (row) {
-      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
-    }
-  },
-  ready () {
-    this.model.f_loggedOnUserId = this.f.id
-    this.model.chosenOrg.id = this.f.parent.id
-    this.model.search()
-  }
-}
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <div novalidate class="form-inline auto" partial>
+          <div class="form-group">
+            <label class="col-sm-12 control-label">选择年月：</label>
+            <div class="col-sm-12">
+              <datepicker placeholder="请选择年月"
+                :value.sync="$parent.$parent.model.f_ym"
+                :disabled-days-of-Week="[]"
+                :format="'yyyy-MM'">
+              </datepicker>
+              <button class="btn btn-default" @click="search()">查询</button>
+              <div class="form-group">
+                部门:
+                <chooser :userid.sync='$parent.$parent.f.id' resource-type="organization" :width='200' :select-data.sync='$parent.$parent.model.chosenOrg'></chooser>
+              </div>
+              {{$parent.$parent.model.chosenOrg.fullname}}
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>手机使用者</th>
+            <th>流量Mb</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td v-on:click.stop.prevent='$parent.$parent.$parent.dailyTraffic(row)'>{{row.f_user_name}}&nbsp;&nbsp;&nbsp;&nbsp;<span class="glyphicon glyphicon-option-horizontal"></span></td>
+          <td>{{row.f_traffic}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { PagedList } from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  data () {
+    let model = new PagedList('rs/rcq/月度流量统计', 20, {f_loggedOnUserId: 'this.f_loggedOnUserId', f_loggedOnOrgId: 'this.chosenOrg.id', f_ym: 'this.f_ym'})
+    model.f_ym = Util.toStandardYearMonth()
+    model.chosenOrg = {id:0}
+    return {
+      model: model,
+    }
+  },
+  methods: {
+    dailyTraffic (row) {
+      this.$goto('daily-traffic', {f_userinfoid: row.f_userinfoid, f_user_name: row.f_user_name, f_ym: this.model.f_ym}, 'self')
+    }
+  },
+  ready () {
+    this.model.f_loggedOnUserId = this.f.id
+    this.model.chosenOrg.id = this.f.parent.id
+    this.model.search()
+  }
+}
+</script>

package/src/components/phonestate/MonthlyTrafficRouter.vue

@@ -1,15 +1,15 @@
-<template>
-  <div>
-    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '月流量统计',
-  props: ['f'],
-  ready () {
-    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
-  }
-}
-</script>
+<template>
+  <div>
+    <route :comp="{name: 'void-page'}" name="traffic-router"></route>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '月流量统计',
+  props: ['f'],
+  ready () {
+    this.$goto('monthly-traffic-list', {f: this.f}, 'self')
+  }
+}
+</script>

package/src/components/phonestate/PostMap.vue

@@ -1,82 +1,82 @@
-<template>
-  <div class="auto">
-    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
-    <div id="allmap2" :style="mapStyle"></div>
-  </div>
-</template>
-
-<script>
-// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
-
-import Vue from 'vue'
-
-export default {
-  title: '岗位图',
-  props: ['lonlats'],
-  data () {
-    return {
-      mapStyle: {
-        width: (this.$parent.$el.clientWidth -30) + 'px',
-        height: (this.$parent.$el.clientHeight - 80) + 'px'
-      },
-      markers : []
-    }
-  },
-  ready () {
-    this.lonlats.filter((item) => {
-      return item.f_longitude != 0 && item.f_latitude != 0
-    }).forEach((item) => {
-      this.markers.push({
-        longitude: item.f_longitude,
-        latitude: item.f_latitude,
-        hint: item.f_user_name + '[' + item.f_datetime + ']'
-      })
-    })
-    if(Vue.mapLoaded) {
-      this.render()
-    } else {
-      window.__mapCallback__ = this.mapCallback
-      let element = document.createElement('script')
-      element.setAttribute("type","text/javascript")
-      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
-      document.body.appendChild(element)
-    }
-  },
-  methods: {
-    mapCallback () {
-      Vue.mapLoaded = true
-      this.render()
-    },
-    patch () {
-      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
-      if(a.length != 0) {
-        a[0].style.height = 'auto'
-      } else {
-        window.setTimeout(this.patch, 500)
-      }
-    },
-    render () {
-      window.map = new BMap.Map("allmap2")
-      window.map.clearOverlays();
-      if(this.markers.length == 0)
-        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
-      else
-        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
-      window.map.addControl(new BMap.NavigationControl())
-      this.markers.forEach(function(pos) {
-        var point = new BMap.Point(pos.longitude,pos.latitude)
-      	var marker = new BMap.Marker(point)  // 创建标注
-        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
-        marker.setLabel(label)
-        label.setStyle({ border : '0px', padding: '0px'})
-      	window.map.addOverlay(marker)              // 将标注添加到地图中
-      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
-      // 	marker.addEventListener("click", function(){
-      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
-      // 	})
-      })
-      this.patch()
-    }
-  }
-}
-</script>
+<template>
+  <div class="auto">
+    <button type="button" class="btn btn-default" @click="this.$back('ass')">&lt;&lt;</button>
+    <div id="allmap2" :style="mapStyle"></div>
+  </div>
+</template>
+
+<script>
+// because of some weired behavior of baidu map, logic cant be extracted out and factored into a map component
+
+import Vue from 'vue'
+
+export default {
+  title: '岗位图',
+  props: ['lonlats'],
+  data () {
+    return {
+      mapStyle: {
+        width: (this.$parent.$el.clientWidth -30) + 'px',
+        height: (this.$parent.$el.clientHeight - 80) + 'px'
+      },
+      markers : []
+    }
+  },
+  ready () {
+    this.lonlats.filter((item) => {
+      return item.f_longitude != 0 && item.f_latitude != 0
+    }).forEach((item) => {
+      this.markers.push({
+        longitude: item.f_longitude,
+        latitude: item.f_latitude,
+        hint: item.f_user_name + '[' + item.f_datetime + ']'
+      })
+    })
+    if(Vue.mapLoaded) {
+      this.render()
+    } else {
+      window.__mapCallback__ = this.mapCallback
+      let element = document.createElement('script')
+      element.setAttribute("type","text/javascript")
+      element.setAttribute("src", 'http://api.map.baidu.com/api?v=2.0&ak=CAErfbr2DatVA6rHdoUELPynrdPh9A6S&callback=__mapCallback__')
+      document.body.appendChild(element)
+    }
+  },
+  methods: {
+    mapCallback () {
+      Vue.mapLoaded = true
+      this.render()
+    },
+    patch () {
+      let a = document.getElementById('allmap2').getElementsByClassName('BMap_cpyCtrl BMap_noprint anchorBL')
+      if(a.length != 0) {
+        a[0].style.height = 'auto'
+      } else {
+        window.setTimeout(this.patch, 500)
+      }
+    },
+    render () {
+      window.map = new BMap.Map("allmap2")
+      window.map.clearOverlays();
+      if(this.markers.length == 0)
+        window.map.centerAndZoom(new BMap.Point(116.404, 39.915), 11)
+      else
+        window.map.centerAndZoom(new BMap.Point(this.markers[0].longitude, this.markers[0].latitude), 11)
+      window.map.addControl(new BMap.NavigationControl())
+      this.markers.forEach(function(pos) {
+        var point = new BMap.Point(pos.longitude,pos.latitude)
+      	var marker = new BMap.Marker(point)  // 创建标注
+        var label = new BMap.Label(pos.hint, {offset: new BMap.Size(20, 0)})
+        marker.setLabel(label)
+        label.setStyle({ border : '0px', padding: '0px'})
+      	window.map.addOverlay(marker)              // 将标注添加到地图中
+      // 	var infoWindow = new BMap.InfoWindow(pos.hint)  // 创建信息窗口对象
+      // 	marker.addEventListener("click", function(){
+      // 		window.map.openInfoWindow(infoWindow,point) //开启信息窗口
+      // 	})
+      })
+      this.patch()
+    }
+  }
+}
+</script>

package/src/components/planmanage/PlanManage.vue

@@ -771,6 +771,7 @@ export default {
       if(res.data.code==200){
         //Vue.showMessage("下发成功！其中有"+res.data.repet+"个计划己经是下发状态")
         this.$showMessage("下发成功！")
+        this.checkplan.check.checkes = []
       }else{
         this.$showMessage("下发失败！")
       }

package/src/components/querycheckpaper/CheckPaperList.vue

@@ -53,6 +53,7 @@
 import {PagedList} from 'vue-client'
 import Vue from "vue";
 import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import {isEmpty} from "../Util";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -86,9 +87,11 @@ export default {
     }
   },
   ready() {
-    //tag
     this.rowdata = this.row
-    var condition = "f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    var condition =' 1=1 '
+    if(!isEmpty(this.row.f_userinfo_id)){
+     condition+= " and f_userinfoid = '" + this.row.f_userinfo_id + "'"
+    }
     if (this.row.filialeCon){
       condition += ` and ${this.row.filialeCon}`
     }
@@ -122,8 +125,7 @@ export default {
       return '正常'
     },
     goDetail(row) {
-      row.f_upload_state = '已传'
-      this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+      this.$emit('showcheckpaper',row)
     }
   }
 }

package/src/components/querycheckpaper/CheckPaperSearchUser.vue

@@ -1,6 +1,6 @@
 <template>
   <!--安检综合查询主界面-->
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+  <div id="unit" class="flex-row" :class="{'binary':showItem}" v-show="showinfo1">
     <div :class="{'basic-main':!showItem,'binary-left':showItem}">
       <!--展示查询界面-->
       <check-search-user class="flex" :tempval="hidden" :style="style" :style2="style2" @select-changed="selected"
@@ -9,11 +9,12 @@
     </div>
     <div class="binary-right" v-show="showItem">
       <div class="flex">
-        <check-paper-list style="height: 100%" :row="rowData"></check-paper-list>
+        <check-paper-list style="height: 100%" :row="rowData" v-on:showcheckpaper="checkpapershow"></check-paper-list>
       </div>
     </div>
   </div>
-
+  <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
+  <new-check-paper-temp  v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
 </template>
 
 <script>
@@ -29,10 +30,35 @@ export default {
       barwidth: '100%',
       showItem: false,
       rowData: {},
-      filialeCon: ''
+      filialeCon: '',
+      shouinfodata:{},
+      showinfo1:true,
+      showinfo2: false,
+      showinfo3:false
+
     }
   },
   methods: {
+    showback1(){
+      this.showinfo1 = true
+      this.showinfo2 = false
+    },
+    showback2(){
+      this.showinfo1 = true
+      this.showinfo3 = false
+    },
+    checkpapershow(val){
+      val.f_upload_state = '已传'
+      this.shouinfodata = JSON.parse(JSON.stringify(val))
+      this.showinfo1 = false
+      if (val.f_safe_type == '已挂表未办卡安检'){
+        this.showinfo2 = false
+        this.showinfo3 = true
+        return
+      }
+      this.showinfo2 = true
+      this.showinfo3 = false
+    },
     show() {
       this.showItem = this.showItem ? false : true
     },

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -189,6 +189,11 @@
               <input type="number" class="input_search" v-model="model.f_check_version"
                      style="width: 60%" placeholder="到访不遇次数">
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检结果</label>
+              <input style="width: 60%" type="text" class="input_search" v-model="model.f_defect_content"
+                     placeholder="安检结果" condition="f_defect_content like '%{}%'">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -399,7 +404,7 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">
-            {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '无问题' : row.f_last_check_result) }}
+            {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '正常' : row.f_last_check_result) }}
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>