diff --git a/src/api/storeManagement/additionalPlan.js b/src/api/storeManagement/additionalPlan.js
index 8b4186b4..5dcfde8d 100644
--- a/src/api/storeManagement/additionalPlan.js
+++ b/src/api/storeManagement/additionalPlan.js
@@ -91,3 +91,13 @@ export const del = params => {
       params
     });
 };
+
+
+// 查询详情  stBuyOrder/detail
+export const detailData = params => { 
+    return request({
+      url: '/api/blade-wms/stBuyOrder/detail',
+      method: 'get',
+      params
+    });
+};
\ No newline at end of file
diff --git a/src/api/storeManagement/warehouseRequest.js b/src/api/storeManagement/warehouseRequest.js
index 4fe82c64..7b3ad43c 100644
--- a/src/api/storeManagement/warehouseRequest.js
+++ b/src/api/storeManagement/warehouseRequest.js
@@ -31,4 +31,21 @@ export const batchRequest = data =>
     url: '/api/blade-wms/stWmsRequest/submit/batch',
     method: 'post',
     data
+  });
+
+  // 删除
+  export const del = params =>
+  request({
+    url: '/api/blade-wms/stWmsRequest/remove',
+    method: 'post',
+    params
+  });
+
+
+  // 更新
+  export const update = data =>
+  request({
+    url: '/api/blade-wms/stWmsRequest/update',
+    method: 'post',
+    data
   });
\ No newline at end of file
diff --git a/src/views/flowManagement/addDialog.vue b/src/views/flowManagement/addDialog.vue
index c13db223..78cfc655 100644
--- a/src/views/flowManagement/addDialog.vue
+++ b/src/views/flowManagement/addDialog.vue
@@ -565,9 +565,8 @@ export default {
               type: 'warning',
             })
               .then(() => {
-                addProcess({
+                updateProcess({
                   ...submitData,
-                  approvalStatus: this.isStatusEdit ? this.rowItem.approvalStatus : 1,
                 })
                   .then(res => {
                     this.$message.success('提交成功');
@@ -581,7 +580,7 @@ export default {
               .catch(() => { });
           } else {
             if (this.rowItem.approvalStatus == 2) {
-              this.rowItem.approvalStatus = 1;
+              this.rowItem.approvalStatus = 0;
             }
             updateProcess({
               ...submitData,
diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue
index e1ee71f7..45028fb3 100644
--- a/src/views/flowManagement/managementOfKeyTasks.vue
+++ b/src/views/flowManagement/managementOfKeyTasks.vue
@@ -18,7 +18,7 @@
         <el-button type="text" @click="handleView(row)" v-if="permission.managementOfKeyTasks_details">
           详情
         </el-button>
-        <el-button type="text" v-if="row.approvalStatus != 8 && permission.managementOfKeyTasks_edit"
+        <el-button type="text" v-if="(row.approvalStatus != 8 &&row.approvalStatus != 1)&& permission.managementOfKeyTasks_edit"
           @click="handleEdit(row)">
           修改
         </el-button>
diff --git a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
index 2dd206f8..334e2f56 100644
--- a/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
+++ b/src/views/productionSchedulingPlan/basic/components/addEquipment.vue
@@ -183,7 +183,7 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="指定使用" width="150">
+        <!-- <el-table-column align="center" label="指定使用" width="150">
           <template #default="scope">
             <el-form-item :prop="`tableData[${scope.$index}].assignUse`">
               <el-input v-model="scope.row.assignUse" placeholder="请输入内容"></el-input>
@@ -196,7 +196,7 @@
               <el-input v-model="scope.row.remarks" placeholder="请输入内容"></el-input>
             </el-form-item>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </el-form>
 
diff --git a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
index ff91ce89..a661c452 100644
--- a/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
+++ b/src/views/productionSchedulingPlan/basic/equipmentCapacity.vue
@@ -284,22 +284,22 @@ export default {
             ],
           },
 
-          {
-            label: '指定使用',
-            prop: 'assignUse',
-            search: false,
-            sortable: 'custom',
-            span: 12,
-            width: 120,
-          },
-          {
-            label: '备注',
-            prop: 'remarks',
-            search: false,
-            sortable: 'custom',
-            span: 12,
-            width: 180,
-          },
+          // {
+          //   label: '指定使用',
+          //   prop: 'assignUse',
+          //   search: false,
+          //   sortable: 'custom',
+          //   span: 12,
+          //   width: 120,
+          // },
+          // {
+          //   label: '备注',
+          //   prop: 'remarks',
+          //   search: false,
+          //   sortable: 'custom',
+          //   span: 12,
+          //   width: 180,
+          // },
         ],
       },
 
diff --git a/src/views/warehouseManagement/additionalPlan/components/details.vue b/src/views/warehouseManagement/additionalPlan/components/details.vue
new file mode 100644
index 00000000..23d59895
--- /dev/null
+++ b/src/views/warehouseManagement/additionalPlan/components/details.vue
@@ -0,0 +1,95 @@
+<template>
+    <el-dialog title="详情" append-to-body :modelValue="openShow" width="30%" @close="closeDialog">
+        <avue-form ref="form" v-model="form" :option="option"></avue-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="closeDialog">取 消</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script>
+import { detailData } from "@/api/storeManagement/additionalPlan"
+export default {
+    props: {
+        showDialog: {
+            type: Boolean,
+            default: false,
+        },
+        rowItem: {
+            type: Object,
+            default: {},
+        }
+    },
+    data() {
+        return {
+            openShow: false,
+            form: {},
+            option: {
+                submitBtn: false,
+                emptyBtn: false,
+                labelWidth: 'auto',
+                column: [
+                    {
+                        label: '采购部计划员名称',
+                        prop: 'planBuyManName',
+                        span: 24,
+                        disabled: true,
+                    },
+                    {
+                        label: '需求状态',
+                        prop: 'needStatus',
+                        span: 24,
+                        disabled: true,
+                    },
+                    {
+                        label: 'erp采购单号',
+                        prop: 'erpBuyCode',
+                        span: 24,
+                        disabled: true,
+                    },
+                    {
+                        label: '采购员名称',
+                        prop: 'buyManName',
+                        span: 24,
+                        disabled: true,
+                    },
+                ],
+            },
+        };
+    },
+    mounted() {
+        this.openShow = this.showDialog;
+        this.init()
+    },
+    methods: {
+        init() {
+            detailData({ id: this.rowItem.id }).then(res => {
+                this.form = res.data.data;
+            });
+        },
+        closeDialog() {
+            this.openShow = false;
+            this.$emit('closeDialog');
+        },
+        submit() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    // let params = {
+                    //   id: this.$route.query.id,
+                    //   approvalStatus: '',
+                    // };
+                    // updateProcess(params).then((res) => {
+                    //   if (res.code == 200) {
+                    //     this.$message.success('操作成功');
+                    //     this.closeDialog();
+                    //   }
+                    // });
+                }
+            });
+        },
+    },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/warehouseManagement/additionalPlan/components/purchase.vue b/src/views/warehouseManagement/additionalPlan/components/purchase.vue
index 4ce478fe..a3aa7206 100644
--- a/src/views/warehouseManagement/additionalPlan/components/purchase.vue
+++ b/src/views/warehouseManagement/additionalPlan/components/purchase.vue
@@ -1,43 +1,39 @@
 <template>
-  <avue-crud
-    :option="option"
-    :table-loading="loading"
-    :data="data"
-    v-model="form"
-    v-model:page="page"
-    ref="crud"
-    @row-del="rowDel"
-    @search-change="searchChange"
-    @search-reset="searchReset"
-    @selection-change="selectionChange"
-    @current-change="currentChange"
-    @size-change="sizeChange"
-    @refresh-change="refreshChange"
-    @on-load="onLoad"
-  >
-    <template #menu-left>
-      <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
+  <div>
+    <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
+      @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+      <template #menu-left>
+        <!-- <el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
                 </el-button> -->
-    </template>
-    <template #menu-right>
-      <!-- <el-button type="success" icon="el-icon-upload" @click="handleImport">批量发送
+      </template>
+      <template #menu-right>
+        <!-- <el-button type="success" icon="el-icon-upload" @click="handleImport">批量发送
             </el-button> -->
-    </template>
-    <template #menu>
-      <el-button type="text" size="mini" @click="render(scope.row)">提交</el-button>
-    </template>
-  </avue-crud>
+      </template>
+      <template #menu="scope">
+        <el-button type="text" @click="detailsFn(scope.row)">详情</el-button>
+        <!-- <el-button type="text" @click="render(scope.row)">提交</el-button> -->
+      </template>
+    </avue-crud>
+    <detailsDialog v-if="detailsShow" :showDialog="detailsShow" :rowItem="rowItem" @closeDialog="closeDialog"></detailsDialog>
+  </div>
+
+
 </template>
 <script>
-import {getTrackList} from "@/api/storeManagement/additionalPlan"
+import { getTrackList } from "@/api/storeManagement/additionalPlan"
+import detailsDialog from "./details.vue"
 export default {
+  components: { detailsDialog },
   data() {
     return {
+      detailsShow:false,
       formData: {
         method: "mes_request_stocks",
         date: [],
       },
-      loading:false,
+      loading: false,
       selectionList: [],
       option: {
         height: "auto",
@@ -52,8 +48,8 @@ export default {
         tree: false,
         border: true,
         index: true,
-        selection: true,
-        viewBtn: true,
+        selection: false,
+        viewBtn: false,
         editBtn: false,
         delBtn: false,
         addBtn: false,
@@ -64,8 +60,8 @@ export default {
         editBtnIcon: " ",
         viewBtnText: "详情",
         labelWidth: 120,
-        menuWidth: 120,
-        searchLabelWidth:100,
+        menuWidth: 80,
+        searchLabelWidth: 100,
         dialogWidth: 1040,
         dialogClickModal: false,
         searchEnter: true,
@@ -75,14 +71,13 @@ export default {
         columnSort: true,
         excelBtn: true,
         columnSort: true,
-        index: false,
         showOverflowTooltip: true,
-        menu: false,
+        menu: true,
         searchLabelPosition: "left",
         searchLabelWidth: 'auto',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: "center",
         gridBtn: false,
         searchMenuPosition: "right",
         align: "center",
@@ -97,16 +92,6 @@ export default {
             width: 140,
             // searchLabelWidth: 140,
           },
-          // {
-          //   label: "上报单号", //可点击  点击跳转展示  老mes的额外计划详情页面
-          //   prop: "boCode",
-          //   search: true,
-          //   sortable: true,
-          //   filter: true,
-          //   span: 12,
-          //   width: 140,
-          //   // searchLabelWidth: 140,
-          // },
           {
             label: "物料编号",
             prop: "goodsCode",
@@ -169,36 +154,36 @@ export default {
           {
             label: "批料状态",
             prop: "batchStatus",
-            type:"select",
+            type: "select",
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 140,
-            dicData:[
-              {label:'新建',value:'新建'},
-              {label:'未批料',value:'未批料'},
-              {label:'部分批料',value:'部分批料'},
-              {label:'全部批料',value:'全部批料'},
-              {label:'物资取消',value:'物资取消'},
-              {label:'车间取消',value:'车间取消'},
-              {label:'完工取消',value:'完工取消'},
+            dicData: [
+              { label: '新建', value: '新建' },
+              { label: '未批料', value: '未批料' },
+              { label: '部分批料', value: '部分批料' },
+              { label: '全部批料', value: '全部批料' },
+              { label: '物资取消', value: '物资取消' },
+              { label: '车间取消', value: '车间取消' },
+              { label: '完工取消', value: '完工取消' },
             ]
           },
           {
             label: "领料状态",
             prop: "pickStatus",
-            type:"select",
+            type: "select",
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 140,
-            dicData:[
-              {label:'新建',value:'新建'},
-              {label:'未领',value:'未领'},
-              {label:'领取部分',value:'领取部分'},
-              {label:'已领',value:'已领'},
+            dicData: [
+              { label: '新建', value: '新建' },
+              { label: '未领', value: '未领' },
+              { label: '领取部分', value: '领取部分' },
+              { label: '已领', value: '已领' },
             ]
           },
           {
@@ -216,8 +201,8 @@ export default {
             search: true,
             sortable: true,
             filter: true,
-            format:"YYYY-MM-DD",
-            valueFormat:"YYYY-MM-DD",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
             span: 12,
             width: 140,
             type: 'date',
@@ -244,46 +229,46 @@ export default {
             span: 12,
             width: 140,
           },
-         {
-                        label: '采购部门',
-                        prop: 'purchaseDeptName',
-                        // bind: 'buyDept.deptName',
-                        search: false,
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        width: 140,
-                    },
-                    {
-                        label: '需求部门',
-                        prop: 'requireDeptName',
-                        // bind: 'needDept.deptName',
-                        search: true,
-                        sortable: true,
-                        filter: true,
-                        span: 12,
-                        width: 140,
-                        searchOrder: 16,
-                    },
-
           {
-            label: "采购员",
-            prop: "buyManName",
-            // bind: "buyMan.userName",
+            label: '采购部门',
+            prop: 'purchaseDeptName',
+            // bind: 'buyDept.deptName',
+            search: false,
+            sortable: true,
+            filter: true,
+            span: 12,
+            width: 140,
+          },
+          {
+            label: '需求部门',
+            prop: 'requireDeptName',
+            // bind: 'needDept.deptName',
             search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 140,
+            searchOrder: 16,
           },
+
+          // {
+          //   label: "采购员",
+          //   prop: "buyManName",
+          //   // bind: "buyMan.userName",
+          //   search: true,
+          //   sortable: true,
+          //   filter: true,
+          //   span: 12,
+          //   width: 140,
+          // },
           {
             label: "申报日期",
             prop: "declareDate",
             search: true,
             sortable: true,
             filter: true,
-            format:"YYYY-MM-DD",
-            valueFormat:"YYYY-MM-DD",
+            format: "YYYY-MM-DD",
+            valueFormat: "YYYY-MM-DD",
             span: 12,
             width: 140,
             type: 'date',
@@ -321,7 +306,7 @@ export default {
           },
         ],
       },
-      query:{},
+      query: {},
       form: {},
       page: {
         pageSize: 10,
@@ -331,6 +316,15 @@ export default {
     };
   },
   methods: {
+    // 详情
+    detailsFn(row) {
+      this.detailsShow = true
+      this.rowItem = row
+    },
+    closeDialog(){
+      this.detailsShow = false
+      this.onLoad(this.page)
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
@@ -340,19 +334,19 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      }).then(() => {});
+      }).then(() => { });
     },
     // 多选
     selectionChange(list) {
       this.selectionList = list;
     },
-    searchChange(params, done){
+    searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1
       this.onLoad(this.page, params)
       done()
     },
-    searchReset(){
+    searchReset() {
       this.query = {}
       this.onLoad()
     },
@@ -366,18 +360,18 @@ export default {
       this.loading = true;
       let params = {
         ...this.query,
-        startNeedDate:this.query.needDate  && this.query.needDate.length != 0 && this.query.needDate[0],
-        endNeedDate:this.query.needDate  && this.query.needDate.length != 0 && this.query.needDate[1],
-        startDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[0],
-        endDeclareDate:this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[1],
+        startNeedDate: this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[0],
+        endNeedDate: this.query.needDate && this.query.needDate.length != 0 && this.query.needDate[1],
+        startDeclareDate: this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[0],
+        endDeclareDate: this.query.declareDate && this.query.declareDate.length != 0 && this.query.declareDate[1],
       }
-      let {needDate,declareDate,...searchParams} = params
-      console.log('searchParams',searchParams)
+      let { needDate, declareDate, ...searchParams } = params
+      console.log('searchParams', searchParams)
       getTrackList({
-        current:this.page.currentPage,
-        size:this.page.pageSize,
+        current: this.page.currentPage,
+        size: this.page.pageSize,
         ...searchParams
-      }).then(res =>{
+      }).then(res => {
         this.data = res.data.data.records
         this.page.total = res.data.data.total
         this.loading = false
diff --git a/src/views/warehouseManagement/warehouseRequest/components/processDialog.vue b/src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
index 4a396913..240e3d5a 100644
--- a/src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
+++ b/src/views/warehouseManagement/warehouseRequest/components/processDialog.vue
@@ -1,72 +1,79 @@
 <template>
-  <el-dialog title="仓库提请" append-to-body :modelValue="openShow" width="70%" @close="closeDialog" >
-     <el-button type="danger" size="mini" @click="deleteRow()" v-if="tableData.length>1">删除一行</el-button>
-    <el-table :data="tableData" @select="selectChange" style="margin-top:10px;">
-        <el-table-column type="selection" width="55px"></el-table-column>
-        <el-table-column label="采购单号" prop="boCode" align="center"></el-table-column>
-        <el-table-column label="采购数量" prop="buyQty" align="center"></el-table-column>
-        <el-table-column label="已提请数量" prop="drawQuantity" align="center"></el-table-column>
-        <el-table-column label="提请数量" prop="requestQty" align="center">
-            <template #default="scope">
-                <el-input-number v-model="scope.row.requestQty" :min="1" :controls-position="right"></el-input-number>
-            </template>
-        </el-table-column>
-    </el-table>
-    <template #footer>
-        <span class="dialog-footer">
-            <el-button @click="closeDialog">取 消</el-button>
-            <el-button type="primary" @click="submit">确 定</el-button>
-        </span>
-    </template>
-  </el-dialog>
+    <el-dialog :title="title" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
+        <el-button type="danger" size="mini" @click="deleteRow()" v-if="tableData.length > 1">删除一行</el-button>
+        <el-table :data="tableData" @select="selectChange" style="margin-top:10px;">
+            <el-table-column type="selection" width="55px"></el-table-column>
+            <el-table-column label="采购单号" prop="boCode" align="center"></el-table-column>
+            <el-table-column label="采购数量" prop="buyQty" align="center"></el-table-column>
+            <el-table-column label="已提请数量" prop="drawQuantity" align="center"></el-table-column>
+            <el-table-column label="提请数量" prop="requestQty" align="center">
+                <template #default="scope">
+                    <el-input-number v-model="scope.row.requestQty" :min="1"
+                        :controls-position="right"></el-input-number>
+                </template>
+            </el-table-column>
+        </el-table>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="closeDialog">取 消</el-button>
+                <el-button type="primary" @click="submit" :loading="submitLoading">确 定</el-button>
+            </span>
+        </template>
+    </el-dialog>
 </template>
 
 <script>
-import {batchRequest} from "@/api/storeManagement/warehouseRequest"
+import { batchRequest, update } from "@/api/storeManagement/warehouseRequest"
 export default {
     props: {
         showDialog: {
             type: Boolean,
             default: false
         },
-        list:{
+        list: {
             type: Array,
             default: []
         },
-        type:{
+        type: {
             type: String,
             default: ''
+        },
+        title: {
+            type: String,
+            default: '仓库提请'
+
         }
     },
     data() {
         return {
-            openShow:false,
-            tableData:[]
+            submitLoading:false,
+            openShow: false,
+            tableData: []
         }
     },
-    mounted(){
+    mounted() {
         this.openShow = this.showDialog
-        this.list.forEach(item=>{
+        this.list.forEach(item => {
             this.tableData.push({
                 ...item,
-                _select:false,
+                _select: false,
                 // drawQuantity:0,
-                requestQty:1
+                requestQty: 1
             })
         })
-        console.log('table-------',this.tableData)
+        console.log('table-------', this.tableData)
     },
     methods: {
         closeDialog(val) {
             this.openShow = false
             this.$emit('closeDialog', val)
         },
-        selectChange(list, row){
+        selectChange(list, row) {
             row._select = !row._select;
         },
-        deleteRow(){
+        deleteRow() {
             let data = this.tableData.filter(item => item._select)
-            if(data.length == 0){
+            if (data.length == 0) {
                 this.$message.warning('请至少选择一条数据')
                 return
             }
@@ -78,49 +85,63 @@ export default {
                 this.tableData = this.tableData.filter(item => !item._select)
             })
         },
-        submit(){
+        submit() {
             let isFalse = false
-            this.tableData.map((item,index) =>{
-                if(item.requestQty + item.drawQuantity > item.buyQty){
-                    this.$message.error(`第${index+1}行数据超出采购数量`)
+            this.tableData.map((item, index) => {
+                if (item.requestQty + item.drawQuantity > item.buyQty) {
+                    this.$message.error(`第${index + 1}行数据超出采购数量`)
                     isFalse = true
                 }
             })
-            if(isFalse) return
+            if (isFalse) return
             let data = []
-            this.tableData.map(item =>{
-                if(this.type == 'request'){
+            this.tableData.map(item => {
+                if (this.type == 'request') {
                     data.push({
-                        requestQty:item.requestQty,
-                        drawQuantity:item.drawQuantity,
+                        requestQty: item.requestQty,
+                        drawQuantity: item.drawQuantity,
                         // boCode:item.boCode,
-                        buyQty:item.buyQty,
-                        boId:item.id,
+                        buyQty: item.buyQty,
+                        boId: item.id,
                     })
-                }else{
+                } else {
                     data.push({
-                        requestQty:item.requestQty,
-                        drawQuantity:item.drawQuantity,
+                        requestQty: item.requestQty,
+                        drawQuantity: item.drawQuantity,
                         // boCode:item.boCode,
-                        buyQty:item.buyQty,
-                        id:item.id,
-                        boId:item.boId,
+                        buyQty: item.buyQty,
+                        id: item.id,
+                        boId: item.boId,
                     })
                 }
-                
-            })
-            batchRequest(data).then(res =>{
-                if(res.data.code === 200){
-                    this.$message.success('提请成功')
-                    this.closeDialog(true)
-                }
+
             })
+            this.submitLoading = true
+            if (this.type == 'request') {
+                batchRequest(data).then(res => {
+                    if (res.data.code === 200) {
+                        this.$message.success('提请成功')
+                        this.submitLoading = false
+                        this.closeDialog(true)
+                    }
+                }).catach(err => {
+                    this.submitLoading = false
+                })
+            } else {
+                update(data[0]).then(res => {
+                    if (res.data.code === 200) {
+                        this.$message.success('提请成功')
+                        this.closeDialog(true)
+                    }
+                }).catach(err => {
+                    this.submitLoading = false
+                })
+            }
+
         },
     },
-    
+
 }
 </script>
 
-<style>
-
-</style>
\ No newline at end of file
+<style></style>
\ No newline at end of file
diff --git a/src/views/warehouseManagement/warehouseRequest/components/record.vue b/src/views/warehouseManagement/warehouseRequest/components/record.vue
index f7c4092a..cf377bec 100644
--- a/src/views/warehouseManagement/warehouseRequest/components/record.vue
+++ b/src/views/warehouseManagement/warehouseRequest/components/record.vue
@@ -12,7 +12,9 @@
             </template>
             <template #menu="scope">
                 <!-- 待审核之前都能修改  同步erp修改数据 -->
-                <el-button type="text" v-if="scope.row.erpApprovalStatus == -1" @click="batchMaintain(scope.row)">修改</el-button>
+                <el-button type="text" v-if="scope.row.erpApprovalStatus == -1"
+                    @click="batchMaintain(scope.row)">修改</el-button>
+                <el-button type="text" v-if="scope.row.erpApprovalStatus == -1" @click="delFn(scope.row)">删除</el-button>
                 <!-- <el-button type="text" v-if="scope.row.approvalStatus == 0" @click="handeExamine(scope.row)">审批</el-button> -->
             </template>
 
@@ -31,11 +33,12 @@
                 </span>
             </template>
         </el-dialog>
-        <processDialog :showDialog="isOpen" v-if="isOpen" type="edit" :list="selectList" @closeDialog="closeDialog"></processDialog>
+        <processDialog :showDialog="isOpen" :title="'修改'" v-if="isOpen" type="edit" :list="selectList" @closeDialog="closeDialog">
+        </processDialog>
     </div>
 </template>
 <script>
-import {getRecords,approve} from "@/api/storeManagement/warehouseRequest"
+import { getRecords, approve, del } from "@/api/storeManagement/warehouseRequest"
 import processDialog from './processDialog.vue'
 export default {
     components: {
@@ -44,9 +47,9 @@ export default {
     data() {
         return {
             selectionList: [],
-            selectList:[],
-            loading:false,
-            query:{},
+            selectList: [],
+            loading: false,
+            query: {},
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -70,10 +73,10 @@ export default {
                 viewBtnIcon: ' ',
                 delBtnIcon: ' ',
                 editBtnIcon: ' ',
-                editBtn:false,
+                editBtn: false,
                 viewBtnText: '详情',
                 labelWidth: 120,
-                menuWidth: 80,
+                menuWidth: 120,
                 dialogWidth: 1040,
                 dialogClickModal: false,
                 searchEnter: true,
@@ -89,7 +92,7 @@ export default {
                 searchGutter: 24,
                 searchSpan: 6,
                 menuAlign: 'center',
-                menu:true,
+                menu: true,
                 gridBtn: false,
                 searchMenuPosition: 'right',
                 align: 'center',
@@ -201,15 +204,15 @@ export default {
                         dicData: [
                             {
                                 label: '审批中',
-                                value:0
+                                value: 0
                             },
                             {
                                 label: '审批通过',
-                                value:1
+                                value: 1
                             },
                             {
                                 label: '审批驳回',
-                                value:10
+                                value: 10
                             }
                         ]
                     },
@@ -272,10 +275,10 @@ export default {
                 total: 0,
             },
             isOpen: false,
-            approveDialog:false,
-            auditForm:{},
-            auditRules:{
-               approvalResult:[{ required: true, message: '请选择是否通过审核', trigger: 'blur' }] 
+            approveDialog: false,
+            auditForm: {},
+            auditRules: {
+                approvalResult: [{ required: true, message: '请选择是否通过审核', trigger: 'blur' }]
             },
         }
     },
@@ -286,7 +289,7 @@ export default {
         },
         closeDialog(val) {
             this.isOpen = false
-            if(val){
+            if (val) {
                 this.onLoad()
             }
         },
@@ -302,36 +305,55 @@ export default {
             }).then(() => {
             })
         },
+        delFn(row) {
+            this.$confirm('确定将选择数据删除?', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(() => {
+                this.loading = true
+                del({ ids: row.id }).then(res => {
+                    this.$message({
+                        message: '删除成功',
+                        type: 'success'
+                    });
+                    this.onLoad(this.page)
+                }).catch(() => {
+                    this.loading = false
+                })
+
+            })
+        },
         // 多选
         selectionChange(list) {
             this.selectionList = list;
         },
-        searchChange(params, done){
+        searchChange(params, done) {
             this.query = params;
             this.page.currentPage = 1;
             this.onLoad()
             done()
         },
-        searchReset(){
+        searchReset() {
             this.query = {}
             this.onLoad()
         },
-        currentChange(currentPage){
+        currentChange(currentPage) {
             this.page.currentPage = currentPage;
         },
-        sizeChange(pageSize){
+        sizeChange(pageSize) {
             this.page.pageSize = pageSize;
         },
-        handeExamine(row){
+        handeExamine(row) {
             this.auditForm = {}
             this.auditForm.id = row.id
             this.approveDialog = true
         },
-        submit(){
+        submit() {
             this.$refs.auditForm.validate(valid => {
-                if(valid){
-                    approve({...this.auditForm}).then(res =>{
-                        if(res.data.code == 200){
+                if (valid) {
+                    approve({ ...this.auditForm }).then(res => {
+                        if (res.data.code == 200) {
                             this.$message.success('审批成功')
                             this.approveDialog = false
                             this.onLoad()
@@ -344,15 +366,15 @@ export default {
             this.loading = true
             let param = {
                 ...this.query,
-                startCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
-                endCreateTime:this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1],
+                startCreateTime: this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
+                endCreateTime: this.query && this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1],
             }
-            if(param.createTime) delete param.createTime
+            if (param.createTime) delete param.createTime
             getRecords({
-                current:this.page.currentPage,
-                size:this.page.pageSize,
+                current: this.page.currentPage,
+                size: this.page.pageSize,
                 ...param
-            }).then(res =>{
+            }).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
                 this.loading = false
diff --git a/src/views/warehouseManagement/warehouseRequest/components/request.vue b/src/views/warehouseManagement/warehouseRequest/components/request.vue
index 96be986d..7876e822 100644
--- a/src/views/warehouseManagement/warehouseRequest/components/request.vue
+++ b/src/views/warehouseManagement/warehouseRequest/components/request.vue
@@ -18,7 +18,8 @@
             </template>
 
         </avue-crud>
-        <processDialog :showDialog="isOpen" type="request" v-if="isOpen" :list="selectList" @closeDialog="closeDialog"></processDialog>
+        <processDialog :showDialog="isOpen" type="request" v-if="isOpen" :list="selectList" @closeDialog="closeDialog">
+        </processDialog>
         <el-dialog width="30%" v-model="approveDialog" title="审批">
             <el-form :model="auditForm" :rules="auditRules" ref="auditForm">
                 <el-form-item label="是否审核通过" prop="approvalResult">
@@ -36,7 +37,7 @@
     </div>
 </template>
 <script>
-import {getList,approve} from "@/api/storeManagement/warehouseRequest"
+import { getList, approve } from "@/api/storeManagement/warehouseRequest"
 import processDialog from './processDialog.vue'
 export default {
     components: {
@@ -45,9 +46,9 @@ export default {
     data() {
         return {
             selectionList: [],
-            selectList:[],
-            loading:false,
-            query:{},
+            selectList: [],
+            loading: false,
+            query: {},
             option: {
                 height: 'auto',
                 calcHeight: 32,
@@ -96,24 +97,14 @@ export default {
                 isOpen: false,
                 moldAddMore: false,
                 column: [
-
-                    // {
-                    //     label: '提请单号',
-                    //     prop: 'reqCode',
-                    //     search: true,
-                    //     sortable: true,
-                    //     filter: true,
-                    //     span: 12,
-                    //     width: 120,
-                    // },
                     {
                         label: '采购单号',
                         prop: 'boCode',
-                        // bind: 'stBuyOrder.boCode',
                         search: true,
                         sortable: true,
                         filter: true,
                         span: 12,
+                        width:120,
 
                     },
                     {
@@ -123,7 +114,7 @@ export default {
                         search: true,
                         sortable: true,
                         filter: true,
-                        width:180,
+                        width: 180,
                         span: 12,
 
                     },
@@ -135,6 +126,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
 
                     },
                     {
@@ -145,6 +137,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
                     },
                     {
                         label: '物料规格',
@@ -154,6 +147,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
                     },
                     {
                         label: '采购数量',
@@ -163,6 +157,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
                     },
                     {
                         label: '已批数量',//erp已经审核通过的总数
@@ -171,6 +166,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
 
                     },
                     {
@@ -180,6 +176,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
                     },
                     {
                         label: '已提请数量',//已提交  erp未审批数量 
@@ -188,6 +185,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
                     },
                     {
                         label: '生产标识',
@@ -197,6 +195,7 @@ export default {
                         sortable: true,
                         filter: true,
                         span: 12,
+                         width:120,
 
                     },
                     {
@@ -211,6 +210,7 @@ export default {
                         searchRange: true,
                         startPlaceholder: '开始时间',
                         endPlaceholder: "结束时间",
+                        width:120
 
                     },
 
@@ -225,31 +225,31 @@ export default {
                 total: 0,
             },
             isOpen: false,
-            approveDialog:false,
-            auditForm:{},
-            auditRules:{
-               approvalResult:[{ required: true, message: '请选择是否通过审核', trigger: 'blur' }] 
+            approveDialog: false,
+            auditForm: {},
+            auditRules: {
+                approvalResult: [{ required: true, message: '请选择是否通过审核', trigger: 'blur' }]
             },
         }
     },
     methods: {
         batchMaintain(row) {
-            if(row){
+            if (row) {
                 this.selectList = [row]
                 this.isOpen = true
-            }else{
-                if(this.selectionList.length == 0){
+            } else {
+                if (this.selectionList.length == 0) {
                     this.$message.error('请至少选择一条数据')
                     return
                 }
                 this.selectList = this.selectionList
                 this.isOpen = true
             }
-            
+
         },
         closeDialog(val) {
             this.isOpen = false
-            if(val){
+            if (val) {
                 this.onLoad()
             }
         },
@@ -269,32 +269,32 @@ export default {
         selectionChange(list) {
             this.selectionList = list;
         },
-        searchChange(params, done){
+        searchChange(params, done) {
             this.query = params;
             this.page.currentPage = 1;
             this.onLoad()
             done()
         },
-        searchReset(){
+        searchReset() {
             this.query = {}
             this.onLoad()
         },
-        currentChange(currentPage){
+        currentChange(currentPage) {
             this.page.currentPage = currentPage
         },
-        sizeChange(pageSize){
+        sizeChange(pageSize) {
             this.page.pageSize = pageSize
         },
-        handeExamine(row){
+        handeExamine(row) {
             this.auditForm = {}
             this.auditForm.id = row.id
             this.approveDialog = true
         },
-        submit(){
+        submit() {
             this.$refs.auditForm.validate(valid => {
-                if(valid){
-                    approve({...this.auditForm}).then(res =>{
-                        if(res.data.code == 200){
+                if (valid) {
+                    approve({ ...this.auditForm }).then(res => {
+                        if (res.data.code == 200) {
                             this.$message.success('审批成功')
                             this.approveDialog = false
                             this.onLoad()
@@ -306,10 +306,10 @@ export default {
         onLoad() {
             this.loading = true
             getList({
-                current:this.page.currentPage,
-                size:this.page.pageSize,
+                current: this.page.currentPage,
+                size: this.page.pageSize,
                 ...this.query
-            }).then(res =>{
+            }).then(res => {
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total
                 this.loading = false