safecheck-client 3.0.33-11 → 3.0.33-110

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

@@ -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"
+                        :value-single="true"
+                        :options='$parent.$parent.residentialareas'
+                        v-model="model.f_residential_area"
+                        condition="f_residential_area = '{}'"
+                        close-on-select clear-button></v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">地&emsp;&emsp;址</label>
@@ -186,6 +192,89 @@
                         :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_gas_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_gas_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">通气开始</label>
+              <datepicker
+                :value.sync="model.f_gas_start"
+                placeholder='开始时间' style="width: 60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                v-model="model.f_gas_start"
+                condition="f_gas_date > ='{} 00:00:00'">
+              </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"
+                v-model="model.f_gas_end"
+                condition="f_gas_date <=  '{} 23:59:59'">
+              </datepicker>
+            </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检册</label>
+              <input style="width: 60%" type="text" class="input_search" v-model="model.f_check_book_name" id="f_check_book_name"
+                     placeholder="安检册" condition="f_check_book_name like '%{}%'">
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -307,7 +396,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_defect_content  >= '{}'"
+              >
+              </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_gas_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 +488,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 +535,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>
@@ -471,6 +621,7 @@ export default {
         'f_meternumber': '用户表号',
         'f_user_type': '用户类型',
         'f_checker_name': '安检员',
+        'f_slice_area': '片区',
         'f_residential_area': '小区名称',
         'f_address': '地址',
         'f_last_check_date': '安检日期',
@@ -521,6 +672,7 @@ export default {
       f_check_results: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '有隐患', value: '有隐患'}],
       creatPlanWay: '',
       sliceArea: [],
+      residentialareas: [],
       cbcs:[],
       cbc:[],
       pcds:[]
@@ -554,6 +706,7 @@ export default {
     this.model.f_OrgStr = this.$login.f.orgpathstr
     this.Mreadibook(`('${this.$login.f.orgid}')`)
     this.getAllMeterBook(`('${this.$login.f.orgid}')`)
+    this.getresidentialarea()
   },
   methods: {
     //查询二维码
@@ -637,6 +790,27 @@ 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
+            })
+          })
+
+        })
+    },
     // 获取县域分公司内容
     getfengongsi() {
       let val = {

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: {