'基础资料部分'

src/views/basicData/Equipment/components/equipmentInfo-add.vue

@@ -82,9 +82,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('module.basicData.visual.productionTime')" prop="productionTime">
+            <el-form-item :label="$t('module.basicData.visual.productionTime')" prop="createTime">
               <el-date-picker
-                v-model="dataForm.productionTime"
+                v-model="dataForm.createTime"
                 :disabled="isdetail"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
@@ -330,8 +330,7 @@ import {
   equipmentInfoUpdate,
   equipmentInfoAdd,
   equipmentInfoCode,
-  equipmentInfoFileAdd,
-  getEquipmentInfoFile
+  equipmentInfoFileAdd
 } from '@/api/basicData/Equipment/equipmentInfo'
 import { equipmentGroupList } from '@/api/basicData/Equipment/equipmentGroup'
 import { equipmentInfoAttrList, equipmentInfoAttrDelete } from '@/api/basicData/Equipment/equipmentInfoAttr'
@@ -393,7 +392,7 @@ export default {
         abbr: '',
         equipmentType: '',
         spec: '',
-        productionTime: '',
+        createTime: '',
         enterTime: '',
         debugTime: '',
         debugPeriod: '',
@@ -467,23 +466,24 @@ export default {
     init() {
       this.isdetail = false
       this.isdetail = Boolean(this.$route.query.isdetail)
-      if (this.isdetail) {
-        const data =
-          {
-            'equipmentId': this.listQuery.equipmentId
-          }
-        getEquipmentInfoFile(data).then(res => {
-          this.downloadList = res.data
-          this.downloadList.forEach(item => {
-            if (item.typeCode === 'equipmentInfoImage') {
-              this.imgList.push(item)
-            } else {
-              this.fileList.push(item)
-            }
-          })
-        })
-      }
-      this.list.splice(0, this.list.length)
+      // 设备信息下载接口，暂时未调用
+      // if (this.isdetail) {
+      //   const data =
+      //     {
+      //       'equipmentId': this.listQuery.equipmentId
+      //     }
+      //   getEquipmentInfoFile(data).then(res => {
+      //     this.downloadList = res.data
+      //     this.downloadList.forEach(item => {
+      //       if (item.typeCode === 'equipmentInfoImage') {
+      //         this.imgList.push(item)
+      //       } else {
+      //         this.fileList.push(item)
+      //       }
+      //     })
+      //   })
+      // }
+      // this.list.splice(0, this.list.length)
       equipmentTypeList(this.listQuery).then(response => {
         this.equipmentTypeOption = response.data.records
       })
@@ -525,7 +525,7 @@ export default {
     },
     handleClick(raw) {
       if (raw.type === 'delete') {
-        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.attrName}]?`, this.$t('module.basicData.visual.Tips'), {
+        this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
           confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
           cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
           type: 'warning'

src/views/basicData/Equipment/equipmentInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
- * @LastEditors: zwq
- * @LastEditTime: 2021-07-08 09:46:10
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-03 20:28:43
  * @Description:
 -->
 <template>
@@ -43,7 +43,7 @@ import HeadForm from '@/components/basicData/HeadForm'
 import BaseTable from '@/components/BaseTable'
 import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
 import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
-// import { timeFormatter } from '@/filters'
+import { timeFormatter } from '@/filters'
 // import dataDict from '@/filters/DataDict'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -76,20 +76,15 @@ const tableBtn = [
   }
 ]
 const tableProps = [
-  // {
-  //   prop: 'createTime',
-  //   label: i18n.t('module.basicData.factory.createTime'),
-  //   filter: timeFormatter,
-  //   align: 'center'
-  // },
   {
-    prop: 'name',
-    label: i18n.t('module.basicData.equipment.EquipmentName'),
+    prop: 'createTime',
+    label: i18n.t('module.basicData.factory.createTime'),
+    filter: timeFormatter,
     align: 'center'
   },
   {
-    prop: 'equipmentTypeName',
-    label: i18n.t('module.basicData.equipment.EquipmentType'),
+    prop: 'name',
+    label: i18n.t('module.basicData.equipment.EquipmentName'),
     align: 'center'
   },
   {
@@ -98,8 +93,8 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'equipmentGroupName',
-    label: i18n.t('module.basicData.equipment.EquipmentGrouping'),
+    prop: 'equipmentType',
+    label: i18n.t('module.basicData.equipment.EquipmentType'),
     align: 'center'
   },
   {
@@ -108,26 +103,11 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'maintenanceCycle',
-    label: i18n.t('module.basicData.equipment.maintenanceCycle'),
-    align: 'center'
-  },
-  {
-    prop: 'maintenanceTime',
-    label: i18n.t('module.basicData.equipment.maintenanceTime'),
-    align: 'center'
-  },
-  {
-    prop: 'description',
-    label: i18n.t('module.basicData.equipment.FunctionDescription'),
+    prop: 'abbr',
+    label: i18n.t('module.basicData.equipment.shortName'),
     align: 'center'
   }
   // {
-  //   prop: 'abbr',
-  //   label: i18n.t('module.basicData.visual.Abbreviation'),
-  //   align: 'center'
-  // }
-  // {
   //   prop: 'estatus',
   //   label: i18n.t('module.basicData.visual.CurrentState'),
   //   filter: dataDict('enableState'),
@@ -197,6 +177,7 @@ export default {
       this.listQuery.name = key
       this.listQuery.code = key
       equipmentInfoList(this.listQuery).then(response => {
+        console.log(response)
         if (response.data.records) {
           this.list = response.data.records
         } else {