safecheck-client 3.0.39-8 → 3.0.39-81

package/src/filiale/kelai/android/PhoneUpUserinfo.vue

@@ -14,7 +14,7 @@
           <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_userinfo_code"  readonly/>
         </div>
         <div class="row auto" style="margin: 5px 0">
-          <label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"  v-model="userinfo.baseinfo.base.f_user_name" readonly />
+          <label class="righttxt">用户名称:</label><input type="text" class="form-control rightipt"  v-model="userinfo.baseinfo.base.f_user_name"  />
         </div>
         <div class="row auto" style="margin: 5px 0">
           <label class="righttxt">用户状态:</label><input type="text" class="form-control rightipt" readonly v-model="userinfo.baseinfo.base.f_user_state"  />

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

@@ -1587,7 +1587,7 @@ export default {
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
           //tag
-          HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
+          // HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
       }

package/src/filiale/kelai/android/SafecheckUserInfo.vue

@@ -538,7 +538,7 @@ export default {
       //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        // this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')

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

@@ -169,6 +169,18 @@
                           :value-single="true">
                 </v-select>
               </div>
+              <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">有无计划</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_no_checkplan" v-model="model.f_no_checkplan"
+                          :options='$parent.$parent.no_checkplans'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_no_checkplan='{}'"
+                          :value-single="true">
+                </v-select>
+              </div>
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -330,6 +342,7 @@ import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
       // }
       // model.f_subcompany = this.$login.f.f_fengongsi
       return {
+        no_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
         audioshow:false,
         searchData: {
           condition: "1=1",

package/src/filiale/kelai/pc/UserInfoAudit.vue

@@ -57,9 +57,8 @@
             </div>
             <div class="col-sm-4 " style="width: auto; margin-top: 8px">
               <button class="button_search button_spacing" @click="search">查询</button>
-              <!--<button class="button_new button_spacing" @click="$parent.$parent.verify()">审核</button>-->
-              <!--<button class="button_export button_spacing" @click="$parent.$parent.verifyAll()">一键审核</button>-->
-
+              <button class="button_new button_spacing" @click="$parent.$parent.verifyAll()">批量审核</button>
+              <button class="button_export button_spacing" @click="$parent.$parent.rejectAll()">批量不通过</button>
             </div>
           </div>
 
@@ -68,7 +67,7 @@
       <data-grid class="list_area table_sy" :model="model" partial='list' v-ref:grid>
         <template partial='head'>
           <tr>
-            <!--<th><nobr></nobr></th>-->
+            <th><nobr></nobr></th>
             <th><nobr>用户编号</nobr></th>
             <th><nobr>用户名称</nobr></th>
             <th><nobr>提交人</nobr></th>
@@ -81,7 +80,7 @@
           </tr>
         </template>
         <template partial='body'>
-          <!--<td style="text-align: center"><nobr><input type="checkbox" v-model="row.checked" v-bind:checked="row.checked"  @click="$parent.$parent.$parent.addChecked(row)"></nobr></td>-->
+          <td style="text-align: center"><nobr><input type="checkbox" v-model="row.checked" @click="$parent.$parent.$parent.addChecked(row)"></nobr></td>
           <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
           <td style="text-align: center"><nobr>{{row.f_modifier}}</nobr></td>
@@ -126,128 +125,165 @@ export default {
       excessive:false,
       userInformation:{},
       f_approval_states:this.$appdata.getParam('审核状态'),
+      checkedRows: [] // 新增：用于存储选中的行
     }
   },
   methods: {
     search(args){
       args += 'f_time= (select max(f_time) from t_modify_userinfo B where A.f_userinfoid = B.f_userinfoid)'
-     this.model.search(args)
+      this.model.search(args)
+      this.checkedRows = [] // 清空选中项
     },
     change(row) {
-      //tag)
       new HttpResetClass().load('post',`/rs/logic/filemanage_getFilesDetail`, {
-        //f_userinfo_code:'12381344',
         f_userinfo_id:row.f_userinfoid
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-        //tag
-        //this.userInformation=res.data
         this.$set('userInformation',res.data)
-        //tag
         this.$set('info',row)
         this.showModal = true
       })
-
     },
-    async todo(row){
+    addChecked(row) {
+      if (row.checked) {
+        this.checkedRows.push(row)
+      } else {
+        this.checkedRows.$remove(row)
+      }
+    },
+    async todo(row) {
       let r = confirm("确认修改该资料？")
-      if(r) {
-        this.excessive=true
-        let userinfoms=Object.assign({},this.userInformation.baseinfo.base)
-        //userinfoms.f_user_name=row.f_user_name
-        userinfoms.f_operator_record=row.f_modifier
-        userinfoms.f_operatorid_record=row.f_modifier_id
-        //userinfoms.f_remark=row.f_remark
-        //tag
-        if(this.userInformation.meterinfo[0].f_meter_classify!='物联网表'){
-          this.userInformation.meterinfo[0].f_meternumber=row.f_meternumber
+      if (r) {
+        this.excessive = true
+        let userinfoms = Object.assign({}, this.userInformation.baseinfo.base)
+        userinfoms.f_operator_record = row.f_modifier
+        userinfoms.f_operatorid_record = row.f_modifier_id
+
+        if (this.userInformation.meterinfo[0].f_meter_classify != '物联网表') {
+          this.userInformation.meterinfo[0].f_meternumber = row.f_meternumber
         }
-        userinfoms.userfiles=[]
+        userinfoms.userfiles = []
         userinfoms.userfiles.push(this.userInformation.meterinfo[0])
-        userinfoms.f_orgid_record=null
-        userinfoms.f_orgname_record=null
-        userinfoms.f_depid_record=null
-        userinfoms.f_depname_record=null
-        let useraddressms=Object.assign({},this.userInformation.addressinfo)
-        useraddressms.f_pcd=row.f_pcd
-        useraddressms.f_pcd_id=row.f_pcd_id
-        useraddressms.f_street=row.f_street
-        useraddressms.f_street_id=row.f_street_id
-        useraddressms.f_residential_area=row.f_residential_area
-        useraddressms.f_residential_area_id=row.f_residential_area_id
-        useraddressms.f_building=row.f_building?row.f_building:null
-        useraddressms.f_building_id=row.f_building_id
-        useraddressms.f_unit=row.f_unit?row.f_unit:null
-        useraddressms.f_floor=row.f_floor?row.f_floor:null
-        useraddressms.f_room=row.f_room?row.f_room:null
-        useraddressms.f_building_suffix= row.f_building_suffix?row.f_building_suffix:null
-        useraddressms.f_unit_suffix= row.f_unit_suffix?row.f_unit_suffix:null
-        useraddressms.f_floor_suffix= row.f_floor_suffix?row.f_floor_suffix:null
-        useraddressms.f_room_suffix= row.f_room_suffix?row.f_room_suffix:null
-        //useraddressms.f_slice_area=row.f_slice_area
-        useraddressms.f_address=row.f_address
-        useraddressms.f_special=row.f_special
-        useraddressms.f_iscity=row.f_iscity
-        useraddressms.f_operator=row.f_modifier
-        useraddressms.f_operatorid=row.f_modifier_id
-        try{
-          let res1=await new HttpResetClass().load('POST','/rs/logic/filemanage_fileSave', {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}审核通过更改档案信息`:'',address:{id:this.userInformation.addressinfo.id,oldid:this.userInformation.addressinfo.id}}},{resolveMsg: null, rejectMsg: null})
-          //tag)
-          if(res1.data.status==200){
-            let res2=await new HttpResetClass().load('POST','/rs/logic/address_updateuseraddress', useraddressms,{resolveMsg: null, rejectMsg: null})
-            //tag)
-            if(res2.data.id){
-              //tag)
-              this.info.f_approved='已审核'
-              this.info.f_approved_by=this.$login.f.name
-              this.info.f_approved_time=Util.toStandardTimeString()
-              //tag)
-              let res3=await new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null})
-                //tag)
-                if(res3.data.code==200){
-                  this.$showMessage("审核成功,用户信息已更新！")
-                  this.excessive=false
-                }else{
-                  this.$showMessage("审核失败！")
-                  this.excessive=false
-                }
-            }else{
+        userinfoms.f_orgid_record = null
+        userinfoms.f_orgname_record = null
+        userinfoms.f_depid_record = null
+        userinfoms.f_depname_record = null
+        let useraddressms = Object.assign({}, this.userInformation.addressinfo)
+        useraddressms.f_pcd = row.f_pcd
+        useraddressms.f_pcd_id = row.f_pcd_id
+        useraddressms.f_street = row.f_street
+        useraddressms.f_street_id = row.f_street_id
+        useraddressms.f_residential_area = row.f_residential_area
+        useraddressms.f_residential_area_id = row.f_residential_area_id
+        useraddressms.f_building = row.f_building ? row.f_building : null
+        useraddressms.f_building_id = row.f_building_id
+        useraddressms.f_unit = row.f_unit ? row.f_unit : null
+        useraddressms.f_floor = row.f_floor ? row.f_floor : null
+        useraddressms.f_room = row.f_room ? row.f_room : null
+        useraddressms.f_building_suffix = row.f_building_suffix ? row.f_building_suffix : null
+        useraddressms.f_unit_suffix = row.f_unit_suffix ? row.f_unit_suffix : null
+        useraddressms.f_floor_suffix = row.f_floor_suffix ? row.f_floor_suffix : null
+        useraddressms.f_room_suffix = row.f_room_suffix ? row.f_room_suffix : null
+        useraddressms.f_address = row.f_address
+        useraddressms.f_special = row.f_special
+        useraddressms.f_iscity = row.f_iscity
+        useraddressms.f_operator = row.f_modifier
+        useraddressms.f_operatorid = row.f_modifier_id
+        try {
+          let res1 = await new HttpResetClass().load('POST', '/rs/logic/filemanage_fileSave', {data: {userinfo: userinfoms, modifyReason: this.f_source ? `${this.f_source}审核通过更改档案信息` : '', address: {id: this.userInformation.addressinfo.id, oldid: this.userInformation.addressinfo.id}}}, {resolveMsg: null, rejectMsg: null})
+          if (res1.data.status == 200) {
+            let res2 = await new HttpResetClass().load('POST', '/rs/logic/address_updateuseraddress', useraddressms, {resolveMsg: null, rejectMsg: null})
+            if (res2.data.id) {
+              row.f_approved = '已审核'
+              row.f_approved_by = this.$login.f.name
+              row.f_approved_time = Util.toStandardTimeString()
+              let res3 = await new HttpResetClass().load('POST', '/rs/logic/SaveEntity', {data: {row: row, tablename: 't_modify_userinfo'}}, {resolveMsg: null, rejectMsg: null})
+              if (res3.data.code == 200) {
+                this.$showMessage("审核成功,用户信息已更新！")
+                this.excessive = false
+              } else {
+                this.$showMessage("审核失败！")
+                this.excessive = false
+              }
+            } else {
               this.$showMessage("更新地址信息失败！")
-              this.excessive=false
+              this.excessive = false
             }
-          }else{
+          } else {
             this.$showMessage("修改用户信息失败！")
-            this.excessive=false
+            this.excessive = false
           }
-        }catch(msg){
-          if( typeof msg == 'object' && msg.data){
-            this.$showMessage("修改用户信息失败！"+msg.data)
-          }else{
+        } catch (msg) {
+          if (typeof msg == 'object' && msg.data) {
+            this.$showMessage("修改用户信息失败！" + msg.data)
+          } else {
             this.$showMessage("审核失败,可以尝试重新点击审核按钮再次进行审核！！")
           }
-          this.excessive=false
+          this.excessive = false
         }
       }
     },
-    isnull(val){
-      if(val == null){
+    isnull(val) {
+      if (val == null) {
         return ''
-      }else{
+      } else {
         return val
       }
     },
-    undo(row){
-      this.info.f_approved='未通过'
-      this.info.f_approved_by=this.$login.f.name
-      this.info.f_approved_time=Util.toStandardTimeString()
-      new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
-        //tag)
+    async verifyAll() {
+      if (this.checkedRows.length === 0) {
+        this.$showMessage("请选择要批量审核的记录！")
+        return
+      }
+      let r = confirm("确认批量审核选中的资料？")
+      if (r) {
+        this.excessive = true
+        for (let i = 0; i < this.checkedRows.length; i++) {
+          let row = this.checkedRows[i]
+          if (row.f_approved === '未审核') {
+            await new HttpResetClass().load('post',`/rs/logic/filemanage_getFilesDetail`, {
+              f_userinfo_id:row.f_userinfoid
+            }, {resolveMsg: null, rejectMsg: null}).then(async (res) => {
+              this.$set('userInformation',res.data)
+              this.$set('info',row)
+              await this.todo(row)
+            })
+          }
+        }
+        this.excessive = false
+        this.search('') // 刷新列表
+        this.$showMessage("批量审核完成！")
+      }
+    },
+    async rejectAll() {
+      if (this.checkedRows.length === 0) {
+        this.$showMessage("请选择要批量不通过的记录！")
+        return
+      }
+      let r = confirm("确认批量不通过选中的资料？")
+      if (r) {
+        this.excessive = true
+        for (let i = 0; i < this.checkedRows.length; i++) {
+          let row = this.checkedRows[i]
+          if (row.f_approved === '未审核') {
+            await this.undo(row)
+          }
+        }
+        this.excessive = false
+        this.search('') // 刷新列表
+        this.$showMessage("批量不通过完成！")
+      }
+    },
+    async undo(row){
+      row.f_approved='未通过'
+      row.f_approved_by=this.$login.f.name
+      row.f_approved_time=Util.toStandardTimeString()
+      await new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:row,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
         if(res3.data.code==200){
           this.$showMessage("审核成功,审核结果:未通过！")
         }else{
           this.$showMessage("审核失败！")
         }
       })
-
     }
   }
 }

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

@@ -52,10 +52,9 @@
                 <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-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                  <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-old>
+                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
                 </div>
               </div>
             </div>
@@ -192,10 +191,9 @@
                 <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-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
+                  <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-old>
+                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
                 </div>
               </div>
             </div>

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

@@ -955,14 +955,14 @@ export default {
               // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
               this.isshow = true
               asyncReady(this).then(() => {
-                ////tag
-                ////tag)
-                if (this.data.f_check_type=='民用'){
+                if (this.data.f_check_type){
+                  if (this.data.f_check_type=='民用'){
+                    this.deviceconfig=Vue.config.safecheck.DevicesConfig
+                  }else if (this.data.f_check_type=='非民用'){
+                    this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
+                  }
+                }else {
                   this.deviceconfig=Vue.config.safecheck.DevicesConfig
-                  ////tag)
-                }else if (this.data.f_check_type=='非民用'){
-                  this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
-                  ////tag)
                 }
                 if (this.planmeter.f_meter_classify=='机表'){
                   let aaa=Object.assign({},this.configjb["燃气表"].items,this.deviceconfig["燃气表"].items)

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

@@ -44,10 +44,9 @@
 <!--                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"-->
 <!--                                 :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">-->
 <!--              </export-excel-safe>-->
-              <export-excel-old :data="$parent.$parent.exportParameter"
+              <export-excel-safe :data="$parent.$parent.exportParameter"
                                 :field="$parent.$parent.exportExcelField"
-                                progress="safeGetExportProgress"
-                                sqlurl="rs/logic/SafeExportExcel" sql-name="planItem" :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'"></export-excel-old>
+                                sqlurl="rs/logic/SafeExportExcel" sql-name="planItem" :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'"></export-excel-safe>
             </div>
             <div class="form-group col-sm-2 safe_p">
               <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>