Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/device/device-inspection.vue

@@ -0,0 +1,123 @@
+<template>
+  <div>
+    <div class="my-title">点检</div>
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="140px"
+    >
+      <el-form-item label="点检时间" prop="rowRersion">
+        <el-date-picker
+          v-model="dataForm.rowRersion"
+          type="datetime"
+          placeholder="点检时间"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 100%;" />
+      </el-form-item>
+      <el-form-item prop="one">
+        <span class="my-title">1. 设备外观清洁；内部打扫干净，无残留。</span>
+        <el-radio-group v-model="dataForm.one">
+          <el-radio label="1">是</el-radio>
+          <el-radio label="2">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="two">
+        <span class="my-title">2. 各滑动面及导轨丝杆等传动部位，润滑充足，无损坏，运转无杂音。</span>
+        <el-radio-group v-model="dataForm.two">
+          <el-radio label="1">是</el-radio>
+          <el-radio label="2">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="three">
+        <span class="my-title">3. 油路畅通，油量充足；冷却液无变质。</span>
+        <el-radio-group v-model="dataForm.three">
+          <el-radio label="1">是</el-radio>
+          <el-radio label="2">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="four">
+        <span class="my-title">4. 系统运转正常，无报警，无异常。</span>
+        <el-radio-group v-model="dataForm.four">
+          <el-radio label="1">是</el-radio>
+          <el-radio label="2">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item prop="five">
+        <span class="my-title">5. 做好交接班工作，记录清晰完整。</span>
+        <el-radio-group v-model="dataForm.five">
+          <el-radio label="1">是</el-radio>
+          <el-radio label="2">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="故障维修记录" prop="measuredRecords">
+        <el-input v-model="dataForm.measuredRecords" type="textarea" :rows="5" placeholder="故障维修记录"></el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="onChose">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-reClick>确定</el-button>
+    </span>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'device-inspection',
+  data () {
+    return {
+      dataForm: {
+        id: 0,
+        rowRersion: '',
+        one: '1',
+        two: '1',
+        three: '1',
+        four: '1',
+        five: '1',
+        measuredRecords: ''
+      },
+      dataRule: {
+        rowRersion: [{required: true, message: '请选择点检时间', trigger: 'change'}]
+      }
+    }
+  },
+  mounted () {},
+  methods: {
+    init (row) {
+      this.dataForm.id = row.id
+    },
+    onChose () {
+      this.$emit('onChose')
+    },
+    dataFormSubmit () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl(`/biz-service/equipmentCheckRecord/updateCheck`),
+            method: 'post',
+            data: this.$http.adornData({ ...this.dataForm })
+          }).then(({ data }) => {
+            if (data && data.code === '200') {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.onChose()
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/views/modules/device/device-list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="device">
-    <template v-if="!addOrUpdateVisible && !detailVisible && !historyVisible && !damageVisible && !checkVisible">
+    <template v-if="!addOrUpdateVisible && !detailVisible && !historyVisible && !damageVisible && !checkVisible && !inspectionVisible">
       <!-- 查询、新增操作 -->
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
         <el-form-item label="名称/编号">
@@ -242,7 +242,7 @@
           fixed="right"
           header-align="center"
           align="center"
-          width="190"
+          width="230"
           label="操作">
           <template slot-scope="scope">
 <!--            <el-button v-if="isAuth('prod:equipment:info')" type="text" size="small" @click="detailHandle(scope.row.id)">查看</el-button>-->
@@ -250,6 +250,7 @@
             <el-button v-if="isAuth('prod:equipment:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">编辑</el-button>
             <el-button v-if="isAuth('prod:updateVerification:update')" type="text" size="small" @click="checkHandle(scope.row)">检定</el-button>
             <el-button v-if="isAuth('prod:updateBreakage:update')" type="text" size="small" @click="damageHandle(scope.row)">报损</el-button>
+            <el-button v-if="isAuth('prod:equipmentCheckRecord:updateCheck')" type="text" size="small" @click="inspectionHandle(scope.row)">点检</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -270,6 +271,7 @@
     <preview-component v-if="previewVisible" ref="preview" @onChose="onChose"></preview-component>
     <device-damage v-if="damageVisible" ref="damage" @onChose="onChose" @refreshDataList="getDataList"></device-damage>
     <device-check v-if="checkVisible" ref="check" @onChose="onChose" @refreshDataList="getDataList"></device-check>
+    <device-inspection v-if="inspectionVisible" ref="inspection" @onChose="onChose" @refreshDataList="getDataList"></device-inspection>
   </div>
 </template>
 
@@ -285,9 +287,11 @@ import PreviewComponent from '@/views/modules/common/preview-component.vue'
 import DeviceHistory from '@/views/modules/device/device-history.vue'
 import DeviceDamage from '@/views/modules/device/device-damage.vue'
 import DeviceCheck from '@/views/modules/device/device-check.vue'
+import DeviceInspection from '@/views/modules/device/device-inspection.vue'
 export default {
   name: 'device-list',
   components: {
+    DeviceInspection,
     DeviceCheck,
     DeviceDamage,
     DeviceHistory,
@@ -306,6 +310,7 @@ export default {
       previewVisible: false,
       damageVisible: false,
       checkVisible: false,
+      inspectionVisible: false,
       dataForm: {},
       dataList: [],
       pageIndex: 1,
@@ -327,6 +332,7 @@ export default {
       this.historyVisible = false
       this.damageVisible = false
       this.checkVisible = false
+      this.inspectionVisible = false
     },
     // 查询
     search () {
@@ -413,6 +419,13 @@ export default {
         this.$refs.check.init(row)
       })
     },
+    // 点检
+    inspectionHandle (row) {
+      this.inspectionVisible = true
+      this.$nextTick(() => {
+        this.$refs.inspection.init(row)
+      })
+    },
     // 删除
     deleteHandle (id) {
       if (!id) return