safecheck-client 3.0.39-63 → 3.0.39-64

package/src/components/android/rejectInspecCheck.vue

@@ -0,0 +1,303 @@
+<style scoped>
+  .bg {
+    background-color: blue;
+    height: 1px;
+    border: 0;
+  }
+
+  .app-row {
+    background-color: white;
+    padding: 10px 10px 0 10px;
+    border-bottom: 1px solid rgba(235, 235, 235, 0.5);
+  }
+
+  .search_input {
+    border: 0;
+    outline: none;
+  }
+
+  .font {
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+
+  .input-font {
+    font: 15px PingFang-SC-Medium;
+    color: #333333;
+  }
+
+  .btn-font {
+    font: 600 16px PingFang-SC-Bold;
+    color: #499EDF;
+  }
+
+  .btn-color {
+    background-color: #FFFFFF;
+    border-radius: 10px;
+    border: 1px solid #499EDF;
+  }
+
+  .app-text {
+    font-size: 12px;
+  }
+
+  .panel-self {
+    border-radius: 10px;
+    border: 1px solid #499EDF;
+    background-color: #F8F8F8;
+  }
+
+  .yybtn-color {
+    background-color: #499edf;
+    border-radius: 4px;
+    border: 1px solid #499EDF;
+    color: #FFFFFF;
+    font: 14px PingFang-SC-Bold;
+  }
+
+  .qxbtn-color {
+    background-color: #FFFFFF;
+    border-radius: 4px;
+    color: #499edf;
+    font: 14px PingFang-SC-Bold;
+    border: 1px solid #499EDF;
+  }
+
+  .button_shrink_top {
+    width: 35px;
+    height: 35px;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_top.png")
+  }
+
+  .button_shrink_bottom {
+    width: 35px;
+    height: 35px;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_bottom.png")
+  }
+
+  .button_shrink_left {
+    width: 35px;
+    height: 35px;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_left.png")
+  }
+
+  .button_shrink_right {
+    width: 35px;
+    height: 35px;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_right.png")
+  }
+</style>
+<template>
+  <div style="height: auto;width: 100%">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial>
+          <form>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户姓名.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户姓名：</label>
+              </div>
+              <div class="col-xs-8">
+                <input class="search_input input-font" v-model=model.f_user_name
+                       condition="f_user_name like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/用户ID.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label for="f_userinfo_code" class="font text-left">用户编号：</label>
+              </div>
+              <div class="col-xs-8">
+                <input id="f_userinfo_code" class="search_input input-font"
+                       v-model=model.f_userinfo_code condition="f_userinfo_code like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row app-row">
+              <div class="col-xs-4">
+                <img src="../../assets/小区.png" style="width: 20px;margin-bottom: 5px" alt="">
+                <label class="font text-left">用户地址：</label>
+              </div>
+              <div class="col-xs-8">
+                <input class="search_input input-font"
+                       v-model=model.f_address condition="f_address like '%{}%'"/>
+              </div>
+            </div>
+            <div class="row text-center" style="margin-top: 20px;">
+              <button type="button" class="btn btn-lg btn-font btn-color" style="width: 25%;"
+                      @click="$parent.$parent.selfSearch">查询
+              </button>
+              <div style="float: right;margin-right: 3% " class="button_spacing"
+                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                   @click="$parent.$parent.hidden()"></div>
+            </div>
+            <div style="height:30px;"></div>
+          </form>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial>
+          <div class="auto app-text" style="margin-top: 5px;">
+            <div class="panel" style="padding: 10px 10px 5px 10px;">
+              <div class="panel-body panel-self">
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户编号:</b></p>
+                  <p class="panel-title col-xs-5 text-left input-font" style="width: 74%">{{ row.f_userinfo_code }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font" style="width: 79%">{{ row.f_user_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>用户电话:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_user_phone }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 23%;float: left"><b>安检时间:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 77%">{{ row.f_create_time }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>用户地址:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_address }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title text-left font" style="width: 21%;float: left"><b>所属安检:</b></p>
+                  <p class="panel-title text-left input-font" style="width: 79%">{{ row.f_checker_name }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p  class="panel-title col-xs-5 text-left font"><b>不通过原因:</b></p>
+                  <p  style="color: red"   class="panel-title col-xs-7 text-left input-font">{{ row.f_approved_note }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <button type="button" name="button" class="btn btn-primary"
+                          style="background-color:#499edf;float: right;margin-right:10px;"
+                          @click="$parent.$parent.$parent.Handle(row)">处理
+                  </button>
+                  <button type="button" name="button" class="btn btn-primary"
+                          style="background-color:#499edf;float: right;margin-right:10px;"
+                          @click="$parent.$parent.$parent.reassign(row)">转单
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </list>
+    </criteria-paged>
+    <modal :show.sync="showModal" v-ref:modal :backdrop="false">
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          选择安检员
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <div class="col-xs-12">
+          <div class="col-xs-4">
+            <v-select :value.sync="check" v-model='check'
+                      :value-single="true"
+                      class="select_list select"
+                      :options='checkers' placeholder='安检员'
+                      close-on-select width="100%"></v-select>
+          </div>
+      </div>
+      </div>
+      <div slot="modal-footer" class="modal-footer">
+        <button  class="btn btn-default" @click="iscancel()">取消</button>
+        <button  class="btn btn-default" @click="manyisok()">确认</button>
+      </div>
+    </modal>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import * as Util from '../Util'
+  import co from "co";
+  let select = function * (self) {
+    let http = new HttpResetClass()
+    http.load('POST', `${self.$androidUtil.getProxyUrl()}/rs/search`, {
+      source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+      userid: Vue.user.id
+    }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      //tag
+      self.checkers.push({label:'全部',value:''})
+      res.data.forEach((checker)=>{
+        self.checkers.push({label:checker.name,value:checker.name})
+      })
+    })
+  }
+  export default {
+    title: '安检单驳回',
+    data() {
+      return {
+        checkers: [],
+        check: '',
+        showModal: false,
+        f_filialeids: '',
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidGetcheckpaper`, 20, {
+          condition: 'this.condition',
+          f_filialeids: `'${Vue.user.orgid}'`,
+          f_checker_id: `'${Vue.user.id}'`
+        }),
+        criteriaShow: false,
+        select: {}
+      }
+    },
+    ready() {
+      this.selfSearch()
+      let gen = select(this)
+      co(gen)
+    },
+    methods: {
+      selfSearch() {
+        let condition = "1=1 "
+        if (this.$refs.paged.$refs.cri.model.f_user_name) {
+          if (this.$refs.paged.$refs.cri.model.f_user_name.toString().trim()) {
+            condition += " and f_user_name like '%" + this.$refs.paged.$refs.cri.model.f_user_name + "%'"
+          }
+        }
+        if (this.$refs.paged.$refs.cri.model.f_userinfo_code) {
+          if (this.$refs.paged.$refs.cri.model.f_userinfo_code.toString().trim()) {
+            condition += " and f_userinfo_code = '" + this.$refs.paged.$refs.cri.model.f_userinfo_code + "'"
+          }
+        }
+        if (this.$refs.paged.$refs.cri.model.f_address) {
+          if (this.$refs.paged.$refs.cri.model.f_address.toString().trim()) {
+            condition += " and f_address like '%" + this.$refs.paged.$refs.cri.model.f_address + "%'"
+          }
+        }
+        condition += `and ( f_checker_name='${Vue.user.name}' and  f_checker_reciver is null) or  ( f_checker_reciver='${Vue.user.name}' and f_checker_name!='${Vue.user.name}') `
+        this.model.search(condition)
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      Handle(row) {
+        //调转到无计划安检页面重新安检一次
+
+      },
+      reassign(row) {
+        this.select = row
+        this.showModal = true
+      },
+      manyisok() {
+      let  sqlstr=`update t_check_paper set f_checker_reciver='${this.check}' where id='${this.select.id}'`
+        let http = new HttpResetClass()
+        http.load('POST', 'rs/logic/runSQL', {data: {sql: sqlstr}},
+          {resolveMsg: null, rejectMsg: '移出安检册失败'}).then(resp=>{
+          this.showModal = false
+            this.selfSearch()
+        }).catch(error=>{
+          this.$showMessage('转单失败',error)
+        })
+      },
+      iscancel() {
+        this.showModal = false
+      }
+    }
+  }
+</script>

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>