safecheck-client 3.0.34-35 → 3.0.34-39

package/src/components/android/examples/SafeListExamples.vue

@@ -1,96 +1,96 @@
-<template>
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body">
-      <div class="panel panel-default well" v-if="model.length>0">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户名称: {{ model[0].f_user_name }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户编号: {{ model[0].f_userinfo_code }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户电话: {{ model[0].f_user_phone }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  用户地址: {{ model[0].f_address }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="panel panel-default well" v-for="row in model">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检时间: {{ row.f_offsite_time }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检员: {{ row.f_checker_name }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检状态: {{ row.f_entry_status }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  安检结果: {{ row.f_defect_content.include('正常') ? '正常' : '有隐患' }}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  整改内容: {{ row.f_defect_text }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '查询用户',
-  data() {
-    return {
-      model: [],
-      f_safecheck_code: ''
-    }
-  },
-  methods: {
-    getmodel() {
-      let http = new HttpResetClass()
-      http.load('POST', `rs/sql/tel_singleTable_OrderBy`, {
-        data: {
-          items: "tcp.*,CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END as f_defect_text",
-          tablename: 't_check_paper tcp left join t_qr_code tqr on tcp.f_userinfoid = tqr.f_userinfo_id',
-          condition: `tqr.f_safecheck_code  = '${this.f_safecheck_code}'`,
-          orderitem: 'tcp.f_offsite_time desc'
-        }
-      }).then((res) => {
-        this.model = res.data
-      })
-    },
-  },
-  ready() {
-    console.log(window.location.href)
-    let url = window.location.href
-    if (url.includes('id')){
-      const urlObj = new URL(url);
-      this.f_safecheck_code = urlObj.searchParams.get('id')
-      this.getmodel()
-    }else {
-      console.log(window.location.href)
-      console.log('非法数据')
-    }
-  }
-}
-</script>
-<style>
-</style>
+<template>
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body">
+      <div class="panel panel-default well" v-if="model.length>0">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户名称: {{ model[0].f_user_name }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户编号: {{ model[0].f_userinfo_code }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户电话: {{ model[0].f_user_phone }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  用户地址: {{ model[0].f_address }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检时间: {{ row.f_offsite_time }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检员: {{ row.f_checker_name }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检状态: {{ row.f_entry_status }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  安检结果: {{ row.f_defect_content.include('正常') ? '正常' : '有隐患' }}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  整改内容: {{ row.f_defect_text }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '查询用户',
+  data() {
+    return {
+      model: [],
+      f_safecheck_code: ''
+    }
+  },
+  methods: {
+    getmodel() {
+      let http = new HttpResetClass()
+      http.load('POST', `rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: "tcp.*,CASE WHEN CHARINDEX( '\"result\":\"正常\"', f_defect_content ) > 0 THEN '无隐患' ELSE replace(replace(replace( replace( RIGHT ( f_defect_content, len( f_defect_content ) - 26 ), substring('{}',2,1), '' ), substring('{}',1,1), '' ),']',''),'\"','') END as f_defect_text",
+          tablename: 't_check_paper tcp left join t_qr_code tqr on tcp.f_userinfoid = tqr.f_userinfo_id',
+          condition: `tqr.f_safecheck_code  = '${this.f_safecheck_code}'`,
+          orderitem: 'tcp.f_offsite_time desc'
+        }
+      }).then((res) => {
+        this.model = res.data
+      })
+    },
+  },
+  ready() {
+    console.log(window.location.href)
+    let url = window.location.href
+    if (url.includes('id')){
+      const urlObj = new URL(url);
+      this.f_safecheck_code = urlObj.searchParams.get('id')
+      this.getmodel()
+    }else {
+      console.log(window.location.href)
+      console.log('非法数据')
+    }
+  }
+}
+</script>
+<style>
+</style>

package/src/components/android/examples/UserExamples.vue

@@ -1,126 +1,126 @@
-<template>
-  <div class="work-badge" style="height: 100%">
-    <div class="badge-top" style="height: 33%">
-      <div class="badge-number">NO.{{ f_head_code }}</div>
-    </div>
-    <div class="badge-middle" style="height: 33%">
-      <img class="badge-image" :src="f_head_pic" alt="Badge Image">
-      <h1 class="name">{{ f_head_name }}</h1>
-      <div class="position">{{ f_head_post }}</div>
-    </div>
-    <div class="badge-bottom" style="height: 33%">
-      <div class="contact">
-        <img class="phone-icon" src="../../../assets/123.png" style="height: 30px;width: 30px" alt="Phone Icon">
-        <span style="font-size: 30px">{{ f_head_phone }}</span>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from "vue-client";
-
-export default {
-  name: 'WorkBadge',
-  title:'WorkBadge',
-  data () {
-    return {
-      // 默认值或初始状态
-      f_head_pic: '',
-      f_head_code: '',
-      f_head_name: '',
-      f_head_post: '',
-      f_head_phone: ''
-    };
-  },
-  async ready () {
-    console.log(window.location.href)
-    let id = ''
-    let url = window.location.href
-    if (url.includes('id')){
-      const urlObj = new URL(url);
-      id = urlObj.searchParams.get('id');
-      let QRCode = await new HttpResetClass().load('post',`rs/sql/tel_singleTable_OrderBy`,{data: {
-          items: '*',
-          tablename: 't_qr_code',
-          condition: `f_head_code = '${id}'`,
-          orderitem: '1'
-        }})
-      if (QRCode && QRCode.data && QRCode.data.length > 0){
-        this.f_head_pic = `/resource/af-revenue/images/${QRCode.data[0].f_head_pic}`
-        this.f_head_code = QRCode.data[0].f_head_code
-        this.f_head_name = QRCode.data[0].f_head_name
-        this.f_head_post = QRCode.data[0].f_head_post
-        this.f_head_phone = QRCode.data[0].f_head_phone
-      }else {
-        console.log('获取二维码信息失败')
-        console.log(QRCode)
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-.work-badge {
-  display: flex;
-  flex-direction: column;
-  background-image: url('../../../assets/f8632d3c8c4c1cb68e99da754cab1a7.png');
-  align-items: center;
-  background-color: #007BFF;
-  color: white;
-  padding: 20px;
-  border-radius: 10px;
-}
-
-.badge-top {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.badge-image {
-  width: 150px;
-  height: 150px;
-  margin-right: 20px;
-}
-
-.badge-number {
-  font-size: 24px;
-  float: left;
-  text-align: left;
-  font-weight: bold;
-}
-
-.badge-middle {
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.name {
-  font-size: 48px;
-  font-weight: bold;
-  margin-bottom: 10px;
-}
-
-.position {
-  font-size: 24px;
-}
-
-.badge-bottom {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.contact {
-  display: flex;
-  align-items: center;
-}
-
-.phone-icon {
-  width: 30px;
-  height: 30px;
-  margin-right: 10px;
-}
-</style>
+<template>
+  <div class="work-badge" style="height: 100%">
+    <div class="badge-top" style="height: 33%">
+      <div class="badge-number">NO.{{ f_head_code }}</div>
+    </div>
+    <div class="badge-middle" style="height: 33%">
+      <img class="badge-image" :src="f_head_pic" alt="Badge Image">
+      <h1 class="name">{{ f_head_name }}</h1>
+      <div class="position">{{ f_head_post }}</div>
+    </div>
+    <div class="badge-bottom" style="height: 33%">
+      <div class="contact">
+        <img class="phone-icon" src="../../../assets/123.png" style="height: 30px;width: 30px" alt="Phone Icon">
+        <span style="font-size: 30px">{{ f_head_phone }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  name: 'WorkBadge',
+  title:'WorkBadge',
+  data () {
+    return {
+      // 默认值或初始状态
+      f_head_pic: '',
+      f_head_code: '',
+      f_head_name: '',
+      f_head_post: '',
+      f_head_phone: ''
+    };
+  },
+  async ready () {
+    console.log(window.location.href)
+    let id = ''
+    let url = window.location.href
+    if (url.includes('id')){
+      const urlObj = new URL(url);
+      id = urlObj.searchParams.get('id');
+      let QRCode = await new HttpResetClass().load('post',`rs/sql/tel_singleTable_OrderBy`,{data: {
+          items: '*',
+          tablename: 't_qr_code',
+          condition: `f_head_code = '${id}'`,
+          orderitem: '1'
+        }})
+      if (QRCode && QRCode.data && QRCode.data.length > 0){
+        this.f_head_pic = `/resource/af-revenue/images/${QRCode.data[0].f_head_pic}`
+        this.f_head_code = QRCode.data[0].f_head_code
+        this.f_head_name = QRCode.data[0].f_head_name
+        this.f_head_post = QRCode.data[0].f_head_post
+        this.f_head_phone = QRCode.data[0].f_head_phone
+      }else {
+        console.log('获取二维码信息失败')
+        console.log(QRCode)
+      }
+    }
+  }
+};
+</script>
+<style scoped>
+.work-badge {
+  display: flex;
+  flex-direction: column;
+  background-image: url('../../../assets/f8632d3c8c4c1cb68e99da754cab1a7.png');
+  align-items: center;
+  background-color: #007BFF;
+  color: white;
+  padding: 20px;
+  border-radius: 10px;
+}
+
+.badge-top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.badge-image {
+  width: 150px;
+  height: 150px;
+  margin-right: 20px;
+}
+
+.badge-number {
+  font-size: 24px;
+  float: left;
+  text-align: left;
+  font-weight: bold;
+}
+
+.badge-middle {
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.name {
+  font-size: 48px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.position {
+  font-size: 24px;
+}
+
+.badge-bottom {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.contact {
+  display: flex;
+  align-items: center;
+}
+
+.phone-icon {
+  width: 30px;
+  height: 30px;
+  margin-right: 10px;
+}
+</style>

package/src/filiale/bayan/android/SafecheckOrderV.vue

@@ -84,6 +84,13 @@
                     close-on-select>
           </v-select>
         </div>
+        <div class="row" style="margin-top: 10px">
+          <label class="font_normal_body">选择站点</label>
+          <right-tree
+            islist
+            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
+            @re-res="getSiteRes"></right-tree>
+        </div>
         <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给维修员'">
           <label class="font_normal_body">维&ensp;修&ensp;员</label>
           <v-select
@@ -93,13 +100,6 @@
             placeholder='请选择维修员'
             close-on-select></v-select>
         </div>
-        <div class="row" style="margin-top: 10px" v-if="selectData.dispatchType=='派发给站点'">
-          <label class="font_normal_body">站&ensp;&ensp;&ensp;&ensp;点</label>
-          <right-tree
-            islist
-            :source="'dep=this.getParentByType($organization$).getSpecialResByType($department$),tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))'"
-            @re-res="getSiteRes"></right-tree>
-        </div>
         <!--<div class="row" style="margin-top: 10px">
           <label class="font_normal_body">报修类型</label>
           <v-select :value.sync="selectData.f_repairtype"
@@ -362,7 +362,7 @@
         }
         console.log("准备保存！")
         this.disableTimer()
-        this.getEmp()
+        // this.getEmp()
         this.showModal2=true
       },
       cancel1(){
@@ -377,14 +377,37 @@
       getSiteRes(obj) {
         console.log('siteRes ---> ')
         console.log(obj)
-        if(obj.resids[0]){
-          this.selectData.f_meetunit = obj.res.join('.')
-          this.selectData.f_reciever = obj.resids.join('.')
-          this.selectData.f_outlets = obj.res[obj.res.length - 1]
+        if(this.selectData.dispatchType=='派发给站点'){
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+            this.selectData.f_reciever = obj.resids.join('.')
+            this.selectData.f_outlets = obj.res[obj.res.length - 1]
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
         }else {
-          this.selectData.f_meetunit = ''
-          this.selectData.f_reciever = ''
-          this.selectData.f_outlets = ''
+          if(obj.resids[0]){
+            this.selectData.f_meetunit = obj.res.join('.')
+          }else {
+            this.selectData.f_meetunit = ''
+            this.selectData.f_reciever = ''
+            this.selectData.f_outlets = ''
+          }
+          this.repairers = []
+          let vali = {
+            source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$)!=-1)`,
+            userid: `${obj.resids[0]}`
+          }
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            res.data.forEach((item) => {
+              if (item.state == '在职'){
+                this.repairers.push({label: `${item.name}`, value: item.name})
+              }
+            })
+          })
         }
       },
       rectification(){
@@ -417,7 +440,7 @@
           toRepair=null
         }else{
           console.log('派发给维修员---------'+this.selectData.f_repairman)
-          act={f_meetunit:'',f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
+          act={f_meetunit:this.selectData.f_meetunit,f_reciever:this.selectData.f_repairman,f_service_acitivity_type:'派单'}
           toRepair='一级派单'
         }
         let repData={
@@ -438,16 +461,16 @@
         this.save()
       },
       // 获取维修员
-      getEmp() {
-        this.repairers=[]
-        let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
-        let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          res.data.forEach((user)=>{
-            this.repairers.push({label:user.name, value: user.name})
-          })
-        })
-      },
+      // getEmp() {
+      //   this.repairers=[]
+      //   let per = {source: 'this.getRights().where(row.getType()==$user$).where(row.getAttributes().get($rolestr$).indexOf($维修员$) != -1))', userid: `${Vue.user.id}`}
+      //   let http = new HttpResetClass()
+      //   http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/search`, {data: per}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //     res.data.forEach((user)=>{
+      //       this.repairers.push({label:user.name, value: user.name})
+      //     })
+      //   })
+      // },
       closely(isdelete){
         try {
           var startOrStopAudioClipStr;