safecheck-client 3.0.27-gongyi → 3.0.30-gongyi

package/src/components/defects/AddDevice.vue

@@ -1,95 +1,95 @@
-<template>
-  <modal :show.sync="$parent.showModal" 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-3 control-label">设备名称:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_defect" placeholder='设备名称'>
-          </div>
-          <label  class="col-sm-3 control-label">用户类型:</label>
-          <div class="col-sm-3">
-            <v-select id="f_user_type" :value.sync="model.f_user_type"
-                      :options='user_type'
-                      close-on-select clear-button></v-select>
-          </div>
-        </div>
-        <div class="form-group">
-          <label  class=" col-sm-3 control-label">设备保存字段:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_device_field" placeholder='例如：f_device_field'>
-          </div>
-
-          <label class="col-sm-3 control-label">是否必检:</label>
-          <div class="col-sm-3">
-            <input class="form-control" type="text" v-model="model.f_write_must" placeholder='是否必检'>
-          </div>
-        </div>
-    </div>
-    </div>
-    <div slot="modal-footer" class="modal-footer">
-      <button type="button" class="btn btn-primary" @click="addDevice" >保存</button>
-      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
-    </div>
-  </modal>
-</template>
-
-<script>
-  import Vue from 'vue'
-
-
-  export default {
-    title: '添加设备信息',
-    data() {
-      return {
-        model:{},
-        devices:[]
-      }
-    },
-    methods: {
-      addDevice() {
-        let errorring = true
-        if(this.model.f_defect_field)
-          if(this.model.f_defect_field.endsWith("_path")){
-            errorring = false
-            alert("隐患字段不能以 _path结尾")
-          }
-        if(errorring) {
-          if (this.model.f_defect_path) {
-            if (!this.model.f_defect_path.endsWith("_path")) {
-              errorring = false
-              alert("图片路径字段必须以 _path结尾")
-            }
-          }
-        }
-        if(errorring) {
-          this.$resetpost('rs/entity/t_device_info',
-            {data: this.model},
-            {resolveMsg: null, rejectMsg: null}).then(
-            (response) => {
-              window.alert('添加隐患信息成功')
-            }
-          ).catch(
-            (response) => {
-              window.alert('添加隐患信息失败')
-            }
-          )
-        }
-        this.$parent.undo()
-      },
-    },
-    ready(){
-      let that = this
-      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
-        respanse.data.data.forEach((item)=>{
-          that.devices.push({label:item.f_device_name,value:item.f_device_name})
-        })
-      })
-    }
-  }
-</script>
+<template>
+  <modal :show.sync="$parent.showModal" 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-3 control-label">设备名称:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_defect" placeholder='设备名称'>
+          </div>
+          <label  class="col-sm-3 control-label">用户类型:</label>
+          <div class="col-sm-3">
+            <v-select id="f_user_type" :value.sync="model.f_user_type"
+                      :options='user_type'
+                      close-on-select clear-button></v-select>
+          </div>
+        </div>
+        <div class="form-group">
+          <label  class=" col-sm-3 control-label">设备保存字段:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_device_field" placeholder='例如：f_device_field'>
+          </div>
+
+          <label class="col-sm-3 control-label">是否必检:</label>
+          <div class="col-sm-3">
+            <input class="form-control" type="text" v-model="model.f_write_must" placeholder='是否必检'>
+          </div>
+        </div>
+    </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="addDevice" >保存</button>
+      <button type="button" class="btn btn-default" @click="$parent.undo()">取消</button>
+    </div>
+  </modal>
+</template>
+
+<script>
+  import Vue from 'vue'
+
+
+  export default {
+    title: '添加设备信息',
+    data() {
+      return {
+        model:{},
+        devices:[]
+      }
+    },
+    methods: {
+      addDevice() {
+        let errorring = true
+        if(this.model.f_defect_field)
+          if(this.model.f_defect_field.endsWith("_path")){
+            errorring = false
+            alert("隐患字段不能以 _path结尾")
+          }
+        if(errorring) {
+          if (this.model.f_defect_path) {
+            if (!this.model.f_defect_path.endsWith("_path")) {
+              errorring = false
+              alert("图片路径字段必须以 _path结尾")
+            }
+          }
+        }
+        if(errorring) {
+          this.$resetpost('rs/entity/t_device_info',
+            {data: this.model},
+            {resolveMsg: null, rejectMsg: null}).then(
+            (response) => {
+              window.alert('添加隐患信息成功')
+            }
+          ).catch(
+            (response) => {
+              window.alert('添加隐患信息失败')
+            }
+          )
+        }
+        this.$parent.undo()
+      },
+    },
+    ready(){
+      let that = this
+      this.$resetpost("rs/logic/获取安检设备",{condition: '1 =1'}).then((respanse) => {
+        respanse.data.data.forEach((item)=>{
+          that.devices.push({label:item.f_device_name,value:item.f_device_name})
+        })
+      })
+    }
+  }
+</script>

package/src/components/defects/CheckPaperItem.vue

@@ -1,92 +1,92 @@
-<template>
-  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
-    <div  class="auto" >
-      <partial-view v-ref:pv>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户姓名:</label>
-          <span class = "col-sm-9">{{rowdata.f_user_name}}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户地址:</label>
-          <span class = "col-sm-9">{{rowdata.f_address}}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">入户时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">离开时间:</label>
-          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">安检人:</label>
-          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
-          <label class = "col-sm-3 control-label">安检状态:</label>
-          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
-        </div>
-        <div class="row text-left" style="padding-bottom: 10px">
-          <label class = "col-sm-3 control-label">用户评价:</label>
-          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
-          <label class = "col-sm-3 control-label">是否维修:</label>
-          <span class = "col-sm-3">
-            {{rowdata.f_repaired}}
-            <a v-if="rowdata.f_repaired === '已修'" style="text-decoration: none" href="#" @click="repairlist()">查看</a>
-          </span>
-        </div>
-      </partial-view>
-    </div>
-    <check-paper-items :row="rowdata"></check-paper-items>
-    <!--<work-history :row-one="workhistoryid" v-if="repaierShow"></work-history>-->
-  </div>
-</template>
-
-<script>
-  import Vue from 'vue'
-  import co from 'co'
-  // import RepairOrder from 'telephone-clients/src/components/workorder/RepairOrder'
-  // import WorkHistory from 'telephone-clients/src/components/pc/WorkHistory'
-
-  let readRepair = async function (self) {
-    let condition = "f_service_id = '" + self.rowdata.f_safetorepair_id+"'"
-    let res = await self.$resetpost('rs/sql/singleTable',{data:{tablename:'t_serviceworkorder',condition:condition}}, { resolveMsg: null, rejectMsg: null })
-    self.workhistoryid.id = res.data[0].id
-    self.workhistoryid.f_workorder_type = '报修单'
-    self.repaierShow =true
-  }
-
-  export default {
-    title: '安检项信息',
-    name: 'CheckPaperItem',
-    props: ['row'],
-    data () {
-      return {
-        workhistoryid: {},
-        rowdata: this.row,
-        repaierShow: false,
-        service: null,
-        repair: {}
-      }
-    },
-    ready () {
-      this.rowdata = this.row
-    },
-    watch: {
-      'row' (val) {
-        this.rowdata = val
-        this.repaierShow = false
-      }
-    },
-    methods: {
-      repairlist () {
-        readRepair(this)
-      },
-      close () {
-        this.repaierShow = false
-      }
-    },
-    components: {
-      // 'work-history' : WorkHistory
-      // 'repair-order': RepairOrder
-    }
-  }
-</script>
+<template>
+  <div style="height: 100%;width: 100%;padding:10px 0px 10px 0px;">
+    <div  class="auto" >
+      <partial-view v-ref:pv>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户姓名:</label>
+          <span class = "col-sm-9">{{rowdata.f_user_name}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户地址:</label>
+          <span class = "col-sm-9">{{rowdata.f_address}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">入户时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_onsite_time}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">离开时间:</label>
+          <span class = "col-sm-9">{{rowdata.f_offsite_time}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">安检人:</label>
+          <span class = "col-sm-3">{{rowdata.f_checker_name}}</span>
+          <label class = "col-sm-3 control-label">安检状态:</label>
+          <span class = "col-sm-3">{{rowdata.f_entry_status}}</span>
+        </div>
+        <div class="row text-left" style="padding-bottom: 10px">
+          <label class = "col-sm-3 control-label">用户评价:</label>
+          <span class = "col-sm-3">{{rowdata.f_client_evaluation}}</span>
+          <label class = "col-sm-3 control-label">是否维修:</label>
+          <span class = "col-sm-3">
+            {{rowdata.f_repaired}}
+            <a v-if="rowdata.f_repaired === '已修'" style="text-decoration: none" href="#" @click="repairlist()">查看</a>
+          </span>
+        </div>
+      </partial-view>
+    </div>
+    <check-paper-items :row="rowdata"></check-paper-items>
+    <!--<work-history :row-one="workhistoryid" v-if="repaierShow"></work-history>-->
+  </div>
+</template>
+
+<script>
+  import Vue from 'vue'
+  import co from 'co'
+  // import RepairOrder from 'telephone-clients/src/components/workorder/RepairOrder'
+  // import WorkHistory from 'telephone-clients/src/components/pc/WorkHistory'
+
+  let readRepair = async function (self) {
+    let condition = "f_service_id = '" + self.rowdata.f_safetorepair_id+"'"
+    let res = await self.$resetpost('rs/sql/singleTable',{data:{tablename:'t_serviceworkorder',condition:condition}}, { resolveMsg: null, rejectMsg: null })
+    self.workhistoryid.id = res.data[0].id
+    self.workhistoryid.f_workorder_type = '报修单'
+    self.repaierShow =true
+  }
+
+  export default {
+    title: '安检项信息',
+    name: 'CheckPaperItem',
+    props: ['row'],
+    data () {
+      return {
+        workhistoryid: {},
+        rowdata: this.row,
+        repaierShow: false,
+        service: null,
+        repair: {}
+      }
+    },
+    ready () {
+      this.rowdata = this.row
+    },
+    watch: {
+      'row' (val) {
+        this.rowdata = val
+        this.repaierShow = false
+      }
+    },
+    methods: {
+      repairlist () {
+        readRepair(this)
+      },
+      close () {
+        this.repaierShow = false
+      }
+    },
+    components: {
+      // 'work-history' : WorkHistory
+      // 'repair-order': RepairOrder
+    }
+  }
+</script>

package/src/components/defects/CheckPaperItems.vue

@@ -1,89 +1,89 @@
-<template>
-  <div>
-    <criteria-paged :model="model" v-ref:paged :pager="false">
-      <criteria partial='criteria' @condition-changed='search' v-ref:criteria>
-        <div novalidate class="form-inline auto" partial style="text-align: center">
-          <div class="form-group">
-            <label class="font_normal_body">设备类型</label>
-            <v-select id="f_device_type"
-                      class="select_list select"
-                      style="width: 60%;"
-                      v-model='model.f_device_type'
-                      :value.sync="model.f_device_type"
-                      :options='$parent.$parent.f_devices'
-                      condition="t_paper_devices.f_device_type = '{}'"
-                      :value-single="true"
-                      close-on-select
-                      clear-button> </v-select>
-          </div>
-          <div class="form-group">
-            <button class="button_spacing button_search" @click="search()">查询</button>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
-        <template partial='head'>
-          <tr>
-            <th>设备类型</th>
-            <th>检查项信息名</th>
-            <th>检查项信息值</th>
-            <th>是否已处理</th>
-            <th>维修人</th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <td v-if="row.type !== 'picture'">{{row.f_device_type}}</td>
-          <td v-if="row.type !== 'picture'">{{row.f_item_name}}</td>
-          <td v-if="row.f_is_defect === 'true' && row.type !== 'picture'" style="color: red;font-weight: bold">{{row.f_item_value}}</td>
-          <td v-if="row.f_is_defect !== 'true' && row.type !== 'picture'">{{row.f_item_value}}</td>
-          <td >{{row.f_is_repaired}}</td>
-          <td >{{row.repairman}}</td>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import Vue from 'vue'
-  import co from 'co'
-  export default {
-    title: '安检详细信息',
-    name: 'CheckPaperItems',
-    props: ['row'],
-
-    data () {
-      let model = new PagedList('rs/sql/CheckPaperSearchItem', 100, {
-        f_paper_id: 'this.f_paper_id',
-      })
-      model.f_paper_id = this.row.id
-      return {
-        model: model,
-        f_devices: this.devices(),
-        rowdata: this.row
-      }
-    },
-    methods: {
-      devices(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安检项')]
-      },
-    },
-    ready () {
-      console.log(this)
-      this.rowdata = this.row
-      this.$refs.paged.$refs.criteria.model.f_device_type = this.$parent.$parent.$refs.checksearch.model.model.f_device_type[0]
-      this.$children[0].$children[0].search()
-    },
-    watch: {
-      '$parent.$parent.rowData' (val) {
-        this.rowdata = val
-        this.model.f_paper_id = val.id
-        this.$refs.paged.$refs.criteria.model.f_device_type = this.$parent.$parent.$refs.checksearch.model.model.f_device_type[0]
-          this.$refs.paged.$refs.criteria.search()
-        console.log('this.model', this.model)
-      }
-    },
-
-  }
-</script>
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged :pager="false">
+      <criteria partial='criteria' @condition-changed='search' v-ref:criteria>
+        <div novalidate class="form-inline auto" partial style="text-align: center">
+          <div class="form-group">
+            <label class="font_normal_body">设备类型</label>
+            <v-select id="f_device_type"
+                      class="select_list select"
+                      style="width: 60%;"
+                      v-model='model.f_device_type'
+                      :value.sync="model.f_device_type"
+                      :options='$parent.$parent.f_devices'
+                      condition="t_paper_devices.f_device_type = '{}'"
+                      :value-single="true"
+                      close-on-select
+                      clear-button> </v-select>
+          </div>
+          <div class="form-group">
+            <button class="button_spacing button_search" @click="search()">查询</button>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>设备类型</th>
+            <th>检查项信息名</th>
+            <th>检查项信息值</th>
+            <th>是否已处理</th>
+            <th>维修人</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td v-if="row.type !== 'picture'">{{row.f_device_type}}</td>
+          <td v-if="row.type !== 'picture'">{{row.f_item_name}}</td>
+          <td v-if="row.f_is_defect === 'true' && row.type !== 'picture'" style="color: red;font-weight: bold">{{row.f_item_value}}</td>
+          <td v-if="row.f_is_defect !== 'true' && row.type !== 'picture'">{{row.f_item_value}}</td>
+          <td >{{row.f_is_repaired}}</td>
+          <td >{{row.repairman}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import co from 'co'
+  export default {
+    title: '安检详细信息',
+    name: 'CheckPaperItems',
+    props: ['row'],
+
+    data () {
+      let model = new PagedList('rs/sql/CheckPaperSearchItem', 100, {
+        f_paper_id: 'this.f_paper_id',
+      })
+      model.f_paper_id = this.row.id
+      return {
+        model: model,
+        f_devices: this.devices(),
+        rowdata: this.row
+      }
+    },
+    methods: {
+      devices(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('安检项')]
+      },
+    },
+    ready () {
+      console.log(this)
+      this.rowdata = this.row
+      this.$refs.paged.$refs.criteria.model.f_device_type = this.$parent.$parent.$refs.checksearch.model.model.f_device_type[0]
+      this.$children[0].$children[0].search()
+    },
+    watch: {
+      '$parent.$parent.rowData' (val) {
+        this.rowdata = val
+        this.model.f_paper_id = val.id
+        this.$refs.paged.$refs.criteria.model.f_device_type = this.$parent.$parent.$refs.checksearch.model.model.f_device_type[0]
+          this.$refs.paged.$refs.criteria.search()
+        console.log('this.model', this.model)
+      }
+    },
+
+  }
+</script>