safecheck-client 4.0.2-23 → 4.0.2-24

package/src/components/defects/DefectModal.vue

@@ -1,101 +1,101 @@
-<template>
-  <modal :show.sync="$parent.show" v-ref:modal>
-    <div slot="modal-header" class="modal-header">
-      <h4 class="modal-title">
-        隐患处理
-      </h4>
-    </div>
-    <div slot="modal-body" class="modal-body">
-      <div class="row auto">
-      <div class="form-group">
-        <label class="col-sm-12 control-label">隐患级别：</label>
-        <div class="col-sm-12">{{defect.f_defect_level}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label text-left">隐患：</label>
-        <div class="col-sm-12">{{defect.f_defect}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">部位：</label>
-        <div class="col-sm-12">{{defect.f_device_type}}</div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理方式：</label>
-        <div class="col-sm-12">
-          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
-          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
-        </radio-group></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">整改结果：</label>
-        <div class="col-sm-12">
-          <v-select id="f_ratification" :value.sync="f_ratification"
-                    :options='ratifications' close-on-select clear-button></v-select></div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理人：</label>
-        <div class="col-sm-12">
-          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
-          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
-        </div>
-      </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">处理时间：</label>
-        <div class="col-sm-12"><datepicker id="f_end"
-                      :value.sync="defect.f_ratifieddate"
-                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
-        </div>
-      <div class="form-group">
-        <label class="col-sm-12 control-label">备注：</label>
-        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
-      </div>
-      </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
-  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
-
-  export default {
-        title:'隐患处理',
-        props:['defect','f'],
-    data(){
-          return {
-            model: {},
-            chosenOrg:{id:0},
-            ratifications:[
-                {label: '请选择处理结果', value: null},
-                {label: '未处理', value: '未处理'},
-                {label: '已处理', value: '已处理'},
-              ],
-          }
-    },
-    components: {
-      RadioGroup,
-      Radio
-    },
-    watch:{
-         'f_ratification'(val){
-            if(this.defect.f_ratification)
-              this.defect.f_ratification = this.f_ratification[0]
-          },
-          'defect'(val){
-            this.defect.id = this.defect.defectid
-            this.f_ratification = this.defect.ratification
-            this.defect.f_remark = this.defect.remark
-        }
-     },
-    }
-</script>
-
+<template>
+  <modal :show.sync="$parent.show" v-ref:modal>
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        隐患处理
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row auto">
+      <div class="form-group">
+        <label class="col-sm-12 control-label">隐患级别：</label>
+        <div class="col-sm-12">{{defect.f_defect_level}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label text-left">隐患：</label>
+        <div class="col-sm-12">{{defect.f_defect}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">部位：</label>
+        <div class="col-sm-12">{{defect.f_device_type}}</div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理方式：</label>
+        <div class="col-sm-12">
+          <radio-group :value.sync="defect.f_resolve_type" type="success" buttons="false" disabled="disabled">
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='现场处理'" value="现场处理">现场处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='用户处理'" value="用户处理">用户处理</radio>
+          <radio disabled="disabled" v-if="defect.f_resolve_type =='维修处理'"  value="维修处理">维修处理</radio>
+        </radio-group></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">整改结果：</label>
+        <div class="col-sm-12">
+          <v-select id="f_ratification" :value.sync="f_ratification"
+                    :options='ratifications' close-on-select clear-button></v-select></div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理人：</label>
+        <div class="col-sm-12">
+          <input type="text" class="form-control" v-model="defect.f_ratifiedpeople" maxlength="20">
+          <!--<chooser :userid.sync='f.id' v-model="defect.f_ratifiedpeople" resource-type="user" :width='200' :select-data.sync='chosenOrg'></chooser>-->
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">处理时间：</label>
+        <div class="col-sm-12"><datepicker id="f_end"
+                      :value.sync="defect.f_ratifieddate"
+                      :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'"></datepicker></div>
+        </div>
+      <div class="form-group">
+        <label class="col-sm-12 control-label">备注：</label>
+        <div class="col-sm-12"><textarea  class="form-control"  v-model="defect.f_remark" rows="3"></textarea></div>
+      </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-default" @click="$parent.todo(defect)" v-if="!defect.flag">保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
+  import Radio from 'vue-client/src/vue-strap/src/radioBtn'
+
+  export default {
+        title:'隐患处理',
+        props:['defect','f'],
+    data(){
+          return {
+            model: {},
+            chosenOrg:{id:0},
+            ratifications:[
+                {label: '请选择处理结果', value: null},
+                {label: '未处理', value: '未处理'},
+                {label: '已处理', value: '已处理'},
+              ],
+          }
+    },
+    components: {
+      RadioGroup,
+      Radio
+    },
+    watch:{
+         'f_ratification'(val){
+            if(this.defect.f_ratification)
+              this.defect.f_ratification = this.f_ratification[0]
+          },
+          'defect'(val){
+            this.defect.id = this.defect.defectid
+            this.f_ratification = this.defect.ratification
+            this.defect.f_remark = this.defect.remark
+        }
+     },
+    }
+</script>
+

package/src/components/defects/DevicesAndItem.vue

@@ -1,39 +1,39 @@
-<template>
-<div>
-    <table class="table table-bordered table-hover">
-      <thead>
-      <tr>
-          <th>检查项</th>
-          <th>数据字段</th>
-          <th>数据类型</th>
-          <th>是否必检</th>
-      </tr>
-      </thead>
-      <tbody v-for=" row in model">
-      <tr>
-        <td>{{row.f_item_name}}</td>
-        <td>{{row.f_item_field}}</td>
-        <td>{{row.f_item_type}}</td>
-        <td>{{row.f_write_must}}</td>
-      </tr>
-        </tbody>
-    </table>
-</div>
-</template>
-
-<script>
-
-  export default {
-    title: '安检设备项列表',
-    data () {
-      return {
-        model:this.$parent.device
-      }
-    },
-  watch:{
-    '$parent.device'(val){
-      this.model = val
-    },
-  }
-  }
-</script>
+<template>
+<div>
+    <table class="table table-bordered table-hover">
+      <thead>
+      <tr>
+          <th>检查项</th>
+          <th>数据字段</th>
+          <th>数据类型</th>
+          <th>是否必检</th>
+      </tr>
+      </thead>
+      <tbody v-for=" row in model">
+      <tr>
+        <td>{{row.f_item_name}}</td>
+        <td>{{row.f_item_field}}</td>
+        <td>{{row.f_item_type}}</td>
+        <td>{{row.f_write_must}}</td>
+      </tr>
+        </tbody>
+    </table>
+</div>
+</template>
+
+<script>
+
+  export default {
+    title: '安检设备项列表',
+    data () {
+      return {
+        model:this.$parent.device
+      }
+    },
+  watch:{
+    '$parent.device'(val){
+      this.model = val
+    },
+  }
+  }
+</script>

package/src/components/filialCircle/CircleList.vue

@@ -1,139 +1,139 @@
-<template>
-  <div class="flex" @keyup.enter="search">
-    <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>
-          <div class="row">
-            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
-              <label class="font_normal_body">组织机构</label>
-              <res-select restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          :initresid='$parent.$parent.curorgid'>
-              </res-select>
-            </div>
-            <div  class="col-sm-4 form-group button-range">
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing" style="width: max-content;" v-show="$parent.$parent.addshow"  @click="$parent.$parent.add()">添加周期</button>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-        <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'>
-          <tr>
-            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_filiale}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_circle}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_start_time}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_remarks}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operator_time}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList,HttpResetClass } from 'vue-client'
-
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        model: new PagedList('api/af-safecheck/sql/safe_getcirclelist',20),
-        addflag: false,
-        addtitle:'',
-        addshow:false,
-
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
-
-      }
-    },
-    title: '安检周期列表',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      f_filiale:{
-        type: String
-      }
-    },
-    ready(){
-      this.search()
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-      add(){
-        if (this.f_filialeids) {
-          let http = new HttpResetClass()
-          http.load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy', {data: {
-              items: '*',
-              tablename: 't_safe_circle',
-              condition: `f_filialeid  = '${this.f_filialeids}'`,
-              orderitem: 'id'
-            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            if(res.data.length >0 ){
-              this.$showMessage('该公司下已有安检周期配置', 'warning')
-            }else{
-              this.$refs.paged.$refs.grid.selectStore.selected = null
-              this.$dispatch('add')
-            }
-          })
-        } else {
-          this.$showMessage('请先选择左上角的所在分公司', 'warning')
-        }
-
-      },
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      selfSearch (args) {
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-        args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
-        this.model.search(args.condition, args.model)
-      },
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val,orgname) {
-        if(val.length == 1){
-          this.addshow = true
-        }else{
-          this.addshow = false
-        }
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-        this.f_filiale = orgname != undefined ? orgname[0]:''
-      }
-    },
-    watch:{
-
-    }
-
-  }
-</script>
+<template>
+  <div class="flex" @keyup.enter="search">
+    <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>
+          <div class="row">
+            <div class="form-group" :class="{'col-sm-3':$parent.$parent.$parent.areaShow,'col-sm-2':!$parent.$parent.$parent.areaShow}">
+              <label class="font_normal_body">组织机构</label>
+              <res-select restype='organization'
+                          @res-select="$parent.$parent.getorg"
+                          :initresid='$parent.$parent.curorgid'>
+              </res-select>
+            </div>
+            <div  class="col-sm-4 form-group button-range">
+              <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_new button_spacing" style="width: max-content;" v-show="$parent.$parent.addshow"  @click="$parent.$parent.add()">添加周期</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+        <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'>
+          <tr>
+            <td style="text-align:center"><nobr>{{$index + 1}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_filiale}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_circle}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_start_time}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_remarks}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator_time}}</nobr></td>
+            <td style="text-align:center"><nobr>{{row.f_operator}}</nobr></td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList,HttpResetClass } from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('api/af-safecheck/sql/safe_getcirclelist',20),
+        addflag: false,
+        addtitle:'',
+        addshow:false,
+
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+
+      }
+    },
+    title: '安检周期列表',
+    props:{
+      f_filialeids:{
+        type: String
+      },
+      f_filiale:{
+        type: String
+      }
+    },
+    ready(){
+      this.search()
+    },
+    methods: {
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+      add(){
+        if (this.f_filialeids) {
+          let http = new HttpResetClass()
+          http.load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy', {data: {
+              items: '*',
+              tablename: 't_safe_circle',
+              condition: `f_filialeid  = '${this.f_filialeids}'`,
+              orderitem: 'id'
+            }}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            if(res.data.length >0 ){
+              this.$showMessage('该公司下已有安检周期配置', 'warning')
+            }else{
+              this.$refs.paged.$refs.grid.selectStore.selected = null
+              this.$dispatch('add')
+            }
+          })
+        } else {
+          this.$showMessage('请先选择左上角的所在分公司', 'warning')
+        }
+
+      },
+      modify(val){
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify',val)
+      },
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition} and f_filialeid  in ${this.f_orgid}`
+        this.model.search(args.condition, args.model)
+      },
+      //清空
+      clear(){
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val,orgname) {
+        if(val.length == 1){
+          this.addshow = true
+        }else{
+          this.addshow = false
+        }
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+        this.f_filiale = orgname != undefined ? orgname[0]:''
+      }
+    },
+    watch:{
+
+    }
+
+  }
+</script>