diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 3b3a3b0..21d9c09 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -595,7 +595,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
     validateError(msg) {
       this.$message.error(msg)
     },
-    getPlanList(val) {
+    async getPlanList (val) {
       console.log(val,"传值")
       let ids=[]
       if (!!val){
@@ -606,7 +606,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
       this.processUdgetPlanIds=ids.join(",");
       let params = {}
       params.ids = JSON.stringify(ids)
-      this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)
+     await this.requestSubTableDatas(this.url.list, params, this.processMaterialWarehousingListTable)
       // getAction(this.url.list,params).then((res)=>{
       //   if(res.success){
       //     console.log('将要回填的数据',res.result)
@@ -614,50 +614,51 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
       // })
     },
     /** 查询某个tab的数据 */
-    requestSubTableData(url, params, tab, success) {
+    requestSubTableDatas(url, params, tab, success) {
       tab.loading = true
-      getAction(url, params).then(res => {
-        let { result } = res
-        let dataSource = []
-        if (result) {
-          if (Array.isArray(result)) {
-            dataSource = result
-          } else if (Array.isArray(result.records)) {
-            dataSource = result.records
-          }
-        }
-        tab.dataSource = dataSource;
-        // console.log("tab.dataSource",tab.dataSource)
-        tab.dataSource.forEach(item =>{
-          let par = { id : item.materialGroup,}
-          let param = {id : item.materialNumber,}
-          getAction(this.url.queryByIdDescription,par).then( res=>{
-            // console.log(res);
-            if(res.success){
-              this.processMaterialWarehousingListTable.columns[0].options= [{
-                title : res.result.materialClassify,
-                value :  item.materialGroup,
-                disabled : true }];
-            }
-          })
-          getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{
-            // console.log(res);
-            if(res.success){
-              this.processMaterialWarehousingListTable.columns[1].options= [{
-                title : res.result.materialsNumber,
-                value :  item.materialNumber,
-                disabled : true }];
+        getAction(url, params).then(res => {
+          let { result } = res
+          let dataSource = []
+          if (result) {
+            if (Array.isArray(result)) {
+              dataSource = result
+            } else if (Array.isArray(result.records)) {
+              dataSource = result.records
             }
-          })
+          }
 
+          // console.log("tab.dataSource",tab.dataSource)
+          dataSource.forEach(item =>{
+            let par = { id : item.materialGroup,}
+            let param = {id : item.materialNumber,}
+            getAction(this.url.queryByIdDescription,par).then( res=>{
+              // console.log(res);
+              if(res.success){
+                this.processMaterialWarehousingListTable.columns[0].options= [{
+                  title : res.result.materialClassify,
+                  value :  item.materialGroup,
+                  disabled : true }];
+              }
+            })
+            getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{
+              // console.log(res);
+              if(res.success){
+                this.processMaterialWarehousingListTable.columns[1].options= [{
+                  title : res.result.materialsNumber,
+                  value :  item.materialNumber,
+                  disabled : true }];
+              }
+            })
+
+          })
+          tab.dataSource = dataSource;
+          typeof success === 'function' ? success(res) : ''
+        }).finally(() => {
+          tab.loading = false
         })
 
+      },
 
-        typeof success === 'function' ? success(res) : ''
-      }).finally(() => {
-        tab.loading = false
-      })
-    },
 
 
 
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 7678750..5efbc58 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -204,7 +204,7 @@
               defaultValue: ''
             },
             {
-              title: '物料名称',
+              title: '物料名称及规格型号',
               key: 'materialName',
               type: FormTypes.input,
               dictCode: '',
@@ -212,23 +212,23 @@
               placeholder: '请输入${title}',
               defaultValue: ''
             },
-            {
-              title: '规格',
-              key: 'specification',
-              type: FormTypes.input,
-              dictCode: '',
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            }, {
-              title: '型号',
-              key: 'type',
-              type: FormTypes.input,
-              dictCode: '',
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
+            // {
+            //   title: '规格',
+            //   key: 'specification',
+            //   type: FormTypes.input,
+            //   dictCode: '',
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // }, {
+            //   title: '型号',
+            //   key: 'type',
+            //   type: FormTypes.input,
+            //   dictCode: '',
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
             {
               title: '单位',
               key: 'materialUnit',
@@ -992,7 +992,7 @@
               }
               res.result.forEach(item => {
                 this.processMaterialsDeliveryListTable.columns[0].options.push({
-                  title: item.descriptionName,
+                  title: item.materialClassify,
                   value: item.descriptionId
                 })
               })
@@ -1006,13 +1006,14 @@
             accountingAttributes: value
           }
           getAction(this.url.descriptionRake, par).then((res) => {
+            console.log("1231234123",res)
             if (res.success) {
               if (this.processMaterialsDeliveryListTable.columns[0].options.length > 0) {
                 this.processMaterialsDeliveryListTable.columns[0].options = []
               }
               res.result.forEach(item => {
                 this.processMaterialsDeliveryListTable.columns[0].options.push({
-                  title: item.descriptionName,
+                  title: item.materialClassify,
                   value: item.descriptionId
                 })
               })
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 0163883..cdc8bb0 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -76,6 +76,7 @@
           :action-button="true"
           :rowNumber="true"
           :disabled="hiegs"
+          :rowSelection="true"
           :isabled = "isabled"
           :actionButton="true"
           @descriptionFetch="descriptionFetchDatas"
@@ -872,7 +873,7 @@
 
           });
           getAction(this.url.merchandiseNewsList,par).then((res)=>{
-            console.log("12312",res.result);
+            // console.log("12312",res.result);
             if(res.success){
               let newList = res.result;
               if(numberList.length > 0){
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index 365b81d..ca3a4d6 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/src/views/activiti/processInsManage.vue
@@ -17,16 +17,16 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="8">
-              <a-form-item label="标识Key" prop="name">
-                <a-input
-                  type="text"
-                  v-model="searchForm.key"
-                  placeholder="请输入"
-                  clearable
-                />
-              </a-form-item>
-            </a-col>
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <a-form-item label="流程描述" prop="name">-->
+<!--                <a-input-->
+<!--                  type="text"-->
+<!--                  v-model="searchForm.key"-->
+<!--                  placeholder="请输入"-->
+<!--                  clearable-->
+<!--                />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="12" >
               <a-button @click="handleSearch" type="primary" icon="search">搜索</a-button>
@@ -46,37 +46,37 @@
           @change="handleTableChange"
           ref="table"
         >
-          <a-table-column title="#"  :width="50">
+          <a-table-column title="序号"  :width="80">
             <template slot-scope="t,r,i" >
               <span> {{i+1}} </span>
             </template>
           </a-table-column>
-          <a-table-column title="流程实例ID" dataIndex="id" :width="150">
+          <a-table-column title="流程实例ID" dataIndex="id" :width="200">
             <template slot-scope="t,r,i" >
               <span> {{t}} </span>
             </template>
           </a-table-column>
-          <a-table-column title="流程名称" dataIndex="name" :width="150">
+          <a-table-column title="流程名称" dataIndex="name" :width="200">
             <template slot-scope="t,r,i" >
               <span> {{t}} </span>
             </template>
           </a-table-column>
-          <a-table-column title="申请人" dataIndex="applyer" :width="100">
+          <a-table-column title="申请人" dataIndex="applyer" :width="200">
             <template slot-scope="t,r,i" >
               <span> {{t}} </span>
             </template>
           </a-table-column>
-          <a-table-column title="标识Key" dataIndex="key" :width="150">
+          <a-table-column title="流程描述" dataIndex="key" :width="200">
             <template slot-scope="t,r,i" >
               <span> {{t}} </span>
             </template>
           </a-table-column>
-          <a-table-column title="版本" dataIndex="version" :width="150">
-            <template slot-scope="t,r,i" >
-              <span> v.{{t}} </span>
-            </template>
-          </a-table-column>
-          <a-table-column title="当前环节" dataIndex="currTaskName" :width="150">
+<!--          <a-table-column title="版本" dataIndex="version" :width="150">-->
+<!--            <template slot-scope="t,r,i" >-->
+<!--              <span> v.{{t}} </span>-->
+<!--            </template>-->
+<!--          </a-table-column>-->
+          <a-table-column title="当前环节" dataIndex="currTaskName" :width="250">
             <template slot-scope="t,r,i" >
               <span> {{t}} </span>
             </template>
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 3ff4784..5e1e81a 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -141,7 +141,7 @@
           {
             title:'物料组',
             align:"center",
-            dataIndex: 'descriptionName'
+            dataIndex: 'materialClassify'
           },
           {
             title:'物料号',
@@ -150,20 +150,20 @@
           },
 
           {
-            title:'物料名称',
+            title:'物料名称及规格型号',
             align:"center",
             dataIndex: 'merchandiseName'
           },
-          {
-            title:'规格',
-            align:"center",
-            dataIndex: 'specification'
-          },
-          {
-            title:'型号',
-            align:"center",
-            dataIndex: 'type'
-          },
+          // {
+          //   title:'规格',
+          //   align:"center",
+          //   dataIndex: 'specification'
+          // },
+          // {
+          //   title:'型号',
+          //   align:"center",
+          //   dataIndex: 'type'
+          // },
 
           {
             title:'计量单位',
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index acc5c48..4351219 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -152,7 +152,7 @@
         <span slot="supplierName" slot-scope="text, record">
           <j-ellipsis :value="text" :length="5"/>
         </span>
-        <span slot="descriptionName" slot-scope="text, record">
+        <span slot="materialClassify" slot-scope="text, record">
           <j-ellipsis :value="text" :length="10"/>
         </span>
         <span slot="materialsNumber" slot-scope="text, record">
@@ -264,7 +264,7 @@
             title:'供应商',
             align:"center",
             scopedSlots: { customRender: 'supplierName' },
-            dataIndex: 'supplierName'
+            dataIndex: 'supplierId'
           },
           // {
           //   title:'供应商描述',
@@ -274,8 +274,8 @@
           {
             title:'物料组',
             align:"center",
-            scopedSlots: { customRender: 'descriptionName' },
-            dataIndex: 'descriptionName'
+            scopedSlots: { customRender: 'materialClassify' },
+            dataIndex: 'materialClassify'
           },
           {
             title:'物料编号',
@@ -284,12 +284,12 @@
             dataIndex: 'materialsNumber'
           },
           {
-            title:'物料名称',
+            title:'物料名称及规格型号',
             align:"center",
             scopedSlots: { customRender: 'merchandiseName' },
             dataIndex: 'merchandiseName'
           },
-          {
+         /* {
             title:'规格',
             align:"center",
             scopedSlots: { customRender: 'specification' },
@@ -300,7 +300,7 @@
             align:"center",
             scopedSlots: { customRender: 'type' },
             dataIndex: 'type'
-          },
+          },*/
           {
             title:'计量单位',
             align:"center",
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index e262d83..a5b5d54 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -161,23 +161,23 @@
             dataIndex: 'materialNumber'
           },
           {
-            title:'物料名称',
+            title:'物料名称及规格型号',
             align:"center",
             scopedSlots: { customRender: 'materialDescription' },
             dataIndex: 'materialDescription'
           },
-          {
-            title:'型号',
-            align:"center",
-            scopedSlots: { customRender: 'type' },
-            dataIndex: 'type'
-          },
-          {
-            title:'规格',
-            align:"center",
-            scopedSlots: { customRender: 'specification' },
-            dataIndex: 'specification'
-          },
+          // {
+          //   title:'型号',
+          //   align:"center",
+          //   scopedSlots: { customRender: 'type' },
+          //   dataIndex: 'type'
+          // },
+          // {
+          //   title:'规格',
+          //   align:"center",
+          //   scopedSlots: { customRender: 'specification' },
+          //   dataIndex: 'specification'
+          // },
           {
             title:'计量单位',
             align:"center",
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 142bba5..dc6a73b 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -189,7 +189,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -212,7 +212,7 @@
           {
             title:'物料组',
             align:"center",
-            dataIndex: 'descriptionName'
+            dataIndex: 'materialClassify'
           },
           {
             title:'物料号',
@@ -229,13 +229,13 @@
             title:'库存位置',
             align:"center",
             scopedSlots: { customRender: 'materialStorageId' },
-            dataIndex: 'materialStorageId'
-          },
-          {
-            title:'库存仓位',
-            align:"center",
-            dataIndex: 'freightSpace'
+            dataIndex: 'departName'
           },
+          // {
+          //   title:'库存仓位',
+          //   align:"center",
+          //   dataIndex: 'freightSpace'
+          // },
           {
             title:'计量单位',
             align:"center",