safecheck-client 4.0.0-27 → 4.0.0-29

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/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/pc/NewCheckpaper.vue

@@ -1351,9 +1351,11 @@ export default {
       }
       //tag
       //tag)
-      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType) {
+      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度普检']) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
-      } else if (Vue.config.safecheck.SafecheckType){
+      }else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度安检'][this.item.f_check_type]])
+      }else if (Vue.config.safecheck.SafecheckType){
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
       }else {
         if(this.item.f_check_type == '民用'){