5.25

src/api/basicConfig.js

@@ -122,18 +122,10 @@ export function getMaterialArr(data) {
     data
   })
 }
-// 获取耗材名称ID规格和单位
+// 根据耗材名称查ID、规格和单位
 export function materialList(data) {
   return request({
-    url: '/basic/consumableConfiguration/materialAndUnit',
-    method: 'post',
-    data
-  })
-}
-
-export function getSpecList(data) {
-  return request({
-    url: '/basic/consumableConfiguration/specList',
+    url: '/basic/consumableConfiguration/materialList',
     method: 'post',
     data
   })

src/views/consumablesManagement/components/inAndOutManagementAdd.vue

@@ -178,7 +178,11 @@ import {
   materialManageInsert,
   materialManageDelete
 } from '@/api/consumablesManagement'
-import { sideLibraryList, getMaterialArr, getSpecList } from '@/api/basicConfig'
+import {
+  sideLibraryList,
+  getMaterialArr,
+  materialList
+} from '@/api/basicConfig'
 export default {
   name: 'inAndOutManagementAdd',
   data() {
@@ -286,7 +290,7 @@ export default {
             this.form.unit = item.unit
           }
         })
-      getSpecList({ name: val }).then((res) => {
+      materialList({ name: val }).then((res) => {
         console.log(res)
         if (res.code === 0) {
           this.consumablesSpecList = res.data
@@ -356,6 +360,8 @@ export default {
       this.showEdit = false
       this.showOutput = false
       this.batchCodeList = []
+      this.sideLibaryIdList = []
+      this.consumablesSpecList = []
       this.$refs.form.resetFields()
     },
     toggleSupplier(val) {

src/views/consumablesManagement/inAndOutRecords.vue

@@ -24,7 +24,7 @@
 <script>
 import { tableHeight } from '@/utils/index'
 import { getOutInRecordRecord } from '@/api/consumablesManagement'
-import { sideLibraryList, materialList } from '@/api/basicConfig'
+import { sideLibraryList, getMaterialArr } from '@/api/basicConfig'
 import moment from 'moment'
 import { publicFormatter, timeFormatter } from '@/utils'
 const tableProps = [
@@ -224,7 +224,7 @@ export default {
       }
     },
     getMaterialList() {
-      materialList().then((res) => {
+      getMaterialArr().then((res) => {
         if (res.code === 0) {
           this.formConfig[4].selectOptions = res.data
         }

src/views/deviceManagement/maintenanceManagement/plannedMaintenance.vue

@@ -172,12 +172,17 @@ const tableBtn = [
     type: 'edit',
     btnName: '编辑',
     showParam: {
-      type: '&',
+      type: '|',
       data: [
         {
           type: 'unequal',
           name: 'status',
           value: '未完成'
+        },
+        {
+          type: 'unequal',
+          name: 'status',
+          value: '已超时'
         }
       ]
     }

src/views/qualityManagement/components/standardSetting.vue

@@ -88,8 +88,7 @@ import {
 const tableProps = [
   {
     prop: 'detectItem',
-    label: '检验项目',
-    subcomponent: inputArea
+    label: '检验项目'
   },
   {
     prop: 'detectPoint',

src/views/siteMonitoring/deviceStatus.vue

@@ -71,13 +71,14 @@ export default {
     setCurrent() {
       let _this = this
       setTimeout(function () {
-        _this.$refs.deviceStatusTree.setCurrentKey(1)
+        _this.$refs.deviceStatusTree.setCurrentKey(_this.equipmentId)
       }, 500)
     },
     getMsg() {
       eqMonitorGet({ equipmentId: this.equipmentId }).then((res) => {
         console.log(res)
         this.eqMessage = res.data
+        this.equipmentName = res.data.equipmentName
         this.deviceImg = process.env.VUE_APP_VIEW_PIC + res.data.imgId
       })
     },