废弃操作成功plus

src/api/equipment/check.js

 import request from '@/utils/request'
 import Qs from 'qs'
+import { exportConfig } from '../system/config'
 // 查询角色列表
 export function listCheck(query) {
   return request({
@@ -8,88 +9,14 @@ export function listCheck(query) {
     params: query
   })
 }
-export function getlistRole() {
-  return request({
-    url: 'system/role/listAll',
-    method: 'get'
-  })
-}
-
-// 查询角色详细
-export function getRole(businessId) {
-  return request({
-    url: '/system/role/detail/' + businessId,
-    method: 'get'
-  })
-}
-
-// 新增角色
-export function addRole(data) {
-  data = Qs.stringify(data)
-  return request({
-    url: '/system/role/add',
-    method: 'post',
-    data: data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
 
-// 修改角色
-export function updateRole(data) {
-  const businessId = data.businessId
-  data = Qs.stringify(data)
+export function abandon(data) {
   return request({
-    url: '/system/role/update/' + businessId,
+    url: '/wbwarehouse/abandon', 
     method: 'put',
     data,
     headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
+      'Content-Type': 'application/json;charset=UTF-8'
     }
   })
 }
-
-// 角色数据权限
-export function dataScope(data) {
-  data = Qs.stringify(data)
-  return request({
-    url: '/system/role/dataScope',
-    method: 'put',
-    data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
-
-// 角色状态修改
-export function changeRoleStatus(businessId, flag) {
-  const data = {
-    businessId,
-    flag
-  }
-  return request({
-    url: '/system/role/changeStatus',
-    method: 'put',
-    params: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: '/system/role/deleteLogical/' + roleId,
-    method: 'delete'
-  })
-}
-
-// 导出角色
-export function exportRole(query) {
-  return request({
-    url: '/system/role/export',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/equipment/equipmentAbandonment.js

@@ -37,18 +37,7 @@ export function addRole(data) {
 }
 
 // 修改角色
-export function updateRole(data) {
-  const businessId = data.businessId
-  data = Qs.stringify(data)
-  return request({
-    url: '/system/role/update/' + businessId,
-    method: 'put',
-    data,
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded'
-    }
-  })
-}
+
 
 // 角色数据权限
 export function dataScope(data) {

src/views/equipment/check.vue

@@ -38,14 +38,7 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button
-            style="padding: 8px 7px;"
-            :type="typePrimary"
-            :size="smallSize"
-            :icon="addIcon"
-          >开始盘点
-            {{ check }}
-          </el-button>
+          <el-button style="padding: 8px 7px;" :type="typePrimary" :size="smallSize" :icon="addIcon" @click="handleAdd">开始盘点 {{ check }} </el-button>
         </el-form-item>
         <!-- 这俩都没写接口以及方法 -->
         <el-form-item>

src/views/equipment/equipmentAbandonment.vue

@@ -87,15 +87,8 @@
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
           <template slot-scope="scope">
-            <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">
-              详情
-            </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-            >废弃</el-button>
+            <el-button :type="typeParent" :size="size" @click="handleDetail(scope.row)">详情</el-button>
+            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">废弃</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -107,7 +100,7 @@
       :limit.sync="queryParams.rows"
       @pagination="getList"
     />
-
+      
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
@@ -215,9 +208,37 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
       </el-form>
     </el-dialog>
+    <!-- 废弃表单 -->
+    <el-dialog :title="abandonTitle" :visible.sync="abandonOpen" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="abandonFrom" :rules="abandonFromRules" size="small" label-width="80px">
+        <el-form-item label="fq_bz" prop="fq_bz">
+          <el-input v-model.trim="abandonFrom.fq_bz" show-word-limit :maxlength="30" placeholder="请输入fq_bz" />
+        </el-form-item>
+        <el-form-item label="fq_dd" prop="fq_dd">
+          <el-input v-model.trim="abandonFrom.fq_dd" show-word-limit :maxlength="30" placeholder="请输入fq_dd" />
+        </el-form-item>
+        <el-form-item label="fq_mcode" prop="fq_mcode">
+          <el-input v-model.trim="abandonFrom.fq_mcode" show-word-limit :maxlength="30" placeholder="请输入fq_mcode" />
+        </el-form-item>
+        <el-form-item label="fq_ys" prop="fq_ys">
+          <el-input v-model.trim="abandonFrom.fq_ys" show-word-limit :maxlength="30" placeholder="请输入fq_ys" />
+        </el-form-item>
+        <el-form-item label="fq_dbxi" prop="fq_dbxi">
+          <el-input v-model.trim="abandonFrom.fq_dbxi" show-word-limit :maxlength="30" placeholder="请输入fq_dbxi" />
+        </el-form-item>
+        <el-form-item label="fq_yy" prop="fq_yy">
+          <el-input v-model.trim="abandonFrom.fq_yy" show-word-limit :maxlength="30" placeholder="请输入fq_yy" />
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="abandonsubmitForm">确 定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -232,7 +253,7 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
-import {listCheck} from '@/api/equipment/check'
+import {listCheck, abandon} from '@/api/equipment/check'
 import {delEquipment} from  '../../api/equipment/equipmentAbandonment'
 import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
 import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
@@ -241,6 +262,22 @@ export default {
   name: 'Role',
   data() {
     return {
+      abandonTitle: '',
+      abandonOpen: false,
+      abandonFrom:{
+        businessId: '',
+        fq_bz: '',
+        fq_dbxi: '',
+        fq_dd: '',
+        fq_mcode: '',
+        fq_ys: '',
+        fq_yy: '',
+        pstatus: '1'
+
+      },
+      abandonFromRules: {
+
+      },
       // TODO: 表单里的单项详情参数
       singleDetails: {
         equipmentName: '',
@@ -396,6 +433,34 @@ export default {
     // });
   },
   methods: {
+    
+    abandonsubmitForm() {
+      console.log('abandonFrom',this.abandonFrom)
+      abandon(this.abandonFrom).then(res => {
+        console.log('res',res)
+        if(res.code === 200) {
+          this.abandonOpen = false
+                this.$message.success('操作成功')
+                this.getList()
+                this.reFrom() 
+        }
+      })
+      
+      
+    },
+    reFrom() {
+      this.form = {
+        businessId: '',
+        fq_bz: '',
+        fq_dbxi: '',
+        fq_dd: '',
+        fq_mcode: '',
+        fq_ys: '',
+        fq_yy: '',
+        pstatus: '1'
+      }
+      
+    },
     // TODO: 获取所选行详情信息操作
     handleDetail(row) {
       this.singleDetails = this.formReset
@@ -687,24 +752,36 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
-      const EquipmentIds = row.businessId || this.ids
-      this.$confirm('是否确认操作？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        console.log(row)
-        return delEquipment(EquipmentIds)
-      }).then(() => {
-        this.getList()
-        this.$message({
-          message: '删除成功',
-          type: 'success'
-        })
-      }).catch(function() {
-      })
-    },
+       console.log('row',row);
+       this.abandonTitle = "废弃表单信息"
+       this.abandonFrom.businessId = row.businessId
+       this.abandonOpen = true
+  // const EquipmentIds = row.businessId || this.ids;
+  // const vm = this; // 保存当前上下文
+
+  // this.$prompt('请填写废弃原因', '提示', {
+  //   confirmButtonText: '确定',
+  //   cancelButtonText: '取消',
+  //   inputPlaceholder: '请输入fq_yy',
+  //   inputPattern: /\S+/,
+  //   inputErrorMessage: '废弃原因不能为空',
+  // }).then(({ value }) => {
+  //   console.log(row);
+  //   const reason = value; // 获取用户填写的废弃原因
+
+  //   // 在此处处理相关逻辑，比如将废弃原因和其他输入框的值提交给后端进行处理
+
+  //   return delEquipment(EquipmentIds);
+  // }).then(() => {
+  //   vm.getList(); // 使用保存的上下文进行调用
+  //   vm.$message({
+  //     message: '删除成功',
+  //     type: 'success',
+  //   });
+  // }).catch(() => {
+  //   // 处理异常情况
+  // });
+},
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams