工序库设备领用登录弹窗

src/api/equipment/draw.js

@@ -42,3 +42,15 @@ export function detail(id) {
     method: 'get'
   })
 }
+
+// 菜单权限验证接口
+export function checkPermission(password) {
+  return request({
+    url: '/wbapply/checkPermission',
+    method: 'post',
+    password,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

src/views/equipment/draw.vue

@@ -227,12 +227,6 @@
             {{ scope.row.psm || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pissb" prop="pissb">
-          <template slot-scope="scope">
-            <span v-if="scope.row.pissb === '0'">否</span>
-            <span v-else>是</span>
-          </template>
-        </el-table-column>
       </el-table>
     </el-dialog>
 
@@ -312,12 +306,6 @@
             {{ scope.row.psm || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pissb" prop="pissb">
-          <template slot-scope="scope">
-            <span v-if="scope.row.pissb === '0'">否</span>
-            <span v-else>是</span>
-          </template>
-        </el-table-column>
       </el-table>
       <pagination
         v-show="totalDetail>0"

src/views/processManagement/draw.vue

@@ -272,8 +272,8 @@
           <el-button style="padding: 8px 7px;" icon="el-icon-refresh" size="small" @click="resetQueryWarehouse">重置</el-button>
         </el-form-item>
         <el-radio-group v-model="radio1" class="ml-4" style="padding: 25px 7px;" @change="login">
-          <el-radio label="1" size="large">设备库</el-radio>
           <el-radio label="2" size="large">工序库</el-radio>
+          <el-radio label="1" size="large">设备库</el-radio>
         </el-radio-group>
       </el-form>
 
@@ -315,10 +315,9 @@
             {{ scope.row.psm || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pissb" prop="pissb">
+        <el-table-column label="回收时间" prop="recycleDate">
           <template slot-scope="scope">
-            <span v-if="scope.row.pissb === '0'">否</span>
-            <span v-else>是</span>
+            {{ scope.row.recycleDate || '-' }}
           </template>
         </el-table-column>
       </el-table>
@@ -341,14 +340,11 @@
 <!--    登录验证-->
     <el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body>
       <el-form ref="form" :model="loginform" label-width="80px">
-        <el-form-item label="用户名">
-          <el-input v-model="loginform.username"></el-input>
-        </el-form-item>
         <el-form-item label="密码">
           <el-input type="password" v-model="loginform.password"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleSubmit">登录</el-button>
+          <el-button type="primary" @click="handleConfirm">确定</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -356,7 +352,7 @@
 </template>
 <script>
 import { getEquipment } from '@/api/equipment/application'
-import { listWbApply, deleteLogical, detailList, batchAddition, detail } from '@/api/equipment/draw'
+import { listWbApply, deleteLogical, detailList, batchAddition, detail, checkPermission } from '@/api/equipment/draw'
 import { parseTime } from '@/utils'
 export default {
   name: 'Draw',
@@ -368,7 +364,7 @@ export default {
       },
       // 打开登录验证界面
       openLogin: false,
-      radio1: '',
+      radio1: '2',
       ptype: '',
       pgx: '',
       prank: '',
@@ -491,6 +487,16 @@ export default {
     this.getList()
   },
   methods: {
+
+    // 菜单权限验证确定
+    handleConfirm() {
+      checkPermission(this.loginform.password).then(res => {
+        if (res.code === 200) {
+          this.$message.warning('已切换到设备库')
+        }
+      })
+    },
+
     handleCance() {
       this.loadingDetail = true
       if (this.multipleSelection.length === 0) {
@@ -513,7 +519,6 @@ export default {
         })
         console.log('canceList', this.canceList)
         batchAddition(this.canceList).then(res => {
-          console.log('res', res)
           if (res.code === 200) {
             this.loadingDetail = false
             this.openHandle = false
@@ -659,7 +664,7 @@ export default {
     },
     // 登录
     login() {
-      this.title = '登录'
+      this.title = '菜单权限'
       this.openLogin = true
     },
     // warehouse的重置按钮