safecheck-client 3.0.33-14 → 3.0.33-141

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

@@ -0,0 +1,256 @@
+<template>
+  <div id='app' class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false'>
+      <criteria partial='criteria' @condition-changed='search' class="search_area">
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+<!--            <div class="col-sm-4 form-group">-->
+<!--              <role-selector-safe-->
+<!--                role-name="安检员"-->
+<!--                role-lable="安&ensp;检&ensp;员"-->
+<!--                @re-res="$parent.$parent.getRes"-->
+<!--                :value.sync="model.f_checker_id"-->
+<!--                v-model="model.f_checker_id"-->
+<!--                condition="f_checker_name like '%{}%'">-->
+<!--              </role-selector-safe>-->
+<!--            </div>-->
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body" >区&emsp;&emsp;域</label>
+              <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
+                        :options='$parent.$parent.quyus' placeholder='区域' class="select_list select" style="width: 60%"
+                        @change="$parent.$parent.quyuChange"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body" >营&ensp;业&ensp;厅</label>
+              <v-select :value.sync="model.f_bumen" :value-single="true" v-model="model.f_bumen"
+                        :options='$parent.$parent.bumens' placeholder='营业厅'
+                        @change="$parent.$parent.bumenChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body">小&emsp;&emsp;组</label>
+              <v-select :value.sync="model.f_team" :value-single="true" v-model="model.f_team"
+                        :options='$parent.$parent.teams' placeholder='小组'
+                        @change="$parent.$parent.teamChange" class="select_list select" style="width: 60%"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" >
+              <label class="font_normal_body" >安&ensp;检&ensp;员</label>
+              <v-select :value.sync="model.f_checker_id" v-model="model.f_checker_id"
+                        :multiple="true" class="select_list select" style="width: 60%"
+                        :options='$parent.$parent.checkers' placeholder='安检员' condition="f_checker_name in {}"
+                        close-on-select>
+              </v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="startDate" class="font_normal_body">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          style="width: 60%;"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label for="endDate" class="font_normal_body">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          style="width: 60%;"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">用气性质</label>
+              <v-select
+                class="select_list select"
+                placeholder='用气性质' style="width: 60%"
+                v-model='model.userType'
+                :value.sync="model.userType"
+                :options='$parent.$parent.userTypes'
+                condition="tuf.f_gasproperties in {} "
+                :multiple="true"
+               ></v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">气表类型</label>
+              <v-select
+                class="select_list select"
+                placeholder='气表类型' style="width: 60%"
+                v-model='model.tableType'
+                :value.sync="model.tableType"
+                :options='$parent.$parent.tableTypes'
+                condition="tuf.f_meter_classify = '{}'"
+                :value-single="true"
+                close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">气表品牌</label>
+              <v-select
+                class="select_list select"
+                placeholder='气表类型' style="width: 60%"
+                v-model='model.tableBrand'
+                :value.sync="model.tableBrand"
+                :options='$parent.$parent.tableBrands'
+                condition="gb.f_meter_brand = '{}'"
+                :value-single="true"
+                close-on-select clear-button></v-select>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="model.f_check_type" v-model='model.f_check_type'
+                        :value-single="true" style="width: 60%"
+                        class="select_list select"
+                        :options='$parent.$parent.checktype' placeholder='客户类型'
+                        close-on-select
+                        condition="f_check_type = '{}'"></v-select>
+            </div>
+            <div class="col-sm-4 form-group" style="margin-top: 8px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <report-print class="button_export button_spacing" style="width:28%" id='shexian'></report-print>
+              <report-excel class="button_export button_spacing" style="width:28%" id='shexian'></report-excel>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <div partial='list' id='shexian' class="list_area" style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">隐患报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <th colspan='5' style="font-weight: normal;">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </th>
+          </tr>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '隐患报表',
+    data () {
+
+      let model = new DataModel('rs/report/hiddensituation', {
+        startDate: 'this.model.startDate',
+        endDate: 'this.model.endDate',
+        f_filialeid: 'this.f_filialeid'
+      })
+      model.f_filialeid = '(' + this.$login.f.orgid + ')'
+      return {
+        checktype: this.$appdata.getParam('用户类型')?[{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]:[{label: '全部', value: ''}],
+        allCheckers: [{label: '请选择', value: ''}],
+        quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
+        bumens: [{label: '请选择', value: ''}],
+        teams: [{label: '请选择', value: ''}],
+        checkers:[{label: '请选择', value: ''}],
+        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')],
+        tableTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')],
+        tableBrands: [{label: '全部', value: ''}],
+        filialeNameStr: '',
+        filialeCodeStr: '',
+        userid: this.$login.f.id,
+        source: `tool.getFullTree(this.getRights().where(row.getType() != $zone$).where(row.getType() == $organization$))`,
+        model: model
+      }
+    },
+    methods: {
+      bumenChange(val) {
+        if (val) {
+          this.teams = this.$appdata.getParam(`工单-` + val) ? [{
+            label: '请选择',
+            value: ''
+          }, ...this.$appdata.getParam(`工单-` + val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
+      teamChange(val) {
+        if (val) {
+          this.checkers = this.$appdata.getParam(val) ? [...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
+      quyuChange(val) {
+        if (val) {
+          this.bumens = this.$appdata.getParam(val) ? [{
+            label: '请选择',
+            value: ''
+          }, ...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
+      getRes (obj) {
+        this.model.f_filialeid = this.$login.convertToIn(obj.resids)
+      },
+      getTableBrands() {
+        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+          {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
+          {resolveMsg: null, rejectMsg: null}).then((resp) => {
+          resp.data.forEach((result) => {
+            this.tableBrands.push({label: result.f_meter_brand, value: result.f_meter_brand})
+          })
+        })
+      },
+      getAllChecker() {
+        new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+          data: {
+            items: 'name',
+            tablename: 't_user',
+            condition: `state = '在职' and rolestr like '%安检员%'`,
+            orderitem: 'id'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach(ress => {
+            this.allCheckers.push({
+              label: ress.name,
+              value: ress.name
+            })
+          })
+          this.checkers = this.allCheckers
+        })
+      }
+    },
+    ready () {
+      this.getAllChecker()
+      this.getTableBrands()
+    },
+    computed: {
+      selected () {
+        return this.$refs.grid.selected
+      }
+      // outlets () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('营业网点')]
+      // },
+      // operator () {
+      //   return [{label: '全部', value: ''}, ...AppData.getParam('操作员')]
+      // }
+    }
+  }
+</script>

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

@@ -212,6 +212,22 @@ div {
                   </button-link>
                 </td>
               </tr>
+              <tr>
+                <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_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: 33%">
+                  {{ paperdata.f_remark }}
+                </td>
+              </tr>
+              <tr>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">备注信息:</td>
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 50%">
+                  {{ paperdata.f_remark }}
+                </td>
+              </tr>
 
               </tbody>
             </table>
@@ -593,6 +609,16 @@ div {
                     </button-link>
                   </td>
                 </tr>
+                <tr>
+                  <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_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: 33%">
+                    {{ paperdata.f_remark }}
+                  </td>
+                </tr>
 
                 </tbody>
               </table>
@@ -890,6 +916,7 @@ import Vue from 'vue'
 import * as Util from '../../Util'
 import {jsonSort} from '../../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
+import {isEmpty} from "../../Util";
 
 let asyncReady = async function (self) {
   // 获取配置信息
@@ -1461,7 +1488,10 @@ export default {
                 if (this.devicesAll[i][j].f_items[k].f_item_lists[0]) {
                   for (let l = 0; l < this.devicesAll[i][j].f_items[k].f_item_lists.length; l++) {
                     let val = this.devicesAll[i][j].f_items[k].f_item_lists[l].f_item_value
-                    aa += (val === null ? '空' : val) + ' '
+                    aa += (val === null? '空' : val) + ' '
+                  }
+                  if(isEmpty(aa)){
+                    return  '无'
                   }
                   return aa
                 }

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

@@ -147,16 +147,16 @@
 <!--              <right-tree @re-res="$parent.$parent.getRes" :initresid="$parent.$parent.$login.f.orgid">-->
 <!--              </right-tree>-->
 <!--            </div>-->
-            <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">
-              <role-selector-safe
-                role-name="安检员"
-                role-lable="安&nbsp;检&nbsp;员&nbsp;"
-                @re-res="$parent.$parent.getRes"
-                :value.sync="model.f_checker_id"
-                v-model="model.f_checker_id"
-                condition="f_checker_name = '{}'">
-              </role-selector-safe>
-            </div>
+<!--            <div class="col-sm-4 form-group" v-show="$parent.$parent.criteriaShow" style="margin: 0">-->
+<!--              <role-selector-safe-->
+<!--                role-name="安检员"-->
+<!--                role-lable="安&nbsp;检&nbsp;员&nbsp;"-->
+<!--                @re-res="$parent.$parent.getRes"-->
+<!--                :value.sync="model.f_checker_id"-->
+<!--                v-model="model.f_checker_id"-->
+<!--                condition="f_checker_name = '{}'">-->
+<!--              </role-selector-safe>-->
+<!--            </div>-->
             <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
               <label class="font_normal_body">片&emsp;&emsp;区</label>
               <v-select class="select_list select"
@@ -280,8 +280,8 @@
 <!--              </div>-->
               <div class="form-group col-sm-2"   v-show="$parent.$parent.criteriaShow">
                 <label class="font_normal_body">未用燃气</label>
-                <v-select class="select_list select"
-                          placeholder='请选择' style="width: 60%"
+                <v-select class="select_list select" style="width: 60%"
+                          placeholder='请选择'
                           :value.sync="model.f_usegas" v-model="model.f_usegas"
                           :options='$parent.$parent.usegas'
                           filer-key="name"
@@ -300,6 +300,62 @@
                 <input type="number" class="input_search" v-model="model.f_check_date"
                        style="width: 60%" placeholder="距上次安检天数" >
               </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body" >区&emsp;&emsp;域</label>
+                <v-select :value.sync="model.f_quyu" :value-single="true" v-model="model.f_quyu"
+                          :options='$parent.$parent.quyus' placeholder='区域' class="select_list select" style="width: 60%"
+                          @change="$parent.$parent.quyuChange"
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body" >营&ensp;业&ensp;厅</label>
+                <v-select :value.sync="model.f_bumen" :value-single="true" v-model="model.f_bumen"
+                          :options='$parent.$parent.bumens' placeholder='营业厅'
+                          @change="$parent.$parent.bumenChange" class="select_list select" style="width: 60%"
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body">小&emsp;&emsp;组</label>
+                <v-select :value.sync="model.f_team" :value-single="true" v-model="model.f_team"
+                          :options='$parent.$parent.teams' placeholder='小组'
+                          @change="$parent.$parent.teamChange" class="select_list select" style="width: 60%"
+                          close-on-select>
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" v-show="$parent.$parent.criteriaShow">
+                <label class="font_normal_body" >安&ensp;检&ensp;员</label>
+                <v-select :value.sync="model.f_checker_id" v-model="model.f_checker_id"
+                          :multiple="true" class="select_list select" style="width: 60%"
+                          :options='$parent.$parent.checkers' placeholder='安检员' condition="f_checker_name in {}"
+                          close-on-select>
+                </v-select>
+              </div>
+<!--              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >-->
+<!--                <label class="font_normal_body">连续时间</label>-->
+<!--                <datepicker-->
+<!--                  :value.sync="model.f_last_start"-->
+<!--                  placeholder='连续时间开始' style="width: 60%"-->
+<!--                  :disabled-days-of-week="[]"-->
+<!--                  :format="'yyyy-MM-dd'"-->
+<!--                  :show-rest-button="reset"-->
+<!--                  v-model="model.f_last_start"-->
+<!--                  condition="f_last_check_date> ='{} 00:00:00'">-->
+<!--                </datepicker>-->
+<!--              </div>-->
+<!--              <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >-->
+<!--                <label class="font_normal_body">连续时间</label>-->
+<!--                <datepicker-->
+<!--                  :value.sync="model.f_last_end"-->
+<!--                  placeholder='连续时间结束' style="width: 60%"-->
+<!--                  :disabled-days-of-week="[]"-->
+<!--                  :format="'yyyy-MM-dd'"-->
+<!--                  :show-rest-button="reset"-->
+<!--                  v-model="model.f_last_end"-->
+<!--                  condition="f_last_check_date<=  '{} 23:59:59'">-->
+<!--                </datepicker>-->
+<!--              </div>-->
             </div>
             <modal :show.sync="$parent.$parent.showModal" v-ref:modal backdrop="false">
               <div slot="modal-header" class="modal-header">
@@ -490,6 +546,11 @@ export default {
     // }
     // model.f_subcompany = this.$login.f.f_fengongsi
     return {
+      allCheckers: [{label: '请选择', value: ''}],
+      quyus: [{label: '请选择', value: ''}, ...this.$appdata.getParam('区域')],
+      bumens: [{label: '请选择', value: ''}],
+      teams: [{label: '请选择', value: ''}],
+      checkers:[{label: '请选择', value: ''}],
       tableBrands: [{label: '全部', value: ''}],
       audioshow: false,
       safeAudit: this.$appdata.getSingleValue('安检审核') == '是' ? true : false,
@@ -545,6 +606,33 @@ export default {
       }
     },
     methods: {
+      bumenChange(val) {
+        if (val) {
+          this.teams = this.$appdata.getParam(`工单-` + val) ? [{
+            label: '请选择',
+            value: ''
+          }, ...this.$appdata.getParam(`工单-` + val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
+      teamChange(val) {
+        if (val) {
+          this.checkers = this.$appdata.getParam(val) ? [...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
+      quyuChange(val) {
+        if (val) {
+          this.bumens = this.$appdata.getParam(val) ? [{
+            label: '请选择',
+            value: ''
+          }, ...this.$appdata.getParam(val)] : [{label: '请选择', value: ''}]
+        }else {
+          this.checkers = this.allCheckers
+        }
+      },
             //气表品牌查询
       getTableBrands() {
         new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
@@ -741,6 +829,24 @@ export default {
           }
         }
         this.model.search(args.condition, args.model, args.condValue)
+      },
+      getAllChecker() {
+        new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+          data: {
+            items: 'name',
+            tablename: 't_user',
+            condition: `state = '在职' and rolestr like '%安检员%'`,
+            orderitem: 'id'
+          }
+        }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          res.data.forEach(ress => {
+            this.allCheckers.push({
+              label: ress.name,
+              value: ress.name
+            })
+          })
+          this.checkers = this.allCheckers
+        })
       }
     },
 
@@ -754,6 +860,7 @@ export default {
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
+      this.getAllChecker()
     },
     watch: {
       'model.f_no_checkplan'(val) {

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

@@ -275,13 +275,26 @@
               >
               </v-select>
             </div>
-            <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
-              <label class=" font_normal_body">选择站点</label>
+            <div class="form-group col-sm-4">
+              <label class=" font_normal_body">选择部门</label>
               <input style="width: 60%" type="text" v-show="false" v-model="createPlan.f_outlets">
               <right-tree islist :userid="userid" :source="source"  v-on:re-res="reres" :textContent="选择站点">
 
               </right-tree>
             </div>
+            <div class="form-group col-sm-4" v-show="createPlan.isShare=='是'">
+              <label class=" font_normal_body">选择班组</label>
+              <v-select
+                class="select select_list"
+                :value.sync="createPlan.f_class"
+                v-model="createPlan.f_class"
+                :options='classes'
+                placeholder='请选择'
+                close-on-select
+                value-single
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4" v-show="createPlan.isShare=='否'">
               <label class="font_normal_body">安&ensp;检&ensp;员:</label>
               <v-select
@@ -450,6 +463,7 @@
         title: '计划管理',
         data() {
           return {
+            classes:[],
             source:
               'dep=this.getParentByType($organization$).getSpecialResByType($department$),' +
               'tool.getFullTree(dep.where(row.hasSpecialRole($派单员$)))',
@@ -528,19 +542,26 @@
             return
           }
           this.createPlan.f_outlets = val.res[0]
-          this.checker = []
-          let vali = {
+          if (this.createPlan.isShare=='否'){
+            this.checker = []
+            let vali = {
               source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$)!=-1)`,
               userid: `${val.resids[0]}`
-          }
-          let http = new HttpResetClass()
-          http.load('POST', '/rs/search', {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            }
+            let http = new HttpResetClass()
+            http.load('POST', '/rs/search', {data: vali}, {resolveMsg: null, rejectMsg: null}).then((res) => {
               res.data.forEach((item) => {
                 if (item.state == '在职'){
                   this.checker.push({label:item.name,value:item})
                 }
               })
-          })
+            })
+          }else {
+            this.classes = this.$appdata.getParam(`工单-` + val.res[0]) ? [{
+              label: '请选择',
+              value: ''
+            }, ...this.$appdata.getParam(`工单-` + val.res[0])] : [{label: '请选择', value: ''}]
+          }
         },
       /*  ntoway() {
           /!* return AppData.getParam('安检类型')*!/