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

# Conflicts:
#	src/views/equipment/draw.vue
#	src/views/processManagement/draw.vue

src/views/equipment/draw.vue

@@ -155,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">
@@ -248,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">
@@ -395,11 +395,12 @@ import {
   checkPermission
 } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
-import {getDictData, getEquipment} from '@/api/equipment/application'
+import { getDictData, getEquipment } from '@/api/equipment/application'
 export default {
   name: 'Draw',
   data() {
     return {
+      // 字典数据
       dictList: [],
       number: '',
       monthDate: false,
@@ -415,6 +416,7 @@ export default {
       pgx: '',
       prank: '',
       pissb: '',
+      rkDate: '',
       totalApplyDetail: 0,
       applyList: [],
       canceList: [],
@@ -510,6 +512,7 @@ export default {
     next()
   },
   created() {
+    this.getDict()
     this.getList()
     this.getCodeDict()
   },
@@ -536,7 +539,7 @@ export default {
     // 判断时间范围 是否是一个月以内的的时间
     isWithinLastMonth(dateToCheck) {
       // 获取当前日期
-      const currentDate = new Date();
+      const currentDate = new Date()
       // 获取当前日期的年份和月份
       const currentYear = currentDate.getFullYear()
       const currentMonth = currentDate.getMonth()
@@ -626,7 +629,8 @@ export default {
             plocation: item.plocation,
             phd: item.phd,
             psm: item.psm,
-            prank: item.prank
+            prank: item.prank,
+            rkDate: item.createDate
           }
           this.canceList.push(obj)
         })
@@ -848,6 +852,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)
+        }
+      })
     }
   }
 }

src/views/processManagement/deviceReuse/index.vue

@@ -40,14 +40,16 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="12" style="padding-left: 9%;">
+      <el-row :gutter="40">
+        <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="prank:" style="flex-basis: 50%;" prop="prank">
             <el-input ref="input7" v-model="form.prank" placeholder="请输入prank" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(7,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          &nbsp;&nbsp;
+          <el-form-item label="印刷次数:" style="flex-basis: 50%;" prop="fq_ys">
+            <el-input ref="input8" v-model="form.fq_ys" placeholder="请输入印刷次数" clearable style="width: 400px" :maxlength="8" @keyup.enter.native="handelTab(8,$event)" />
+          </el-form-item>
         </el-col>
       </el-row>
     </el-form>
@@ -81,6 +83,7 @@ export default {
         psm: '',
         pzl: '',
         prank: '',
+        fq_ys: '',
         flag: 1,
         ptype: '',
         pstatus: 0

src/views/processManagement/draw.vue

@@ -156,7 +156,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="pgx：" prop="pgx">
-              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
+              <span>{{ replace(singleDetails.pgx) }}</span>
+              <!--              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -254,7 +255,9 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="pgx：" prop="pgx">
-              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />
+              <span>{{ replace(singleDetails.pgx) }}</span>
+<!--              {{ singleDetails.pgx }}-->
+              <!--              <el-input v-model.trim="singleDetails.pgx" :readonly="true" />-->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -409,7 +412,7 @@
   </div>
 </template>
 <script>
-import { getEquipment } from '@/api/equipment/application'
+import { getDictData, getEquipment } from '@/api/equipment/application'
 import { listWbApply, deleteLogical, batchAddition, detail, checkPermission, canceListByType } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
 export default {
@@ -417,6 +420,8 @@ export default {
   data() {
     return {
       errorPassword: false,
+      // 数据字典列表
+      dictList: [],
       isClose: false,
       number: '',
       menu: false,
@@ -436,6 +441,7 @@ export default {
       pgx: '',
       prank: '',
       pissb: '',
+      rkDate: '',
       totalApplyDetail: 0,
       applyList: [],
       canceList: [],
@@ -548,9 +554,31 @@ export default {
     next()
   },
   created() {
+    this.getDict()
     this.getList()
   },
   methods: {
+    replace(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 => {
+        if (res.code === 200 && res.data !== null) {
+          this.dictList = res.data
+        }
+      })
+    },
     handlemenuClose() {
       this.menu = false
       this.loadingDetail = false
@@ -706,7 +734,8 @@ export default {
             plocation: item.plocation,
             phd: item.phd,
             psm: item.psm,
-            prank: item.prank
+            prank: item.prank,
+            rkDate: item.recycleDate
           }
           this.canceList.push(obj)
         })