safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/filiale/liaoyuan/pc/DefectPaperWeiXiu.vue

@@ -43,7 +43,7 @@
             </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"
+                <div style="float: right" class="button_spacing"
                      :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
                      @click="$parent.$parent.hiddenr()"></div>
                 <div style="float: right" class="button_spacing"
@@ -52,10 +52,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <button style="float: right" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
                 <div style="float: right">
-                <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
-                                :field="$parent.$parent.getfield"
-                                progress="safeGetExportProgress"
-                                sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                  <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                                      :field="$parent.$parent.getfield"
+                                      progress="safeGetExportProgress"
+                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel-old>
                 </div>
               </div>
             </div>
@@ -144,6 +144,18 @@
                 condition="f_is_deal  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
+            <div :class="$parent.$parent.style">
+              <label class="font_normal_body">是否维修</label>
+              <v-select
+                placeholder='是否维修'
+                :value-single="true"
+                class="select select_list" style="width: 60%"
+                v-model='model.f_repaired'
+                :value.sync="model.f_repaired"
+                :options='$parent.$parent.repairedOptions'
+                condition="f_repaired  = '{}'"
+                close-on-select clear-button> </v-select>
+            </div>
 
           </div>
 
@@ -180,10 +192,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <button style="float: right" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
-                                  :field="$parent.$parent.getfield"
-                                  progress="safeGetExportProgress"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                  <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
+                                      :field="$parent.$parent.getfield"
+                                      progress="safeGetExportProgress"
+                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel-old>
                 </div>
               </div>
             </div>
@@ -301,7 +313,7 @@
       <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
           <tr>
-<!--            <th><nobr><input type="checkbox" v-model="$parent.$parent.$parent.checkAll" @click.stop="()=>{return}" />全选</nobr></th>-->
+            <!--            <th><nobr><input type="checkbox" v-model="$parent.$parent.$parent.checkAll" @click.stop="()=>{return}" />全选</nobr></th>-->
             <th><nobr>入户状态</nobr></th>
             <th><nobr>用户编号</nobr></th>
             <th><nobr>用户名</nobr></th>
@@ -317,12 +329,14 @@
             <th><nobr>完成数</nobr></th>
             <th><nobr>处理情况</nobr></th>
             <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'>
-<!--          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" @click="$event.cancelBubble=true" :checked="$parent.$parent.$parent.isChecked(row.id)" @change="$parent.$parent.$parent.setCheckes(row.id)"></input></td>-->
+          <!--          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" @click="$event.cancelBubble=true" :checked="$parent.$parent.$parent.isChecked(row.id)" @change="$parent.$parent.$parent.setCheckes(row.id)"></input></td>-->
           <td style="text-align: center;white-space:nowrap;">{{row.f_entry_status}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_userinfo_code}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_user_name}}</td>
@@ -338,8 +352,12 @@
           <td style="text-align: center;white-space:nowrap;">{{row.f_repair_count}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_deal}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_is_repair}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_repaired}}</td>
           <td style="text-align: center;white-space:nowrap;">{{row.f_repairman}}</td>
-
+          <td style="text-align: center;white-space:nowrap;">{{row.f_defect_content}}</td>
+          <td style="text-align: center;white-space:nowrap;">
+            <button v-if="row.f_is_deal == '未处理' && row.f_is_repair != '已报备'" style="float: right" class="button_search button_spacing" @click="$parent.$parent.$parent.modal_show(row)">隐患处理</button>
+          </td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -427,549 +445,567 @@
         </h4>
       </div>
       <div slot="modal-body" class="modal-body">
-      <div class="progress">
-        <div class="progress-bar" role="progressbar" aria-valuenow="60"
-             aria-valuemin="0" aria-valuemax="100" :style="'width:'+ progressbarWidth+'%'">
-<!--          <span class="sr-only">40% 完成</span>-->
+        <div class="progress">
+          <div class="progress-bar" role="progressbar" aria-valuenow="60"
+               aria-valuemin="0" aria-valuemax="100" :style="'width:'+ progressbarWidth+'%'">
+            <!--          <span class="sr-only">40% 完成</span>-->
+          </div>
         </div>
       </div>
-      </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
     </modal>
+    <modal :show.sync="showUpload" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
+        <h4 class="modal-title" style="text-align: center">文件上传</h4>
+      </header>
+      <article slot="modal-body" class="modal-body form-horizontal">
+        <div class="form-group" style="text-align: center">
+          <file-upload class="my-file-uploader" :name="'myFile' + blodid"
+                       action="rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button style="float: right" class="button_search button_spacing" :disabled="is_handle" @click="handle()">提交</button>
+        <button style="float: right" class="button_search button_spacing" @click="close()">取消</button>
+      </footer>
+    </modal>
   </div>
 </template>
 <script>
-  import {PagedList} from 'vue-client'
-  import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-  import co from 'co'
-  import Vue from 'vue'
-  import * as Util from '../../../components/Util'
-
-  let select = function* (self) {
-    let http = new HttpResetClass()
-    let getGasman = yield http.load('POST', '/rs/search', {
-      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
-      userid: self.$login.f.id
-    }, {resolveMsg: null, rejectMsg: null})
-    console.log('获取安检员', getGasman)
-    self.checkersid.push({label: '全部', value: ''})
-    getGasman.data.forEach((checker) => {
-      self.checkersid.push({label: checker.name, value: checker.name})
+import {PagedList} from 'vue-client'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import co from 'co'
+import Vue from 'vue'
+import * as Util from '../../../components/Util'
+
+let select = function* (self) {
+  let http = new HttpResetClass()
+  let getGasman = yield http.load('POST', '/rs/search', {
+    source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+    userid: self.$login.f.id
+  }, {resolveMsg: null, rejectMsg: null})
+  //tag
+  self.checkersid.push({label: '全部', value: ''})
+  getGasman.data.forEach((checker) => {
+    self.checkersid.push({label: checker.name, value: checker.name})
+  })
+}
+export default {
+  title: '隐患查询',
+  data() {
+    let model = new PagedList('rs/sql/GetCheckPaperByDefect', 20, {
+      f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
     })
-  }
-  export default {
-    title: '隐患查询',
-    data() {
-      let model = new PagedList('rs/sql/GetCheckPaperByDefect', 20, {
-        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"
-      return {
-        repaired:[{label: '全部', value: ''},{label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
-        deals:[{label: '全部', value: ''},{label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}],
-        hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {label: '无隐患', value: '无隐患'}],
-        f: this.$login.f,
-        model: model,
-        criteriaShow: false,
-        checkAll:false,
-        timercount:0,
-        showModal2:false,
-        repairTypeOptions:this.$appdata.getParam('报修类型'),
-        dispatchTypeOptions: [{label: '派发给维修员', value: '派发给维修员'}],
-        checkes:[],
-        showModal: false,
-        f_check_plan: {f_plan_name: '', id: ''},
-        sumsmodel: {},
-        all: false,
-        fields: {},
-
-        selectData:{
-          dispatchType:'',
-          f_repairman:'',
-          f_remarks:'',
-          f_repairtype:''
-        },
-        progressbarWidth:'0',
-        modelval: [],
-        isbusy:false,
-        checkersid: [],
-        showModal3:false,
-        toRepairCount:0,
-        sliceArea: [],
-        callSends:[],
-        cbc:[],
-        repairers:[],
-        cbcs:[],
-        thead: '',
-        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:{
-
-      style: {
-        type: String,
-        default: 'col-sm-2 form-group'
+    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"
+    return {
+      is_handle:true,
+      showUpload:false,
+      row:{},
+      headers: {
+        'username': this.$login.f.name,
+        'blodid': '',
+        'businessid': '',
+        'fremarks': '',
+        'defname': '',
+        'fusetype': ''
+      }, // 调用rs/file/uploadFile 的参数
+      blodid: '',
+      repaired:[{label: '全部', value: ''},{label: '未完成', value: '未完成'}, {label: '已完成', value: '已完成'}],
+      deals:[{label: '全部', value: ''},{label: '未处理', value: '未处理'}, {label: '已处理', value: '已处理'}, {label: '已报备', value: '已报备'}],
+      hasDefectOptions: [{label: '全部', value: ''}, {label: '有隐患', value: '有隐患'}, {label: '无隐患', value: '无隐患'}],
+      f: this.$login.f,
+      model: model,
+      criteriaShow: false,
+      checkAll:false,
+      timercount:0,
+      showModal2:false,
+      repairTypeOptions:this.$appdata.getParam('报修类型'),
+      dispatchTypeOptions: [{label: '派发给维修员', value: '派发给维修员'}],
+      checkes:[],
+      showModal: false,
+      f_check_plan: {f_plan_name: '', id: ''},
+      sumsmodel: {},
+      all: false,
+      fields: {},
+
+      selectData:{
+        dispatchType:'',
+        f_repairman:'',
+        f_remarks:'',
+        f_repairtype:''
       },
-      style2: {
-        type: String,
-        default: 'col-sm-4 form-group'
-      }
+      progressbarWidth:'0',
+      modelval: [],
+      isbusy:false,
+      checkersid: [],
+      showModal3:false,
+      toRepairCount:0,
+      sliceArea: [],
+      callSends:[],
+      cbc:[],
+      repairedOptions:[{label: '全部', value: ''},{label: '已修', value: '已修'}, {label: '未修', value: '未修'}],
+      repairers:[],
+      cbcs:[],
+      thead: '',
+      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:{
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    style2: {
+      type: String,
+      default: 'col-sm-4 form-group'
+    }
 
+  },
+  events:{
+    onFileUpload: function (file, res) {
+      this.row.f_handle_path = res.f_filename
+      this.is_handle = false
+    }
+  },
+  methods: {
+    modal_show(row){
+      this.row = row
+      this.showUpload = true
+      this.blodid = this.row.f_userinfo_id
+      this.headers.blodid = this.row.f_userinfo_id
+    },
+    close() {
+      this.is_handle =true
+      this.showUpload = false
+      this.blodid = ''
+      this.headers.blodid = ''
+      this.row = {}
     },
+    handle(){
+      this.row.f_repairman = this.$login.f.name
+      this.row.f_repair_date = Util.getNowDate()
+      new HttpResetClass().load('POST', '/rs/logic/handleDefectPC', {data:this.row}).then((res) => {
+        this.$showMessage('操作成功')
+        this.close()
+    }).catch((err) => {
+        this.$showMessage('操作失败')
+        this.close()
+      })
+    },
+    getEmp() {
+      let val = {source: 'this.getParentByType($organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).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) => {
+          //tag
+          if(idx+1==arr.length){
+            str += item.id
+          }else{
+            str += item.id+','
+          }
 
-    methods: {
-      getEmp() {
-        let val = {source: 'this.getParentByType($organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).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){
-              str += item.id
-            }else{
-              str += item.id+','
+        })
+        let http1 = new HttpResetClass()
+        http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          data: {
+            items: 'id,f_user_telephone',
+            tablename: 't_user',
+            condition: `id  in  (${str})`,
+            orderitem: 'id'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
+
+          res.data.forEach((user)=>{
+            try {
+              ress.data.forEach((tel,tidx,arr)=>{
+                //tag
+                if(user.id==tel.id){
+                  this.repairers.push({label: `${user.name}：${tel.f_user_telephone}`, value: user.name})
+                  ress.data.splice(tidx,1)
+                  //tag
+                  throw new Error("跳出循环");
+                }
+              })
+            }catch (e) {
+              //tag
             }
-
           })
-          let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
-            data: {
-              items: 'id,f_user_telephone',
-              tablename: 't_user',
-              condition: `id  in  (${str})`,
-              orderitem: 'id'
-            }
-          }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
+        })
 
-            res.data.forEach((user)=>{
-              try {
-                ress.data.forEach((tel,tidx,arr)=>{
-                  console.log(`${user.id}--------------${tel.id}   ----------${tidx}-------${ress.data[tidx].id}`)
-                  if(user.id==tel.id){
-                    this.repairers.push({label: `${user.name}：${tel.f_user_telephone}`, value: user.name})
-                    ress.data.splice(tidx,1)
-                    console.log(`******${ress.data[tidx].id}`)
-                    throw new Error("跳出循环");
-                  }
-                })
-              }catch (e) {
-                console.log('下一次！')
-              }
+      })
+    },
+    toRepair(){
+      //tag
+      this.showModal2=true
+    },
+    async rectification(){
+      this.isbusy =true
+      // if (this.checkAll){
+      let data={
+        f_filialeids: this.model.params.f_filialeids,
+        f_defect_content: this.model.params.f_defect_content,
+        condition:this.model.params.condition
+      }
+      let res1= await new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefect',{data: data })
+      let res2 = await new HttpResetClass().load('POST' , 'rs/sql/GetCheckPaperByDefectAllInfo' , {data: data } )
+      for (let i = 0; i < res1.data.length; i++) {
+        //tag
+        let uploadData = {
+          model: {
+            serviceacitivity: [{
+              f_service_acitivity_type: '派单'
+            }],
+            f_repairitems: {},
+            failure: '',
+            f_source: '安检',
+            f_service_id: '',
+            f_contact_phone: '',
+            f_meetunit: '',
+            f_phone: '',
+            f_user_name: '',
+            f_address: '',
+            f_repair_date: '',
+            f_reciever: '',
+            f_remarks: '',
+            f_user_type: '',
+            f_area: '',
+            f_unit_name: '',
+            f_street: '',
+            f_residential_area: '',
+            f_building: '',
+            f_unit: '',
+            f_floor: '',
+            f_room: '',
+            aState: '',
+            f_repairtype: '',
+            f_userinfo_id: '',
+            f_userinfo_code: '',
+            f_orgstr: '',
+            f_outlets: '',
+            f_attendant: this.$login.f.name
+          },
+          loginUser: {
+            name: this.$login.f.name,
+            ename: this.$login.f.ename
+          },
+          user: {
+            f_userinfo_id: ''
+          },
+          callObj: null
+        }
+        uploadData.model.serviceacitivity[0].f_reciever = this.selectData.f_repairman
+        // uploadData.model.f_meetunit = self.$login.f.orgpathnames
+        // uploadData.model.f_orgstr = self.$login.f.orgpathstr
+        // uploadData.model.f_outlets = self.$login.f.f_parentname
+        uploadData.model.f_meetunit = this.$login.f.deps
+        uploadData.model.f_orgid = this.$login.f.orgid
+        uploadData.model.f_filiale = this.$login.f.org
+        uploadData.model.f_outlets = this.$login.f.deps
+        uploadData.model.f_filiale_id = this.$login.f.orgid
+        uploadData.toRepair = '一级派单'
+        uploadData.model = Object.assign(uploadData.model, res1.data[i])
+        uploadData.user.f_userinfo_id = res1.data[i].f_userinfo_id
+        uploadData.model.f_repair_date = Util.getNowDate()
+        uploadData.model.f_repairtype = '隐患处理'
+        uploadData.model.f_remarks = null
+        let failure = []
+        res2.data.filter(item=>item.f_paper_id === res1.data[i].id).forEach(row => {
+          if (row.f_repaire_type == '隐患未处理') {
+            failure.push({
+              f_failure_type: row.f_item_name,
+              failurecase: row.f_item_value.split(',')
             })
-          })
-
+          }
         })
-      },
-
-      toRepair(){
-        console.log("进入转维修页面")
-        this.showModal2=true
-        // if(this.checkAll){
-        //   let data={
-        //     f_filialeids: this.model.params.f_filialeids,
-        //     f_defect_content: this.model.params.f_defect_content,
-        //     condition:this.model.params.condition
-        //   }
-        //   new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefect',{data:data}).then(res=>{
-        //     console.log("res长度",res.data.length)
-            // if (res.data.length>100){
-            //   this.$showMessage('单次转维修不可超过100户,请重新筛选')
-            //   return
-            // }else{
-
-
-            // }
-          // })
-        // }else{
-        //   if (this.checkes.length<1){
-        //     Vue.showAlert('未选中用户', 'warning' ,3000)
-        //     return
-        //   }
-        //   this.showModal2=true
-        //
-        // }
-      },
-      async rectification(){
-        this.isbusy =true
-          // if (this.checkAll){
-           let data={
-              f_filialeids: this.model.params.f_filialeids,
-              f_defect_content: this.model.params.f_defect_content,
-              condition:this.model.params.condition
-            }
-           let res1= await new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefect',{data: data })
-           for (let i = 0; i < res1.data.length; i++) {
-                let data1={
-                  f_paper_id: res1.data[i].id,
-                  condition:`f_repaire_type != '无隐患'`
-                }
-                let res2 = await new HttpResetClass().load('POST' , 'rs/sql/GetDefectByPaperId' , {data: data1 } )
-                  console.log('resss',res2.data)
-                  const uploadData = {
-                    model: {
-                      serviceacitivity: [{
-                        f_service_acitivity_type: '派单'
-                      }],
-                        f_repairitems: {},
-                      failure: '',
-                        f_source: '安检',
-                        f_service_id: '',
-                        f_contact_phone: '',
-                        f_meetunit: '',
-                        f_phone: '',
-                        f_user_name: '',
-                        f_address: '',
-                        f_repair_date: '',
-                        f_reciever: '',
-                        f_remarks: '',
-                        f_user_type: '',
-                        f_area: '',
-                        f_unit_name: '',
-                        f_street: '',
-                        f_residential_area: '',
-                        f_building: '',
-                        f_unit: '',
-                        f_floor: '',
-                        f_room: '',
-                        aState: '',
-                        f_repairtype: '',
-                        f_userinfo_id: '',
-                        f_userinfo_code: '',
-                        f_orgstr: '',
-                        f_outlets: '',
-                        f_attendant: this.$login.f.name
-                    },
-                    loginUser: {
-                      name: this.$login.f.name,
-                      ename: this.$login.f.ename
-                    },
-                    user: {
-                      f_userinfo_id: ''
-                    },
-                    callObj: null
-                  }
-
-                  uploadData.model.serviceacitivity[0].f_reciever = this.selectData.f_repairman
-                  // uploadData.model.f_meetunit = self.$login.f.orgpathnames
-                  // uploadData.model.f_orgstr = self.$login.f.orgpathstr
-                  // uploadData.model.f_outlets = self.$login.f.f_parentname
-                  uploadData.model.f_meetunit = this.$login.f.deps
-                  uploadData.model.f_orgid = this.$login.f.orgid
-                  uploadData.model.f_filiale = this.$login.f.org
-                  uploadData.model.f_outlets = this.$login.f.deps
-                  uploadData.model.f_filiale_id = this.$login.f.orgid
-                  uploadData.toRepair = '一级派单'
-                  let res3 = await new HttpResetClass().load('post','/rs/sql/GetUserForRepaire', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
-                    uploadData.model = Object.assign(uploadData.model, res3.data[0])
-                    uploadData.user.f_userinfo_id = res3.data[0].f_userinfo_id
-                    uploadData.model.f_repair_date = Util.getNowDate()
-                    uploadData.model.f_repairtype = res3.data[0].f_repairtype
-                    uploadData.model.f_remarks = res3.data[0].f_remarks
-                    let failure = []
-                    res2.data.forEach(row => {
-                      if (row.f_repaire_type == '隐患未处理') {
-                        failure.push({
-                          f_failure_type: row.f_item_name,
-                          failurecase: row.f_item_value.split(',')
-                        })
-                      }
-                    })
-                    uploadData.model.failure = failure
-                    // 拼接repairitems
-                    let rows = JSON.parse(JSON.stringify(res2.data))
-                    let repairitems = {
-                      data: []
-                    }
-                    let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
-                    // 取隐患未处理的
-                    rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
-                    console.log('row => ' + JSON.stringify(rows))
-                    // 开始拼接
-                    rows.forEach(row => {
-                      let existIndex = -1
-                      // 判断该设备是否已经存在
-                      for (let i = 0; i < repairitems.data.length; i++) {
-                        if (repairitems.data[i].f_type == row.f_device_type) {
-                          existIndex = i
-                          break
-                        }
-                      }
-                      if (existIndex == -1) {
-                        // 不存在则新建
-                        let newItem = {
-                          f_type: row.f_device_type,
-                          details: [{
-                            f_defect_id: row.id,
-                            f_project: `${row.f_item_name}:${row.f_item_value}`,
-                            type: 'selector',
-                            options: safecheckOptions
-                          }]
-                        }
-                        repairitems.data.push(newItem)
-                      } else {
-                        // 存在则追加
-                        repairitems.data[existIndex].details.push({
-                          f_defect_id: row.id,
-                          f_project: `${row.f_item_name}:${row.f_item_value}`,
-                          type: 'selector',
-                          options: safecheckOptions
-                        })
-                      }
-                    })
-                    uploadData.model.f_repairitems = repairitems
-                    uploadData.rows=rows
-                    console.log('uploadData ---> ' + JSON.stringify(uploadData))
-                    console.log(uploadData.model.f_repairitems)
-                    if (uploadData.model.f_repairitems.data.length>0){
-                      this.callSends.push(uploadData)
-                    }else{
-                      console.log('无隐患，无需转维修')
-                    }
-
-
-
-
-              }
-            console.log('666666666666',JSON.stringify(this.callSends))
-            let timer = setInterval(async ()=>{
-              this.showModal3=true
-              this.isbusy=false
-              if (this.timercount<this.callSends.length){
-                console.log('要发送的参数',JSON.stringify(this.callSends[this.timercount]))
-                let rows=this.callSends[this.timercount].rows
-                console.log('rows ===> ' + JSON.stringify(rows))
-                let result = await this.$resetpost('/rs/logic/callerSend', this.callSends[this.timercount])
-                console.log('result ===> ' + JSON.stringify(result))
-                if (result.data.f_service_id) {
-                  let updateRes = await this.$resetpost('/rs/logic/updateDefectState', {itemsId: this.$login.convertToIn(rows.map(row => row.id))})
-                  console.log('updateRes',updateRes)
-                }
-                this.toRepairCount++
-                console.log(timer,this.progressbarWidth)
-                this.timercount++
-              }else{
-                clearInterval(timer)
-                console.log('停止发送',timer)
-                this.callSends=[]
-                this.timercount=0
-                this.showModal3=false
-                this.cancel1()
-                this.$showMessage('本次转维修成功'+this.toRepairCount+'单')
-                this.toRepairCount=0
-              }
-            }, 3000)
-
-
-          // } else {
-          //   for (let i = 0; i <this.checkes.length; i++) {
-          //     let data={
-          //       f_paper_id: this.checkes[i],
-          //       condition:`f_repaire_type != '无隐患'`
-          //     }
-          //     new HttpResetClass().load('POST','rs/sql/GetDefectByPaperId',{data:data}).then(res=>{
-          //       console.log('resss',res.data)
-          //     })
-          //   }
-          // }
-      },
-      cancel1(){
-        this.showModal2=false
-        this.selectData={
-          dispatchType:'',
-          f_repairman:'',
-          f_remarks:'',
-          f_repairtype:''
+        uploadData.model.failure = failure
+        // 拼接repairitems
+        let rows = JSON.parse(JSON.stringify(res2.data.filter(item=>item.f_paper_id === res1.data[i].id)))
+        let repairitems = {
+          data: []
         }
-      },
-     sleep(d){
-        console.log('开始睡眠',Date.now())
-        var t = Date.now()
-        while(Date.now - t <= d)
-        console.log('结束睡眠',Date.now())
-     },
-      isChecked(v) {
-        // 如果全选，不在的按选中算，否则，在的按选中算
-        if (this.checkAll) {
-          return this.checkes.indexOf(v) == -1
-        } else {
-          return this.checkes.indexOf(v) != -1
+        let safecheckOptions = [{"data": "已处理"}, {"data": "未处理"}]
+        // 取隐患未处理的
+        rows = rows.filter(row => row.f_repaire_type == '隐患未处理')
+        //tag)
+        // 开始拼接
+        rows.forEach(row => {
+          let existIndex = -1
+          // 判断该设备是否已经存在
+          for (let i = 0; i < repairitems.data.length; i++) {
+            if (repairitems.data[i].f_type == row.f_device_type) {
+              existIndex = i
+              break
+            }
+          }
+          if (existIndex == -1) {
+            // 不存在则新建
+            let newItem = {
+              f_type: row.f_device_type,
+              details: [{
+                f_defect_id: row.id,
+                f_project: `${row.f_item_name}:${row.f_item_value}`,
+                type: 'selector',
+                options: safecheckOptions
+              }]
+            }
+            repairitems.data.push(newItem)
+          } else {
+            // 存在则追加
+            repairitems.data[existIndex].details.push({
+              f_defect_id: row.id,
+              f_project: `${row.f_item_name}:${row.f_item_value}`,
+              type: 'selector',
+              options: safecheckOptions
+            })
+          }
+        })
+        uploadData.model.f_repairitems = repairitems
+        uploadData.rows=rows
+        delete uploadData.model.id
+        //tag)
+        //tag
+        if (uploadData.model.f_repairitems.data.length>0){
+          this.callSends.push(uploadData)
+        }else{
+          //tag
         }
-      },
-      setCheckAll() {
-        this.checkAll=this.checkAll?false:true;
-        // 全选改变后，清空选中数据
-        this.checkes = []
-      },
-      setCheckes(id) {
-        let index=this.checkes.indexOf(id)
-        if(index<0){
-          this.checkes.push(id)
+      }
+      //tag)
+      let timer = setInterval(async ()=>{
+        this.showModal3=true
+        this.isbusy=false
+        if (this.timercount<this.callSends.length){
+          //tag)
+          let rows=this.callSends[this.timercount].rows
+          //tag)
+          let result = await this.$resetpost('/rs/logic/callerSend', this.callSends[this.timercount])
+          //tag)
+          if (result.data.f_service_id) {
+            const data = {
+              f_paper_id: rows[0].f_paper_id,
+              f_service_id: result.data.f_service_id,
+              itemsId: this.$login.convertToIn(rows.map(row => row.id))
+            }
+            //tag
+            let updateRes = await this.$resetpost('/rs/logic/updateDefectState', data)
+          }
+          this.toRepairCount++
+          //tag
+          this.timercount++
         }else{
-          this.checkes.splice(index,1)
+          clearInterval(timer)
+          //tag
+          this.callSends=[]
+          this.timercount=0
+          this.showModal3=false
+          this.cancel1()
+          this.$showMessage('本次转维修成功'+this.toRepairCount+'单')
+          this.toRepairCount=0
         }
-      },
+      }, 3000)
+    },
+    cancel1(){
+      this.showModal2=false
+      this.selectData={
+        dispatchType:'',
+        f_repairman:'',
+        f_remarks:'',
+        f_repairtype:''
+      }
+    },
+    sleep(d){
+      //tag)
+      var t = Date.now()
+      while(Date.now - t <= d){
 
-      getmeterbook(val){
-        this.cbc=[]
-        this.cbc.push({
-          label:'全部',
-          value:''
-        })
-        if (val==''){
+      }
+      //tag)
+    },
+    isChecked(v) {
+      // 如果全选，不在的按选中算，否则，在的按选中算
+      if (this.checkAll) {
+        return this.checkes.indexOf(v) == -1
+      } else {
+        return this.checkes.indexOf(v) != -1
+      }
+    },
+    setCheckAll() {
+      this.checkAll=this.checkAll?false:true;
+      // 全选改变后，清空选中数据
+      this.checkes = []
+    },
+    setCheckes(id) {
+      let index=this.checkes.indexOf(id)
+      if(index<0){
+        this.checkes.push(id)
+      }else{
+        this.checkes.splice(index,1)
+      }
+    },
 
-          this.cbcs.forEach(res=>{
+    getmeterbook(val){
+      this.cbc=[]
+      this.cbc.push({
+        label:'全部',
+        value:''
+      })
+      if (val==''){
+
+        this.cbcs.forEach(res=>{
+          this.cbc.push({
+            label:res.f_book_name,
+            value:res.id
+          })
+        })
+      }else{
+        this.cbcs.forEach(res=>{
+          if (res.f_book_slice_area==val){
             this.cbc.push({
               label:res.f_book_name,
               value:res.id
             })
-          })
-        }else{
-          this.cbcs.forEach(res=>{
-            if (res.f_book_slice_area==val){
-              this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
-              })
-            }
-          })
-        }
-      },
+          }
+        })
+      }
+    },
 
-      Mreadibook(val){
-        console.log("999999999")
-        console.log(val)
-        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) => {
+    Mreadibook(val){
+      //tag
+      //tag
+      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) => {
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
             this.sliceArea.push({
-              label:'全部',
-              value:''
+              label:ress.name,
+              value:ress.name
             })
-            res.data.forEach(ress=>{
-              this.sliceArea.push({
-                label:ress.name,
-                value:ress.name
-              })
-            })
-
           })
-        }
-      },
-      getAllMeterBook(val){
-        console.log("999999999")
-        console.log(val)
-        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=>{
-              this.cbcs.push({
-                id:ress.id,
-                f_book_name:ress.f_book_name,
-                f_book_slice_area:ress.f_book_slice_area
-              })
+
+        })
+      }
+    },
+    getAllMeterBook(val){
+      //tag
+      //tag
+      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=>{
+            this.cbcs.push({
+              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:''
+          })
+          this.cbcs.forEach(res=>{
             this.cbc.push({
-              label:'全部',
-              value:''
-            })
-            this.cbcs.forEach(res=>{
-              this.cbc.push({
-                label:res.f_book_name,
-                value:res.id
-              })
+              label:res.f_book_name,
+              value:res.id
             })
           })
-        }
-      },
-      hiddenr() {
-        this.$parent.showItem = !this.$parent.showItem
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      search(args) {
-        if (this.f_check_plan.f_plan_name) {
-          args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
-        }
-        this.checkes = []
-        this.checkAll=false
-        this.model.search(args.condition, args.model)
-      },
-      getRes(obj) {
-        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-        this.Mreadibook(this.model.f_filialeids)
-        this.getAllMeterBook(this.model.f_filialeids)
-      },
-      showChooser() {
-        this.showModal = true
-      },
-      ok() {
-        this.showModal = false
-        if (this.$refs.modal.$children[0].selectedRow.id) {
-          this.f_check_plan = this.$refs.modal.$children[0].selectedRow
-        }
-      },
-      cancel() {
-        this.showModal = false
-        this.f_check_plan = {f_plan_name: '', id: ''}
+        })
       }
     },
-    ready() {
-      this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
-      this.getEmp()
-      let gen = select(this)
-      // this.Mreadibook(`('${this.$login.f.orgid}')`)
-      co(gen)
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
     },
-    watch:{
-      'timercount'(){
-        if (this.timercount===0){
-          this.progressbarWidth = '0'
-        }else {
-          console.log(this.callSends.length)
-          console.log(this.timercount)
-          this.progressbarWidth=parseInt(this.timercount*100/(this.callSends.length+1))
-        }
-
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search(args) {
+      //tag
+      if (this.f_check_plan.f_plan_name) {
+        args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
       }
+      this.checkes = []
+      this.checkAll=false
+      this.model.search(args.condition, args.model)
     },
-    computed: {
-      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]
+    getRes(obj) {
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      this.Mreadibook(this.model.f_filialeids)
+      this.getAllMeterBook(this.model.f_filialeids)
+    },
+    showChooser() {
+      this.showModal = true
+    },
+    ok() {
+      this.showModal = false
+      if (this.$refs.modal.$children[0].selectedRow.id) {
+        this.f_check_plan = this.$refs.modal.$children[0].selectedRow
+      }
+    },
+    cancel() {
+      this.showModal = false
+      this.f_check_plan = {f_plan_name: '', id: ''}
+    }
+  },
+  ready() {
+    //tag
+    this.$refs.paged.$refs.criteria.model.f_has_defect = '有隐患'
+    this.getEmp()
+    let gen = select(this)
+    // this.Mreadibook(`('${this.$login.f.orgid}')`)
+    co(gen)
+  },
+  watch:{
+    'timercount'(){
+      if (this.timercount===0){
+        this.progressbarWidth = '0'
+      }else {
+        //tag
+        //tag
+        this.progressbarWidth=parseInt(this.timercount*100/(this.callSends.length+1))
+      }
+
+    }
+  },
+  computed: {
+    selected() {
+      return this.$refs.paged.$refs.grid.selected
+    },
+    getfield () {
+      //tag
+      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>`
         })
-        //合计字段打印
-        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
+      } else {
+        this.tfoot += '暂无'
       }
+      this.tfoot += '</th></tr>'
+      return data
     }
   }
+}
 </script>