safecheck-client 3.1.1-gaomi-7 → 4.0.1

package/src/components/userplan/UserplanList.vue

@@ -0,0 +1,166 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <ul class="nav nav-tabs">
+            <li role="presentation" class="active"><a style="	color: #5ac0d9 !important;">下发明细</a></li>
+          </ul>
+          <div class="col-sm-2 ">
+            <label class="font_normal_body">安检员</label>
+            <v-select id="checker"
+                      v-model="model.f_checker_id"
+                      :value.sync="model.f_checker_id" placeholder='安检员'
+                      condition="tcp.f_checker_id = '{}'"
+                      :value-single="true"
+                      class="select_list select"
+                      style="width: 60%"
+                      :options='$parent.$parent.checkers' close-on-select clear-button> </v-select>
+          </div>
+          <div class="col-sm-4" style="width: 20%;float: right;">
+            <div class="span" style="text-align: center;">
+              <button class="button_search" @click="search()">查询</button>
+            </div>
+          </div>
+        </div>
+
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th><nobr>计划名称</nobr></th>
+            <th><nobr>计划下发人</nobr></th>
+            <th><nobr>下发时间</nobr></th>
+            <th><nobr>安检状态</nobr></th>
+            <th><nobr>完成时间</nobr></th>
+            <th><nobr>计划完成状态</nobr></th>
+            <th><nobr>安检员姓名 </nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_plan_name}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_send_operator}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_issue_time}}</td>
+        <td style="text-align: center;white-space:nowrap;">
+          <div v-if="row.f_state=='已检'" @click='$parent.$parent.$parent.goDetail(row)'>{{row.f_state}}</div>
+          <div v-if="row.f_state=='未检'">{{row.f_state}}</div>
+        </td>
+          <td style="text-align: center;white-space:nowrap;">{{ row.f_state=='已检' ? row.f_last_check_date : ''}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{ row.f_state=='已检' ? row.f_last_check_state : ''}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{  row.f_checker }}</td>
+
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import * as Util from '../Util'
+import Vue from "vue";
+
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    Vue.config = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
+export default {
+  title: '用户计划下发情况',
+
+  props: ['check'],
+  data() {
+    let model = new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 20, {
+      items: "' tcp.f_plan_name,tcpi.f_plan_id,tcpi.f_userinfo_code userinfocode,tcp.f_send_operator,tcpi.f_state,tcp.f_issue_time,tcpi.f_last_check_date,tcpi.f_last_check_state,tcp.f_checker,cp.id,cp.f_check_type,cp.f_collection_type,cp.f_entry_status '",
+      tablename: "'t_check_plan tcp left join t_check_plan_item tcpi on tcp.id=tcpi.f_plan_id LEFT JOIN (SELECT cpb.*,cpa.id,cpa.f_check_type,cpa.f_collection_type,cpa.f_entry_status FROM t_check_paper cpa LEFT JOIN ( SELECT f_check_item_id, MAX ( f_offsite_time ) f_offsite_time FROM t_check_paper GROUP BY f_check_item_id ) cpb ON cpb.f_check_item_id = cpa.f_check_item_id AND cpb.f_offsite_time = cpa.f_offsite_time ) cp ON cp.f_check_item_id = tcpi.id '",
+      orderitem: "'1'"
+    })
+    model.f_filialeids = '(' + this.$login.f.orgid + ')'
+    return {
+      f_filialeids:'(' + this.$login.f.orgid + ')',
+      userid: this.$login.f.id,
+      f: this.$login.f,
+      model: model,
+      checkers: [],
+      // criteriaShow: false,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+    }
+  },
+  watch: {
+    'check'() {
+      let condition = `tcpi.f_state !='作废' and tcpi.f_userinfo_code = '${this.check.f_userinfo_code}'`
+      if (this.$parent.$refs.check.$refs.paged.$refs.criteria.model.f_plan_year){
+        condition += ` and tcp.f_plan_year = ${this.$parent.$refs.check.$refs.paged.$refs.criteria.model.f_plan_year} `
+      }
+      this.model.search(condition)
+    }
+  },
+  ready(){
+    let condition = `tcpi.f_state !='作废' and tcpi.f_userinfo_code = '${this.check.f_userinfo_code}'`
+    if (this.$parent.$refs.check.$refs.paged.$refs.criteria.model.f_plan_year){
+      condition += ` and tcp.f_plan_year = ${this.$parent.$refs.check.$refs.paged.$refs.criteria.model.f_plan_year} `
+    }
+    this.model.search(condition)
+
+    this.getCheckerList()
+
+  },
+  methods: {
+    getCheckerList() {
+      let http = new HttpResetClass()
+      http.load('POST', `/rs/search`, {
+        source: 'tool.getChildrenOfResName($安检员$)',
+        userid: this.$login.f.id
+      }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        res.data.forEach((checker)=>{
+          this.checkers.push({label:checker.name,value:checker.id})
+        })
+        this.checkers.push({label:'全部',value:''})
+      })
+    },
+    selfSearch(args) {
+      return this.model.search(args.condition, args.model)
+    },
+    //查看的方法
+    goDetail(row){
+      asyncReady(this).then(() => {
+        row.f_upload_state = '已传'
+        this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+      }).catch(
+        (respanse) => {
+          alert('获取配置文件失败')
+        })
+    },
+    search(args) {
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj) {
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      console.log(this.f_filialeids)
+      console.log('11111111111'+JSON.stringify(this.model))
+      console.log('11111111111'+JSON.stringify(this.obj))
+    },
+  },
+  computed: {
+    selected() {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>
+
+
+<style lang="less" scoped>
+                   .select-error {
+button {
+  border-bottom: 1px solid #a94442 !important;
+}
+}
+</style>
+

package/src/components/userplan/UserplanMain.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="flex">
+    <section>
+      <div class="row"  style="height: 100%" :class="{'basic-main':!showItem,'binary':showItem}">
+        <div :class="{'binary-left':showItem}" >
+          <userplan-paper  @select-changed="selected" v-ref:check></userplan-paper>
+        </div>
+        <div  :class="{'binary-right':showItem}" v-show="showItem">
+          <userplan-list v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected'
+                       v-ref:detail></userplan-list>
+        </div>
+
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+let asyncReady = async function (self) {
+  // 获取配置信息
+  try {
+    let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    Vue.config = res.data
+  } catch (error) {
+    // 忽略704,文件找不到异常R
+    if (error.status !== 704) {
+      throw error
+    }
+  }
+}
+
+import Vue from "vue";
+
+export default {
+  title: '用户派发情况',
+  props: ['f'],
+
+  data() {
+    return {
+      showItem: false
+    }
+  },
+  ready(){
+    // asyncReady(this)
+  },
+  methods: {
+
+    selected(row) {
+      this.showItem = true
+    }
+  },
+
+  watch: {}
+
+}
+</script>
+
+<style >
+.form-input-group label {
+  text-align: right;
+  width: auto;
+}
+
+.datapanel {
+  color: #333;
+  background-color: white;
+  box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px;
+  padding: 5px 7px 5px 7px;
+  border-radius: 10px;
+}
+</style>

package/src/components/userplan/UserplanPaper.vue

@@ -0,0 +1,182 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">用户编号</label>
+              <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                     style="width: 60%" placeholder="用户编号"
+                     condition="ui.f_userinfo_code='{}'"
+              >
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">用户名称</label>
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     style="width: 60%" placeholder="用户名称"
+                     condition="ui.f_user_name like'%{}%'"
+              >
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">用户地址</label>
+              <input type="text" class="input_search" v-model="model.f_address"
+                     style="width: 60%" placeholder="用户地址"
+                     condition="tua.f_address like '%{}%'"
+              >
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">建档日期</label>
+              <datepicker
+                placeholder='建档日期' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset"
+                :value.sync="model.f_createfile_date"
+                v-model="model.f_createfile_date"
+                condition="ui.f_createfile_date >= '{} 00:00:00'">
+              </datepicker>
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <div class="span" style="float: right;margin-top: 8px">
+                <!--                <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"-->
+                <!--                                :field="$parent.$parent.getfield"-->
+                <!--                                sqlurl="api/af-safecheck/logic/exportfile" sql-name="GetCheckPaperByDefect" :template-name='$parent.$parent.excelTitle' :choose-col="true"></export-excel>-->
+                <export-excel :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="UserplanPaper" :template-name="$parent.$parent.excelTitle"></export-excel>
+
+                <button class="button_search button_spacing" @click="search">查询</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                     @click="$parent.$parent.hiddenr()"></div>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                     @click="$parent.$parent.hidden()"></div>
+              </div>
+            </div>
+          </div>
+          <div class="row" v-if="$parent.$parent.criteriaShow" >
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">&nbsp;公&nbsp;&nbsp;&nbsp;&nbsp;司&nbsp;</label>
+              <right-tree :userid.sync='$parent.$parent.userid' style="width: 60%;" :source.sync='$parent.$parent.source' @re-res="$parent.$parent.getRes" ></right-tree>
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body" style="margin-right: 2px">用户类型</label>
+              <v-select :value.sync="model.f_user_type" v-model='model.f_user_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.user_types' placeholder='用户类型'
+                        close-on-select
+                        condition="tuf.f_user_type='{}'"></v-select>
+            </div>
+            <div class="col-sm-4" style="width: 20%">
+              <label class="font_normal_body">派发年份</label>
+              <input type="text" class="input_search" v-model="model.f_plan_year"
+                     style="width: 60%" placeholder="派发年份"
+              >
+            </div>
+
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户名称</nobr></th>
+            <th><nobr>地址</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>证件号码</nobr></th>
+            <th><nobr>建档日期</nobr></th>
+            <th><nobr>公司机构</nobr></th>
+            <th><nobr>计划下发次数</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_userinfo_code}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_user_name}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_address}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_user_phone}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_idnumber}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_createfile_date}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.f_orgname}}</td>
+          <td style="text-align: center;white-space:nowrap;">{{row.n}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import * as Util from '../Util'
+
+export default {
+  title: '用户信息',
+  data() {
+    let model = new PagedList('api/af-safecheck/sql/UserplanPaper', 20, {
+      f_filialeid: 'this.f_filialeids',
+      f_plan_year:'this.f_plan_year'
+    })
+    model.f_filialeids = '(' + this.$login.f.orgid + ')'
+    model.f_plan_year = ''
+    return {
+      excelTitle:'用户派发情况导出',
+
+      excelHeaders: {
+        'f_userinfo_code': '用户编号',
+        'f_user_name': '用户姓名',
+        'f_address': '用户地址',
+        'f_user_phone': '用户电话',
+        'f_idnumber': '证件号码',
+        'f_createfile_date': '建档日期',
+        'f_orgname': '公司机构',
+        'n': '计划下发次数'
+      },
+      searchData: {
+        condition: "1=1",
+        f_filialeid: `('${this.$login.f.orgid}')`,
+        f_plan_year : ''
+      },
+      user_types:[{label:'全部',value:''},{label:'民用',value:'民用'},{label:'非民用',value:'非民用'}],
+      f_filialeids:'(' + this.$login.f.orgid + ')',
+      userid: this.$login.f.id,
+      f: this.$login.f,
+      model: model,
+      criteriaShow: false,
+      source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+    }
+  },
+  methods: {
+
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search(args) {
+      if (args.model.f_plan_year){
+        this.model.f_plan_year = args.model.f_plan_year
+        this.searchData.f_plan_year = args.model.f_plan_year
+      }
+      this.searchData.condition=args.condition
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj) {
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      this.searchData.f_filialeid=this.$login.convertToIn(obj.resids);
+      console.log(this.f_filialeids)
+      console.log('11111111111'+JSON.stringify(this.model))
+      console.log('11111111111'+JSON.stringify(this.obj))
+    },
+  },
+  computed: {
+    selected() {
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

package/src/components/zhuanxiang/CheckPaperListZX.vue

@@ -0,0 +1,129 @@
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div  class="auto" >
+      <partial-view v-ref:pv>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户编号:</label>
+          <span class = "col-sm-9">{{rowdata.f_userinfo_code}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户姓名:</label>
+          <span class = "col-sm-9">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户类型:</label>
+          <span class = "col-sm-9">{{rowdata.f_user_type}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户地址:</label>
+          <span class = "col-sm-9">{{rowdata.f_address}}</span>
+        </div>
+<!--        <div class="row text-left" style="padding-bottom: 10px">-->
+<!--          <label class = "col-sm-3 control-label">安检次数:</label>-->
+<!--          <span class = "col-sm-9">{{model.rows.length}}</span>-->
+<!--        </div>-->
+      </partial-view>
+  </div>
+    <data-grid :model="model" partial='list' v-ref:grid>
+      <template partial='head'>
+        <tr>
+          <th>安检人</th>
+          <th>安检开始时间</th>
+          <th>安检结束时间</th>
+          <th>安检状态</th>
+          <th>隐患情况</th>
+          <th>操作</th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr style="text-align: center">
+          <td>{{row.f_checker_name}}</td>
+          <td>{{row.f_onsite_time}}</td>
+          <td>{{row.f_offsite_time}}</td>
+          <td>{{row.f_entry_status}}</td>
+          <td>{{$parent.$parent.getDefect(row.f_defect_content)}}</td>
+          <td>
+            <button class="button_spacing button_search-1" @click='$parent.$parent.goDetail(row)'>查看</button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from "vue";
+
+  let asyncReady = async function (self) {
+    // 获取配置信息
+    try {
+      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+      Vue.config = res.data
+    } catch (error) {
+      // 忽略704,文件找不到异常R
+      if (error.status !== 704) {
+        throw error
+      }
+    }
+  }
+
+  export default {
+    title: '安检记录列表',
+    props: ['row'],
+    data () {
+      return {
+        rowdata: this.row,
+        model: new PagedList('api/af-safecheck/sql/QueryCheckPaper', 10, {
+          f_filialeid:"''",
+          f_plan_id: "''",
+          f_approved: "''",
+          f_entry_status: "''",
+          f_no_checkplan: "''",
+          orderitem: "'f_offsite_time desc'"
+        })
+      }
+    },
+    ready () {
+      console.log("开始加载列表------------------------------")
+      console.log(`('${this.$login.f.orgid}')`)
+      this.rowdata = this.row
+      var condition = "f_userinfoid = '"+ this.row.f_userinfo_id +"'"
+
+      this.model.search(condition)
+    },
+    watch: {
+      'row' (val) {
+        if(val){
+          this.rowdata = val
+          var condition =  "f_userinfoid = '"+ this.row.f_userinfo_id +"'"
+          this.model.search(condition)
+
+        }
+      }
+    },
+    methods: {
+      getDefect(val){
+        if(val){
+          try {
+            var defect = JSON.parse(val)
+            return defect.result
+          }catch (e) {
+            console.log(val)
+            return '正常'
+          }
+        }
+        return '正常'
+      },
+      goDetail(row){
+        asyncReady(this).then(() => {
+          row.f_upload_state = '已传'
+          this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+        }).catch(
+          (respanse) => {
+            alert('获取配置文件失败')
+          })
+      }
+    }
+  }
+</script>

package/src/components/{rongcheng/CheckPaperSearchUser.vue → zhuanxiang/CheckPaperSearchUserZX.vue}

@@ -3,25 +3,32 @@
   <div id="unit" class="flex-row">
     <div class="row basic-main"  style="display: flex">
     <!--展示查询界面-->
-    <check-search-user class="flex" :tempval="hidden" v-bind:style="{width:barwidth}" @select-changed="selected"  @canel-main="close" v-ref:checksearch></check-search-user>
+    <check-search-zx class="flex" :tempval="hidden" v-bind:style="{width:barwidth}" @select-changed="selected"  @canel-main="close" v-ref:checksearch></check-search-zx>
     <div  class="flex" style="width: 35%" v-if="showItem" >
-
       <!--安检项详细信息-->
       <ul class="nav nav-tabs">
         <li role="presentation" class="active"><a href="#">安检记录</a></li>
       </ul>
-      <div style="height:auto;overflow: hidden;">
-        <check-paper-list style="height: 100%" :row="rowData"></check-paper-list>
+      <div style="width: 45%" :class="{'binary-right':showItem}" v-if="showItem">
+        <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus"
+                      v-ref:detail></check-detail>
+      </div>
+
+        <div style="height:auto;overflow: hidden;">
+        <check-paper-zx style="height: 100%" :row="rowData"></check-paper-zx>
+
+
       </div>
     </div>
     </div>
+
   </div>
 </template>
 
 <script>
 
   export default {
-    title: '民用用户安检情况',
+    title: '用户安检情况',
     name: 'CheckPaperSearchUser',
     data () {
       return {
@@ -37,7 +44,7 @@
       },
       selected (row) {
         this.showItem = true
-        this.barwidth = '60%'
+        this.barwidth = '50%'
         this.rowData = row.val
         this.hidden = false
         console.log('2.现在的状态是:'+this.hidden)
@@ -49,6 +56,7 @@
         this.hidden = true
       }
     }
+
   }
 
 </script>