Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/draw.vue

@@ -75,8 +75,7 @@
         </el-table-column>
         <el-table-column label="pgx" prop="pgx">
           <template slot-scope="scope">
-            <span v-if="scope.row.pgx === '001'">压缩</span>
-            <span v-if="scope.row.pgx === '002'">排水</span>
+            {{ replaced(scope.row.pgx) }}
           </template>
         </el-table-column>
         <el-table-column label="pnumber" prop="pnumber">
@@ -156,7 +155,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="pgx：" prop="pgx">
-              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
+              {{ replaced(singleDetails.pgx) }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -249,7 +248,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="pgx：" prop="pgx">
-              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
+              {{ replaced(singleDetails.pgx) }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -396,11 +395,13 @@ import {
   checkPermission
 } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
-import { getEquipment } from '@/api/equipment/application'
+import { getDictData, getEquipment } from '@/api/equipment/application'
 export default {
   name: 'Draw',
   data() {
     return {
+      // 字典数据
+      dictList: [],
       number: '',
       monthDate: false,
       // 是否切换库
@@ -510,6 +511,7 @@ export default {
     next()
   },
   created() {
+    this.getDict()
     this.getList()
   },
   methods: {
@@ -521,7 +523,7 @@ export default {
     // 判断时间范围 是否是一个月以内的的时间
     isWithinLastMonth(dateToCheck) {
       // 获取当前日期
-      const currentDate = new Date();
+      const currentDate = new Date()
       // 获取当前日期的年份和月份
       const currentYear = currentDate.getFullYear()
       const currentMonth = currentDate.getMonth()
@@ -833,6 +835,29 @@ export default {
         default:
           return ''
       }
+    },
+    replaced(value) {
+      let label = ''
+      if (this.dictList.length > 0) {
+        this.dictList.forEach(item => {
+          if (item.dictValue === value) {
+            label = item.dictLabel
+          }
+        })
+      }
+      return label
+    },
+    getDict() {
+      const obj = {
+        key: 'GX_CODE'
+      }
+      getDictData(obj).then(res => {
+        console.log('res', res)
+        if (res.code === 200 && res.data !== null) {
+          this.dictList = res.data
+          console.log(this.dictList)
+        }
+      })
     }
   }
 }