页面

src/views/equipment/printingCheck/index.vue

@@ -374,8 +374,8 @@
 
         <el-row>
           <el-col>
-            <el-form-item label="lot" prop="lot">
-              <el-input v-model="form.lot" placeholder="请输入lot" />
+            <el-form-item label="批号" prop="lot">
+              <el-input v-model="form.lot" placeholder="请输入批号" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -390,7 +390,7 @@
           <el-col>
             <el-form-item label="是否废弃" prop="poperate">
               <el-radio-group v-model="form.poperate">
-                <el-radio :label="0">未废弃</el-radio>
+                <el-radio :label="0">无需废弃</el-radio>
                 <el-radio :label="1">已废弃</el-radio>
               </el-radio-group>
             </el-form-item>

src/views/processManagement/deviceReuse/index.vue

@@ -58,7 +58,7 @@
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">
           <el-form-item label="印刷原因:" style="flex-basis: 50%;" prop="fq_yy">
-            <span>{{ form.fq_yy || '无' }}</span>
+            <span>{{ getDictValue(form.fq_yy) || '无' }}</span>
 <!--            <el-input ref="input7" v-model="form.fq_yy" :readonly="true" placeholder="请输入印刷原因" clearable style="width: 400px" :maxlength="100" @keyup.enter.native="handelTab(7,$event)" />-->
           </el-form-item>
         </el-col>
@@ -80,11 +80,13 @@
 <script>
 import { recycle } from '@/api/magnagement'
 import { getWbWarehouseByLot } from '@/api/processMangement/InventoryRecord'
+import { getDictData } from '@/api/equipment/application'
 
 export default {
   name: 'Role',
   data() {
     return {
+      pgxList: [],
       // 缓存判断
       recycleexist: false,
       form: {
@@ -124,10 +126,10 @@ export default {
             trigger: 'blur'
           }
         ],
-        phd: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
-        psm: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
-        pzl: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }],
-        prank: [{ pattern: /^\d+$/, message: '请输入整数', trigger: 'change' }]
+        phd: [{ pattern: /^-?\d+$/, message: '请输入整数', trigger: 'change' }],
+        psm: [{ pattern: /^-?\d+$/, message: '请输入整数', trigger: 'change' }],
+        pzl: [{ pattern: /^-?\d+$/, message: '请输入整数', trigger: 'change' }],
+        prank: [{ pattern: /^-?\d+$/, message: '请输入整数', trigger: 'change' }]
       }
     }
   },
@@ -142,6 +144,7 @@ export default {
     next()
   },
   created() {
+    this.getDict()
     sessionStorage.getItem('recycleform') ? this.recycleexist = true : this.recycleexist = false
     if (this.recycleexist) {
       this.form = JSON.parse(sessionStorage.getItem('recycleform'))
@@ -156,6 +159,24 @@ export default {
     }
   },
   methods: {
+    // 废弃原因匹配
+    getDictValue(fqYy) {
+      const item = this.pgxList.find(item => item.dictLabel === fqYy)
+      console.log('item', item)
+      return item ? item.dictValue : ''
+    },
+    // 废弃原因下拉框
+    getDict() {
+      const obj = {
+        key: 'FQ_CODE'
+      }
+      getDictData(obj).then(res => {
+        console.log('res', res)
+        if (res.code === 200 && res.data !== null) {
+          this.pgxList = res.data
+        }
+      })
+    },
     handleBlur() {
       if (this.form.lot !== null && this.form.lot !== '' && this.form.lot !== undefined) {
         const obj = {