diff --git a/src/components/jeecg/MBBEditableTable.vue b/src/components/jeecg/MBBEditableTable.vue
index 6397826..50ee299 100644
--- a/src/components/jeecg/MBBEditableTable.vue
+++ b/src/components/jeecg/MBBEditableTable.vue
@@ -11,7 +11,8 @@
       <a-col>
         <!-- 操作按钮 -->
         <div v-if="actionButton" class="action-button">
-          <a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-if="isabled" :disabled="isabled">新增</a-button>
+          <a-button type="primary" icon="plus" @click="handleClickAdd" v-else :disabled="isabled">新增</a-button>
           <span class="gap"></span>
           <template v-if="selectedRowIds.length>0">
             <a-popconfirm
@@ -690,6 +691,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 是否禁用新增按钮
+    isabled: {
+      type: Boolean,
+      default: false
+    },
     // 是否可拖拽排序
     dragSort: {
       type: Boolean,
diff --git a/src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue b/src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
index fb3dc4a..fe0fc66 100644
--- a/src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
+++ b/src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
@@ -278,6 +278,7 @@ import pick from 'lodash.pick'
       passTask(){},
       //提交申请
       applySubmit(e) {
+        console.log("e>>>>>>>>>>>>>>>>>",e)
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
         }).then(allValues => {
diff --git a/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue b/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
index 2d9fe18..a3d3c00 100644
--- a/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
+++ b/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
@@ -41,16 +41,23 @@
     <!-- 子表单区域 -->
     <a-tabs v-model="activeKey" @change="handleChangeTabs">
       <a-tab-pane tab="民爆物资报废详情表" :key="refKeys[0]" :forceRender="true">
-        <j-editable-table
+        <m-b-b-editable-table
+          ref="processIndustrialScrapMaterial"
           :ref="refKeys[0]"
           :loading="processIndustrialScrapMaterialTable.loading"
           :columns="processIndustrialScrapMaterialTable.columns"
           :dataSource="processIndustrialScrapMaterialTable.dataSource"
+          :dragSortType="accounting"
           :maxHeight="300"
           :disabled="formDisabled"
+          :isabled="isabled"
+          :materialNature = materialNature
+          @valueChange ="onSelect"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true" />
+          :actionButton="!task"
+          @descriptionFetch = "searchInformation"
+        />
       </a-tab-pane>
     </a-tabs>
     <div class="div_process">
@@ -70,7 +77,6 @@
       <a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center">
         <a-button type="primary" @click="handleSubmit">保存</a-button>
         <a-button style="margin-left: 8px" type="primary" @click="saveAndpassTask">通过</a-button>
-        <!--                <a-button type="primary"  @click="ewrold">下载</a-button>-->
         <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
       </a-form-item>
     </div>
@@ -88,8 +94,7 @@ import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
 import JDictSelectTag from '@/components/dict/JDictSelectTag'
 import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
-import { validateDuplicateValue } from '@/utils/util'
-import { getStringArry } from '@api/manage'
+import { getAction, getStringArry, httpAction } from '@api/manage'
 import pick from 'lodash.pick'
 
 export default {
@@ -108,6 +113,10 @@ export default {
     return {
       isGetOneAndLast: true, //提交按钮显示
       btndisabled: false,
+      materialNature : null, //资产类型
+      accounting: undefined, //类型
+      isabled : true,
+      qeihuan : true, //切换类型
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 }
@@ -129,7 +138,6 @@ export default {
         xs: { span: 24 },
         sm: { span: 5 }
       },
-
       validatorRules: {
         departId: [
           { required: true, message: '请输入流程发起部门!' }
@@ -148,14 +156,14 @@ export default {
         loading: false,
         dataSource: [],
         columns: [
-          {
-            title: '民爆报废ID',
-            key: 'industrialScrapId',
-            type: FormTypes.input,
-            width: '200px',
-            placeholder: '请输入${title}',
-            defaultValue: ''
-          },
+          // {
+          //   title: '民爆报废ID',
+          //   key: 'industrialScrapId',
+          //   type: FormTypes.input,
+          //   width: '200px',
+          //   placeholder: '请输入${title}',
+          //   defaultValue: ''
+          // },
           {
             title: '请求数量',
             key: 'quantity',
@@ -233,6 +241,7 @@ export default {
       url: {
         add: '/burst/processIndustrialScraps/add',
         edit: '/burst/processIndustrialScraps/edit',
+        processIndustrialUrlList: '/burst/processIndustrial/list', //查询民爆物资表
         processIndustrialScrapMaterial: {
           list: '/burst/processIndustrialScraps/queryProcessIndustrialScrapMaterialByMainId'
         }
@@ -254,6 +263,8 @@ export default {
       default: false,
       required: false
     },
+    /*是否新增*/
+    isNew: { type: Boolean, default: false, required: false },
     /*是否处理流程*/
     task: { type: Boolean, default: false, required: false },
     /*采购类型*/
@@ -272,12 +283,88 @@ export default {
   },
   methods: {
     //物资类型切换
-    elect(val) {
+    async elect(val) {
       console.log("val>>>>>>>>>>>",val)
       if (val != undefined) {
+        this.accounting = val;
+        this.isabled = false;
+        this.qeihuan = val;
+        //查询民爆物资
         this.assigneesText = val
+        await  this.searchInformation();
       }
     },
+    async onSelect(record){
+      console.log("record>>>>>>>>>>>>>>>>>>>>>>>>>",record)
+      // //物料号
+      // if(record.column.key == "equipment" && !!record.row.id || record.column.key == "materialName" && !!record.row.id ){
+      //   await this.pastSla();
+      //   let l = false;
+      //   this.historyNumList.forEach( item =>{
+      //     // console.log("111",item);
+      //     if(item.equipment == record.value){
+      //       l =true;
+      //     }
+      //   });
+      //   if(l){
+      //     this.qingKong(record.row.id);
+      //   }else{
+      //     let sous = false;
+      //     this.equipmentList.forEach( item =>{
+      //       // console.log(item)
+      //       if(item.merchandiseNewsId == record.value){
+      //         sous = true;
+      //       }
+      //     })
+      //     if(!sous){
+      //       //根据ID查询
+      //       await this.searchInformation(record.value);
+      //     }
+      //     this.fuZhi(record.row.id,record.value);
+      //   }
+      //   await this.jinYong();
+      // }
+      // //计算金额
+      // if(record.column.key = "actualNumber" && !!record.row.scrapNumber && !this.allotBaoNumber){
+      //   let ase = 0;
+      //   let bao = false;
+      //   this.BaoFeiNumList.forEach(item =>{
+      //
+      //     if(item.merchandiseNewsId === record.row.equipment){
+      //       // console.log("11-=-=",item);
+      //
+      //       if(record.row.actualNumber > item.materialQuantity){
+      //         this.$message.warning("实际报废数大于库存数！");
+      //         bao = true;
+      //         let values = [
+      //           {
+      //             rowKey: record.row.id,
+      //             values: {
+      //               'actualNumber': null ,
+      //               'materialAmount': null,
+      //             }
+      //           }
+      //         ]
+      //         this.$refs.processSmaterialsScrapList.setValues(values);
+      //       }
+      //     }
+      //   })
+      //   if(!bao){
+      //     ase = accMul(record.row.actualNumber,record.row.materialPrice)  > 0 ? accMul(record.row.actualNumber,record.row.materialPrice) : 1 * record.row.materialPrice;
+      //     let values = [
+      //       {
+      //         rowKey: record.row.id,
+      //         values: {
+      //           // 'scrapNumber': record.row.scrapNumber > 0 ? record.row.scrapNumber : 1 ,
+      //           'materialAmount': ase,
+      //         }
+      //       }
+      //     ]
+      //     this.$refs.processSmaterialsScrapList.setValues(values);
+      //   }
+      // }
+
+    },
     //通过
     saveAndpassTask() {
       this.handleSubmit(true)
@@ -287,15 +374,66 @@ export default {
     },
     //通过
     passTask() {
+    },
+    //查询民爆
+    searchInformation(value){
+
+      return new Promise( (resolve, reject) => {
+        let par = {
+          type: this.accounting
+        }
+        let numberList = [];
+        this.$refs.processIndustrialScrapMaterial.getValues((a, b, c) => {
+          b.forEach(item => {
+            if (!!item.equipment) {
+              numberList.push(item.equipment)
+            }
+          })
+        })
+        //查询数据
+        console.log("=-=-=-",par);
+        getAction(this.url.processIndustrialUrlList,par).then(res =>{
+          if(res.success){
+            console.log("res>>>>>>>>>>>>>>>>>>>>",res)
+            this.equipmentList = res.result.records;
+            let nu = res.result.records || res.result;
+            let qc = [];
+            // if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) {
+            //   this.processIndustrialScrapMaterialTable.columns[1].options = []
+            // }
+            nu.forEach(item =>{
+              qc.push({
+                title: item.materialNumber,
+                value: item.merchandiseNewsId,
+                disabled: false
+              })
+            })
+            console.log("qc>>>>>>>>>>>>>>>",qc)
+            numberList.forEach( it => {
+              // console.log("000000",it);
+              qc.forEach(item =>{
+                if( it == item.value ){
+                  item.disabled = true;
+                }
+              })
+            })
+           // this.processSmaterialsScrapListTable.columns[1].options = qc;
+          }
+          resolve();
+        })
+      })
+
     },
     //提交申请
     applySubmit(e) {
+      console.log('e>>>>>>>>>>>>>>>', e)
       this.getAllTable().then(tables => {
         return validateFormAndTables(this.form, tables)
       }).then(allValues => {
           if (typeof this.classifyIntoFormData !== 'function') {
             throw this.throwNotFunction('classifyIntoFormData')
           }
+        console.log('allValues=--=-=-', allValues)
           let formData = this.classifyIntoFormData(allValues)
           console.log('=--=-=-', formData)
           /*  if (formData.processIndustrialPurchaseMaterialList==0){
@@ -321,10 +459,10 @@ export default {
             //   formData.materialPrice = 0;
             // }
             formData.describes = this.describes
-            if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
-              this.$message.error('需求时间不能小于当前流程发起时间')
-              return
-            }
+            // if (new Date(formData.createTime).getTime() / 100 > new Date(formData.needTime).getTime() / 100) {
+            //   this.$message.error('需求时间不能小于当前流程发起时间')
+            //   return
+            // }
             // console.log(this.opinion, '流程说明')
             this.form.validateFields((err, values) => {
               if (!err) {
@@ -335,10 +473,10 @@ export default {
                 //formData.sourceCapital
                 // console.log('this.planType++', this.planType)
                 if (!formData.tableName) formData.tableName = this.processData.businessTable
-                var url = this.url.addFromTableApply
+                var url = this.url.add
                 let method = 'post'
                 if (!this.isNew) {
-                  url = this.url.editFromTableApply
+                  url = this.url.edit
                   method = 'put'
                   formData.assignees = this.assignees
                   formData.tableName = this.processData.tableName
@@ -361,21 +499,20 @@ export default {
                   //   }
                   // }
                 }
-                console.log(formData, '表单数据')
                 if (this.btndisabled === false) {
                   this.btndisabled = true
-                  // httpAction(url, formData, method).then((res) => {
-                  //   if (res.success) {
-                  //     this.$message.success('提交申请成功！')
-                  //     //todo 将表单的数据传给父组件
-                  //     this.$emit('loadData')
-                  //     this.close()
-                  //   } else {
-                  //     this.$message.error(res.message)
-                  //   }
-                  // }).finally(() => {
-                  //   this.btndisabled = false
-                  // })
+                  httpAction(url, formData, method).then((res) => {
+                    if (res.success) {
+                      this.$message.success('提交申请成功！')
+                      //todo 将表单的数据传给父组件
+                      this.$emit('loadData')
+                      this.close()
+                    } else {
+                      this.$message.error(res.message)
+                    }
+                  }).finally(() => {
+                    this.btndisabled = false
+                  })
                 }
               }
             })
@@ -398,6 +535,7 @@ export default {
                this.$message.error('请填写清单内容')
                return
              }
+
              for (let i = 0; i < formData.processIndustrialScrapMaterialList.length; i++) {
                if (i == 0) {
                  this.describes = formData.processIndustrialScrapMaterialList[i].materialName