删除菜单

src/views/equipment/draw.vue

@@ -339,10 +339,15 @@
 <script>
 import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
+import { getEquipment } from '@/api/equipment/application'
 export default {
   name: 'Draw',
   data() {
     return {
+      ptype: '',
+      pgx: '',
+      prank: '',
+      pissb: '',
       totalApplyDetail: 0,
       applyList: [],
       canceList: [],
@@ -458,16 +463,7 @@ export default {
     next()
   },
   created() {
-    this.resetQuery()
-    if (this.$store.getters.searchParams[this.$route.path]) {
-      const { searchParams } = this.$store.getters; const { path } = this.$route
-      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
-      this.queryParams = { ...param }
-    }
     this.getList()
-    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
-    //   this.statusOptions = response.data;
-    // });
   },
   methods: {
     handleCance() {
@@ -507,7 +503,18 @@ export default {
     /** 查询warehouse列表 */
     getDeviceList() {
       this.loadingDetail = true
-      detailList(this.queryParamsDetail).then(res => {
+      const obj = {
+        ptype: this.ptype,
+        pgx: this.pgx,
+        prank: this.prank,
+        pissb: this.pissb,
+        page: this.queryParamsDetail.page,
+        rows: this.queryParamsDetail.rows,
+        pn: this.queryParamsDetail.pn,
+        lot: this.queryParams.lot,
+        plocation: this.queryParams.plocation
+      }
+      getEquipment(obj).then(res => {
         res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
         this.totalDetail = res.total
         this.detailApplyList = res.rows
@@ -515,16 +522,43 @@ export default {
       })
     },
     handle(row) {
+      console.log('row', row)
       this.applyId = row.businessId
-      this.title = '处理'
-      this.openHandle = !this.openHandle
-      this.loadingDetail = true
-      detailList(this.queryParamsDetail).then(res => {
-        res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
-        this.totalDetail = res.total
+      this.ptype = row.ptype
+      this.pgx = row.pgx
+      this.prank = row.prank
+      this.pissb = row.pissb
+      const obj = {
+        pn: row.pn,
+        ptype: row.ptype,
+        pgx: row.pgx,
+        prank: row.prank,
+        pissb: row.pissb,
+        page: this.queryParamsDetail.page,
+        rows: this.queryParamsDetail.rows
+      }
+      getEquipment(obj).then(res => {
+        if (res.code && res.code === null) {
+          this.$message.warning(res.message)
+        }
+        console.log('res')
+        if (res.rows.createDate && res.rows.createDate !== null) {
+          res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
+        }
         this.detailApplyList = res.rows
         this.loadingDetail = false
+        this.openHandle = true
       })
+      // this.applyId = row.businessId
+      this.title = '处理'
+      // this.openHandle = !this.openHandle
+      this.loadingDetail = true
+      // detailList(this.queryParamsDetail).then(res => {
+      //   res.rows.createDate = parseTime(res.rows.createDate, '{y}-{m}-{d}')
+      //   this.totalDetail = res.total
+      //   this.detailApplyList = res.rows
+      //   this.loadingDetail = false
+      // })
     },
     // 获取所选行详情信息
     handleDetail(row) {

src/views/processManagement/draw.vue

@@ -462,16 +462,7 @@ export default {
     next()
   },
   created() {
-    this.resetQuery()
-    if (this.$store.getters.searchParams[this.$route.path]) {
-      const { searchParams } = this.$store.getters; const { path } = this.$route
-      const param = JSON.parse(searchParams[path]) // 保留着的查询条件
-      this.queryParams = { ...param }
-    }
     this.getList()
-    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
-    //   this.statusOptions = response.data;
-    // });
   },
   methods: {
     handleCance() {
@@ -531,6 +522,7 @@ export default {
     },
     handle(row) {
       console.log('row', row)
+      this.applyId = row.businessId
       this.ptype = row.ptype
       this.pgx = row.pgx
       this.prank = row.prank