safecheck-client 3.0.39-5 → 3.0.39-50

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.f_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/RoleSelector.vue

@@ -1,172 +1,172 @@
-<template>
-  <div style="width: 100%;height: 100%">
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">公&emsp;&emsp;司</label>
-      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
-    </div>
-    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
-      <label class="font_normal_body">{{ roleLable }}</label>
-      <v-select :value="selVal" v-model='selVal'
-                :value-single="!valueMultiple"
-                class="select_list select"
-                :options='users' :placeholder='roleName'
-                :close-on-select = 'valueClose'
-                :multiple="valueMultiple"
-                :width="rightWidth"
-                @change="valuechange">
-      </v-select>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    name: "RoleSelector",
-    props: {
-      valueMultiple: {
-        type: Boolean,
-        default: false
-      },
-      roleName: {
-        type: String,
-        default: '安检员'
-      },
-      roleLable: {
-        type: String,
-        default: '安检员'
-      },
-      leftWidth: {
-        type: String,
-        default: '60%'
-      },
-      rightWidth: {
-        type: String,
-        default: '60%'
-      },
-      value: {
-        default: ''
-      },
-      resobjprop: {
-        default: {}
-      },
-      valueClose: {
-        type: Boolean,
-        default: true
-      }
-    },
-    data() {
-      return {
-        // source: `tool.getChildrenOfResName($${this.roleName}$)`,
-        source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
-        allUsers: [],
-        users: [],
-        selVal: '',
-        organizationname:this.$login.f.organizationname,
-        resids: [],
-        changeval: ''
-      }
-    },
-    watch: {
-      'value'(val) {
-        console.log("969696", val)
-        if (val) {
-          if (this.valueMultiple) {
-
-          } else {
-            this.selVal = val
-          }
-
-        }
-      }
-    },
-    async ready() {
-      await this.search()
-      await this.filterUser(this.resids)
-    },
-    methods: {
-      async clear() {
-        // 根据valueMultiple属性设置适当的空值
-        const emptyValue = this.valueMultiple ? [] : '';
-        // 设置内部状态
-        this.selVal = emptyValue;
-        // 调用valuechange方法，确保值同步
-        this.valuechange(emptyValue);
-      },
-      async search() {
-        let http = new HttpResetClass()
-        const res = await http.load('POST', '/rs/search', {
-          data: {
-            source: this.source,
-            userid: this.$login.f.id
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-        this.allUsers = res.data
-      },
-      valuechange(val) {
-        console.log(`val instanceof Array======${!val instanceof Array}`)
-        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
-          return
-        }
-        if (this.valueMultiple && Array.isArray(val)) {
-          if (val && val.length > 0) {
-            let valuesele = `(`
-            for (let i = 0; i < val.length; i++) {
-              valuesele += `'${val[i]}',`
-            }
-            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
-          } else {
-            this.value = ''
-          }
-        } else {
-          this.value = val
-        }
-        // this.changeval = val
-      },
-      getRes(obj) {
-        this.resids = obj.resids
-        this.organizationname = obj.res[0]
-        this.filterUser(this.resids)
-        this.$dispatch('re-res', obj)
-      },
-      async filterUser(resids) {
-        // 处理第一次进入页面值异常问题
-        if (resids.length > 0 && typeof resids[0] == "object") {
-          resids = resids[0]
-        }
-        if (resids[0]) {
-          this.source = `root.getResourceById($${resids[0]}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`
-          await this.search()
-        }
-        this.users = []
-        this.allUsers.forEach(user => {
-          if ((this.organizationname == user.organizationname || !user.organizationname) && user.state == '在职') {
-            this.users.push({label: user.name, value: user.name})
-          }
-        })
-        if (!this.valueMultiple && this.users.length > 0) {
-          this.users = [{label: '全部', value: ''}, ...this.users]
-        }
-        let temp = []
-        this.users = this.users.filter(item => {
-          if (!temp.includes(item.label)) {
-            temp.push(item.label)
-            return true
-          }
-          return false
-        })
-        let sort = this.$appdata.getSingleValue('数据排序') || '否'
-        if (sort == '是'){
-          this.users.sort((a,b)=>a.label.localeCompare(b.label, 'zh-Hans-CN'))
-        }
-        this.$emit('alluser', this.allUsers)
-        //tag
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <div style="width: 100%;height: 100%">
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">公&emsp;&emsp;司</label>
+      <right-tree-safe :width="leftWidth" @re-res="getRes" :resobjprop.sync="resobjprop"></right-tree-safe>
+    </div>
+    <div class="col-sm-6 form-group" style="margin-bottom: 0px">
+      <label class="font_normal_body">{{ roleLable }}</label>
+      <v-select :value="selVal" v-model='selVal'
+                :value-single="!valueMultiple"
+                class="select_list select"
+                :options='users' :placeholder='roleName'
+                :close-on-select = 'valueClose'
+                :multiple="valueMultiple"
+                :width="rightWidth"
+                @change="valuechange">
+      </v-select>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    name: "RoleSelector",
+    props: {
+      valueMultiple: {
+        type: Boolean,
+        default: false
+      },
+      roleName: {
+        type: String,
+        default: '安检员'
+      },
+      roleLable: {
+        type: String,
+        default: '安检员'
+      },
+      leftWidth: {
+        type: String,
+        default: '60%'
+      },
+      rightWidth: {
+        type: String,
+        default: '60%'
+      },
+      value: {
+        default: ''
+      },
+      resobjprop: {
+        default: {}
+      },
+      valueClose: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        // source: `tool.getChildrenOfResName($${this.roleName}$)`,
+        source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`,
+        allUsers: [],
+        users: [],
+        selVal: '',
+        organizationname:this.$login.f.organizationname,
+        resids: [],
+        changeval: ''
+      }
+    },
+    watch: {
+      'value'(val) {
+        console.log("969696", val)
+        if (val) {
+          if (this.valueMultiple) {
+
+          } else {
+            this.selVal = val
+          }
+
+        }
+      }
+    },
+    async ready() {
+      await this.search()
+      await this.filterUser(this.resids)
+    },
+    methods: {
+      async clear() {
+        // 根据valueMultiple属性设置适当的空值
+        const emptyValue = this.valueMultiple ? [] : '';
+        // 设置内部状态
+        this.selVal = emptyValue;
+        // 调用valuechange方法，确保值同步
+        this.valuechange(emptyValue);
+      },
+      async search() {
+        let http = new HttpResetClass()
+        const res = await http.load('POST', '/rs/search', {
+          data: {
+            source: this.source,
+            userid: this.$login.f.id
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        this.allUsers = res.data
+      },
+      valuechange(val) {
+        console.log(`val instanceof Array======${!val instanceof Array}`)
+        if ((typeof val === 'object' && !val instanceof Array) || (val instanceof Event)) {
+          return
+        }
+        if (this.valueMultiple && Array.isArray(val)) {
+          if (val && val.length > 0) {
+            let valuesele = `(`
+            for (let i = 0; i < val.length; i++) {
+              valuesele += `'${val[i]}',`
+            }
+            this.value = valuesele.substring(0, valuesele.length - 1) + ')'
+          } else {
+            this.value = ''
+          }
+        } else {
+          this.value = val
+        }
+        // this.changeval = val
+      },
+      getRes(obj) {
+        this.resids = obj.resids
+        this.organizationname = obj.res[0]
+        this.filterUser(this.resids)
+        this.$dispatch('re-res', obj)
+      },
+      async filterUser(resids) {
+        // 处理第一次进入页面值异常问题
+        if (resids.length > 0 && typeof resids[0] == "object") {
+          resids = resids[0]
+        }
+        if (resids[0]) {
+          this.source = `root.getResourceById($${resids[0]}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`
+          await this.search()
+        }
+        this.users = []
+        this.allUsers.forEach(user => {
+          if ((this.organizationname == user.organizationname || !user.organizationname) && user.state == '在职') {
+            this.users.push({label: user.name, value: user.name})
+          }
+        })
+        if (!this.valueMultiple && this.users.length > 0) {
+          this.users = [{label: '全部', value: ''}, ...this.users]
+        }
+        let temp = []
+        this.users = this.users.filter(item => {
+          if (!temp.includes(item.label)) {
+            temp.push(item.label)
+            return true
+          }
+          return false
+        })
+        let sort = this.$appdata.getSingleValue('数据排序') || '否'
+        if (sort == '是'){
+          this.users.sort((a,b)=>a.label.localeCompare(b.label, 'zh-Hans-CN'))
+        }
+        this.$emit('alluser', this.allUsers)
+        //tag
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

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`,