diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
index 90f3e59..b45333a 100644
--- a/src/components/jeecg/HPlan.vue
+++ b/src/components/jeecg/HPlan.vue
@@ -157,7 +157,7 @@
             let data={}
             data.id=res.result.id;
             dataList.push(data)
-            this.$emit('mounted', dataList)
+            this.$emit('PlanIds', dataList)
           }
           if (res.code === 510) {
             this.$message.warning(res.message)
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 95c0b6f..82ab6fb 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -489,7 +489,7 @@
           );
           return;
         }
-        console.log("isView>>>>>>>>>>>>",isView)
+        // console.log("isView>>>>>>>>>>>>",isView)
         isView = isView||false;
         this.lcModa.disabled = isView;
         this.lcModa.hieg = isView;
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index f9c17b1..9bfadfa 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -34,7 +34,7 @@
             <a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
               <h-plan v-decorator="['processUdgetPlanId']" :trigger-change="true"
-                      code="demo" field="name"  orgFields="name" @mounted="getPlanList" @callType="getcallType"
+                      code="demo" field="name"  orgFields="name" @mounted="getPlanList" @PlanIds="getPlanIds" @callType="getcallType"
                       destFields="name"  />
               <!--              <j-popup-->
               <!--                v-decorator="['one']"-->
@@ -585,6 +585,39 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
         })
       }
     },
+    getPlanIds(val){
+      let ids=[]
+      if (!!val){
+        for (let i = 0; i < val.length; i++) {
+          ids.push(val[i].id);
+        }
+      }
+      this.processUdgetPlanIds=ids.join(",");
+      this.processMaterialWarehousingListTable.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 }];
+          }
+        })
+
+      })
+
+    },
     validateError(msg) {
       this.$message.error(msg)
     },
@@ -599,7 +632,7 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
       this.processUdgetPlanIds=ids.join(",");
       let params = {}
       params.ids = JSON.stringify(ids)
-     await this.requestSubTableDatas(this.url.list, params, this.processMaterialWarehousingListTable)
+     await this.requestSubTableData(this.url.list, params, this.processMaterialWarehousingListTable)
       // getAction(this.url.list,params).then((res)=>{
       //   if(res.success){
       //     console.log('将要回填的数据',res.result)
@@ -608,7 +641,12 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
     },
     /** 查询某个tab的数据 */
     requestSubTableDatas(url, params, tab, success) {
-      tab.loading = true
+      // tab.loading = true;
+      if(this.disabled && !this.task ){
+        console.log("执行了不重新查",tab.dataSource);
+
+
+      }else{
         getAction(url, params).then(res => {
           let { result } = res
           let dataSource = []
@@ -619,7 +657,6 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
               dataSource = result.records
             }
           }
-
           // console.log("tab.dataSource",tab.dataSource)
           dataSource.forEach(item =>{
             let par = { id : item.materialGroup,}
@@ -645,11 +682,13 @@ import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
 
           })
           tab.dataSource = dataSource;
+          // console.log("tab.dataSource",tab.dataSource)
           typeof success === 'function' ? success(res) : ''
         }).finally(() => {
           tab.loading = false
         })
 
+      }
       },
     getcallType(type) {
       this.data.materialType = type.materialType
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 4351219..3ae43f6 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -147,7 +147,8 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="processId" slot-scope="text, record">
-          <j-ellipsis :value="text" :length="10"/>
+<!--          <j-ellipsis :value="text" :length="10"/>-->
+          <a href="javascript:void(0);" @click="jumpLink(text,record)" >{{text}}111</a>
         </span>
         <span slot="supplierName" slot-scope="text, record">
           <j-ellipsis :value="text" :length="5"/>
@@ -198,7 +199,12 @@
 
       </a-table>
     </div>
-
+    <!--流程表单-->
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%">
+      <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
+                 :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
+                 @close="lcModa.visible=false,lcModa.disabled = false"></component>
+    </a-modal>
     <process-supplies-stronger-modal ref="modalForm" @ok="modalFormOk"></process-supplies-stronger-modal>
   </a-card>
 </template>
@@ -208,6 +214,7 @@
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
   import ProcessSuppliesStrongerModal from './modules/ProcessSuppliesStrongerModal'
   import JDate from '@/components/jeecg/JDate.vue'
   import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
@@ -217,7 +224,7 @@
 
   export default {
     name: 'ProcessSuppliesStrongerLists',
-    mixins:[JeecgListMixin, mixinDevice],
+    mixins:[JeecgListMixin, mixinDevice,activitiMixin],
     components: {
       JDate,
       JSearchSelectTag,
@@ -226,6 +233,13 @@
     },
     data () {
       return {
+        lcModa: {
+          title: '',
+          disabled: false,
+          visible: false,
+          formComponent: null,
+          isNew: false
+        },
         productLicenseDate:[],
         inboundLicenseDate:[],
         queryParam: {
@@ -258,7 +272,7 @@
             title:'流程表单号',
             align:"center",
             scopedSlots: { customRender: 'processId' },
-            dataIndex: 'processId',
+            dataIndex: 'warehousingBatch',
           },
           {
             title:'供应商',
@@ -379,6 +393,7 @@
           }
         ],
         url: {
+          listUrl: "/actBusiness/listData",
           list: "/suppliesstronger/processSuppliesStronger/lists",
           delete: "/suppliesstronger/processSuppliesStronger/delete",
           deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
@@ -415,6 +430,50 @@
       },
     },
     methods: {
+      jumpLink(text,record){
+        console.log("跳转了",text,record)
+        let params = {
+          tableId: record.processMaterialWarehousingId,
+          logType:1
+        }
+        this.loading = true;
+        getAction(this.url.listUrl, params).then((res) => {
+          if (res.success) {
+            // console.log(res.result.records);
+            this.edit(res.result.records[0],true);
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+
+      },
+      edit(r,isView) {
+        // if (!r.routeName) {
+        //   this.$message.warning(
+        //     "该流程信息未配置表单，请联系开发人员！"
+        //   );
+        //   return;
+        // }
+        // console.log("isView>>>>>>>>>>>>",isView)
+        console.log("r>>>>>>>>>>>>",r)
+        isView = isView||false;
+        this.lcModa.disabled = isView;
+        this.lcModa.hieg = isView;
+        if (isView) this.lcModa.title = '查看流程业务信息：'+r.title;
+        this.lcModa.formComponent = this.getFormComponent("@/views/activiti/form/ProcessMaterialWarehousing").component;
+        this.lcModa.processData = r;
+        this.lcModa.pictureId=r.procDefId
+        if(!r.procInstId){
+          r.procInstId='';
+        }
+        this.lcModa.procInstId=r.procInstId;
+        this.lcModa.isNew = false;
+        this.lcModa.visible = true;
+      },
+
+
       onDateChange: function (value, dateString) {
         this.productLicenseDate = value;
         this.queryParam.productDateBegin=dateString[0];
@@ -444,7 +503,7 @@
         },
           getAction(this.url.list,this.queryParam).then((res)=>{
             if(res.success){
-              console.log("res.result----------",res.result)
+              // console.log("res.result----------",res.result)
               this.dataSource=res.result.records;
             }
           });
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index a5b5d54..3ad50a4 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -276,15 +276,15 @@
       section(){
         let ue= sessionStorage.getItem('USER_INFORMATION');
         let res=JSON.parse(ue);
-        console.log("23r4qwerfasdfgzsfh",res)
+        // console.log("23r4qwerfasdfgzsfh",res)
         if(res.realname !== "管理员"){
           this.queryParam.sysOrgCode = res.departIds;
         }
       },
 
       handleDetail(record){
-        console.log("1111111111111111111111111111111111")
-        console.log(record);
+        // console.log("1111111111111111111111111111111111")
+        // console.log(record);
         this.$router.push({
           // name:'src-views-wastematerials-ProcessWasteMaterialsLists',
           // params:{
@@ -295,7 +295,7 @@
           query:{
             merchandiseNewsId: record.merchandiseNewsId,
             materialStorageId : record.departId,
-            merchandiseName : ' - '+record.materialDescription.substring(0,record.materialDescription.lastIndexOf(" "))
+            merchandiseName : ' - '+record.materialDescription.substring(0,10)
           }
         })
       },