safecheck-client 3.0.30-gongyi → 3.0.33-gongyi

package/src/components/checkplan/CheckPlan.vue

@@ -1,59 +1,59 @@
-<template>
-  <div id="unit" class="flex-row" :class="{'binary':showItem}">
-<!--    <section>-->
-
-    <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
-          <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
-        </div>
-    <div  class="binary-right" v-show="showItem">
-      <div class="flex">
-          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
-                        v-ref:detail></check-detail>
-        </div>
-    </div>
-
-<!--    </section>-->d
-  </div>
-</template>
-
-<script>
-    import SelectCheckPlan from './SelectCheckPlan'
-    import CheckDetail from './CheckDetail'
-
-    export default {
-        title: '安检员考核',
-        props: ['f'],
-        components: {SelectCheckPlan, CheckDetail},
-        data() {
-            return {
-                showItem: false,
-                checkstatus: null,
-              style:'col-sm-2 form-group',
-              style2:'col-sm-4 form-group'
-            }
-        },
-        methods: {
-          selected(row) {
-            // console.log('as')
-            this.showItem = true
-          },
-          checkstatusChange(val){
-            this.checkstatus = val
-          }
-        }
-    }
-</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>
+<template>
+  <div id="unit" class="flex-row" :class="{'binary':showItem}">
+<!--    <section>-->
+
+    <div  :class="{'basic-main':!showItem,'binary-left':showItem}" >
+          <select-check-plan @select-changed="selected" :style="style" :style2="style2" @checkstatus-changed="checkstatusChange" v-ref:check></select-check-plan>
+        </div>
+    <div  class="binary-right" v-show="showItem">
+      <div class="flex">
+          <check-detail v-if='$refs.check && $refs.check.selected' :check='$refs.check.selected' :checkstatus="checkstatus" :checkstart="$refs.check.f_check_start" :checkend="$refs.check.f_check_end"
+                        v-ref:detail></check-detail>
+        </div>
+    </div>
+
+<!--    </section>-->d
+  </div>
+</template>
+
+<script>
+    import SelectCheckPlan from './SelectCheckPlan'
+    import CheckDetail from './CheckDetail'
+
+    export default {
+        title: '安检员考核',
+        props: ['f'],
+        components: {SelectCheckPlan, CheckDetail},
+        data() {
+            return {
+                showItem: false,
+                checkstatus: null,
+              style:'col-sm-2 form-group',
+              style2:'col-sm-4 form-group'
+            }
+        },
+        methods: {
+          selected(row) {
+            // console.log('as')
+            this.showItem = true
+          },
+          checkstatusChange(val){
+            this.checkstatus = val
+          }
+        }
+    }
+</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/checkplan/SelectCheckPlan.vue

@@ -1,224 +1,224 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-          <div class="row">
-            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
-              <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="c.f_checker = '{}'">
-              </role-selector-safe>
-            </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
-              <label class="font_normal_body">起始月份</label>
-              <datepicker
-                :value.sync="$parent.$parent.f_check_start"
-                placeholder='起始月份' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM'"
-                :select-month="true"
-                :show-rest-button="reset">
-              </datepicker>
-            </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
-              <label class="font_normal_body">结束月份</label>
-              <datepicker
-                :value.sync="$parent.$parent.f_check_end"
-                placeholder='结束月份' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM'"
-                :select-month="true"
-                :show-rest-button="reset">
-              </datepicker>
-            </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检状态</label>
-              <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
-                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="cp.f_entry_status = '{}'">
-              </v-select>
-            </div>
-            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.showItem && $parent.$parent.criteriaShow"></div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检起始</label>
-              <datepicker
-                :value.sync="$parent.$parent.f_start_time"
-                placeholder='起始时间' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset">
-              </datepicker>
-            </div>
-            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
-              <label class="font_normal_body">安检结束</label>
-              <datepicker
-                :value.sync="$parent.$parent.f_end_time"
-                placeholder='结束时间' style="width:60%"
-                :disabled-days-of-week="[]"
-                :format="'yyyy-MM-dd'"
-                :show-rest-button="reset">
-              </datepicker>
-            </div>
-            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
-              <export-excel-safe   :data="$parent.$parent.searchData"
-                              :field="$parent.$parent.excelHeaders"
-                              progress="safeGetExportProgress"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
-              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
-              <div class="button_spacing"
-                   :class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"
-                   @click="$parent.$parent.hidden()">
-               </div>
-              <div class="button_spacing"
-                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
-                   @click="$parent.$parent.hiddenr()"></div>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
-        <template partial='head'>
-          <tr>
-            <th>安检员</th>
-            <th>计划数</th>
-            <th>已检</th>
-            <th>未检</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td style="text-align: center">{{row.f_checker}}</td>
-          <td style="text-align: center">{{row.c}}</td>
-          <td style="text-align: center">{{row.checked}}</td>
-          <td style="text-align: center">{{row.unchecked}}</td>
-        </template>
-        <template partial="foot">
-          <td style="text-align: center"><span><b>合计：</b></span></td>
-          <td style="text-align: center">{{model.sums.c}}</td>
-          <td style="text-align: center">{{model.sums.checked}}</td>
-          <td style="text-align: center">{{model.sums.unchecked}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-  import {PagedList} from 'vue-client'
-  import co from 'co'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-
-
-  export default {
-    title: '安检计划查询',
-    data() {
-      let options = []
-      let year = (new Date()).getFullYear()
-      for (let i = year - 8; i <= year + 1; i++)
-        options.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/planCount', 20, {
-        f_plan_year: 'this.f_plan_year[0]',
-        f_checker: 'this.chosenOrg.name',
-        f_filialeids: 'this.f_filialeids '
-      }, {c: '', checked: '', unchecked: ''})
-      model.f_plan_year = year + ''
-      model.f_filialeids = '('+this.$login.f.orgid+')'
-      model.chosenOrg = {id: 0, name: ''}
-      return {
-        excelHeaders:{
-          'f_checker': '安检员',
-          'c': '计划数',
-          'checked': '已检',
-          'unchecked': '未检'
-        },
-        searchData:{
-
-          condition:"1=1",
-          f_plan_year:year[0],
-          f_checker:'',
-          f_filialeids:'('+this.$login.f.orgid+')'
-        }
-        ,
-        checker: this.$login.f,
-        checkers: [],
-        checkersname: [],
-        checkStates: this.$appdata.getParam('安检状态'),
-        f: this.$login.f,
-        criteriaShow: false,
-        model: model,
-        c_year_list: options,
-        f_check_start:'',
-        f_check_end: '',
-        f_start_time:'',
-        f_end_time:''
-      }
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      hiddenr() {
-        this.$parent.showItem = !this.$parent.showItem
-      },
-      search(args) {
-        if (this.f_check_start) {
-          args.condition += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
-          args.condition += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
-        }
-        if (this.f_check_end) {
-          args.condition += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
-          args.condition += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
-        }
-        this.$dispatch('checkstatus-changed', this.$refs.paged.$refs.cri.model.f_last_check_state[0])
-        this.model.search(args.condition, args.model)
-        console.log('this.model')
-        console.log(this.model.rows.length)
-      },
-      getRes(obj){
-        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-        console.log(this.model.f_filialeids)
-      }
-    },
-    ready() {
-      this.model.id = this.$login.f.id
-      this.model.f_subcompany = this.$login.f.f_fengongsi
-      this.model.f_filialeid = this.$login.f.orgid
-    },
-
-    watch: {
-      'model.condition'(val) {
-        if(val){
-          this.searchData.condition = val
-        }
-      },
-      'model.f_checker'(val) {
-        if(val){
-          this.searchData.f_checker = val
-        }
-      },
-      'checker'() {
-        // console.log('1')
-        console.log("f_checker", this.checker)
-        this.model.chosenOrg = this.checker[0]
-      },
-      'model.rows.length'() {
-        // 如果查询无结果，将合计置为0
-        if(this.model.rows.length < 1){
-          this.model.sums.c = 0
-          this.model.sums.checked = 0
-          this.model.sums.unchecked = 0
-        }
-      }
-    },
-    computed: {
-      selected() {
-        // console.log('2')
-        // this.$parent.showItem=!this.$parent.showItem
-        return this.$refs.paged.$refs.grid.selected
-      }
-    }
-  }
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <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="c.f_checker = '{}'">
+              </role-selector-safe>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">起始月份</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">结束月份</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检状态</label>
+              <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
+                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="cp.f_entry_status = '{}'">
+              </v-select>
+            </div>
+            <div class="form-group col-sm-2" v-if="!$parent.$parent.$parent.showItem && $parent.$parent.criteriaShow"></div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='起始时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">安检结束</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='结束时间' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM-dd'"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel-safe   :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              progress="safeGetExportProgress"
+                              sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+              <button type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <div class="button_spacing"
+                   :class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"
+                   @click="$parent.$parent.hidden()">
+               </div>
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>安检员</th>
+            <th>计划数</th>
+            <th>已检</th>
+            <th>未检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.c}}</td>
+          <td style="text-align: center">{{row.checked}}</td>
+          <td style="text-align: center">{{row.unchecked}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align: center">{{model.sums.c}}</td>
+          <td style="text-align: center">{{model.sums.checked}}</td>
+          <td style="text-align: center">{{model.sums.unchecked}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+
+
+  export default {
+    title: '安检计划查询',
+    data() {
+      let options = []
+      let year = (new Date()).getFullYear()
+      for (let i = year - 8; i <= year + 1; i++)
+        options.push({label: i + '', value: i + ''})
+      let model = new PagedList('rs/sql/planCount', 20, {
+        f_plan_year: 'this.f_plan_year[0]',
+        f_checker: 'this.chosenOrg.name',
+        f_filialeids: 'this.f_filialeids '
+      }, {c: '', checked: '', unchecked: ''})
+      model.f_plan_year = year + ''
+      model.f_filialeids = '('+this.$login.f.orgid+')'
+      model.chosenOrg = {id: 0, name: ''}
+      return {
+        excelHeaders:{
+          'f_checker': '安检员',
+          'c': '计划数',
+          'checked': '已检',
+          'unchecked': '未检'
+        },
+        searchData:{
+
+          condition:"1=1",
+          f_plan_year:year[0],
+          f_checker:'',
+          f_filialeids:'('+this.$login.f.orgid+')'
+        }
+        ,
+        checker: this.$login.f,
+        checkers: [],
+        checkersname: [],
+        checkStates: this.$appdata.getParam('安检状态'),
+        f: this.$login.f,
+        criteriaShow: false,
+        model: model,
+        c_year_list: options,
+        f_check_start:'',
+        f_check_end: '',
+        f_start_time:'',
+        f_end_time:''
+      }
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      hiddenr() {
+        this.$parent.showItem = !this.$parent.showItem
+      },
+      search(args) {
+        if (this.f_check_start) {
+          args.condition += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+          args.condition += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+        }
+        if (this.f_check_end) {
+          args.condition += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+          args.condition += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+        }
+        this.$dispatch('checkstatus-changed', this.$refs.paged.$refs.cri.model.f_last_check_state[0])
+        this.model.search(args.condition, args.model)
+        console.log('this.model')
+        console.log(this.model.rows.length)
+      },
+      getRes(obj){
+        this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+        console.log(this.model.f_filialeids)
+      }
+    },
+    ready() {
+      this.model.id = this.$login.f.id
+      this.model.f_subcompany = this.$login.f.f_fengongsi
+      this.model.f_filialeid = this.$login.f.orgid
+    },
+
+    watch: {
+      'model.condition'(val) {
+        if(val){
+          this.searchData.condition = val
+        }
+      },
+      'model.f_checker'(val) {
+        if(val){
+          this.searchData.f_checker = val
+        }
+      },
+      'checker'() {
+        // console.log('1')
+        console.log("f_checker", this.checker)
+        this.model.chosenOrg = this.checker[0]
+      },
+      'model.rows.length'() {
+        // 如果查询无结果，将合计置为0
+        if(this.model.rows.length < 1){
+          this.model.sums.c = 0
+          this.model.sums.checked = 0
+          this.model.sums.unchecked = 0
+        }
+      }
+    },
+    computed: {
+      selected() {
+        // console.log('2')
+        // this.$parent.showItem=!this.$parent.showItem
+        return this.$refs.paged.$refs.grid.selected
+      }
+    }
+  }
+</script>