diff --git a/src/components/jeecg/HDelivery.vue b/src/components/jeecg/HDelivery.vue
new file mode 100644
index 0000000..6f8d156
--- /dev/null
+++ b/src/components/jeecg/HDelivery.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="components-input-demo-presuffix" v-if="avalid">
+    <!---->
+    <a-input @click="openModal" :placeholder="placeholder" v-model="showText" readOnly :disabled="disabled">
+      <a-icon slot="prefix" type="cluster" :title="title"/>
+      <a-icon v-if="showText" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+    </a-input>
+
+    <process-delivery
+      ref="ProcessDelivery"
+      :code="code"
+      :multi="multi"
+      :groupId="uniqGroupId"
+      :param="param"
+      @ok="callBack"
+    />
+
+  </div>
+</template>
+
+<script>
+  import ProcessDelivery from './modal/ProcessDelivery'
+
+  export default {
+    name: 'HDelivery',
+    components: {
+      ProcessDelivery
+    },
+    props: {
+      code: {
+        type: String,
+        default: '',
+        required: false
+      },
+      field: {
+        type: String,
+        default: '',
+        required: false
+      },
+      orgFields: {
+        type: String,
+        default: '',
+        required: false
+      },
+      destFields: {
+        type: String,
+        default: '',
+        required: false
+      },
+      width: {
+        type: Number,
+        default: 1200,
+        required: false
+      },
+      placeholder: {
+        type: String,
+        default: '请选择',
+        required: false
+      },
+      value: {
+        type: String,
+        required: false
+      },
+      triggerChange: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      disabled: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      multi: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      //popup动态参数 支持系统变量语法
+      param:{
+        type: Object,
+        required: false,
+        default: ()=>{}
+      },
+      /** 分组ID，用于将多个popup的请求合并到一起，不传不分组 */
+      groupId: String
+
+    },
+    data() {
+      return {
+        showText: '',
+        title: '',
+        avalid: true
+      }
+    },
+    computed: {
+      uniqGroupId() {
+        if (this.groupId) {
+          console.log(this.groupId)
+          let { groupId, code, field, orgFields, destFields } = this
+          return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
+        }
+      }
+    },
+    watch: {
+      value: {
+        immediate: true,
+        handler: function(val) {
+          if (!val) {
+            this.showText = ''
+          } else {
+            this.showText = val
+          }
+        }
+      }
+    },
+    created() {
+    },
+    mounted() {
+      if (!this.orgFields || !this.destFields || !this.code) {
+        this.$message.error('popup参数未正确配置!')
+        this.avalid = false
+      }
+      if (this.destFields.split(',').length != this.orgFields.split(',').length) {
+        this.$message.error('popup参数未正确配置,原始值和目标值数量不一致!')
+        this.avalid = false
+      }
+    },
+    methods: {
+      openModal() {
+        if (this.disabled === false) {
+          this.$refs.ProcessDelivery.show();
+        }
+      },
+      handleEmpty() {
+        this.showText = ''
+        let destFieldsArr = this.destFields.split(',')
+        if (destFieldsArr.length === 0) {
+          return
+        }
+        let res = {}
+        for (let i = 0; i < destFieldsArr.length; i++) {
+          res[destFieldsArr[i]] = ''
+        }
+        if (this.triggerChange) {
+          this.$emit('callback', res)
+        } else {
+          this.$emit('input', '', res)
+        }
+      },
+      callBack(rows) {
+        console.log(rows[0].id)
+        // update--begin--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
+        let orgFieldsArr = this.orgFields.split(',')
+        let destFieldsArr = this.destFields.split(',')
+        let resetText = false
+        if (this.field && this.field.length > 0) {
+          this.showText = ''
+          resetText = true
+        }
+
+        let res = {}
+        if (orgFieldsArr.length > 0) {
+          for (let i = 0; i < orgFieldsArr.length; i++) {
+            let tempDestArr = []
+            for(let rw of rows){
+              let val = rw[orgFieldsArr[i]]
+              if(!val){
+                val = ""
+              }
+              tempDestArr.push(val)
+            }
+            res[destFieldsArr[i]] = tempDestArr.join(",")
+          }
+          if (resetText === true) {
+            let tempText = []
+            for(let rw of rows){
+              let val = rw[orgFieldsArr[destFieldsArr.indexOf(this.field)]]
+              if(!val){
+                val = ""
+              }
+              tempText.push(val)
+            }
+            this.showText = tempText.join(",")
+          }
+          this.showText =rows[0].id
+          // update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
+        }
+        if (this.triggerChange) {
+          //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue
+          this.$emit('callback', rows[0].id)
+          console.log(1)
+        } else {
+          //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
+          // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
+          this.$emit('input', this.showText, rows[0].id)
+          console.log(rows[0].id)
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .components-input-demo-presuffix .anticon-close-circle {
+    cursor: pointer;
+    color: #ccc;
+    transition: color 0.3s;
+    font-size: 12px;
+  }
+
+  .components-input-demo-presuffix .anticon-close-circle:hover {
+    color: #f5222d;
+  }
+
+  .components-input-demo-presuffix .anticon-close-circle:active {
+    color: #666;
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
index 7db7016..33a8d34 100644
--- a/src/components/jeecg/HPlan.vue
+++ b/src/components/jeecg/HPlan.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="components-input-demo-presuffix" v-if="avalid">
     <!---->
-    <a-input @click="openModal" :placeholder="placeholder" v-model="showText" readOnly :disabled="disabled">
+    <a-input @click="openModal" :placeholder="placeholder" v-model="showText" >
       <a-icon slot="prefix" type="cluster" :title="title"/>
       <a-icon v-if="showText" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
     </a-input>
@@ -96,7 +96,7 @@
     computed: {
       uniqGroupId() {
         if (this.groupId) {
-          console.log(this.groupId)
+          console.log('*-*-*-*-*->',this.groupId)
           let { groupId, code, field, orgFields, destFields } = this
           return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
         }
diff --git a/src/components/jeecg/HReturn.vue b/src/components/jeecg/HReturn.vue
new file mode 100644
index 0000000..700f160
--- /dev/null
+++ b/src/components/jeecg/HReturn.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="components-input-demo-presuffix" v-if="avalid">
+    <!---->
+    <a-input @click="openModal" :placeholder="placeholder" v-model="showText" readOnly :disabled="disabled">
+      <a-icon slot="prefix" type="cluster" :title="title"/>
+      <a-icon v-if="showText" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+    </a-input>
+
+    <process-return
+      ref="ProcessReturn"
+      :code="code"
+      :multi="multi"
+      :groupId="uniqGroupId"
+      :param="param"
+      @ok="callBack"
+    />
+
+  </div>
+</template>
+
+<script>
+  import ProcessReturn from './modal/ProcessReturn'
+
+  export default {
+    name: 'HReturn',
+    components: {
+      ProcessReturn
+    },
+    props: {
+      code: {
+        type: String,
+        default: '',
+        required: false
+      },
+      field: {
+        type: String,
+        default: '',
+        required: false
+      },
+      orgFields: {
+        type: String,
+        default: '',
+        required: false
+      },
+      destFields: {
+        type: String,
+        default: '',
+        required: false
+      },
+      width: {
+        type: Number,
+        default: 1200,
+        required: false
+      },
+      placeholder: {
+        type: String,
+        default: '请选择',
+        required: false
+      },
+      value: {
+        type: String,
+        required: false
+      },
+      triggerChange: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      disabled: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      multi: {
+        type: Boolean,
+        required: false,
+        default: false
+      },
+      //popup动态参数 支持系统变量语法
+      param:{
+        type: Object,
+        required: false,
+        default: ()=>{}
+      },
+      /** 分组ID，用于将多个popup的请求合并到一起，不传不分组 */
+      groupId: String
+
+    },
+    data() {
+      return {
+        showText: '',
+        title: '',
+        avalid: true
+      }
+    },
+    computed: {
+      uniqGroupId() {
+        if (this.groupId) {
+          console.log(this.groupId)
+          let { groupId, code, field, orgFields, destFields } = this
+          return `${groupId}_${code}_${field}_${orgFields}_${destFields}`
+        }
+      }
+    },
+    watch: {
+      value: {
+        immediate: true,
+        handler: function(val) {
+          if (!val) {
+            this.showText = ''
+          } else {
+            this.showText = val
+          }
+        }
+      }
+    },
+    created() {
+    },
+    mounted() {
+      if (!this.orgFields || !this.destFields || !this.code) {
+        this.$message.error('popup参数未正确配置!')
+        this.avalid = false
+      }
+      if (this.destFields.split(',').length != this.orgFields.split(',').length) {
+        this.$message.error('popup参数未正确配置,原始值和目标值数量不一致!')
+        this.avalid = false
+      }
+    },
+    methods: {
+      openModal() {
+        if (this.disabled === false) {
+          this.$refs.ProcessReturn.show();
+        }
+      },
+      handleEmpty() {
+        this.showText = ''
+        let destFieldsArr = this.destFields.split(',')
+        if (destFieldsArr.length === 0) {
+          return
+        }
+        let res = {}
+        for (let i = 0; i < destFieldsArr.length; i++) {
+          res[destFieldsArr[i]] = ''
+        }
+        if (this.triggerChange) {
+          this.$emit('callback', res)
+        } else {
+          this.$emit('input', '', res)
+        }
+      },
+      callBack(rows) {
+        console.log(rows[0].id)
+        // update--begin--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
+        let orgFieldsArr = this.orgFields.split(',')
+        let destFieldsArr = this.destFields.split(',')
+        let resetText = false
+        if (this.field && this.field.length > 0) {
+          this.showText = ''
+          resetText = true
+        }
+
+        let res = {}
+        if (orgFieldsArr.length > 0) {
+          for (let i = 0; i < orgFieldsArr.length; i++) {
+            let tempDestArr = []
+            for(let rw of rows){
+              let val = rw[orgFieldsArr[i]]
+              if(!val){
+                val = ""
+              }
+              tempDestArr.push(val)
+            }
+            res[destFieldsArr[i]] = tempDestArr.join(",")
+          }
+          if (resetText === true) {
+            let tempText = []
+            for(let rw of rows){
+              let val = rw[orgFieldsArr[destFieldsArr.indexOf(this.field)]]
+              if(!val){
+                val = ""
+              }
+              tempText.push(val)
+            }
+            this.showText = tempText.join(",")
+          }
+          this.showText =rows[0].id
+          // update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
+        }
+        if (this.triggerChange) {
+          //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue
+          this.$emit('callback', rows[0].id)
+          console.log(1)
+        } else {
+          //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
+          // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
+          this.$emit('input', this.showText, rows[0].id)
+          console.log(rows[0].id)
+        }
+      }
+    }
+  }
+</script>
+<style scoped>
+  .components-input-demo-presuffix .anticon-close-circle {
+    cursor: pointer;
+    color: #ccc;
+    transition: color 0.3s;
+    font-size: 12px;
+  }
+
+  .components-input-demo-presuffix .anticon-close-circle:hover {
+    color: #f5222d;
+  }
+
+  .components-input-demo-presuffix .anticon-close-circle:active {
+    color: #666;
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/jeecg/index.js b/src/components/jeecg/index.js
index 357af97..3d1416f 100644
--- a/src/components/jeecg/index.js
+++ b/src/components/jeecg/index.js
@@ -3,6 +3,8 @@ import JFormContainer from './JFormContainer.vue'
 import JPopup from './JPopup.vue'
 import HPlan from './HPlan'
 import HBorrowing from './HBorrowing'
+import HDelivery from './HDelivery'
+import HReturn from './HReturn'
 import JMarkdownEditor from './JMarkdownEditor'
 import JCodeEditor from './JCodeEditor.vue'
 import JEditor from './JEditor.vue'
@@ -52,6 +54,8 @@ export default {
     Vue.component('JPopup', JPopup)
     Vue.component('HPlan', HPlan)
     Vue.component('HBorrowing', HBorrowing)
+    Vue.component('HDelivery', HDelivery)
+    Vue.component('HReturn', HReturn)
     Vue.component('JSelectMultiple', JSelectMultiple)
     Vue.component('JSlider', JSlider)
     Vue.component('JSuperQuery', JSuperQuery)
diff --git a/src/components/jeecg/modal/ProcessBorrowing.vue b/src/components/jeecg/modal/ProcessBorrowing.vue
index 0400660..2c31b88 100644
--- a/src/components/jeecg/modal/ProcessBorrowing.vue
+++ b/src/components/jeecg/modal/ProcessBorrowing.vue
@@ -133,7 +133,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getAction } from '@/api/manage'
   import {filterObj} from '@/utils/util'
-  import ProcessUdgetPlanMaterialList from '../../../views/processmaterials/ProcessUdgetPlanMaterialList'
+  import ProcessMaterialBorrowingListList from '../../../views/processmaterials/ProcessMaterialBorrowingListList'
   import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
   import '@/assets/less/TableExpand.less'
@@ -142,7 +142,7 @@
     name: 'ProcessPlan',
     props: ['multi', 'code', 'groupId', 'param'],
     components:{
-      ProcessUdgetPlanMaterialList,
+      ProcessMaterialBorrowingListList,
       JSuperQuery,
       JDictSelectTag
     },
@@ -151,8 +151,8 @@
       return {
         visible:false,
         confirmLoading:false,
-        title:'预算计划采购流程管理列表',
-        description: '预算计划采购流程管理页面',
+        title:'物资借用流程管理列表',
+        description: '物资借用流程管理页面',
         queryParam:{
 
         },
@@ -192,14 +192,6 @@
             align:"center",
             dataIndex: 'fileId',
             scopedSlots: {customRender: 'fileSlot'}
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' },
           }
         ],
         url: {
diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
new file mode 100644
index 0000000..2bcb9d8
--- /dev/null
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -0,0 +1,444 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    wrapClassName="j-popup-modal"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="物资类型">
+                <a-input placeholder="请输入物资类型" v-model="queryParam.materialType"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
+
+      <!--&lt;!&ndash; 操作按钮区域 &ndash;&gt;
+      <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('预算计划采购流程')">导出</a-button>
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-upload>
+        &lt;!&ndash; 高级查询区域 &ndash;&gt;
+        <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      </div>-->
+
+      <!-- table区域-begin -->
+      <div>
+        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ this.selectedRowKeys.length }}</a>项
+          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+        </div>
+
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          class="j-table-force-nowrap"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="pagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+          :customRow="clickThenSelect"
+          @change="handleTableChange">
+
+          <template slot="htmlSlot" slot-scope="text">
+            <div v-html="text"></div>
+          </template>
+          <template slot="imgSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+            <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          </template>
+          <template slot="fileSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+            <a-button
+              v-else
+              :ghost="true"
+              type="primary"
+              icon="download"
+              size="small"
+              @click="downloadFile(text)">
+              下载
+            </a-button>
+          </template>
+
+          <!--        <template slot="fileOn" slot-scope="text">-->
+          <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
+          <!--          <a-button-->
+          <!--            v-else-->
+          <!--            :ghost="true"-->
+          <!--            type="primary"-->
+          <!--            size="small"-->
+          <!--            @click="onlineFile(text)">-->
+          <!--            预览-->
+          <!--          </a-button>-->
+          <!--        </template>-->
+
+          <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        </a-table>
+      </div>
+
+      <a-tabs defaultActiveKey="1">
+        <a-tab-pane tab="物资出库流程出库清单" key="1" >
+          <ProcessMaterialsDeliveryListList :mainId="selectedMainId" />
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+
+  </j-modal>
+</template>
+
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
+  import {filterObj} from '@/utils/util'
+  import ProcessMaterialsDeliveryListList from '../../../views/processmaterials/ProcessMaterialsDeliveryListList'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import '@/assets/less/TableExpand.less'
+  const MODAL_WIDTH = 1200;
+  export default {
+    name: 'ProcessDelivery',
+    props: ['multi', 'code', 'groupId', 'param'],
+    components:{
+      ProcessMaterialsDeliveryListList,
+      JSuperQuery,
+      JDictSelectTag
+    },
+    mixins:[JeecgListMixin],
+    data(){
+      return {
+        visible:false,
+        confirmLoading:false,
+        title:'物资出库流程管理列表',
+        description: '物资出库流程管理页面',
+        queryParam:{
+
+        },
+        columns: [
+          {
+            title:'流程发起公司',
+            align:"center",
+            dataIndex: 'company_dictText',
+          },
+          {
+            title:'流程发起时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'流程发起部门',
+            align:"center",
+            dataIndex: 'sysOrgCode_dictText',
+          },
+          {
+            title:'流程发起人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'物资类型',
+            align:"center",
+            dataIndex: 'materialType_dictText',
+          },
+          {
+            title:'出库时间',
+            align:"center",
+            dataIndex: 'deliveryTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'文件id',
+            align:"center",
+            dataIndex: 'fileId',
+            scopedSlots: {customRender: 'fileSlot'}
+          }
+        ],
+        url: {
+          list: "/hy/processMaterialsDelivery/list",
+          delete: "/hy/processMaterialsDelivery/delete",
+          deleteBatch: "/hy/processMaterialsDelivery/deleteBatch",
+          exportXlsUrl: "/hy/processMaterialsDelivery/exportXls",
+          importExcelUrl: "hy/processMaterialsDelivery/importExcel",
+        },
+        dictOptions:{
+          company:[],
+          sysOrgCode:[],
+          materialType:[],
+          processPlan:[],
+        },
+        /* 分页参数 */
+        pagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5', '10', '50'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        selectedMainId:'',
+        superFieldList:[],
+        selectedRowKeys:[],
+        modalWidth:MODAL_WIDTH,
+      }
+    },
+    mounted() {
+      //this.loadColumnsInfo()
+    },
+    /*watch: {
+      code() {
+        this.loadData();
+      },
+      param:{
+        deep:true,
+        handler(){
+          alert(1)
+          this.loadData();
+
+        },
+      }
+    },*/
+    computed:{
+      showSearchFlag(){
+        return this.queryInfo && this.queryInfo.length>0
+      }
+    },
+    methods:{
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.selectedMainId=''
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedMainId=selectedRowKeys[0]
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      loadPlan(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.pagination.current = 1;
+        }
+        this.onClearSelected()
+        var params = this.queryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records;
+            this.pagination.total = res.result.total;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+      clickThenSelect(record) {
+        return {
+          on: {
+            click: () => {
+              this.onSelectChange(record.id.split(","), [record]);
+            }
+          }
+        }
+      },
+      queryParams() {
+        let paramTarget = {}
+        if(this.dynamicParam){
+          //处理自定义参数
+          Object.keys(this.dynamicParam).map(key=>{
+            paramTarget['self_'+key] = this.dynamicParam[key]
+          })
+        }
+        let param = Object.assign(paramTarget, this.queryParam, this.sorter);
+        param.pageNo = this.pagination.current;
+        param.pageSize = this.pagination.pageSize;
+        return filterObj(param);
+      },
+      handleChangeInTableSelect(selectedRowKeys, selectionRows) {
+        //update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
+        if(!selectedRowKeys || selectedRowKeys.length==0){
+          this.table.selectionRows = []
+        }else if(selectedRowKeys.length == selectionRows.length){
+          this.table.selectionRows = selectionRows
+        }else{
+          //当两者长度不一的时候 需要判断
+          let keys = this.table.selectedRowKeys
+          let rows = this.table.selectionRows;
+          //这个循环 添加新的记录
+          for(let i=0;i<selectionRows.length;i++){
+            let combineKey = this.combineRowKey(selectionRows[i])
+            if(keys.indexOf(combineKey)<0){
+              //如果 原来的key 不包含当前记录 push
+              rows.push(selectionRows[i])
+            }
+          }
+          //这个循环 移除取消选中的数据
+          this.table.selectionRows = rows.filter(item=>{
+            let combineKey = this.combineRowKey(item)
+            return selectedRowKeys.indexOf(combineKey)>=0
+          })
+        }
+        //update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
+        this.table.selectedRowKeys = selectedRowKeys
+      },
+      handleChangeInTable(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        if (Object.keys(sorter).length > 0) {
+          this.sorter.column = sorter.field
+          this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+        }
+        this.table.pagination = pagination
+        //this.loadData()
+      },
+      handleCancel() {
+        this.close()
+      },
+      handleSubmit() {
+        if(!this.multi){
+          if(this.selectionRows && this.selectionRows.length>1){
+            this.$message.warning("请选择一条记录")
+            return false
+          }
+        }
+        if(!this.selectionRows || this.selectionRows.length==0){
+          this.$message.warning("请选择一条记录")
+          return false
+        }
+        console.log(this.selectionRows)
+        this.$emit('ok', this.selectionRows);
+        this.close()
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        //this.onClearSelected()
+      },
+      show(){
+        this.visible = true
+        this.loadPlan(1);
+      },
+      handleToggleSearch(){
+        this.toggleSearchStatus = !this.toggleSearchStatus;
+      },
+      searchByquery(){
+        //this.loadData(1);
+      },
+      onlyReload(){
+        //this.loadData();
+      },
+      searchReset(){
+        Object.keys(this.queryParam).forEach(key=>{
+          this.queryParam[key]=""
+        })
+        //this.loadData(1);
+      },
+     /* onClearSelected(){
+        this.table.selectedRowKeys = []
+        this.table.selectionRows = []
+      },*/
+      combineRowKey(record){
+        let res = ''
+        Object.keys(record).forEach(key=>{
+          res+=record[key]
+        })
+        if(res.length>50){
+          res = res.substring(0,50)
+        }
+        return res
+      },
+
+      clickThenCheck(record){
+        return {
+          on: {
+            click: () => {
+              let rowKey = this.combineRowKey(record)
+              if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){
+                let arr1=[],arr2=[]
+                arr1.push(record)
+                arr2.push(rowKey)
+                this.table.selectedRowKeys=arr2
+                this.table.selectionRows=arr1
+              }else{
+                if(this.table.selectedRowKeys.indexOf(rowKey)<0){
+                  this.table.selectedRowKeys.push(rowKey)
+                  this.table.selectionRows.push(record)
+                }else{
+                  let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
+                  this.table.selectedRowKeys.splice(rowKey_index,1);
+                  this.table.selectionRows.splice(rowKey_index,1);
+                }
+              }
+            }
+          }
+        }
+      },
+      //防止字典中有垃圾数据
+      initDictOptionData(dictOptions){
+        alert(1)
+        let obj = { }
+        Object.keys(dictOptions).map(k=>{
+          obj[k] = dictOptions[k].filter(item=>{
+            return item!=null
+          });
+        });
+        this.dictOptions  = obj
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/jeecg/modal/ProcessReturn.vue b/src/components/jeecg/modal/ProcessReturn.vue
new file mode 100644
index 0000000..2dfed4e
--- /dev/null
+++ b/src/components/jeecg/modal/ProcessReturn.vue
@@ -0,0 +1,441 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="modalWidth"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    wrapClassName="j-popup-modal"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="物资类型">
+                <a-input placeholder="请输入物资类型" v-model="queryParam.materialType"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
+
+      <!--&lt;!&ndash; 操作按钮区域 &ndash;&gt;
+      <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('预算计划采购流程')">导出</a-button>
+        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-button type="primary" icon="import">导入</a-button>
+        </a-upload>
+        &lt;!&ndash; 高级查询区域 &ndash;&gt;
+        <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      </div>-->
+
+      <!-- table区域-begin -->
+      <div>
+        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ this.selectedRowKeys.length }}</a>项
+          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+        </div>
+
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          class="j-table-force-nowrap"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="pagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+          :customRow="clickThenSelect"
+          @change="handleTableChange">
+
+          <template slot="htmlSlot" slot-scope="text">
+            <div v-html="text"></div>
+          </template>
+          <template slot="imgSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+            <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+          </template>
+          <template slot="fileSlot" slot-scope="text">
+            <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+            <a-button
+              v-else
+              :ghost="true"
+              type="primary"
+              icon="download"
+              size="small"
+              @click="downloadFile(text)">
+              下载
+            </a-button>
+          </template>
+
+          <!--        <template slot="fileOn" slot-scope="text">-->
+          <!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
+          <!--          <a-button-->
+          <!--            v-else-->
+          <!--            :ghost="true"-->
+          <!--            type="primary"-->
+          <!--            size="small"-->
+          <!--            @click="onlineFile(text)">-->
+          <!--            预览-->
+          <!--          </a-button>-->
+          <!--        </template>-->
+
+          <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        </a-table>
+      </div>
+
+      <a-tabs defaultActiveKey="1">
+        <a-tab-pane tab="物资归还流程归还清单" key="1" >
+          <ProcessMaterialsReturnListList :mainId="selectedMainId" />
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+
+  </j-modal>
+</template>
+
+<script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { getAction } from '@/api/manage'
+  import {filterObj} from '@/utils/util'
+  import ProcessMaterialsReturnListList from '../../../views/processmaterials/ProcessMaterialsReturnListList'
+  import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+  import '@/assets/less/TableExpand.less'
+  const MODAL_WIDTH = 1200;
+  export default {
+    name: 'ProcessReturn',
+    props: ['multi', 'code', 'groupId', 'param'],
+    components:{
+      ProcessMaterialsReturnListList,
+      JSuperQuery,
+      JDictSelectTag
+    },
+    mixins:[JeecgListMixin],
+    data(){
+      return {
+        visible:false,
+        confirmLoading:false,
+        title:'物资归还流程管理列表',
+        description: '物资归还流程管理页面',
+        queryParam:{
+
+        },
+        columns: [
+          {
+            title:'流程发起公司',
+            align:"center",
+            dataIndex: 'company_dictText',
+          },
+          {
+            title:'流程发起时间',
+            align:"center",
+            dataIndex: 'createTime'
+          },
+          {
+            title:'流程发起部门',
+            align:"center",
+            dataIndex: 'sysOrgCode_dictText',
+          },
+          {
+            title:'流程发起人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'物资类型',
+            align:"center",
+            dataIndex: 'materialType_dictText',
+          },
+          {
+            title:'关联借用流程',
+            align:"center",
+            dataIndex: 'processBorrowId_dictText',
+          },
+          {
+            title:'文件id',
+            align:"center",
+            dataIndex: 'fileId',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
+        ],
+        url: {
+          list: "/hy/processMaterialsReturn/list",
+          delete: "/hy/processMaterialsReturn/delete",
+          deleteBatch: "/hy/processMaterialsReturn/deleteBatch",
+          exportXlsUrl: "/hy/processMaterialsReturn/exportXls",
+          importExcelUrl: "hy/processMaterialsReturn/importExcel",
+        },
+        dictOptions:{
+          company:[],
+          sysOrgCode:[],
+          materialType:[],
+          processPlan:[],
+        },
+        /* 分页参数 */
+        pagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5', '10', '50'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        selectedMainId:'',
+        superFieldList:[],
+        selectedRowKeys:[],
+        modalWidth:MODAL_WIDTH,
+      }
+    },
+    mounted() {
+      //this.loadColumnsInfo()
+    },
+    /*watch: {
+      code() {
+        this.loadData();
+      },
+      param:{
+        deep:true,
+        handler(){
+          alert(1)
+          this.loadData();
+
+        },
+      }
+    },*/
+    computed:{
+      showSearchFlag(){
+        return this.queryInfo && this.queryInfo.length>0
+      }
+    },
+    methods:{
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.selectedMainId=''
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        this.selectedMainId=selectedRowKeys[0]
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      loadPlan(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.pagination.current = 1;
+        }
+        this.onClearSelected()
+        var params = this.queryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records;
+            this.pagination.total = res.result.total;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+      clickThenSelect(record) {
+        return {
+          on: {
+            click: () => {
+              this.onSelectChange(record.id.split(","), [record]);
+            }
+          }
+        }
+      },
+      queryParams() {
+        let paramTarget = {}
+        if(this.dynamicParam){
+          //处理自定义参数
+          Object.keys(this.dynamicParam).map(key=>{
+            paramTarget['self_'+key] = this.dynamicParam[key]
+          })
+        }
+        let param = Object.assign(paramTarget, this.queryParam, this.sorter);
+        param.pageNo = this.pagination.current;
+        param.pageSize = this.pagination.pageSize;
+        return filterObj(param);
+      },
+      handleChangeInTableSelect(selectedRowKeys, selectionRows) {
+        //update-begin-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
+        if(!selectedRowKeys || selectedRowKeys.length==0){
+          this.table.selectionRows = []
+        }else if(selectedRowKeys.length == selectionRows.length){
+          this.table.selectionRows = selectionRows
+        }else{
+          //当两者长度不一的时候 需要判断
+          let keys = this.table.selectedRowKeys
+          let rows = this.table.selectionRows;
+          //这个循环 添加新的记录
+          for(let i=0;i<selectionRows.length;i++){
+            let combineKey = this.combineRowKey(selectionRows[i])
+            if(keys.indexOf(combineKey)<0){
+              //如果 原来的key 不包含当前记录 push
+              rows.push(selectionRows[i])
+            }
+          }
+          //这个循环 移除取消选中的数据
+          this.table.selectionRows = rows.filter(item=>{
+            let combineKey = this.combineRowKey(item)
+            return selectedRowKeys.indexOf(combineKey)>=0
+          })
+        }
+        //update-end-author:taoyan date:2020902 for:【issue】开源online的几个问题 LOWCOD-844
+        this.table.selectedRowKeys = selectedRowKeys
+      },
+      handleChangeInTable(pagination, filters, sorter) {
+        //分页、排序、筛选变化时触发
+        if (Object.keys(sorter).length > 0) {
+          this.sorter.column = sorter.field
+          this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+        }
+        this.table.pagination = pagination
+        //this.loadData()
+      },
+      handleCancel() {
+        this.close()
+      },
+      handleSubmit() {
+        if(!this.multi){
+          if(this.selectionRows && this.selectionRows.length>1){
+            this.$message.warning("请选择一条记录")
+            return false
+          }
+        }
+        if(!this.selectionRows || this.selectionRows.length==0){
+          this.$message.warning("请选择一条记录")
+          return false
+        }
+        console.log(this.selectionRows)
+        this.$emit('ok', this.selectionRows);
+        this.close()
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        //this.onClearSelected()
+      },
+      show(){
+        this.visible = true
+        this.loadPlan(1);
+      },
+      handleToggleSearch(){
+        this.toggleSearchStatus = !this.toggleSearchStatus;
+      },
+      searchByquery(){
+        //this.loadData(1);
+      },
+      onlyReload(){
+        //this.loadData();
+      },
+      searchReset(){
+        Object.keys(this.queryParam).forEach(key=>{
+          this.queryParam[key]=""
+        })
+        //this.loadData(1);
+      },
+     /* onClearSelected(){
+        this.table.selectedRowKeys = []
+        this.table.selectionRows = []
+      },*/
+      combineRowKey(record){
+        let res = ''
+        Object.keys(record).forEach(key=>{
+          res+=record[key]
+        })
+        if(res.length>50){
+          res = res.substring(0,50)
+        }
+        return res
+      },
+
+      clickThenCheck(record){
+        return {
+          on: {
+            click: () => {
+              let rowKey = this.combineRowKey(record)
+              if(!this.table.selectedRowKeys || this.table.selectedRowKeys.length==0){
+                let arr1=[],arr2=[]
+                arr1.push(record)
+                arr2.push(rowKey)
+                this.table.selectedRowKeys=arr2
+                this.table.selectionRows=arr1
+              }else{
+                if(this.table.selectedRowKeys.indexOf(rowKey)<0){
+                  this.table.selectedRowKeys.push(rowKey)
+                  this.table.selectionRows.push(record)
+                }else{
+                  let rowKey_index = this.table.selectedRowKeys.indexOf(rowKey)
+                  this.table.selectedRowKeys.splice(rowKey_index,1);
+                  this.table.selectionRows.splice(rowKey_index,1);
+                }
+              }
+            }
+          }
+        }
+      },
+      //防止字典中有垃圾数据
+      initDictOptionData(dictOptions){
+        alert(1)
+        let obj = { }
+        Object.keys(dictOptions).map(k=>{
+          obj[k] = dictOptions[k].filter(item=>{
+            return item!=null
+          });
+        });
+        this.dictOptions  = obj
+      }
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/layouts/RouteView.vue b/src/components/layouts/RouteView.vue
index 63f4e66..4f7cd82 100644
--- a/src/components/layouts/RouteView.vue
+++ b/src/components/layouts/RouteView.vue
@@ -35,6 +35,7 @@
       },
       //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       keepAlive () {
+        this.$route.meta.keepAlive=true;
         return this.$route.meta.keepAlive
       }
     },
diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index bbf66e7..3713d25 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -331,7 +336,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
+        let fieldval = pick(this.data,'id','updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 47198ce..9cb98aa 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -4,7 +4,6 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -28,7 +27,8 @@
           <a-col :span="8" >
             <a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
-              <h-plan v-decorator="['processUdgetPlanId']" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
+              <h-plan v-decorator="['processUdgetPlanId']" code="demo" field="processUdgetPlanId" orgFields="processUdgetPlanId" destFields="processUdgetPlanId" :multi="true"/>
+
             </a-form-item>
           </a-col>
           <a-col :span="8" >
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 09957cc..fcd9041 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -374,7 +379,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index f9bb169..198509e 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -381,7 +386,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
index 4bb51a4..114503c 100644
--- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -374,7 +379,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 0a6f704..b04b7b0 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -31,7 +36,7 @@
           </a-col>
           <a-col :span="8" >
             <a-form-item label="关联出库流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['processOutflowId']" dict=""  />
+              <h-delivery v-decorator="['processOutflowId']" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8" >
@@ -372,7 +377,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index 4c5cba4..ce3087b 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -4,6 +4,11 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
+          <a-col :span="8" v-show="false">
+            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
           <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
@@ -31,7 +36,7 @@
           </a-col>
           <a-col :span="8" >
             <a-form-item label="关联归还流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-search-select-tag v-decorator="['processReturnId']" dict=""  />
+              <h-return v-decorator="['processReturnId']" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
             </a-form-item>
           </a-col>
           <a-col :span="8" >
@@ -367,7 +372,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
+        let fieldval = pick(this.data,'id','company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 5adb18a..fb458cf 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -422,7 +422,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.data, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
+        let fieldval = pick(this.data, 'id','company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
diff --git a/src/views/processmaterials/ProcessMaterialBorrowingListList.vue b/src/views/processmaterials/ProcessMaterialBorrowingListList.vue
index 6b786d0..f14efb4 100644
--- a/src/views/processmaterials/ProcessMaterialBorrowingListList.vue
+++ b/src/views/processmaterials/ProcessMaterialBorrowingListList.vue
@@ -103,7 +103,7 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['processMaterialBorrowingId'] = val
+            this.queryParam['id'] = val
             this.loadData(1);
           }
         }
@@ -209,7 +209,7 @@
           }
         ],
         url: {
-          list: "/hy/processMaterialBorrowing/listProcessMaterialBorrowingListByMainId",
+          list: "/hy/processMaterialBorrowing/queryProcessMaterialBorrowingListByMainId",
           delete: "/hy/processMaterialBorrowing/deleteProcessMaterialBorrowingList",
           deleteBatch: "/hy/processMaterialBorrowing/deleteBatchProcessMaterialBorrowingList",
           exportXlsUrl: "/hy/processMaterialBorrowing/exportProcessMaterialBorrowingList",
diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
index d98036a..3a4af62 100644
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@@ -103,7 +103,7 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['processMaterialsDeliveryId'] = val
+            this.queryParam['id'] = val
             this.loadData(1);
           }
         }
@@ -198,7 +198,7 @@
           }
         ],
         url: {
-          list: "/hy/processMaterialsDelivery/listProcessMaterialsDeliveryListByMainId",
+          list: "/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId",
           delete: "/hy/processMaterialsDelivery/deleteProcessMaterialsDeliveryList",
           deleteBatch: "/hy/processMaterialsDelivery/deleteBatchProcessMaterialsDeliveryList",
           exportXlsUrl: "/hy/processMaterialsDelivery/exportProcessMaterialsDeliveryList",
diff --git a/src/views/processmaterials/ProcessMaterialsReturnListList.vue b/src/views/processmaterials/ProcessMaterialsReturnListList.vue
index 953da31..c9eafc7 100644
--- a/src/views/processmaterials/ProcessMaterialsReturnListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsReturnListList.vue
@@ -103,7 +103,7 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['processMaterialsReturnId'] = val
+            this.queryParam['id'] = val
             this.loadData(1);
           }
         }
@@ -206,7 +206,7 @@
           }
         ],
         url: {
-          list: "/hy/processMaterialsReturn/listProcessMaterialsReturnListByMainId",
+          list: "/hy/processMaterialsReturn/queryProcessMaterialsReturnListByMainId",
           delete: "/hy/processMaterialsReturn/deleteProcessMaterialsReturnList",
           deleteBatch: "/hy/processMaterialsReturn/deleteBatchProcessMaterialsReturnList",
           exportXlsUrl: "/hy/processMaterialsReturn/exportProcessMaterialsReturnList",