safecheck-client 3.0.33-120 → 3.0.33-121

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/defects/DevicesSeting.vue

@@ -1,106 +1,106 @@
-<template>
-  <div class="over col-md-6">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='search'>
-        <form class="form-inline" partial>
-          <div class="form-group">
-            <label class="control-label">设备</label>
-            <v-select id="f_device_name" :value.sync="$parent.$parent.model.f_device_name"
-                      condition="f_device_name={}"
-                      placeholder="设备" :options='$parent.$parent.devices_list' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <label class="control-label">用户类型</label>
-            <v-select id="f_user_type" :value.sync="$parent.$parent.model.f_user_type" placeholder='用户类型'
-                      condition="f_user_type={}"
-                      :options='$parent.$parent.user_types' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <label class="control-label">是否必检</label>
-            <v-select id="f_write_must" :value.sync="$parent.$parent.f_write_must" placeholder='是否必检'
-                      condition="f_write_must={}"
-                      :options='$parent.$parent.write_must' close-on-select clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
-            <button type="button" class="btn btn-default width-80" @click="showMo()">新增</button>
-          </div>
-        </form>
-      </criteria>
-      <data-grid :model="model" partial='list'  v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th>设备</th>
-            <th>用户类型</th>
-            <th>保存字段</th>
-            <th>是否必检</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_name}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_user_type}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_field}}</td>
-          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_write_must}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <div  class="span-row over col-md-6">
-    <devices-and-item ></devices-and-item>
-  </div>
-  <add-devices></add-devices>
-</template>
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  import Vue from 'vue'
-  import * as Util from '../Util'
-  import DevicesAndItem from "./DevicesAndItem";
-
-  let syncDelete = function * (self,row) {
-    yield self.$remove('rs/entity/t_defect_info/', {id: row.id})
-    self.$refs.paged.$refs.criteria.search()
-  }
-
-  export default {
-    components: {DevicesAndItem},
-    title: '安检项配置',
-    data () {
-      return {
-        model:new PagedList('rs/path/getDevices',20) ,
-        user_types: this.$appdata.getParam('用户类型'),
-        write_must: this.$appdata.getParam('是否必检'),
-        devices_list:[],
-        device:[],
-        showModal:false
-      }
-    },
-    ready(){
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          this.devices_list.push({label:item.f_device_name,value:item.f_device_name})
-        })
-      })
-    },
-    computed: {
-      selected () {
-        return this.$refs.paged.$refs.grid.selected
-      }
-    },
-    methods:{
-      checkitem(row){
-      this.$set('device',row.f_device_item)
-      },
-      showMo () {
-        this.showModal = true
-      },
-      delete(row){
-        let gen = syncDelete(this,row)
-        return co(gen)
-      },
-      undo(){
-        this.showModal = false
-      },
-    }
-  }
-</script>
+<template>
+  <div class="over col-md-6">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='search'>
+        <form class="form-inline" partial>
+          <div class="form-group">
+            <label class="control-label">设备</label>
+            <v-select id="f_device_name" :value.sync="$parent.$parent.model.f_device_name"
+                      condition="f_device_name={}"
+                      placeholder="设备" :options='$parent.$parent.devices_list' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <label class="control-label">用户类型</label>
+            <v-select id="f_user_type" :value.sync="$parent.$parent.model.f_user_type" placeholder='用户类型'
+                      condition="f_user_type={}"
+                      :options='$parent.$parent.user_types' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <label class="control-label">是否必检</label>
+            <v-select id="f_write_must" :value.sync="$parent.$parent.f_write_must" placeholder='是否必检'
+                      condition="f_write_must={}"
+                      :options='$parent.$parent.write_must' close-on-select clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <button type="button" class="btn btn-success width-80" @click="search()">查询</button>
+            <button type="button" class="btn btn-default width-80" @click="showMo()">新增</button>
+          </div>
+        </form>
+      </criteria>
+      <data-grid :model="model" partial='list'  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th>设备</th>
+            <th>用户类型</th>
+            <th>保存字段</th>
+            <th>是否必检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_name}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_user_type}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_device_field}}</td>
+          <td @click="$parent.$parent.$parent.checkitem(row)">{{row.f_write_must}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <div  class="span-row over col-md-6">
+    <devices-and-item ></devices-and-item>
+  </div>
+  <add-devices></add-devices>
+</template>
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  import Vue from 'vue'
+  import * as Util from '../Util'
+  import DevicesAndItem from "./DevicesAndItem";
+
+  let syncDelete = function * (self,row) {
+    yield self.$remove('rs/entity/t_defect_info/', {id: row.id})
+    self.$refs.paged.$refs.criteria.search()
+  }
+
+  export default {
+    components: {DevicesAndItem},
+    title: '安检项配置',
+    data () {
+      return {
+        model:new PagedList('rs/path/getDevices',20) ,
+        user_types: this.$appdata.getParam('用户类型'),
+        write_must: this.$appdata.getParam('是否必检'),
+        devices_list:[],
+        device:[],
+        showModal:false
+      }
+    },
+    ready(){
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          this.devices_list.push({label:item.f_device_name,value:item.f_device_name})
+        })
+      })
+    },
+    computed: {
+      selected () {
+        return this.$refs.paged.$refs.grid.selected
+      }
+    },
+    methods:{
+      checkitem(row){
+      this.$set('device',row.f_device_item)
+      },
+      showMo () {
+        this.showModal = true
+      },
+      delete(row){
+        let gen = syncDelete(this,row)
+        return co(gen)
+      },
+      undo(){
+        this.showModal = false
+      },
+    }
+  }
+</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>