safecheck-client 4.0.2-5 → 4.0.2-50

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/issueplan/IssuePlanMain.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <issue-plan-query  v-ref:query ></issue-plan-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-<script>
-import IssuePlanAction from './IssuePlanAction'
-import IssuePlanQuery from './IssuePlanQuery'
-export default {
-  title: '下发计划',
-  props: ['f'],
-  components: { IssuePlanAction, IssuePlanQuery }
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <issue-plan-query  v-ref:query ></issue-plan-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+import IssuePlanAction from './IssuePlanAction'
+import IssuePlanQuery from './IssuePlanQuery'
+export default {
+  title: '下发计划',
+  props: ['f'],
+  components: { IssuePlanAction, IssuePlanQuery }
+}
+</script>

package/src/components/notice/NoticeForm.vue

@@ -1,100 +1,100 @@
-<template>
-<div>
-    <validator name='v'>
-        <form novalidate class="form-horizontal">
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">标题：</label>
-                <div class="col-sm-8">
-                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="col-sm-2 control-lable">内容：</label>
-                <div class="col-sm-8">
-                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">时间：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
-                </div>
-            </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-lable">分公司：</label>
-              <div class="col-sm-8">
-                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
-                  close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="form-group col-sm-10 text-right">
-              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
-              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
-              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
-            </div>
-        </form>
-    </validator>
-</div>
-
-</template>
-
-<script>
-import * as Util from '../Util'
-import co from 'co'
-import Vue from 'vue'
-
-let syncSave = function * (self) {
-  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
-  yield self.$resetpost('rs/entity/t_notice', self.notice)
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-let syncDelete = function * (self) {
-  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-export default {
-  title: '公告表单',
-  props: ['notice'],
-  computed: {
-    f_division: {
-      get() {
-        if (!this.notice || !this.notice.f_subcompany)
-          return Vue.f_subcompany
-        else
-          return [this.notice.f_subcompany]
-      },
-      set(val) {
-        this.notice.f_subcompany = val[0]
-      }
-    }
-  },
-  methods: {
-    save() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      if (!this.notice.id) {
-        this.$set('notice.f_time', Util.toStandardTimeString())
-      }
-      let gen = syncSave(this)
-      return co(gen)
-    },
-    anew() {
-      this.notice = {}
-      this.$set('notice.f_time', Util.toStandardTimeString())
-    },
-    delete() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      let gen = syncDelete(this)
-      return co(gen)
-    }
-  }
-}
-
-</script>
+<template>
+<div>
+    <validator name='v'>
+        <form novalidate class="form-horizontal">
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">标题：</label>
+                <div class="col-sm-8">
+                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
+                </div>
+              </div>
+              <div class="form-group">
+                <label class="col-sm-2 control-lable">内容：</label>
+                <div class="col-sm-8">
+                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">时间：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
+                </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-lable">分公司：</label>
+              <div class="col-sm-8">
+                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
+                  close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="form-group col-sm-10 text-right">
+              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
+              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
+              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
+            </div>
+        </form>
+    </validator>
+</div>
+
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import Vue from 'vue'
+
+let syncSave = function * (self) {
+  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
+  yield self.$resetpost('rs/entity/t_notice', self.notice)
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+let syncDelete = function * (self) {
+  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+export default {
+  title: '公告表单',
+  props: ['notice'],
+  computed: {
+    f_division: {
+      get() {
+        if (!this.notice || !this.notice.f_subcompany)
+          return Vue.f_subcompany
+        else
+          return [this.notice.f_subcompany]
+      },
+      set(val) {
+        this.notice.f_subcompany = val[0]
+      }
+    }
+  },
+  methods: {
+    save() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      if (!this.notice.id) {
+        this.$set('notice.f_time', Util.toStandardTimeString())
+      }
+      let gen = syncSave(this)
+      return co(gen)
+    },
+    anew() {
+      this.notice = {}
+      this.$set('notice.f_time', Util.toStandardTimeString())
+    },
+    delete() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      let gen = syncDelete(this)
+      return co(gen)
+    }
+  }
+}
+
+</script>

package/src/components/notice/NoticeIssue.vue

@@ -1,20 +1,20 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <notice-query v-ref:query></notice-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <notice-form :notice='$refs.query.selected'></notice-form>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '通知管理'
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <notice-query v-ref:query></notice-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <notice-form :notice='$refs.query.selected'></notice-form>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '通知管理'
+}
+</script>

package/src/components/paper/PicViewer.vue

@@ -1,18 +1,18 @@
-<template>
-  <div>
-    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
-    <img :src="pic_path">
-  </div>
-</template>
-
-<script>
-export default {
-  title: '图片浏览',
-  props: ['pic_path'],
-  data() {
-    return {
-      pic_path : this.pic_path
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
+    <img :src="pic_path">
+  </div>
+</template>
+
+<script>
+export default {
+  title: '图片浏览',
+  props: ['pic_path'],
+  data() {
+    return {
+      pic_path : this.pic_path
+    }
+  }
+}
+</script>

package/src/components/paper/safetyledger.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged >
+        <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">客户编号</label>
+                <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                       style="width: 60%" placeholder="客户编号" condition="f_userinfo_code='{}'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">客户名称</label>
+                <input type="text" class="input_search" v-model="model.f_user_name"
+                       style="width: 60%" placeholder="客户名称" condition="f_user_name like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">客户电话</label>
+                <input type="text" class="input_search" v-model="model.f_user_phone"
+                       style="width: 60%" placeholder="客户电话" condition="f_user_phone like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">详细地址</label>
+                <input type="text" class="input_search" v-model="model.f_address"
+                       style="width: 60%" placeholder="详细地址" condition="f_address like '%{}%'">
+              </div>
+              <div class="form-group col-sm-2"  >
+                <label class="font_normal_body">整改措施</label>
+                <v-select class="select_list select"
+                          placeholder='请选择' style="width: 60%"
+                          :value.sync="model.f_is_repaired"
+                          v-model="model.f_is_repaired"
+                          :options='$parent.$parent.repaired'
+                          filer-key="name"
+                          close-on-select clear-button
+                          condition="f_is_repaired in {}"
+                          :multiple="true">
+                </v-select>
+              </div>
+              <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
+                <export-excel :data="$parent.$parent.searchData"
+                              :field="$parent.$parent.excelHeaders"
+                              :choose-col="true"
+                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="safetyledger" template-name='安检台账记录'></export-excel>
+              <button class="button_spacing button_search" @click="search()">查询</button>
+                <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 class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow" >
+                <label class="font_normal_body">开始时间</label>
+                <datepicker
+                  :value.sync="model.f_check_start"
+                  placeholder='开始时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_start"
+                  condition="f_offsite_time > ='{} 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_check_end"
+                  placeholder='结束时间' style="width: 60%"
+                  :disabled-days-of-week="[]"
+                  :format="'yyyy-MM-dd'"
+                  :show-rest-button="reset"
+                  v-model="model.f_check_end"
+                  condition="f_offsite_time <=  '{} 23:59:59'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid class="list_area table_sy" style="overflow: hidden" :model="model" partial='list' 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>
+              <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">{{row.f_filiale_name}}</td>
+            <td style="text-align: center">{{row.f_offsite_time}}</td>
+            <td style="text-align: center">{{row.f_street}}</td>
+            <td style="text-align: center">{{row.f_address}}</td>
+            <td style="text-align: center">{{row.f_user_name}}</td>
+            <td style="text-align: center">{{row.f_userinfo_code}}</td>
+            <td style="text-align: center">{{row.f_user_type}}</td>
+            <td style="text-align: center">{{ row.f_gas_type }}</td>
+            <td style="text-align: center">{{ row.f_device_type }}</td>
+            <td style="text-align: center">{{ row.f_item_name }}</td>
+            <td style="text-align: center">{{ row.f_is_repaired }}</td>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import co from 'co'
+import * as Util from '../Util'
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+export default {
+  title: '隐患台账',
+  data() {
+    let model = new PagedList('api/af-safecheck/sql/safetyledger', 20)
+    return {
+      model: model,
+      criteriaShow:false,
+      repaired: [{label: '全部', value: ''}, {label: '用户自行整改', value: '用户自行整改'}, {label: '现场已处理', value: '现场已处理'}, {label: '维修已处理', value: '维修已处理'}, {label: '转维修', value: '转维修'}],
+      excelHeaders: {
+        'f_userinfo_code': '客户编号',
+        'f_user_name': '客户姓名',
+        'f_user_phone':'客户电话',
+        'f_user_type': '客户类型',
+        'f_residential_area': '小区',
+        'f_address': '客户地址',
+        'f_offsite_time': '安检时间',
+        'f_gas_type': '用气类型',
+        'f_device_type': '隐患类别',
+        'f_item_name': '隐患描述',
+        'f_is_repaired': '整改措施',
+        'excel_export_p0':'隐患照片1',
+        'excel_export_p1':'隐患照片2',
+        'excel_export_p2':'隐患照片3',
+        'excel_export_p3':'隐患照片4',
+        'excel_export_repair':'处理照片1',
+        'excel_export_repair1':'处理照片2',
+        'excel_export_other_dealpath1':'处理照片3',
+        'excel_export_other_dealpath2':'处理照片4',
+      },
+    }
+  },
+  ready() {
+    this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
+    this.search()
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    search() {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch(args) {
+      this.model.search(args.condition, args.model, args.condValue)
+    }
+  },
+  computed :{
+    searchData() {
+      return {condition: this.model.condition}
+    }
+  },
+  watch: {
+  },
+  beforeDestroy() {
+
+  }
+}
+</script>

package/src/components/pc/CheckBook.vue

@@ -217,7 +217,7 @@ export default {
     },
     showdetails (row) {
       console.log('showdetails',row)
-      this.rowData = row
+      this.rowData = JSON.parse(JSON.stringify(row))
       this.rowData.f_check_book_type='用户'
       this.rowData.f_user_type=''
       this.showItem = false