safecheck-client 3.0.33-16 → 3.0.33-160

package/src/filiale/yangchunboneng/pc/CheckSearchUser.vue

@@ -9,7 +9,7 @@
               <input style="width: 60%" type="text" class="input_search" v-model="model.f_userinfo"
                      id="f_userinfo"
                      placeholder="编号 名称 电话 表号 地址"
-                     condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_meternumber like '%{}%' or f_address like '%{}%')">
+                     condition="(f_userinfo_code like '%{}%' or f_user_name like '%{}%' or f_user_phone like '%{}%' or f_meternumber like '%{}%' or f_address like '%{}%' or f_zuhu_phone like '%${}%' or f_rent_phone like '%${}%')">
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">用户编号</label>
@@ -24,9 +24,15 @@
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input style="width: 60%" type="text" class="input_search" v-model="model.f_residential_area"
-                     id="f_residential_area"
-                     placeholder="小区" condition="f_residential_area like '%{}%'">
+              <v-select id="f_residential_area"
+                        placeholder='小区'
+                        class="select select_list"
+                        :value.sync="model.f_residential_area"
+                        :options='$parent.$parent.residentialareas'
+                        :multiple='true'
+                        v-model="model.f_residential_area"
+                        condition="f_residential_area in {}"
+                        ></v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">地&emsp;&emsp;址</label>
@@ -186,6 +192,72 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">通气起始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='通气时间起始'
+                :disabled-days-of-week="[]"
+                style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_uservent_date  >= '{}'"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">通气结束</label>
+              <datepicker
+                :value.sync="model.f_gas_end"
+                placeholder='通气时间结束'
+                style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                condition="f_uservent_date  <= '{}'"
+                v-model="model.f_gas_end">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">建档起始</label>
+              <datepicker
+                :value.sync="model.f_createfile_start"
+                placeholder='建档时间起始'
+                :disabled-days-of-week="[]"
+                style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_createfile_start"
+                condition="f_createfile_date  >= '{}'"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">建档结束</label>
+              <datepicker
+                :value.sync="model.f_createfile_end"
+                placeholder='建档时间结束'
+                style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                condition="f_createfile_date  <= '{}'"
+                v-model="model.f_createfile_end">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安&ensp;检&ensp;册</label>
+              <v-select id="f_check_book_name"
+                        placeholder='安检册'
+                        class="select select_list"
+                        :value.sync="model.f_check_book_name"
+                        :options='$parent.$parent.checkbooknames'
+                        :multiple='true'
+                        v-model="model.f_check_book_name"
+                        condition="f_check_book_name in {}"
+              ></v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -218,12 +290,6 @@
 
           </div>
           <div class="row" v-show="$parent.$parent.$parent.showItem">
-            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input style="width: 60%" type="text" class="input_search" v-model="model.f_residential_area"
-
-                     placeholder="小区" condition="f_residential_area like '%{}%'">
-            </div>
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">地&emsp;&emsp;址</label>
               <input style="width: 60%" type="text" class="input_search" v-model="model.f_address"
@@ -307,7 +373,60 @@
                 condition="f_defect_content  like '%{}%'"
                 close-on-select clear-button></v-select>
             </div>
-
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">通气起始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='通气时间起始'
+                :disabled-days-of-week="[]"
+                style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_uservent_date  >= '{}'"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">通气结束</label>
+              <datepicker
+                :value.sync="model.f_gas_end"
+                placeholder='通气时间结束'
+                style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                condition="f_uservent_date  <= '{}'"
+                v-model="model.f_gas_end">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">建档起始</label>
+              <datepicker
+                :value.sync="model.f_createfile_start"
+                placeholder='建档时间起始'
+                :disabled-days-of-week="[]"
+                style="width: 60%"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_createfile_start"
+                condition="f_createfile_date  >= '{}'"
+              >
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">建档结束</label>
+              <datepicker
+                :value.sync="model.f_createfile_end"
+                placeholder='建档时间结束'
+                style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                condition="f_createfile_date  <= '{}'"
+                v-model="model.f_createfile_end">
+              </datepicker>
+            </div>
           </div>
           <!--<div class="row" v-show="$parent.$parent.$parent.showItem">
             <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
@@ -346,12 +465,18 @@
 <!--            <th>-->
 <!--              <nobr>灶具</nobr>-->
 <!--            </th>-->
+            <th>
+              <nobr>片区</nobr>
+            </th>
             <th>
               <nobr>小区名称</nobr>
             </th>
             <th style="padding: 0 40px">
               <nobr>地址</nobr>
             </th>
+            <th>
+              <nobr>安检册</nobr>
+            </th>
             <th>
               <nobr>安检员</nobr>
             </th>
@@ -387,8 +512,10 @@
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_type }}</td>
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_hasfurnace }}</td>-->
 <!--          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_safe_haskitchen }}</td>-->
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_slice_area }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_residential_area }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_address }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_check_book_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_checker_name }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_last_check_state }}</td>
@@ -396,7 +523,7 @@
             {{row.f_last_check_state!='入户' ? '': (row.f_last_check_result == '无隐患' ? '无问题' : row.f_last_check_result) }}
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
-          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_uservent_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
@@ -471,13 +598,14 @@ export default {
         'f_meternumber': '用户表号',
         'f_user_type': '用户类型',
         'f_checker_name': '安检员',
+        'f_slice_area': '片区',
         'f_residential_area': '小区名称',
         'f_address': '地址',
         'f_last_check_date': '安检日期',
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期',
-        'f_gas_date': '通气日期'
+        'f_uservent_date': '通气日期'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
@@ -521,6 +649,8 @@ export default {
       f_check_results: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '有隐患', value: '有隐患'}],
       creatPlanWay: '',
       sliceArea: [],
+      residentialareas: [],
+      checkbooknames: [],
       cbcs:[],
       cbc:[],
       pcds:[]
@@ -554,6 +684,8 @@ export default {
     this.model.f_OrgStr = this.$login.f.orgpathstr
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
+    this.getresidentialarea()
+    this.getcheckbookname()
   },
   methods: {
     //查询二维码
@@ -637,6 +769,48 @@ export default {
         })
       }
     },
+    getresidentialarea(){
+        new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+            items: 'f_residential_area',
+            tablename: 't_user_address',
+            condition: `f_residential_area is not null and f_orgid = '${this.$login.f.orgid}'`,
+            groupitem: 'f_residential_area',
+          }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.residentialareas=[]
+          this.residentialareas.push({
+            label:'全部',
+            value:''
+          })
+          res.data.forEach(ress=>{
+            this.residentialareas.push({
+              label:ress.f_residential_area,
+              value:ress.f_residential_area
+            })
+          })
+
+        })
+    },
+    getcheckbookname(){
+      new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_GroupBy`, {data: {
+          items: 'f_check_book_name',
+          tablename: 't_check_book',
+          condition: ` f_orgid = '${this.$login.f.orgid}'`,
+          groupitem: 'f_check_book_name',
+        }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        this.checkbooknames=[]
+        this.checkbooknames.push({
+          label:'全部',
+          value:''
+        })
+        res.data.forEach(ress=>{
+          this.checkbooknames.push({
+            label:ress.f_check_book_name,
+            value:ress.f_check_book_name
+          })
+        })
+
+      })
+    },
     // 获取县域分公司内容
     getfengongsi() {
       let val = {

package/src/filiale/yangchunboneng/pc/PaperDefectMain.vue

@@ -256,7 +256,8 @@
             <td style="text-align: center">{{row.f_address}}</td>
             <td style="text-align: center">{{row.f_offsite_time}}</td>
             <td style="text-align: center">{{row.f_checker_name}}</td>
-            <td style="text-align: center">{{row.f_is_repaired}}</td>
+            <td style="text-align: center" v-if="row.f_is_repaired == '隐患未处理' && $parent.$parent.$parent.inrole()" @click="$parent.$parent.$parent.showSolve(row)"><a>{{row.f_is_repaired}}</a></td>
+            <td style="text-align: center" v-else>{{row.f_is_repaired}}</td>
             <td style="text-align: center">{{row.f_repairman}}</td>
             <td style="text-align: center">{{row.f_deal_dispose}}</td>
             <td style="text-align: center">{{row.f_repair_date}}</td>
@@ -350,6 +351,40 @@
         </div>
         <div slot="modal-footer" class="modal-footer" style="text-align: center" v-show="false"></div>
       </modal>
+      <modal :show.sync="showSolveModal" v-ref:solveModal>
+        <div slot="modal-header" class="modal-header">
+          <h4 class="modal-title">
+            处理隐患
+          </h4>
+        </div>
+        <div slot="modal-body" class="modal-body">
+          <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>
+          </div>
+
+          <div class="col-sm-6" style="margin-top: 10px">
+            <label class="font_normal_body">安&nbsp;检&nbsp;员</label>
+            <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="solve.model.f_checker_name" placeholder="安检员">
+          </div>
+          <div class="col-sm-6" style="margin-top: 10px">
+            <label class="font_normal_body">安检时间</label>
+            <input class="input_search" style="width: 60%" type="text" disabled="true" v-model="solve.model.f_offsite_time" placeholder="安检时间">
+          </div>
+          <div class="col-sm-12" style="margin-bottom: 10px" v-if="solve.model.defectImg">
+            <label class="font_normal_body">隐患图片</label>
+            <img-self :width="200" :height="200" :src="solve.model.defectImg"></img-self>
+          </div>
+          <div class="col-sm-12" style="margin-bottom: 10px">
+            <label class="font_normal_body">处理后图片</label>
+            <avatar-upload :width="200" :height="200" :img-src.sync="solve.imgSrc" :filename.sync="solve.filename" v-ref:imginfo></avatar-upload>
+          </div>
+        </div>
+        <div slot="modal-footer" class="modal-footer" style="text-align: center">
+          <button class="button_search" @click="okDefect">确认</button>
+          <button class="button_search" @click="cancelsolveDefect">取消</button>
+        </div>
+      </modal>
     </div>
   </div>
 </template>
@@ -363,7 +398,27 @@
   import getNowDate from "../../../utils/getNowDate";
   import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
   import BenzAMRRecorder from 'benz-amr-recorder'
-
+  const upSolveDefect = function * (self) {
+    self.solve.f_deal_dispose = self.solve.f_deal_dispose || '已处理'
+    self.$resetpost('/rs/logic/pcRepairDefectNew', self.solve, {resolveMsg: null, rejectMsg: null})
+      .then(res => {
+        if (res.data.code === 200) {
+          self.$showMessage('隐患已处理。')
+          self.showSolveModal = false
+          self.search()
+          self.solve={
+            model:{},
+            id: '',
+            f_repairman: self.$login.f.name,
+            f_repair_date: Util.getNowDate().substr(0, 10),
+            f_repair_path: '',
+            imgSrc: '',
+            filename: '',
+            f_defect_remark:''
+          }
+        }
+      })
+  }
   //获取json配置文件
   let asyncReady = async function (self) {
     // 获取配置信息
@@ -460,7 +515,18 @@
         showModal3: false,
         progressbarWidth:'0',
         canToRepair: this.$appdata.getSingleValue('隐患明细转维修'),
-        checkes: []
+        checkes: [],
+        solve:{
+          model:{},
+          id: '',
+          f_repairman: this.$login.f.name,
+          f_repair_date: Util.getNowDate().substr(0, 10),
+          f_repair_path: '',
+          imgSrc: '',
+          filename: '',
+          f_defect_remark:''
+        },
+        showSolveModal:false
       }
     },
     computed :{
@@ -830,6 +896,35 @@
         ////tag
         args.condition += ` and f_filialeid in ${this.model.f_filialeid}`
         this.model.search(args.condition, args.model, args.condValue)
+      },
+      cancelsolveDefect() {
+        this.showSolveModal = false
+        this.solve = {
+          model:{},
+          id: '',
+          f_repairman: this.$login.f.name,
+          f_repair_date: Util.getNowDate().substr(0, 10),
+          f_repair_path: '',
+          imgSrc: '',
+          filename: '',
+          f_defect_remark:''
+        }
+      },
+      okDefect(){
+        if (!(this.solve.filename && this.solve.filename.length > 0)) {
+          this.$showMessage('请录入处理后照片')
+          return
+        }
+        co(upSolveDefect(this))
+      },
+      showSolve(row){
+        this.showSolveModal = true
+        this.solve.model = row
+        this.solve.model.defectImg = row.f_path?'/rs/image/file/' + row.f_path:null
+        this.solve.id = row.f_defect_id
+      },
+      inrole(){
+        return this.$login.f.rolestr.indexOf('安检隐患处理') != -1
       }
     },
 

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

@@ -230,6 +230,17 @@
                           :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_client_evaluation" v-model="model.f_client_evaluation"
+                          :options='$parent.$parent.evaluations'
+                          close-on-select clear-button
+                          condition="f_client_evaluation='{}'"
+                          :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">
@@ -298,6 +309,9 @@
               <th>
                 <nobr>备注</nobr>
               </th>
+              <th>
+                <nobr>客户评价</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -325,6 +339,7 @@
             <td style="text-align: center">{{row.f_remaining_gas_volume}}</td>
             <td style="text-align: center">{{row.f_remaining_amount}}</td>
             <td style="text-align: center">{{row.f_repair_approved_note}}</td>
+            <td style="text-align: center">{{row.f_client_evaluation}}</td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
 
@@ -444,6 +459,7 @@ export default {
         'f_remaining_amount': '剩余金额',
         'f_safecheck_type':'安检类型',
         'f_repair_approved_note': '备注',
+        'f_client_evaluation': '评价',
         'f_plan_name': '计划名称',
       },
       fun: this.$login.f,
@@ -461,6 +477,7 @@ export default {
       f_entry_status: this.$appdata.getParam('安检状态')?[{label: '全部', value: ''}, ...this.$appdata.getParam('安检状态')]:[{label: '全部', value: ''}],
       f_checkplans: this.$appdata.getParam('有无计划')?[{label: '全部', value: ''}, ...this.$appdata.getParam('有无计划')]:[{label: '全部', value: ''}],
       showcheckmsg: false,
+      evaluations:[{label: '全部', value: ''},{label: '满意', value: '满意'},{label: '基本满意', value: '基本满意'},{label: '不满意', value: '不满意'}],
       checkInfo: {},
       orderDefault: "'f_offsite_time'",
       orderFields: {

package/src/filiale/yongzhou/android/PaperFeedback.vue

@@ -1229,7 +1229,7 @@ export default {
       ////tag)
       ////tag
       let limit_times=1
-      let limit_value=3
+      let limit_value=5
       if(Vue.config.safecheck && Vue.config.safecheck.ApproveConfig.limit_times && Vue.config.safecheck.ApproveConfig.limit_value){
         limit_times = Vue.config.safecheck.ApproveConfig.limit_times
         limit_value = Vue.config.safecheck.ApproveConfig.limit_value