safecheck-client 3.0.39-3 → 3.0.39-30

package/src/components/android/SafecheckOrderV.vue

@@ -259,7 +259,7 @@
               "金额异常差值":{"index":10,"type":"number","readonly": true},
               "系统余额":{"index":10,"type":"number","readonly": true},
               "表封号":{"index":11,"type":"string","readonly": true},
-              "燃气表照片":{"index":12,"type":"picture","checkmust": false}
+              "燃气表照片":{"index":12,"type":"picture","checkmust": true}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
           },

package/src/components/pc/AddPlanItemYyChange.vue

@@ -96,6 +96,9 @@
             <th>
               <nobr>安检员</nobr>
             </th>
+            <th>
+              <nobr>派单员</nobr>
+            </th>
             <th>
               <nobr>备注</nobr>
             </th>
@@ -109,6 +112,7 @@
           <td style="text-align: center;white-space:nowrap;">{{ row.f_user_name }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_handler_time }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_handlercheck_name }}</td>
+          <td style="text-align: center;white-space:nowrap;">{{ row.operator }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_safe_remark }}</td>
         </template>
       </data-grid>
@@ -156,7 +160,7 @@ let select = function* (self) {
   })
 }
 export default {
-  title: '隐患查询',
+  title: '预约安检',
   data() {
     let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20, {
       items: "'*'",

package/src/components/pc/SafeCheckOrder/SafeCheckOrderList.vue

@@ -68,6 +68,18 @@
                      condition="f_userinfo_code = '{}'"
                      placeholder="用户编号"/>
             </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">网&ensp;格&ensp;员</label>
+              <v-select class="select_list select"
+                        placeholder='请选择' style="width: 60%"
+                        :value.sync="model.f_book_checker" v-model="model.f_book_checker"
+                        :options='$parent.$parent.users'
+                        filer-key="name"
+                        close-on-select clear-button
+                        condition="f_book_checker like '%{}%' and f_checker_name = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
         </div>
       </div>
@@ -145,6 +157,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         // f_orgids: '1522.255', //测试使用
         suggetsShow: false,
         f_suggest: '',
+        users:[{label: '全部', value: ''}],
 
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
@@ -155,8 +168,29 @@ import {HttpResetClass, PagedList} from 'vue-client'
     ready(){
       // 默认查询待处理状态预约
       this.search()
+      this.initBookChecker()
     },
     methods: {
+      initBookChecker(){
+        new HttpResetClass().load('POST', '/rs/search', {
+          data: {
+            source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($网格员$) != -1)`,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          let data = res.data
+          const addedNames = new Set()
+          this.users = []
+          data.forEach(user => {
+            if (user.state === '在职') {
+              if (!addedNames.has(user.name)) {
+                this.users.push({ label: user.name, value: user.name })
+                addedNames.add(user.name)
+              }
+            }
+          });
+        })
+      },
       getPcds(val) {
         this.pcds = [{label: '全部', value: ''}]
         new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,

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

@@ -829,7 +829,9 @@
 
       },
       changeNewAddress() {
-        this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
+        // this.userinfo.addressinfo.f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
+        const f_address = this.addressType == '普通地址' ? this.getAddress : this.getAddressTS
+        console.log(f_address)
       },
       area_change() {
         //tag

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

@@ -23,10 +23,7 @@
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户电话:</b></p>
-          <input class="panel-title text-left input-font" style="width: 53%"
-                 value="{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}"
-                 v-model="userinfo.f_user_phone"/>
-
+          <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_user_phone2 ? userinfo.f_user_phone2 : userinfo.f_user_phone }}</p>
         </div>
         <!--        <div class="col-xs-12" style="padding: 2px 0" v-if="updateuserphone&&(userinfo.planmeterss.f_aliasname=='机表')">-->
         <!--          <p class="panel-title text-left font" style="width: 23%;float: left"><b>机表表号:</b></p>-->
@@ -39,10 +36,7 @@
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
-          <!--          <p class="panel-title text-left input-font" style="width: 79%;float: left">{{ userinfo.f_address }}</p>-->
-          <input class="panel-title text-left input-font" style="width: 53%"
-                 value="{{userinfo.f_address }}"
-                 v-model="userinfo.f_address"/>
+          <p class="panel-title text-left input-font" style="width: 79%">{{ userinfo.f_address }}</p>
         </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 30%;float: left"><b>租户电话:</b></p>

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

@@ -219,9 +219,9 @@ div {
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
                   {{ paperdata.f_visit_number }}
                 </td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">备注:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">预约备注:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
-                  {{ paperdata.f_remark }}
+                  {{ item.f_remark }}
                 </td>
               </tr>
               <tr>

package/src/filiale/bayan/pc/SummaryOfSecurityInspectionProgress.vue

@@ -6,7 +6,7 @@
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">计划时间</label>
+                <label class="font_normal_body">安检时间</label>
                 <datepicker
                   :value.sync="model.f_start_time"
                   placeholder='开始时间' style="width: 60%"
@@ -18,7 +18,7 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-2">
-                <label class="font_normal_body">计划时间</label>
+                <label class="font_normal_body">安检时间</label>
                 <datepicker
                   :value.sync="model.f_end_time"
                   placeholder='结束时间' style="width: 60%"
@@ -85,7 +85,7 @@
                 <nobr>入户率</nobr>
               </th>
               <th>
-                <nobr>未安检</nobr>
+                <nobr>无计划安检数</nobr>
               </th>
               <th>
                 <nobr>完成率</nobr>
@@ -99,7 +99,7 @@
             <td style="text-align: center" >{{row.f_safe_name}}</td>
             <td style="text-align: center" >{{row.f_ruhu_name}}</td>
             <td style="text-align: center" >{{row.f_ruhu_bv}}</td>
-            <td style="text-align: center" >{{row.f_wj_num}}</td>
+            <td style="text-align: center" >{{row.f_nosafe_num}}</td>
             <td style="text-align: center" >{{row.f_wc_bv}}</td>
           </template>
         </data-grid>
@@ -132,7 +132,7 @@ export default {
         'f_safe_name': '已安检',
         'f_ruhu_name': '已入户',
         'f_ruhu_bv': '入户率',
-        'f_wj_num': '未安检',
+        'f_nosafe_num': '无计划安检数',
         'f_wc_bv': '完成率'
       }
     }
@@ -143,10 +143,10 @@ export default {
       let condition1 = tempStr
       let condition2 = ' 1=1 '
       if (this.da_starttime){
-        condition2 += ` and f_open_date >= '${this.da_starttime}' `
+        condition2 += ` and tu.f_open_date >= '${this.da_starttime}' `
       }
       if (this.da_endtime){
-        condition2 += ` and f_open_date <= '${this.da_endtime}' `
+        condition2 += ` and tu.f_open_date <= '${this.da_endtime}' `
       }
 
       this.model.condition1=condition1