From a551d6e61b0d56f8eef458540673840002210fa8 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Mon, 15 Aug 2022 17:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/eqInspection.js                       | 19 ++--
 src/components/VanFieldCheckBox.vue           |  8 ++
 .../eqInspection/eqInspection-detail.vue      |  4 +-
 src/pages/eqInspection/eqInspection-edit.vue  | 89 ++++++++++++++++---
 .../components/materialPopup-worker.vue       |  1 -
 src/util/request.js                           |  2 +-
 6 files changed, 104 insertions(+), 19 deletions(-)

diff --git a/src/api/eqInspection.js b/src/api/eqInspection.js
index 80eb595..60da31f 100644
--- a/src/api/eqInspection.js
+++ b/src/api/eqInspection.js
@@ -53,6 +53,15 @@ export const eqList = data => {
   })
 }
 
+// 获取巡检项目列表
+export const itemList = data => {
+  return request({
+    url: '/api/equipment/inspectionItem/list',
+    method: 'POST',
+    data
+  })
+}
+
 // 获取设备信息
 export const getEqInfo = data => {
   return request({
@@ -72,7 +81,7 @@ export const getEqInsItemList = data => {
   })
 }
 
-// 获取巡检内容列表
+// 获取巡检项目列表
 export const getInsList = data => {
   return request({
     url: '/api/equipment/equipmentinspection-inspectionitem/list',
@@ -81,7 +90,7 @@ export const getInsList = data => {
   })
 }
 
-// 根据设备获取巡检内容列表
+// 根据设备获取巡检项目列表
 export const getEqInsList = data => {
   return request({
     url: '/api/equipment/inspectionItem/list-WithEQ',
@@ -90,7 +99,7 @@ export const getEqInsList = data => {
   })
 }
 
-// 更新巡检内容完成状态
+// 更新巡检项目完成状态
 export const updateInsStatus = data => {
   return request({
     url: '/api/equipment/equipmentinspection-inspectionitem/update',
@@ -99,7 +108,7 @@ export const updateInsStatus = data => {
   })
 }
 
-// 获取巡检内容详情
+// 获取巡检项目详情
 export const detailIns = data => {
   return request({
     url: '/api/equipment/equipmentinspection-inspectionitem/get',
@@ -108,7 +117,7 @@ export const detailIns = data => {
   })
 }
 
-// 更新巡检内容详情
+// 更新巡检项目详情
 export const updateIns = data => {
   return request({
     url: '/api/equipment/equipmentinspection-inspectionitem/update',
diff --git a/src/components/VanFieldCheckBox.vue b/src/components/VanFieldCheckBox.vue
index 4017758..7c40e1f 100644
--- a/src/components/VanFieldCheckBox.vue
+++ b/src/components/VanFieldCheckBox.vue
@@ -179,3 +179,11 @@ export default {
   }
 }
 </style>
+
+<style lang="scss">
+.dh-field {
+  .van-cell__title, .van-picker__confirm, .van-picker__cancel {
+    font-size: .36rem;
+  }
+}
+</style>
diff --git a/src/pages/eqInspection/eqInspection-detail.vue b/src/pages/eqInspection/eqInspection-detail.vue
index eaf7b5e..29597fd 100644
--- a/src/pages/eqInspection/eqInspection-detail.vue
+++ b/src/pages/eqInspection/eqInspection-detail.vue
@@ -24,7 +24,7 @@
         <van-row class="eq-field-item">
           <van-col :span="12" class="eq-field-item-lable">
             <short-line />
-            巡检内容
+            巡检项目
           </van-col>
           <van-col :span="11" style="text-align: right">
             {{ dataForm.inspectionContent }}
@@ -33,7 +33,7 @@
         <van-row class="eq-field-item">
           <van-col :span="12" class="eq-field-item-lable">
             <short-line />
-            巡检内容编码
+            巡检项目编码
           </van-col>
           <van-col :span="11" style="text-align: right">
             {{ dataForm.inspectionItem }}
diff --git a/src/pages/eqInspection/eqInspection-edit.vue b/src/pages/eqInspection/eqInspection-edit.vue
index 8826620..a8dae7e 100644
--- a/src/pages/eqInspection/eqInspection-edit.vue
+++ b/src/pages/eqInspection/eqInspection-edit.vue
@@ -29,7 +29,6 @@
           <van-col :span="15" :offset="1" class="eq-field-item-input">
             <van-field
               v-model="dataForm.equipmentName"
-              ref="eqCodeInput"
               class="canInput"
               disabled
             />
@@ -43,7 +42,6 @@
           <van-col :span="15" :offset="1" class="eq-field-item-input">
             <van-field
               v-model="dataForm.inspectionWorker"
-              ref="eqCodeInput"
               clearable
               placeholder="填写巡检人员以逗号隔开"
             />
@@ -57,7 +55,6 @@
           <van-col :span="15" :offset="1" class="eq-field-item-input">
             <van-field
               v-model="insTime"
-              ref="eqCodeInput"
               clearable
               clear-trigger="always"
               disabled
@@ -67,12 +64,28 @@
             />
           </van-col>
         </van-row>
+        <van-row class="eq-field-item" v-if="!eqId">
+          <van-col :span="7" class="eq-field-item-lable">
+            <short-line />
+            巡检项目
+          </van-col>
+          <van-col :span="15" :offset="1" class="eq-field-item-input">
+            <van-field
+              v-model="itemShow"
+              class="canInput"
+              clearable
+              disabled
+              placeholder="请选择巡检项目"
+              @click="handleItem"
+            />
+          </van-col>
+        </van-row>
       </div>
       <div class="eq-main-edit-neirong-item" v-if="eqId">
         <van-row class="eq-field-item">
           <van-col :span="7" class="eq-field-item-lable">
             <short-line />
-            巡检内容
+            巡检项目
           </van-col>
           <van-col :span="15" :offset="1" />
           <template v-if="insList && insList.length">
@@ -151,20 +164,32 @@
         @cancel="show = false; dateType = 0"
       />
     </van-popup>
+    <van-popup v-model="showItem" position="bottom">
+      <van-field-check-box
+        title="选择巡检项目"
+        show-toolbar
+        ref="worker-picker"
+        :columns="showList"
+        :select-value="dataForm.itemList"
+        @confirm="setItem"
+        @cancel="showItem = false"
+      />
+    </van-popup>
   </div>
 </template>
 
 <script>
 import moment from 'moment'
-import { detail, eqList, getInsList, updateInsStatus, add, update } from '@/api/eqInspection'
+import { detail, eqList, itemList, getInsList, updateInsStatus, add, update } from '@/api/eqInspection'
 import { uploadFile, downloadFile } from '@/api/file'
 import { blobToBase64 } from '@/util/utils'
 import shortLine from '@/components/shortLine.vue'
+import VanFieldCheckBox from '@/components/VanFieldCheckBox'
 import { Toast } from 'vant'
 
 export default {
   name: 'eqInspectionEdit',
-  components: { shortLine },
+  components: { shortLine, VanFieldCheckBox },
   data () {
     return {
       eqList: [],
@@ -177,36 +202,52 @@ export default {
         inspectionWorker: null,
         inspectionEndTime: null,
         inspectionStartTime: null,
-        source: 3
+        source: 3,
+        itemList: []
       },
+      itemList: [],
+      itemObj: {},
+      itemShow: null,
       insList: [],
       insTime: null,
       fileList: [],
       eqId: null,
       show: false,
+      showItem: false,
       currentDate: null,
       minDate: new Date(2020, 0, 1),
       dateType: 0
     }
   },
+  computed: {
+    showList: function () {
+      return this.itemList.map(item => {
+        return { label: item.inspectionItem, value: item.id }
+      })
+    }
+  },
   mounted () {
     if (this.$route.query.equipmentName) {
       this.dataForm.equipmentName = this.$route.query.equipmentName
     }
     this.getEqList()
+    if (!(this.$route.query.id)) {
+      this.getItemList()
+    }
   },
   methods: {
     // 返回上一页
     onClickLeft () {
       this.$router.goBack()
     },
+    // 获取设备列表
     async getEqList () {
       const result = await eqList({
         current: 1,
         size: 999
       })
       if (result.success) {
-        this.eqList = result.data.records
+        this.eqList = result.data
         if (this.$route.query.id) {
           this.getDetail()
         } else {
@@ -214,6 +255,20 @@ export default {
         }
       }
     },
+    // 获取维修项目列表
+    async getItemList () {
+      const result = await itemList({
+        current: 1,
+        size: 999,
+        type: 1
+      })
+      if (result.success) {
+        this.itemList = result.data
+        result.data.map(item => {
+          this.itemObj[item.id] = item.inspectionItem
+        })
+      }
+    },
     // 获取详情
     async getDetail () {
       this.eqId = this.$route.query.id
@@ -268,7 +323,7 @@ export default {
     oversize () {
       this.$toast.fail('文件不能超过10M')
     },
-    // 更新巡检内容状态
+    // 更新巡检项目状态
     async updateStatus (item) {
       const result = await updateInsStatus({
         id: item.id,
@@ -302,6 +357,20 @@ export default {
     handleDate () {
       this.show = true
     },
+    // 弹出巡检项目选择器
+    handleItem () {
+      this.showItem = true
+    },
+    // 更新巡检项目
+    setItem (v) {
+      if (v && v.length) {
+        this.dataForm.itemList = v
+        this.itemShow = v.map(item => {
+          return this.itemObj[item]
+        }).join(',')
+        this.showItem = false
+      }
+    },
     // 提交表单
     async handleSubmit () {
       let result = {}
@@ -321,7 +390,7 @@ export default {
         })
       }
     },
-    // 前往巡检内容详情
+    // 前往巡检项目详情
     toInsDetail (item) {
       this.$router.push({
         name: 'eqInspectionDetail',
diff --git a/src/pages/material/components/materialPopup-worker.vue b/src/pages/material/components/materialPopup-worker.vue
index 7278f26..e9cb2e7 100644
--- a/src/pages/material/components/materialPopup-worker.vue
+++ b/src/pages/material/components/materialPopup-worker.vue
@@ -11,7 +11,6 @@
     <van-field-check-box
       title="选择操作员"
       show-toolbar
-      ref="worker-picker"
       :columns="showList"
       :select-value="defaultValue"
       @confirm="onConfirm"
diff --git a/src/util/request.js b/src/util/request.js
index 1a03d44..643c399 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -40,7 +40,7 @@ service.interceptors.request.use((config) => {
   // 线上版本
   // config.url = 'http://hfxny.mes.picaiba.com' + config.url
   // 本地版本
-  config.url = 'http://192.168.0.88' + config.url
+  // config.url = 'http://192.168.0.88' + config.url
 
   // ***************
   if (config.formState) {