diff --git a/src/App.vue b/src/App.vue
index 9f4f7a8..03ada47 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,4 +41,11 @@
   #app {
     height: 100%;
   }
+ /* 网页滚动条，没卵用*/
+ /* ::-webkit-scrollbar {*/
+ /*   width: 0 !important;*/
+ /*  }*/
+ /* ::-webkit-scrollbar {*/
+ /*    width: 0 !important;height: 0;*/
+ /*}*/
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 3210d1b..317a11f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,9 @@ import Storage from 'vue-ls'
 import router from './router'
 import store from './store/'
 import { VueAxios } from "@/utils/request"
+// import adaptive from './directive/el-table'
+//
+// Vue.use(adaptive)
 //main.js
 import { Base64 } from 'js-base64';
 Vue.prototype.$Base64 = Base64
diff --git a/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue
index 5b85b75..fdde781 100644
--- a/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue
+++ b/src/views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart.vue
@@ -1,96 +1,97 @@
 <template>
-  <div class="search">
-    <!--<a-card style="margin-bottom:10px;">
-      <p slot="title">
-        <span>流程审批进度历史</span>
-      </p>
+    <div class="search" >
+      <!--<a-card style="margin-bottom:10px;">
+        <p slot="title">
+          <span>流程审批进度历史</span>
+        </p>
+        <a-row style="position:relative">
+          <a-table :loading="loading" rowKey="id"
+                   :dataSource="data"
+                   :pagination="false"
+                    ref="table">
+            <a-table-column title="#"  width="50">
+              <template slot-scope="t,r,i" >
+                <span> {{i+1}} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="任务名称" dataIndex="name"  width="150" align="center">
+              <template slot-scope="t">
+                <span> {{t}} </span>
+              </template>
+            </a-table-column>
+            <a-table-column title="处理人" dataIndex="assignees"  width="150" align="center">
+              <template slot-scope="t">
+                <div v-if="t">
+                  <span v-for="item in t">
+                    <span v-if="item.isExecutor" style="color: #00DB00;">{{item.username}} </span>
+                    <span v-else style="color: #999;">{{item.username}} </span>
+                  </span>
+                </div>
+              </template>
+            </a-table-column>
+            <a-table-column title="审批操作" dataIndex="deleteReason"  width="150" align="center">
+              <template slot-scope="t">
+                <span v-if="t.toString().indexOf('通过')>-1" style="color: #00DB00">{{t}}</span>
+                <span v-else-if="t.toString().indexOf('驳回')>-1" style="color: red;">{{t}}</span>
+                <span v-else>{{t}}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="审批意见" dataIndex="comment"  width="150" align="center">
+              <template slot-scope="t">
+                <span>{{t}}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="耗时" dataIndex="duration"  width="150" align="center">
+              <template slot-scope="t">
+                <span>{{millsToTime(t)}}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="创建时间" dataIndex="createTime"  width="150" align="center">
+              <template slot-scope="t">
+                <span>{{t}}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="完成时间" dataIndex="endTime"  width="150" align="center">
+              <template slot-scope="t">
+                <span>{{t}}</span>
+              </template>
+            </a-table-column>
+            <a-table-column title="状态" dataIndex="endTime" key="aaa" width="150" align="center">
+              <template slot-scope="t">
+                <span v-if="t" style="color: blue;">已办理</span>
+                <span v-else style="color: #999999">待处理</span>
+              </template>
+            </a-table-column>
+          </a-table>
+        </a-row>
+      </a-card>-->
+
+      <!-- <a-tabs type="card" @change="callback">-->
+      <!-- <a-tab-pane key="1" tab="实时流程图">-->
+
+      <!--<p slot="title">
+        <span>实时流程图</span>
+      </p>-->
       <a-row style="position:relative">
-        <a-table :loading="loading" rowKey="id"
-                 :dataSource="data"
-                 :pagination="false"
-                  ref="table">
-          <a-table-column title="#"  width="50">
-            <template slot-scope="t,r,i" >
-              <span> {{i+1}} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="任务名称" dataIndex="name"  width="150" align="center">
-            <template slot-scope="t">
-              <span> {{t}} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="处理人" dataIndex="assignees"  width="150" align="center">
-            <template slot-scope="t">
-              <div v-if="t">
-                <span v-for="item in t">
-                  <span v-if="item.isExecutor" style="color: #00DB00;">{{item.username}} </span>
-                  <span v-else style="color: #999;">{{item.username}} </span>
-                </span>
-              </div>
-            </template>
-          </a-table-column>
-          <a-table-column title="审批操作" dataIndex="deleteReason"  width="150" align="center">
-            <template slot-scope="t">
-              <span v-if="t.toString().indexOf('通过')>-1" style="color: #00DB00">{{t}}</span>
-              <span v-else-if="t.toString().indexOf('驳回')>-1" style="color: red;">{{t}}</span>
-              <span v-else>{{t}}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="审批意见" dataIndex="comment"  width="150" align="center">
-            <template slot-scope="t">
-              <span>{{t}}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="耗时" dataIndex="duration"  width="150" align="center">
-            <template slot-scope="t">
-              <span>{{millsToTime(t)}}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="创建时间" dataIndex="createTime"  width="150" align="center">
-            <template slot-scope="t">
-              <span>{{t}}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="完成时间" dataIndex="endTime"  width="150" align="center">
-            <template slot-scope="t">
-              <span>{{t}}</span>
-            </template>
-          </a-table-column>
-          <a-table-column title="状态" dataIndex="endTime" key="aaa" width="150" align="center">
-            <template slot-scope="t">
-              <span v-if="t" style="color: blue;">已办理</span>
-              <span v-else style="color: #999999">待处理</span>
-            </template>
-          </a-table-column>
-        </a-table>
+        <img :src="imgUrl" />
+        <a-spin size="large" fix v-if="loadingImg"></a-spin>
       </a-row>
-    </a-card>-->
-
-    <!-- <a-tabs type="card" @change="callback">-->
-    <!-- <a-tab-pane key="1" tab="实时流程图">-->
 
-    <!--<p slot="title">
-      <span>实时流程图</span>
-    </p>-->
-    <a-row style="position:relative">
-      <img :src="imgUrl" />
-      <a-spin size="large" fix v-if="loadingImg"></a-spin>
-    </a-row>
+      <!-- </a-tab-pane>-->
+      <!-- <a-tab-pane key="2" tab="表单数据" v-if="lcModa">
+         <a-card>
+           &lt;!&ndash;流程表单&ndash;&gt;
+           <component :disabled="lcModa.disabled" :is="lcModa.formComponent"
+           :processData="lcModa.processData" :isNew="lcModa.isNew" :task="lcModa.isTask"
+           @afterSubmit="afterSub"
+           @passTask="pass(lcModa.processData)"
+           @backTask="back(lcModa.processData)"
+           @close="lcModa.visible=false,lcModa.disabled = false"></component>
+         </a-card>
+       </a-tab-pane>-->
+      <!--</a-tabs>-->
+    </div>
 
-    <!-- </a-tab-pane>-->
-    <!-- <a-tab-pane key="2" tab="表单数据" v-if="lcModa">
-       <a-card>
-         &lt;!&ndash;流程表单&ndash;&gt;
-         <component :disabled="lcModa.disabled" :is="lcModa.formComponent"
-         :processData="lcModa.processData" :isNew="lcModa.isNew" :task="lcModa.isTask"
-         @afterSubmit="afterSub"
-         @passTask="pass(lcModa.processData)"
-         @backTask="back(lcModa.processData)"
-         @close="lcModa.visible=false,lcModa.disabled = false"></component>
-       </a-card>
-     </a-tab-pane>-->
-    <!--</a-tabs>-->
-  </div>
 </template>
 
 <script>
diff --git a/src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue b/src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
index 56ff652..5ed339e 100644
--- a/src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
+++ b/src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
@@ -709,9 +709,9 @@ import { accMul } from '../../../../../common/common'
         if (this.processIndustrialPurchaseMaterialTable.columns[1].options.length > 0) {
           this.processIndustrialPurchaseMaterialTable.columns[1].options = [];
         }
-        if (this.processIndustrialPurchaseMaterialTable.columns[2].options.length > 0) {
-          this.processIndustrialPurchaseMaterialTable.columns[2].options = [];
-        }
+        // if (this.processIndustrialPurchaseMaterialTable.columns[2].options.length > 0) {
+        //   this.processIndustrialPurchaseMaterialTable.columns[2].options = [];
+        // }
         let qc = [];
         newList.forEach(item => {
           qc.push({
diff --git a/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue b/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
index 36bc159..9faacde 100644
--- a/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
+++ b/src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
@@ -53,7 +53,7 @@
           :loading="processIndustrialScrapMaterialTable.loading"
           :columns="processIndustrialScrapMaterialTable.columns"
           :dataSource="processIndustrialScrapMaterialTable.dataSource"
-          :dragSortType="accounting"
+          :dragSortType=this.assigneesText
           :maxHeight="300"
           :disabled="formDisabled"
           :isabled="isabled"
@@ -63,8 +63,10 @@
           :rowSelection="true"
           :qeihuan = this.qeihuan
           :actionButton="!task"
-          @descriptionFetch = "searchInformation"
+          @descriptionFetch = "getMBShuJu"
         />
+<!--        -->
+<!--        -->
       </a-tab-pane>
     </a-tabs>
     <div class="div_process">
@@ -103,6 +105,7 @@ import JDictSelectTag from '@/components/dict/JDictSelectTag'
 import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
 import { getAction, getCurrentTime, getStringArry, httpAction } from '@api/manage'
 import pick from 'lodash.pick'
+import { accMul } from '../../../../../common/common'
 
 export default {
   name: 'ProcessIndustrialScrapsForm',
@@ -121,7 +124,7 @@ export default {
       isGetOneAndLast: true, //提交按钮显示
       btndisabled: false,
       materialNature : null, //资产类型
-      accounting: undefined, //类型
+      assigneesText: undefined, //类型
       isabled : true,
       qeihuan : '' ,//切换类型
       labelCol: {
@@ -150,7 +153,7 @@ export default {
           { required: true, message: '请输入流程发起部门!' }
         ],
         materialType: { rules:[
-            { required: true, message: '请输入物资类型!'},
+            { required: true, message: '请选择物资类型!'},
           ]},
       },
       // 新增时子表默认添加几行空数据
@@ -286,12 +289,20 @@ export default {
         add: '/burst/processIndustrialScraps/add',
         addApply:'/burst/processIndustrialScraps/addApply',
         edit: '/burst/processIndustrialScraps/edit',
-        processIndustrialUrlList: '/burst/processIndustrial/list', //查询民爆物资表
+        ownList: "/burst/processIndustrialScraps/ownList",
+        processIndustrialUrlList: '/burst/processIndustrialScraps/list', //查询民爆物资表
         processIndustrialScrapMaterial: {
           list: '/burst/processIndustrialScraps/queryProcessIndustrialScrapMaterialByMainId'
         }
-      }
+      },
+      isShifu: false, //是否搜过
+      MBShuJuList: [], //表格数据
+      MBShuJu: {}, //民爆对象
+      historyNumList: [], //列表里面的值
+      qeihuan : '' ,//切换类型
+      describes: '',//流程名称标识
     }
+
   },
   props: {
     /*流程数据*/
@@ -335,12 +346,177 @@ export default {
         this.isabled = false;
         this.qeihuan = val;
         //查询民爆物资
-        this.assigneesText = val
-        await  this.searchInformation();
+        // this.assigneesText = val
+        // await  this.searchInformation();
       }
     },
+    //获取列表值
+    async  getMBShuJu(v){
+      let par ={};
+      let url = '';
+      console.log("v>>>>>>>>>",v)
+      //判断是否存在
+      if(!!v){
+        par.id = v;
+        url = this.url.queryById;
+      } else {
+        url = this.url.ownList;
+      }
+      //构建报废民爆物资类型
+      par.materialType = this.assigneesText;
+      await  getAction(url,par).then(res => {
+        if(res.success){
+          if(!!v){
+            this.MBShuJu =  res.result;
+          }else{
+            this.MBShuJuList = res.result.records;
+            this.initialData(this.MBShuJuList);
+          }
+
+        }
+      })
+    },
+    //初始列表数据
+    async initialData(newList){
+      console.log("-=-=-=",newList);
+      await this.getSurface();
+      if (this.processIndustrialScrapMaterialTable.columns[1].options.length > 0) {
+        this.processIndustrialScrapMaterialTable.columns[1].options = [];
+      }
+      // if (this.processIndustrialPurchaseMaterialTable.columns[2].options.length > 0) {
+      //   this.processIndustrialPurchaseMaterialTable.columns[2].options = [];
+      // }
+      let qc = [];
+      newList.forEach(item => {
+        console.log(item.pyrotechnics)
+        qc.push({
+          title: item.pyrotechnics,
+          value: item.id,
+          disabled: false
+        })
+      })
+      this.historyNumList.forEach( item => {
+        qc.forEach(it =>{
+          if(it.value == item.materialNumber){
+            it.disabled = true;
+          }
+        })
+      });
+      this.processIndustrialScrapMaterialTable.columns[1].options = qc;
+    },
+    getSurface(){
+      //取列表值
+      return new Promise(async(resolve, reject) => {
+        await this.$refs.processIndustrialScrapMaterial.getValuesPromise().then(re => {
+          this.historyNumList = re;
+        })
+        resolve(this.historyNumList);
+      })
+    },
+    //清空
+    qingKong(id){
+      let values = [
+        {
+          rowKey: id,
+          values: {
+            'materialGroup': null,
+            'industrialName': '',
+            'unit': undefined,
+            'materialPrice': '',
+            'quantity': '',
+            'amount': '',
+            'money': '',
+            'scrapCause': '',
+            'remarks': '',
+          }
+        }
+      ]
+      this.$refs.processIndustrialScrapMaterial.setValues(values);
+    },
+    //列表赋值
+    fuZhi(id,v){
+      console.log("vvv",v);
+      let values = [
+        {
+          rowKey: id,
+          values: {
+            'materialGroup': v.materialClassify,
+            'equipment': v.id,
+            'materialSeries': v.pyrotechnics ,
+            'industrialName': v.pyrotechnicsName,
+            'unit': v.unit,
+            'materialPrice': v.manufacturer,
+            'quantity': v.number,
+            'amount': '',
+            'money': '',
+            'scrapCause': null,
+            'remarks': null
+          }
+        }
+      ]
+      // console.log(values);
+      this.$refs.processIndustrialScrapMaterial.setValues(values)
+    },
     async onSelect(record){
       console.log("record>>>>>>>>>>>>>>>>>>>>>>>>>",record)
+
+      // console.log("列表值=-",record);
+      await this.getSurface();
+      if(!!record.row.id){
+        let same = false;
+        this.historyNumList.forEach( item =>{
+          // console.log("列表值=-",record);
+          // console.log("====",item);
+          if(!!item.equipment && !!item.equipment && item.equipment == record.value ){
+            this.qingKong(record.row.id);
+            same = true;
+          }
+        });
+        if(same){
+          return ;
+        }
+      }
+      if ( record.column.key == "equipment"  && !!record.row.equipment
+        || record.column.key =="equipment"   && !!record.row.equipment ) {
+        // console.log("select==清空数据",record.row);
+        this.qingKong(record.row.id);
+        return
+      }
+      if(this.isShifu  && !!record.row.id){
+        //查询民爆数据
+        await this.getMBShuJu(record.value);
+        this.isShifu = false;
+        this.fuZhi(record.row.id,this.MBShuJu);
+      }
+      if(record.column.key === "materialNumber" && !!record.row.id ){
+        this.MBShuJuList.forEach(item =>{
+          if(item.id === record.value){
+            this.fuZhi(record.row.id,item);
+            return
+          }
+        })
+      }
+      //计算金额
+      if (!!record.row.materialQuantity && !!record.row.materialPrice  && !!record.row.id ) {
+        // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
+        console.log("3出发了");
+        //回填数据
+        if (record.row.id !== undefined) {
+          let values = [
+            {
+              rowKey: record.row.id,
+              values: {
+                'materialQuantity': record.row.materialQuantity,
+                'materialAmount': accMul(record.row.materialQuantity,record.row.materialPrice),
+              }
+            }
+          ]
+          this.$refs.processIndustrialScrapMaterial.setValues(values)
+        }
+
+      }
+
+
       // //物料号
       // if(record.column.key == "equipment" && !!record.row.id || record.column.key == "materialName" && !!record.row.id ){
       //   await this.pastSla();
@@ -421,54 +597,55 @@ export default {
     passTask() {
     },
     //查询民爆
-    searchInformation(value){
-
-      return new Promise( (resolve, reject) => {
-        let par = {
-          materialType: this.accounting,
-          pageNo: 1,
-          pageSize: 50
-        }
-        let numberList = [];
-        this.$refs.processIndustrialScrapMaterial.getValues((a, b, c) => {
-          b.forEach(item => {
-            if (!!item.equipment) {
-              numberList.push(item.equipment)
-            }
-          })
-        })
-        //查询数据
-        console.log("par=-=-=-",par);
-        getAction(this.url.processIndustrialUrlList,par).then(res =>{
-          if(res.success){
-            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.coding,
-                value: item.id,
-                disabled: false
-              })
-            })
-            numberList.forEach( it => {
-              // console.log("000000",it);
-              qc.forEach(item =>{
-                if( it == item.value ){
-                  item.disabled = true;
-                }
-              })
-            })
-            this.processIndustrialScrapMaterialTable.columns[1].options = qc;
-          }
-          resolve();
-        })
-      })
+    // searchInformation(value){
+    //   console.log("开始查询民爆报废物资列表》》》》》》》》》》》》》》》》》》")
+    //   return new Promise( (resolve, reject) => {
+    //     console.log("this.accounting>>>>>>>>>>>>>>"+this.accounting);
+    //     let par = {
+    //       materialType: this.accounting,
+    //       pageNo: 1,
+    //       pageSize: 50
+    //     }
+    //     let numberList = [];
+    //     this.$refs.processIndustrialScrapMaterial.getValues((a, b, c) => {
+    //       b.forEach(item => {
+    //         if (!!item.equipment) {
+    //           numberList.push(item.equipment)
+    //         }
+    //       })
+    //     })
+    //     //查询数据
+    //     console.log("par=-=-=-",par);
+    //     getAction(this.url.ownList,par).then(res =>{
+    //       if(res.success){
+    //         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.coding,
+    //             value: item.id,
+    //             disabled: false
+    //           })
+    //         })
+    //         numberList.forEach( it => {
+    //           // console.log("000000",it);
+    //           qc.forEach(item =>{
+    //             if( it == item.value ){
+    //               item.disabled = true;
+    //             }
+    //           })
+    //         })
+    //         this.processIndustrialScrapMaterialTable.columns[1].options = qc;
+    //       }
+    //       resolve();
+    //     })
+    //   })
 
-    },
+    // },
     //提交申请
     applySubmit(e) {
       this.getAllTable().then(tables => {
diff --git a/src/views/regime/ProcessRegimeList.vue b/src/views/regime/ProcessRegimeList.vue
index 211b278..d947964 100644
--- a/src/views/regime/ProcessRegimeList.vue
+++ b/src/views/regime/ProcessRegimeList.vue
@@ -140,6 +140,7 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessRegimeModal from './modules/ProcessRegimeModal'
+  import { getAction } from '../../api/manage'
 
   export default {
     name: 'ProcessRegimeList',
@@ -244,6 +245,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'contentDetails',text:'内容',dictCode:''})
+        fieldList.push({type:'Text',value:'contentDetails',text:'内容',dictCode:''})
         fieldList.push({type:'date',value:'createTime',text:'创建时间'})
         fieldList.push({type:'int',value:'states',text:'状态',dictCode:''})
         fieldList.push({type:'int',value:'delFalg',text:'删除标志',dictCode:''})
diff --git a/src/views/regime/modules/ProcessRegimeForm.vue b/src/views/regime/modules/ProcessRegimeForm.vue
index b956ce9..c078077 100644
--- a/src/views/regime/modules/ProcessRegimeForm.vue
+++ b/src/views/regime/modules/ProcessRegimeForm.vue
@@ -8,6 +8,16 @@
               <a-input v-model="model.title" placeholder="请输入标题"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24" >
+            <a-form-item label="附件" >
+              <j-upload v-decorator="['fileId']" :trigger-change="true" style="z-index: 999"></j-upload>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="文件" prop="ossFileList"  v-show="false">
+              <FileList  v-decorator="['ossFileList']"></FileList>
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="内容"  prop="contentDetails">
               <j-editor v-model="model.contentDetails" />
@@ -31,12 +41,15 @@
 
 <script>
 
-  import { httpAction, getAction } from '@/api/manage'
+  import { httpAction, getAction,getRecord } from '@/api/manage'
+  import JUpload from '@/components/jeecg/JUpload'
   import { validateDuplicateValue } from '@/utils/util'
+  import pick from 'lodash.pick'
 
   export default {
     name: 'ProcessRegimeForm',
     components: {
+      JUpload
     },
     props: {
       //表单禁用
@@ -88,6 +101,10 @@
         this.edit(this.modelDefault);
       },
       edit (record) {
+        if (record.id) {
+          //1、文件回显
+          record = getRecord(record)
+        }
         this.model = Object.assign({}, record);
         this.visible = true;
       },
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index d9f5cad..b0d0862 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -67,6 +67,7 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :height="gloable_tableHeight"
         @change="handleTableChange">
 
           <span slot="merchandiseName" slot-scope="text, record">
@@ -116,7 +117,6 @@
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import { deleteAction, getAction } from '@api/manage'
 
-
   export default {
     name: 'ProcessSuppliesStrongerList',
     mixins:[JeecgListMixin, mixinDevice],