safecheck-client 4.0.2-6 → 4.0.2-60

package/src/components/pc/DefectDeal.vue

@@ -248,7 +248,10 @@
             <img-self-plus v-if="solveModal.preData.defectImg1" :width="200" :height="200" :src="solveModal.preData.defectImg1"></img-self-plus>
             <img-self-plus v-if="solveModal.preData.defectImg2" :width="200" :height="200" :src="solveModal.preData.defectImg2"></img-self-plus>
           </div>
-
+          <div class="col-sm-12" style="margin-bottom: 10px; display: flex; gap: 10px" v-if="solveModal.preData.f_repaired_path">
+            <label class="font_normal_body">隐患通知单照片</label>
+            <img-self-plus v-if="solveModal.preData.f_repaired_path" :width="200" :height="200" :src="solveModal.preData.f_repaired_path"></img-self-plus>
+          </div>
           <div style="width: 100%;height: 36px;background-color: #f1f8ff;float: left">
             <div style="width: 8px;height: 100%;background-color: #6aa6e2;margin-right: 20px;float: left"></div>
             <div style="width: auto;height:100%;float: left;"><p class="title-font" style="margin-top: 5px">处理后</p></div>
@@ -506,6 +509,7 @@
             type: '',
             defectImg: '',
             defectImg1: '',
+            f_repaired_path: '',
             defectImg2: '',
             repairedImg: '',
             repairedImg1: '',
@@ -619,7 +623,7 @@
         this.solveModal.preData.defectImg = row.f_path ? '/rs/image/file/' + row.f_path : ''
         this.solveModal.preData.defectImg1 = row.f_p1_path ? '/rs/image/file/' + row.f_p1_path : ''
         this.solveModal.preData.defectImg2 = row.f_p2_path ? '/rs/image/file/' + row.f_p2_path : ''
-
+        this.solveModal.preData.f_repaired_path=row.f_repaired_path ? '/rs/image/file/' + row.f_repaired_path : ''
         this.solveModal.preData.repairedImg = row.f_repair_path ? (row.f_repair_path.startsWith('/resource') ? row.f_repair_path : '/rs/image/file/' + row.f_repair_path) : ''
         this.solveModal.preData.repairedImg1 = row.f_repair1_path ? (row.f_repair1_path.startsWith('/resource') ? row.f_repair1_path : '/rs/image/file/' + row.f_repair1_path) : ''
         this.solveModal.preData.repairedImg2 = row.f_repair2_path ? (row.f_repair2_path.startsWith('/resource') ? row.f_repair2_path : '/rs/image/file/' + row.f_repair2_path) : ''

package/src/components/planmanage/checkUserList.vue

@@ -406,7 +406,7 @@ export default {
   data() {
     return {
       model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
-        "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
+        "orderitem": "'f_address desc'",
         "f_usertype": "''",
         "month": "''",
         "SafeCheckSX": {"f_check_start": '', "f_check_end": ''},

package/src/components/querycheckpaper/CheckSearchUser.vue

@@ -787,7 +787,8 @@ export default {
       con += args.model.f_checker_id ? ` and f_checker_name in ${args.model.f_checker_id}` : ' and 1=1'
       let condition = {
         condition1: args.condition,
-        condition2: con
+        condition2: con,
+        condition3: '1 = 1'
       }
       this.searchData.condition = condition
       return this.model.search(condition, args.model)

package/src/components/report/CheckPlanAreaList.vue

@@ -1,6 +1,6 @@
 <template>
   <div  class="flex">
-    <criteria-paged :model="model" v-ref:paged :pager="false">
+    <criteria-paged :model="model" v-ref:paged>
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
@@ -41,6 +41,18 @@
                         close-on-select clear-button></v-select>
 
             </div>
+            <div  :class="{'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select class="select_list select"
+                        placeholder='片区/管理站' style="width: 60%"
+                        :value.sync="model.f_slice_area" v-model="model.f_slice_area"
+                        :options='$parent.$parent.sliceArea'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_slice_area='{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
             <!--<div  :class="{
             'form-group col-sm-3':$parent.$parent.$parent.isdetail,'form-group col-sm-2':!$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">安&ensp;检&ensp;员</label>
@@ -62,9 +74,12 @@
                                                      sqlurl="api/af-safecheck/logic/exportfile" sql-name="getCheckPlanAreaList"
                                                      template-name='安检汇总' :choose-col="true">
                                 </export-excel>-->
-                <button id="btnaaaa" style="float: right" class="button_search"
-                        @click="$parent.$parent.exportexcel()"
-                        v-el:cx>导出</button>
+                <export-excel   :data="$parent.$parent.exportParameter"
+                                :field="$parent.$parent.exportExcelField"
+                                sqlurl="api/af-safecheck/logic/exportfile"
+                                sql-name="getCheckPlanAreaList"
+                                template-name='安检汇总' :choose-col="true">
+                </export-excel>
                 <button id="btnaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.getGroupName1(),search(),$parent.$parent.getexportExcelField(),$parent.$parent.$parent.isdetail=false,$parent.$parent.listflag=false"
                         v-el:cx>查询</button>
@@ -108,6 +123,8 @@
               <label for="f_checker_name">安检员</label>
               <input type="checkbox" id="f_user_number" value="f_user_number" v-model="$parent.$parent.nameForSql"/>
               <label for="f_checker_name">档案数量</label>
+              <input type="checkbox" id="f_safecheck_type" value="f_safecheck_type" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_checker_name">安检类型</label>
             </div>
           </div>
         </div>
@@ -125,6 +142,7 @@
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')"><nobr>计划名称</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_checker_name')"><nobr>安检员</nobr></th>
             <th v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')"><nobr>档案数量</nobr></th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')"><nobr>安检类型</nobr></th>
             <th>
               <nobr>计划总数</nobr>
             </th>
@@ -165,6 +183,7 @@
             <td style="text-align:center" :class="{'td-0':row.f_plan_name==undefined,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_plan_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql.includes('f_plan_name')">{{row.f_plan_name.indexOf('*&')!=-1?'':row.f_plan_name}}</td>
             <td style="text-align:center" :class="{'td-0':row && !row.f_checker_name,'td-1':model.rows && model.rows.length!=($index+1)&&row.f_checker_name && row.f_checker_name.indexOf('*&')==-1,'td-2':model.rows && model.rows.length!=($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-3':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')!=-1,'td-4':model.rows && model.rows.length==($index+1)&&row.f_checker_name &&row.f_checker_name.indexOf('*&')==-1}" v-if="$parent.$parent.$parent.nameForSql && $parent.$parent.$parent.nameForSql.includes('f_checker_name')">{{row.f_checker_name && row.f_checker_name.indexOf('*&')!=-1?'':row.f_checker_name}}</td>
             <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_user_number')">{{row.f_user_number}}</td>
+            <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_safecheck_type')">{{row.f_safecheck_type}}</td>
             <td style="text-align:center">{{row.f_plan_total}}</td>
             <td style="text-align:center">{{row.f_weijian}}</td>
             <td style="text-align:center"><nobr>{{row.f_yijian}}</nobr></td>
@@ -203,12 +222,13 @@ import XLSX from 'xlsx'
 export default {
   data () {
     return {
-      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
+      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 50,{},{f_plan_total:'',f_weijian:'',f_yijian:'',f_ruhu:'',f_buyu:'',f_jujian:''}),
       // 公司下拉
       curorgid: [this.$login.f.orgid],
       row: {},
       f_orgid: '',
       nameForSql: [],
+      sliceArea: [],
       groupNameForSql: '',
       listflag:false,
       nameflag:false,
@@ -239,9 +259,32 @@ export default {
     this.groupNameForSql = 'f_plan_month', 'f_plan_name','f_checker_name'
     this.pl()
     // this.search()
+    this.Mreadibook(this.$login.f.orgid)
 
   },
   methods: {
+    Mreadibook(val){
+      if (val){
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
+            items: 'name',
+            tablename: 't_zone',
+            condition: `parentid = '${val}'`,
+            orderitem: 'id'
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.sliceArea=[]
+          this.sliceArea.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.sliceArea.push({
+              label:ress.name,
+              value:ress.name
+            })
+          })
+        })
+      }
+    },
     exportexcel(){
       //tag
 // 以上四行也可以直接一行搞定，如果不需要对表格数据进行修改的话
@@ -284,6 +327,9 @@ export default {
         }if (ff==='f_user_number') {
           this.exportExcelField.f_user_number='档案数量'
         }
+        if (ff==='f_safecheck_type') {
+          this.exportExcelField.f_safecheck_type='安检类型'
+        }
       }
     },
     pl() {
@@ -359,7 +405,7 @@ export default {
 
     // 拼接groupName1
     getGroupName1 () {
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
 
       for (var i=0;i<temp.length;i++){
@@ -396,7 +442,7 @@ export default {
       }
       this.listflag=true
       //tag
-      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number']
+      var temp=['f_plan_month','f_no_checkplan','f_residential_area','f_plan_name','f_checker_name','f_user_number','f_safecheck_type']
       var newtemp=[]
       for (var i=0;i<temp.length;i++){
         for (var j=0;j<this.nameForSql.length;j++){