safecheck-client 3.0.35-gongyi → 3.0.35-gongyi-1

package/src/components/defect/DefectPaper.vue

@@ -28,6 +28,9 @@
                      condition="f_userinfo_code = '{}'"
                      style="width: 60%" placeholder="用户编号">
             </div>
+
+
+
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">结果查询</label>
               <v-select
@@ -40,6 +43,46 @@
                 condition="f_repaired  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
+
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">用户类型</label>
+              <v-select id="f_usertype"
+                        placeholder='用户类型'
+                        class="select select_list"
+                        :value.sync="model.f_usertype"
+                        :value-single="true"
+                        :options='$parent.$parent.usertypes'
+                        v-model="model.f_usertype"
+                        close-on-select clear-button></v-select>
+            </div>
+
+
+
+            <div :class="{'col-sm-3 form-group':$parent.$parent.$parent.showItem,'col-sm-2 form-group':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">隐患级别</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectLeave"
+                        v-model="$parent.$parent.defectLeave"
+                        :options='$parent.$parent.defectLeaveList'
+                        placeholder='隐患级别'
+                        close-on-select>
+              </v-select>
+            </div>
+            <div :class="{'col-sm-3 form-group':$parent.$parent.$parent.showItem,'col-sm-2 form-group':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">隐患类型</label>
+              <v-select style="width:60% "
+                        class="select select_list"
+                        :value.sync="$parent.$parent.defectType"
+                        v-model="$parent.$parent.defectType"
+                        :options='$parent.$parent.getdefectType'
+                        placeholder='隐患类型'
+                        :multiple="true">
+              </v-select>
+            </div>
+
+
+
             <div class=" col-sm-4 form-group button-range"  >
               <div class="span" style="float: right;margin-top: 8px">
                                 <div style="float: right" class="button_spacing"
@@ -122,6 +165,7 @@
             </div>
 
 
+
           </div>
           <div class="row" v-if="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style">
@@ -171,6 +215,9 @@
                      condition="f_userinfo_code = '{}'"
                      style="width: 60%" placeholder="用户编号">
             </div>
+
+
+
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">结果查询</label>
               <v-select
@@ -266,7 +313,8 @@
             <th><nobr>是否有隐患</nobr></th>
             <th><nobr>隐患数</nobr></th>
             <th><nobr>整改数</nobr></th>
-
+            <th><nobr>已处理数</nobr></th>
+            <th><nobr>未处理数</nobr></th>
           </tr>
         </template>
         <template partial='body'>
@@ -283,7 +331,8 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_has_defect}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_defect_count}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
-
+          <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.remainder}}</td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -386,14 +435,18 @@
   }
   export default {
     title: '隐患查询',
-    data() {
+    data () {
       let model = new PagedList('rs/sql/GetCheckPaperByDefect', 20, {
-        f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
+        f_filialeids: 'this.f_filialeids', f_defect_content: 'this.f_defect_content'
       })
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
-      model.f_defect_content="CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
+      model.f_defect_content = "CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END"
       return {
-        repaired:[{label: '未修', value: '未修'}, {label: '已修', value: '已修'}],
+        usertypes: this.usertypes(),
+        defectType:[],
+        defectLeave:'',
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+        repaired: [{label: '未修', value: '未修'}, {label: '已修', value: '已修'}],
         hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {label: '无隐患', value: '无隐患'}],
         f: this.$login.f,
         model: model,
@@ -406,27 +459,27 @@
         modelval: [],
         checkersid: [],
         sliceArea: [],
-        cbc:[],
-        cbcs:[],
+        cbc: [],
+        cbcs: [],
         thead: '',
-        showModal2:false,
-        checkAll:false,
-        checkes:[],
-        batchSent:'否',
-        repairTypeOptions:this.$appdata.getParam('报修类型'),
+        showModal2: false,
+        checkAll: false,
+        checkes: [],
+        batchSent: '否',
+        repairTypeOptions: this.$appdata.getParam('报修类型'),
         dispatchTypeOptions: [{label: '派发给维修员', value: '派发给维修员'}],
-        selectData:{
-          dispatchType:'派发给维修员',
-          f_repairman:'',
-          f_remarks:'',
-          f_repairtype:''
+        selectData: {
+          dispatchType: '派发给维修员',
+          f_repairman: '',
+          f_remarks: '',
+          f_repairtype: ''
         },
         repairers: [],
-        headData: ['入户状态','用户编号','用户名','用户电话','用户小区','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','隐患情况'],
-        bodyData: ['f_entry_status','f_userinfo_code','f_user_name','f_user_phone','f_residential_area','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_defect_content']
+        headData: ['入户状态', '用户编号', '用户名', '用户电话', '用户小区', '用户地址', '安检时间', '安检员', '计划名', '是否有隐患', '隐患数', '隐患情况'],
+        bodyData: ['f_entry_status', 'f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_residential_area', 'f_address', 'f_offsite_time', 'f_checker_name', 'f_plan_name', 'f_has_defect', 'f_defect_count', 'f_defect_content']
       }
     },
-    props:{
+    props: {
 
       style: {
         type: String,
@@ -440,126 +493,140 @@
     },
 
     methods: {
-      cancel1(){
-        this.showModal2=false
-        this.selectData={
-          dispatchType:'',
-          f_repairman:'',
-          f_remarks:'',
-          f_repairtype:''
+      usertypes () {
+        return this.$appdata.getParam('用户类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
+      },
+      cancel1 () {
+        this.showModal2 = false
+        this.selectData = {
+          dispatchType: '',
+          f_repairman: '',
+          f_remarks: '',
+          f_repairtype: ''
         }
       },
-      showmod(){
-        if(this.model.rows.length==0){
+      showmod () {
+        if (this.model.rows.length == 0) {
           this.$showMessage('请先选择需要转维修的用户！')
           return
         }
-        if (this.checkAll  ||  this.checkes.length>0) {
-          this.showModal2=true
-        }else{
+        if (this.checkAll || this.checkes.length > 0) {
+          this.showModal2 = true
+        } else {
           this.$showMessage('请先勾选需要转维修的用户！')
           return
         }
 
       },
-      rectification(){
-        if(this.selectData.dispatchType){
-          if(this.selectData.dispatchType=='派发给站点'){
-            if(!this.selectData.f_reciever){
+      rectification () {
+        if (this.selectData.dispatchType) {
+          if (this.selectData.dispatchType == '派发给站点') {
+            if (!this.selectData.f_reciever) {
               this.$showMessage('请选择部门！')
               return
             }
-          }else{
-            if(!this.selectData.f_repairman){
+          } else {
+            if (!this.selectData.f_repairman) {
               this.$showMessage('请选择维修员！')
               return
             }
           }
-        }else {
+        } else {
           this.$showMessage('请选择派发类型！')
           return
         }
-        if(!this.selectData.f_repairtype){
+        if (!this.selectData.f_repairtype) {
           this.$showMessage('请选择报修类型！')
           return
         }
-        this.$showMessage('确定要将当前选中用户转派给维修吗？！', ['confirm', 'cancel']).then((msg)=>{
-          if(msg=='confirm'){
-
-            let act={}
-            let toRepair=''
-            if(this.selectData.dispatchType=='派发给站点'){
-              act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_reciever,f_service_acitivity_type:'派单'}
-              toRepair=null
-            }else{
-              console.log('派发给维修员---------'+this.selectData.f_repairman)
-              act={f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
-              toRepair='一级派单'
+        this.$showMessage('确定要将当前选中用户转派给维修吗？！', ['confirm', 'cancel']).then((msg) => {
+          if (msg == 'confirm') {
+
+            let act = {}
+            let toRepair = ''
+            if (this.selectData.dispatchType == '派发给站点') {
+              act = {
+                f_meetunit: this.selectData.f_meetunit,
+                f_reciever: this.selectData.f_reciever,
+                f_service_acitivity_type: '派单'
+              }
+              toRepair = null
+            } else {
+              console.log('派发给维修员---------' + this.selectData.f_repairman)
+              act = {f_reciever: this.selectData.f_repairman, f_service_acitivity_type: '派单'}
+              toRepair = '一级派单'
             }
             this.$resetpost(`/rs/logic/UploadRectification`,
               {
-                condition:this.model.params.condition,
-                itemname:this.model.itemname,
-                f_filialeids:this.model.params.f_filialeids,
-                switchCheckAll:true,
-                checkAll:this.checkAll,
-                param:this.checkes,
-                columnName:'id',
-                toRepair:toRepair,
-                activity:act,
-                deps:this.$login.f.deps,
-                depids:this.$login.f.depids,
-                f_remarks:this.selectData.f_remarks,
-                f_repairtype:this.selectData.f_repairtype,
+                condition: this.model.params.condition,
+                itemname: this.model.itemname,
+                f_filialeids: this.model.params.f_filialeids,
+                switchCheckAll: true,
+                checkAll: this.checkAll,
+                param: this.checkes,
+                columnName: 'id',
+                toRepair: toRepair,
+                activity: act,
+                deps: this.$login.f.deps,
+                depids: this.$login.f.depids,
+                f_remarks: this.selectData.f_remarks,
+                f_repairtype: this.selectData.f_repairtype,
                 f_attendant: this.$login.f.name,
-                loginUser:{name:this.$login.f.name,ename:this.$login.f.ename,id:this.$login.f.id},
-              },{resolveMsg: null, rejectMsg: null}).then((res) => {
-              if(res.data.code=200){
+                safeCycle: this.model.safeCycle,
+                loginUser: {name: this.$login.f.name, ename: this.$login.f.ename, id: this.$login.f.id},
+              }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+              if (res.data.code = 200) {
                 //this.$showMessage('本次成功派发'+res.data.successcon+'个维修单！'+`其中${res.data.nohidden}个不需要隐患整改,${res.data.repeatCount}个已经派发过隐患整改单`)
-                this.$showMessage('本次成功派发'+res.data.successcon+'个维修单！')
-                this.checkAll=false;
+                this.$showMessage('本次成功派发' + res.data.successcon + '个维修单！')
+                this.checkAll = false;
                 // 全选改变后，清空选中数据
                 this.checkes = []
-                this.selectData={
-                  dispatchType:'派发给维修员',
-                  f_repairman:'',
-                  f_remarks:'',
-                  f_repairtype:''
+                this.selectData = {
+                  dispatchType: '派发给维修员',
+                  f_repairman: '',
+                  f_remarks: '',
+                  f_repairtype: ''
                 }
-                this.showModal2=false
+                this.showModal2 = false
                 this.$refs.paged.$refs.criteria.search()
               }
-            }).cache((msg)=>{
+            }).cache((msg) => {
               this.$showMessage('网络异常，请重新操作！')
             })
           }
         })
       },
-      getSiteRes(obj) {
+      getSiteRes (obj) {
         console.log('siteRes ---> ')
         console.log(obj)
-        if(obj.resids[0]){
+        if (obj.resids[0]) {
           this.selectData.f_meetunit = obj.res.join('.')
           this.selectData.f_reciever = obj.resids.join('.')
           this.selectData.f_outlets = obj.res[obj.res.length - 1]
-        }else {
+        } else {
           this.selectData.f_meetunit = ''
           this.selectData.f_reciever = ''
           this.selectData.f_outlets = ''
         }
       },
       // 获取维修员
-      getEmp() {
-        let val = {source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1 ))', userid: `${this.$login.f.id}`}
+      getEmp () {
+        let val = {
+          source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1 ))',
+          userid: `${this.$login.f.id}`
+        }
         let http = new HttpResetClass()
         http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          let str=''
-          res.data.forEach((item,idx,arr) => {
-            console.log(idx+"----"+arr.length)
-            if(idx+1==arr.length){
+          let str = ''
+          res.data.forEach((item, idx, arr) => {
+            console.log(idx + "----" + arr.length)
+            if (idx + 1 == arr.length) {
               str += item.id
-            }else{
-              str += item.id+','
+            } else {
+              str += item.id + ','
             }
 
           })
@@ -573,18 +640,18 @@
             }
           }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
 
-            res.data.forEach((user)=>{
+            res.data.forEach((user) => {
               try {
-                ress.data.forEach((tel,tidx,arr)=>{
+                ress.data.forEach((tel, tidx, arr) => {
                   console.log(`${user.id}--------------${tel.id}   ----------${tidx}-------${ress.data[tidx].id}`)
-                  if(user.id==tel.id){
+                  if (user.id == tel.id) {
                     this.repairers.push({label: `${user.name}：${tel.f_user_telephone}`, value: user.name})
-                    ress.data.splice(tidx,1)
+                    ress.data.splice(tidx, 1)
                     console.log(`******${ress.data[tidx].id}`)
                     throw new Error("跳出循环");
                   }
                 })
-              }catch (e) {
+              } catch (e) {
                 console.log('下一次！')
               }
             })
@@ -592,7 +659,7 @@
 
         })
       },
-      isChecked(v) {
+      isChecked (v) {
         // 如果全选，不在的按选中算，否则，在的按选中算
         if (this.checkAll) {
           return this.checkes.indexOf(v) == -1
@@ -600,162 +667,207 @@
           return this.checkes.indexOf(v) != -1
         }
       },
-      setCheckAll() {
-        this.checkAll=this.checkAll?false:true;
+      setCheckAll () {
+        this.checkAll = this.checkAll ? false : true;
         // 全选改变后，清空选中数据
         this.checkes = []
       },
-      setCheckes(id) {
-        let index=this.checkes.indexOf(id)
-        if(index<0){
+      setCheckes (id) {
+        let index = this.checkes.indexOf(id)
+        if (index < 0) {
           this.checkes.push(id)
-        }else{
-          this.checkes.splice(index,1)
+        } else {
+          this.checkes.splice(index, 1)
         }
       },
-      getmeterbook(val){
-        this.cbc=[]
+      getmeterbook (val) {
+        this.cbc = []
         this.cbc.push({
-          label:'全部',
-          value:''
+          label: '全部',
+          value: ''
         })
-        if (val==''){
+        if (val == '') {
 
-          this.cbcs.forEach(res=>{
+          this.cbcs.forEach(res => {
             this.cbc.push({
-              label:res.f_book_name,
-              value:res.id
+              label: res.f_book_name,
+              value: res.id
             })
           })
-        }else{
-          this.cbcs.forEach(res=>{
-            if (res.f_book_slice_area==val){
+        } else {
+          this.cbcs.forEach(res => {
+            if (res.f_book_slice_area == val) {
               this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
+                label: res.f_book_name,
+                value: res.id
               })
             }
           })
         }
       },
 
-      Mreadibook(val){
+      Mreadibook (val) {
         console.log("999999999")
         console.log(val)
-        this.sliceArea=[]
-        if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        this.sliceArea = []
+        if (val) {
+          new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+            data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
               orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            }
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
             this.sliceArea.push({
-              label:'全部',
-              value:''
+              label: '全部',
+              value: ''
             })
-            res.data.forEach(ress=>{
+            res.data.forEach(ress => {
               this.sliceArea.push({
-                label:ress.name,
-                value:ress.name
+                label: ress.name,
+                value: ress.name
               })
             })
 
           })
         }
       },
-      getAllMeterBook(val){
+      getAllMeterBook (val) {
         console.log("999999999")
         console.log(val)
-        this.cbcs=[]
-        if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+        this.cbcs = []
+        if (val) {
+          new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+            data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,
               orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            res.data.forEach(ress=>{
+            }
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            res.data.forEach(ress => {
               this.cbcs.push({
-                id:ress.id,
-                f_book_name:ress.f_book_name,
-                f_book_slice_area:ress.f_book_slice_area
+                id: ress.id,
+                f_book_name: ress.f_book_name,
+                f_book_slice_area: ress.f_book_slice_area
               })
             })
-            this.cbc=[]
+            this.cbc = []
             this.cbc.push({
-              label:'全部',
-              value:''
+              label: '全部',
+              value: ''
             })
-            this.cbcs.forEach(res=>{
+            this.cbcs.forEach(res => {
               this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
+                label: res.f_book_name,
+                value: res.id
               })
             })
           })
         }
       },
-      hiddenr() {
+      hiddenr () {
         this.$parent.showItem = !this.$parent.showItem
       },
-      hidden() {
+      hidden () {
         this.criteriaShow = !this.criteriaShow
       },
-      search(args) {
+      search (args) {
+        console.log('测试吧',args.model)
+        if(this.defectLeave){
+          if(this.defectLeave=='一级隐患'){
+            args.condition += ` and f_fist_count > 0`
+          }
+          if(this.defectLeave=='二级隐患'){
+            args.condition += ` and f_second_count > 0`
+          }
+          if(this.defectLeave=='三级隐患'){
+            args.condition += ` and f_third_count > 0`
+          }
+        }
+        if(this.defectType.length>0){
+          args.condition += ` and (`
+          for(let sqlstr=0;sqlstr<this.defectType.length;sqlstr++){
+            console.log(sqlstr)
+            console.log(this.defectType[sqlstr])
+            args.condition += ` f_defect_content like '%${this.defectType[sqlstr]}%'`
+            if(sqlstr<this.defectType.length-1){
+              args.condition +=' or'
+            }
+          }
+          args.condition += ` )`
+        }
         if (this.f_check_plan.f_plan_name) {
           args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
         }
+        args.condition += args.model.f_usertype ? ` and f_check_type = '${args.model.f_usertype}'` : ''
         this.model.search(args.condition, args.model)
       },
-      getRes(obj) {
+      getRes (obj) {
         this.model.f_filialeids = this.$login.convertToIn(obj.resids);
         this.Mreadibook(this.model.f_filialeids)
         this.getAllMeterBook(this.model.f_filialeids)
       },
-      showChooser() {
+      showChooser () {
         this.showModal = true
       },
-      ok() {
+      ok () {
         this.showModal = false
         if (this.$refs.modal.$children[0].selectedRow.id) {
           this.f_check_plan = this.$refs.modal.$children[0].selectedRow
         }
       },
-      cancel() {
+      cancel () {
         this.showModal = false
         this.f_check_plan = {f_plan_name: '', id: ''}
       }
     },
-    ready() {
+    ready () {
       this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
-      this.batchSent=Vue.$appdata.getSingleValue('批量派发维修单')
+      this.batchSent = Vue.$appdata.getSingleValue('批量派发维修单')
       /*let gen = select(this)
       // this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)*/
       this.getEmp()
     },
     computed: {
-      selected() {
+      selected () {
         return this.$refs.paged.$refs.grid.selected
       },
-      getfield(){
-        console.log("---------------------------------------------导出方法")
-        let data = {}
-        this.bodyData.forEach((value, index)=>{
-          data[this.bodyData[index]] = this.headData[index]
-        })
-        //合计字段打印
-        this.tfoot = `<tr><th colspan=${this.modelval.length}>全表汇总信息: `
-        if(this.sumsmodel){
-          Object.keys(this.sumsmodel).forEach((key) => {
-            this.tfoot += this.fields[key] + '合计: ' + `<font color="blue">${this.sumsmodel[key]} </font>`
+      getdefectType(){
+        this.defectType=[]
+        return [... this.$appdata.getParam(this.defectLeave)]
+      },
+      watch: {
+        getfield () {
+          console.log("---------------------------------------------导出方法")
+          let data = {}
+          this.bodyData.forEach((value, index) => {
+            data[this.bodyData[index]] = this.headData[index]
           })
-        }else{
-          this.tfoot += '暂无'
+          //合计字段打印
+          this.tfoot = `<tr><th colspan=${this.modelval.length}>全表汇总信息: `
+          if (this.sumsmodel) {
+            Object.keys(this.sumsmodel).forEach((key) => {
+              this.tfoot += this.fields[key] + '合计: ' + `<font color="blue">${this.sumsmodel[key]} </font>`
+            })
+          } else {
+            this.tfoot += '暂无'
+          }
+          this.tfoot += '</th></tr>'
+          return data
+        },
+        'model.rows.length'() {
+          console.log("发生变化---"+this.model.rows.length)
+          // 如果查询无结果，将合计置为0
+          if(this.model.rows.length < 1){
+            this.model.sums.f_defect_count = 0
+            this.model.sums.f_fist_count = 0
+            this.model.sums.f_second_count = 0
+            this.model.sums.f_third_count = 0
+          }
         }
-        this.tfoot += '</th></tr>'
-        return data
       }
     }
   }