diff --git a/src/views/activiti/Backlog.vue b/src/views/activiti/Backlog.vue
index 79b8b26..1ccb5ed 100644
--- a/src/views/activiti/Backlog.vue
+++ b/src/views/activiti/Backlog.vue
@@ -1,25 +1,29 @@
 <template>
   <div style="background-color: white" :style="conheight" >
-    <a-tabs default-active-key="1" @change="callback" style="padding:0px 10px">
-      <a-tab-pane key="1" tab="我的申请">
-        <apply-list/>
-      </a-tab-pane>
-      <a-tab-pane key="2" tab="我的待办" force-render>
-        <todo-manage/>
-      </a-tab-pane>
-    </a-tabs>
+<!--  <div style="background-color: white"  >-->
+    <Schedule/>
+<!--    <a-tabs default-active-key="1" @change="callback" style="padding:0px 10px">-->
+<!--      <a-tab-pane key="1" tab="我的申请">-->
+<!--        <apply-list/>-->
+<!--      </a-tab-pane>-->
+<!--      <a-tab-pane key="2" tab="我的待办" force-render>-->
+<!--        <todo-manage/>-->
+<!--      </a-tab-pane>-->
+<!--    </a-tabs>-->
   </div>
 </template>
 
 <script>
 import applyList from '@views/activiti/applyList'
 import todoManage from '@views/activiti/todoManage'
+import Schedule from '@views/activiti/Schedule'
 
 export default {
 name: "Backlog",
   components:{
     applyList,
-    todoManage
+    todoManage,
+    Schedule
   },
   data(){
    return{
diff --git a/src/views/activiti/Repository.vue b/src/views/activiti/Repository.vue
new file mode 100644
index 0000000..da869a2
--- /dev/null
+++ b/src/views/activiti/Repository.vue
@@ -0,0 +1,587 @@
+<template>
+    <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="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="物资类型">
+                <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
+                                   placeholder="请选择物资类型"  />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-range-picker
+                  format="YYYY-MM-DD"
+                  :value="processTime"
+                  :placeholder="['开始时间', '结束时间']"
+                  @change="processDateChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24" :hidden="showdw">
+              <a-form-item label="流程发起部门">
+                <a-select v-model="queryParam.departId" placeholder="请输入项目部"  @mouseenter="getUnit" >
+                  <a-select-option v-for="(item,index) in queryParamsUntil" :key="index" :value="item.id">{{item.departName}}</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="5" :lg="7" :md="8" :sm="24">
+              <a-form-item label="流程计划">
+                <j-dict-select-tag type="list" v-model="queryParam.processPlan" dictCode="process_plan"
+                                   placeholder="请选择计划类型"  />
+              </a-form-item>
+            </a-col>
+            <!--<a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="需求时间">
+                <j-date placeholder="请选择需求时间" v-model="queryParam.needTime"></j-date>
+              </a-form-item>
+            </a-col>-->
+            <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <span style="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="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
+          :customRow="clickThenSelect"
+          @change="handleTableChange">
+        <span slot="describes" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="20"/>
+        </span>
+          <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>
+
+
+
+          <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">
+          <ProcessUdgetPlanMaterialList :mainId="selectedRowKeys"/>
+        </a-tab-pane>
+        <a-tab-pane tab="预算计划采购流程物料已入清单表" key="2">
+          <ProcessMaterialWarehousingListList :mainId="selectedMainId" />
+        </a-tab-pane>
+        <a-tab-pane tab="预算计划采购流程物料已申请清单表" key="3">
+          <ProcessMaterialWarehousingApplyiList :mainId="selectedMainId" />
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { getAction } from '@/api/manage'
+import { filterObj } from '@/utils/util'
+import ProcessUdgetPlanMaterialList from '@/views/processmaterials/ProcessUdgetPlanMaterialList'
+import ProcessMaterialWarehousingListList from '@views/processmaterials/ProcessMaterialWarehousingListList'
+import ProcessMaterialWarehousingApplyiList from '@/views/processmaterials/ProcessMaterialWarehousingApplyiList'
+import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+import '@/assets/less/TableExpand.less'
+
+const MODAL_WIDTH = 1600
+export default {
+  name: 'Repository',
+  props: ['multi', 'code', 'groupId', 'param'],
+  components: {
+    ProcessUdgetPlanMaterialList,
+    ProcessMaterialWarehousingListList,
+    ProcessMaterialWarehousingApplyiList,
+    JSuperQuery,
+    JDictSelectTag
+  },
+  mixins: [JeecgListMixin],
+  data() {
+    return {
+      showdw: true,
+      visible: false,
+      confirmLoading: false,
+      title: '预算计划采购流程管理列表',
+      description: '预算计划采购流程管理页面',
+      queryParam: {},
+      // 表头
+      columns: [
+        {
+          title: '流程编号',
+          align: 'center',
+          dataIndex: 'warehousingBatch'
+        },
+        {
+          title: '流程提示',
+          align: 'center',
+          scopedSlots: { customRender: 'describes' },
+          dataIndex: 'describes'
+        },
+        {
+          title: '采购类型',
+          align: 'center',
+          dataIndex: 'planType_dictText'
+        },
+        {
+          title: '流程发起公司',
+          align: 'center',
+          dataIndex: 'company_dictText'
+        },
+        {
+          title: '流程发起时间',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
+        {
+          title: '流程发起部门',
+          align: 'center',
+          dataIndex: 'departId_dictText'
+        },
+        {
+          title: '流程发起人',
+          align: 'center',
+          dataIndex: 'createBy'
+        },
+        {
+          title: '物资类型',
+          align: 'center',
+          dataIndex: 'materialType_dictText'
+        },
+        {
+          title: '流程计划',
+          align: 'center',
+          dataIndex: 'processPlan_dictText'
+        },
+        {
+          title: '需求时间',
+          align: 'center',
+          dataIndex: 'needTime',
+          customRender: function(text) {
+            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
+          }
+        },
+        // {
+        //   title: '顺序号',
+        //   align: 'center',
+        //   dataIndex: 'orderNumber'
+        // }
+        /* {
+           title: '文件id',
+           align: 'center',
+           dataIndex: 'fileId',
+           scopedSlots: { customRender: 'fileSlot' }
+         }*/
+      ],
+      url: {
+        listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAll',
+        list: '/hy/processUdgetPlan/listByplan',
+        delete: '/hy/processUdgetPlan/delete',
+        deleteBatch: '/hy/processUdgetPlan/deleteBatch',
+        exportXlsUrl: '/hy/processUdgetPlan/exportXls',
+        importExcelUrl: 'hy/processUdgetPlan/importExcel'
+      },
+      dictOptions: {
+        company: [],
+        sysOrgCode: [],
+        materialType: [],
+        processPlan: []
+      },
+      /* 分页参数 */
+      ipagination:{
+        current: 1,
+        pageSize: 5,
+        pageSizeOptions: ['5', '10', '50'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      selectedMainId: '',
+      materialWarehousingListID: undefined,
+      superFieldList: [],
+      selectedRowKeys: [],
+      modalWidth: MODAL_WIDTH,
+      changeData: '',
+      getFileData: false,
+      //部门查询
+      queryParamsUntil:[],
+      //时间相关查询
+      processTime:[],
+      labelCol: {
+        xs: { span: 4 },
+        sm: { span: 4 },
+      },
+      wrapperCol: {
+        xs: { span: 20 },
+        sm: { span: 20 },
+      },
+    }
+  },
+  mounted() {
+    //this.loadColumnsInfo()
+  },
+  created() {
+    this.showDepart()
+  },
+  watch: {},
+  computed: {
+    showSearchFlag() {
+      return this.queryInfo && this.queryInfo.length > 0
+    }
+  },
+  methods: {
+
+    //是否隐藏流程发起部门查询
+    showDepart(){
+      let ue= sessionStorage.getItem('USER_INFORMATION');
+      let res=JSON.parse(ue);
+      if(res.realname == "管理员"){
+        this.showdw = false;
+      }
+    },
+
+    //流程发起时间
+    processDateChange: function (value, dateString) {
+      this.processTime = value
+      this.queryParam.processTimeBegin=dateString[0];
+      this.queryParam.processTimeEnd=dateString[1];
+      console.log(this.queryParam)
+    },
+
+    //加載項目部
+    getUnit(){
+      getAction(this.url.listByuntil).then((res) => {
+        if (res.success) {
+          this.queryParamsUntil =  res.result.records||res.result;
+          console.log(this.queryParamsUntil)
+        }
+      })
+    },
+    // initDictConfig(){
+    //   initDictOptions('sys_depart,depart_name,id').then((res) => {
+    //     if (res.success) {
+    //       this.$set(this.dictOptions, 'company', res.result)
+    //     }
+    //   })
+    //   initDictOptions('sys_depart,depart_name,id').then((res) => {
+    //     if (res.success) {
+    //       this.$set(this.dictOptions, 'sysOrgCode', res.result)
+    //     }
+    //   })
+    //   initDictOptions('').then((res) => {
+    //     if (res.success) {
+    //       this.$set(this.dictOptions, 'materialType', res.result)
+    //     }
+    //   })
+    //   initDictOptions('').then((res) => {
+    //     if (res.success) {
+    //       this.$set(this.dictOptions, 'processPlan', res.result)
+    //     }
+    //   })
+    // },
+    onClearSelected() {
+      this.selectedRowKeys = []
+      this.selectionRows = []
+      this.selectedMainId = ''
+    },
+    onSelectChange(selectedRowKeys, selectionRows) {
+      console.log("selectedRowKeys>>>>>>>>>>>>>>>",selectedRowKeys)
+      console.log("selectionRows>>>>>>>>>>>>>>>>>>>",selectionRows)
+      this.selectedMainId = selectedRowKeys[0]
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectionRows
+    },
+    loadData(arg) {
+      if(!this.url.list){
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.onClearSelected()
+      var params = this.getQueryParams();//查询条件
+      let ue= sessionStorage.getItem('USER_INFORMATION');
+      let res=JSON.parse(ue);
+      if(res.realname !== "管理员"){
+        if(!!res.departIds){
+          params.departId = res.departIds ;
+        }else{
+          return ;
+        }
+      }
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        console.log("ere",res);
+        if (res.success) {
+          this.dataSource = res.result.records;
+          this.ipagination.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.getFileData) {
+        this.$emit('close')
+        this.visible = false
+        return
+      }*/
+      console.log('>>>>>>>>>>>>>>>>>>>>>>>>>',this.changeData)
+      // if (!this.multi) {
+      //   if (this.selectionRows && this.selectionRows.length > 1) {
+      //     this.$message.warning('请选择一条记录')
+      //     return false
+      //   }
+      // }
+      if (!this.selectionRows || this.selectionRows.length == 0) {
+        if (this.getFileData){
+          this.$emit('close')
+          this.visible = false
+          return
+        }
+        this.$message.warning('请选择一条记录')
+        return false
+      }
+      this.$emit('ok', this.selectionRows)
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      //this.onClearSelected()
+    },
+    show(val) {
+      this.visible = true
+      if (val) {
+        this.getFileData = true
+        let data = []
+        data.push(val.ids[0])
+        this.changeData = data
+        // this.loadPlan(1)
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    searchByquery() {
+      //this.loadData(1);
+    },
+    onlyReload() {
+      //this.loadData();
+    },
+    searchReset() {
+      this.processTime=[]
+      Object.keys(this.queryParam).forEach(key => {
+        this.queryParam[key] = ''
+      })
+      this.loadData(1);
+    },
+    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) {
+      let obj = {}
+      Object.keys(dictOptions).map(k => {
+        obj[k] = dictOptions[k].filter(item => {
+          return item != null
+        })
+      })
+      this.dictOptions = obj
+    }
+
+  }
+}
+</script>
+
+<style scoped>
+@import '~@assets/less/common.less';
+
+/deep/.ant-modal {
+  /*overflow-y: hidden;*/
+  width: 80% !important;
+  height: 93%;
+  top:45px
+}
+/deep/.ant-modal-content{
+  height: 100%;
+  /*overflow-y: hidden;*/
+  overflow-y: scroll;
+}
+/deep/.ant-modal-body{
+  /*height: 100%;*/
+  /*overflow-y: scroll;*/
+}
+</style>
\ No newline at end of file
diff --git a/src/views/activiti/Schedule.vue b/src/views/activiti/Schedule.vue
new file mode 100644
index 0000000..79b83ca
--- /dev/null
+++ b/src/views/activiti/Schedule.vue
@@ -0,0 +1,1090 @@
+<template >
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入搜索关键词" v-model="queryParam.title"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="状态">
+              <a-select v-model="queryParam.status" placeholder="请选择" :allowClear="true" >
+                <a-select-option value="0">草稿</a-select-option>
+                <a-select-option value="1">处理中</a-select-option>
+                <a-select-option value="2">已结束</a-select-option>
+                <a-select-option value="3">已撤回</a-select-option>
+                <a-select-option value="4">已激活</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <a-form-item label="结果">-->
+<!--              <a-select v-model="queryParam.result" placeholder="请选择" :allowClear="true" >-->
+<!--                <a-select-option value="0">未提交</a-select-option>-->
+<!--                <a-select-option value="1">处理中</a-select-option>-->
+<!--                <a-select-option value="2">通过</a-select-option>-->
+<!--                <a-select-option value="3">驳回</a-select-option>-->
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :md="6" :sm="10">-->
+<!--            <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-range-picker-->
+<!--                style="width: 210px"-->
+<!--                v-model="queryParam.createTimeRange"-->
+<!--                format="YYYY-MM-DD"-->
+<!--                :placeholder="['开始时间', '结束时间']"-->
+<!--                @change="onDateChange"-->
+<!--                @ok="onDateOk"-->
+<!--              />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+            <a-col :md="6" :sm="24" >
+                <a-button type="primary"  style="left: 10px" @click="searchQuery" icon="search">查询</a-button>
+                <a-button type="primary"  @click="searchReset" icon="reload" style="margin-left: 8px;left: 10px">重置</a-button>
+            </a-col>
+          </span>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- table区域-begin -->
+    <a-table
+      bordered
+      ref="table"
+      size="middle"
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      :scroll="{x:1200,y:innerHeight/1.5}"
+      @change="handleTableChange">
+      <span slot="result" slot-scope="text, r">
+        <span v-if="r.result == 0 && r.apart == 1" style="color: #afa8a8">未提交</span>
+        <span v-else-if="r.result==1 && r.apart == 1" style="color: orange">处理中</span>
+        <span v-else-if="r.result==2 && r.apart == 1" style="color: green">已通过</span>
+        <span v-else-if="r.result==3 && r.apart == 1" style="color: red">已驳回</span>
+      </span>
+      <span slot="status" slot-scope="text, r">
+
+        <span v-if="r.status == 0 && r.apart == 1" style="color: #b8b5b5">草稿</span>
+        <span v-else-if="r.result==1 && r.apart == 1" style="color: orange">处理中</span>
+        <span v-else-if="r.status==2 && r.apart == 1" style="color: blue">已结束</span>
+        <span v-else-if="r.status==3 && r.apart == 1" style="color: magenta">已撤回</span>
+        <span v-if="!Boolean(r.isSuspended)  && r.apart == 2" style="color: green;"> 已激活 </span>
+        <span v-if="Boolean(r.isSuspended) && r.apart == 2" style="color: orange;"> 已挂起 </span>
+
+      </span>
+      <span slot="action" slot-scope="text, r">
+         <template  v-if="!Boolean(r.isSuspended)  && r.apart == 2">
+              <span v-if="!Boolean(r.isSuspended)">
+                <a href="javascript:void(0);" @click="details(r)" style="color: blue" v-has="'todoManage:toDo'">查看并处理</a>
+              </span>
+
+              <span v-if="Boolean(r.isSuspended)" style="color: #999999;" title="流程已被挂起，无法操作！">
+                查看并处理
+                <a-divider type="vertical" v-has="'todoManage:toDoOther'"/>
+                委托他人代办
+              </span>
+              <span v-else>
+                <a-divider type="vertical" v-has="'todoManage:toDoOther'"/>
+                <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9" v-has="'todoManage:toDoOther'">委托他人代办</a>
+              </span>
+            </template>
+          <template v-else-if="r.status == 0 && r.apart == 1">
+             <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
+              <a href="javascript:void(0);" style="color:#00A0E9;">提交申请</a>
+            </a-popconfirm>
+            <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="edit(r)" style="color: #000000">编辑提交数据</a>
+            <a-divider type="vertical" v-has="'applyList:delete'"/>
+            <a-popconfirm title="确定删除吗?" @confirm="() => removes(r)">
+              <a href="javascript:void(0);"  style="color: red" v-has="'applyList:delete'">删除</a>
+            </a-popconfirm>
+
+          </template>
+          <template v-else-if="r.status == 1 && r.apart == 1">
+
+            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="handelSubmitCancel(r)"  style="color:#8000ff;" v-has="'applyList:back'">撤回</a>
+            <a-divider type="vertical" v-if="r.procInstStatus == 1"/>
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:veiw'">查看进度</a>
+            <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;" v-has="'applyList:from'">表单数据</a>
+          </template>
+          <template v-else-if="(r.status == 2 && r.result == 3 && r.apart == 1) || r.status == 3 && r.apart == 1">
+            <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
+              <a href="javascript:void(0);" style="color:#00A0E9;">重新申请</a>
+            </a-popconfirm>
+            <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;" v-has="'applyList:edit'">编辑</a>
+            <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:history'">审批历史</a>
+             <a-divider type="vertical" v-has="'applyList:delete'"/>
+            <a-popconfirm title="确定删除吗?" @confirm="() => removes(r)">
+              <a href="javascript:void(0);"  style="color: red" v-has="'applyList:delete'">删除</a>
+            </a-popconfirm>
+          </template>
+          <template v-else>
+            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;" v-has="'applyList:from'">表单数据</a>
+            <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:history'">审批历史</a>
+             <a-divider type="vertical" v-has="'applyList:delete'"/>
+            <a-popconfirm title="确定删除吗?" @confirm="() => removes(r)">
+              <a href="javascript:void(0);"  style="color: red" v-has="'applyList:delete'">删除</a>
+            </a-popconfirm>
+          </template>
+
+      </span>
+      <!-- 字符串超长截取省略号显示-->
+      <span slot="logContent" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="40"/>
+        </span>
+    </a-table>
+    <!-- table区域-end -->
+    <!--流程申请选择-->
+    <a-drawer
+      title="选择流程" width="33%"
+      placement="right"
+      :closable="false"
+      @close="processModalVisible = false"
+      :visible="processModalVisible"
+    >
+      <a-empty description="无流程可供选择" v-if="activeKeyAll.length==0" />
+      <div v-else>
+        <a-input-search style="margin-bottom: 10px;width: 200px"
+                        placeholder="输入流程名称" @search="onSearchProcess" />
+        <a-collapse v-model="activeKey">
+          <a-collapse-panel v-for="(value, index)  in activeKeyAll" :header="filterDictText(dictOptions,value)||'未分类'" :key="value">
+            <a-list :grid="{ gutter: 10,column:1}" :dataSource="processDataMap[value]">
+              <a-list-item slot="renderItem" slot-scope="item">
+                <a-card>
+                  <div slot="title">
+                    <a-row>
+                      <a-col span="12" :title="item.name">{{item.name}} </a-col>
+                      <a-col span="12" style="text-align: right;">
+                        <a href="javascript:void (0)" @click="chooseProcess(item)" v-has="'applyList:apply'">发起申请</a>
+                      </a-col>
+                    </a-row>
+                  </div>
+                  <b>版本：</b>v.{{item.version}}
+                  <br/>
+                  <b>说明：</b>{{item.description}}
+                </a-card>
+              </a-list-item>
+            </a-list>
+          </a-collapse-panel>
+        </a-collapse>
+      </div>
+    </a-drawer>
+    <!--流程表单-->
+    <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"
+                 :itemId="lcModa.itemId"
+                 @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false" ></component>
+      <!--       -->
+    </a-modal>
+
+    <!--提交申请表单-->
+    <a-modal title="提交申请" v-model="loadingData" :mask-closable="false" :width="500" :footer="null">
+      <a-spin tip="Loading...">
+        <a-alert
+          message="Alert message title"
+          description="Further details about the context of this alert."
+        ></a-alert>
+      </a-spin>
+    </a-modal>
+    <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
+      <div v-if="modalLsVisible">
+        <historicDetail :procInstId="procInstId"></historicDetail>
+      </div>
+<!--      <div v-if="modalLsVisible">-->
+<!--        <component :is="historicDetail" :procInstId="procInstId"></component>-->
+<!--      </div>-->
+    </a-modal>
+    <a-modal title="确认撤回" v-model="modalCancelVisible" :mask-closable="false" :width="500">
+      <a-form ref="delForm" v-model="cancelForm" :label-width="70" v-if="modalCancelVisible">
+        <a-form-item label="撤回原因" prop="reason" v-show="false">
+          <a-input type="textarea" v-model="cancelForm.reason" :rows="4" />
+        </a-form-item>
+      </a-form>
+      <div slot="footer">
+        <a-button type="text" @click="modalCancelVisible=false">取消</a-button>
+        <a-button type="primary" :disabled="submitLoading" @click="handelSubmitCancel">提交</a-button>
+      </div>
+    </a-modal>
+
+    <!--流程表单-->
+    <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"
+                 :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType"
+                 :isSourceCapital="lcModa.isSourceCapital"
+                 :task="true" :hieg="lcModa.hieg"
+                 :routePlanName="lcModa.routePlanName"
+                 :isTable="lcModa.isTable"
+                 :itemId="lcModa.itemId"
+                 :actualNumber = "lcModa.actualNumber"
+                 :allotShuNumber = "lcModa.allotShuNumber"
+                 :allotBaoNumber = "lcModa.allotBaoNumber"
+                 :isBuyerName = "lcModa.isBuyerName"
+                 :lead = "lcModa.lead"
+                 @afterSubmit="afterSub"
+                 @passTask="()=>passTask(lcModa.processData)"
+                 @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
+                 :pictureId="lcModa.pictureId"
+                 @close="close"></component>
+    </a-modal>
+    <!-- 审批操作 -->
+    <a-modal :title="modalTaskTitle" v-model="modalTaskVisible" :mask-closable="false" width="60%" style="top: 120px">
+
+      <div v-if="modalTaskVisible">
+        <a-form ref="form" :model="form" :label-width="85" :rules="formValidate">
+          <a-form-item label="审批意见" prop="reason">
+            <j-editor v-model="form.comment"></j-editor>
+
+          </a-form-item>
+          <a-form-item label="下一审批人" prop="assignees" v-show="false" :error="error">
+            <a-select
+              v-model="form.assignees"
+              placeholder="请选择"
+              allowClear
+              mode="multiple"
+              :loading="userLoading"
+            >
+              <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{item.realname}}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+          <a-form-item label="下一审批人" v-show="isGateway">
+            <span>分支网关处暂不支持自定义选择下一审批人，将发送给下一节点所有人</span>
+          </a-form-item>
+          <div v-show="form.type==1">
+            <a-form-item label="驳回至">
+              <a-select
+                v-model="form.backTaskKey"
+                :loading="backLoading"
+                @change="changeBackTask"
+              >
+                <a-select-option v-for="(item, i) in backList" :key="i" :value="item.key">{{item.name}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+            <a-form-item label="指定原节点审批人" prop="assignees" v-show="form.backTaskKey!=-1" :error="error">
+              <a-select
+                v-model="form.assignees"
+                placeholder="请选择"
+                allowClear
+                mode="multiple"
+                :loading="userLoading"
+              >
+                <a-select-option v-for="(item, i) in assigneeList" :key="i" :value="item.username">{{item.realname}}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </div>
+          <a-form-item label="选择委托人" prop="userId" :error="error" v-show="form.type==2">
+            <JSelectUserByDep v-model="form.userId" :multi="false"></JSelectUserByDep>
+          </a-form-item>
+          <a-form-item label="消息通知">
+            <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
+          </a-form-item>
+        </a-form>
+      </div>
+      <div slot="footer">
+        <a-button type="text" @click="modalTaskVisible=false">取消</a-button>
+        <a-button type="primary" :loading="submitLoading" @click="handelSubmit">提交</a-button>
+      </div>
+    </a-modal>
+  </a-card>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { activitiMixin } from '@/views/activiti/mixins/activitiMixin'
+import { filterObj } from '@/utils/util';
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import { putAction, getAction,downFile } from '@/api/manage'
+import pick from "lodash.pick";
+import JTreeSelect from '@/components/jeecg/JTreeSelect'
+import {initDictOptions, filterDictText} from '@/components/dict/JDictSelectUtil'
+import historicDetail from '@/views/activiti/historicDetail'
+import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
+export default {
+  name: "schedule",
+  mixins:[activitiMixin,JeecgListMixin],
+  components: {
+    JEllipsis
+    ,JTreeSelect
+    ,historicDetail,
+    JSelectUserByDep
+  },
+  data () {
+    return {
+      userLoading: false,
+      backLoading: false,
+      backList: [
+        {
+          key: '-1',
+          name: '发起人'
+        }
+      ],
+      formValidate: {
+        // 表单验证规则
+      },
+      modalTaskVisible: false,
+      modalTaskTitle: '',
+      description: '我的申请',
+      conheight: 580,
+      // 查询条件
+      queryParam: {
+        ipInfo:'',
+        createTimeRange:[],
+        logType:'1',
+        keyWord:'',
+      },
+      tabKey: "1",
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          width: '80px',
+          key:'rowIndex',
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+        {
+          title: '批次号',
+          // align:"left",
+          dataIndex: 'warehousingBatch',
+          align:"center",
+          width: '250px',
+          scopedSlots: { customRender: 'logContent' },
+          sorter: true
+        },
+        {
+          title: '所属流程',
+          dataIndex: 'processName',
+          align:"center",
+          width: '250px',
+          sorter: true
+        },
+        {
+          title: '当前环节',
+          dataIndex: 'currTaskName',
+          align:"center",
+          width: '180px',
+          sorter: true
+        },
+        {
+          title: '状态',
+          dataIndex: 'status_dictText',
+          align:"center",
+          width: '120px',
+          scopedSlots: {customRender: 'status'},
+          sorter: true
+
+        },
+        {
+          title: '申请人',
+          dataIndex: 'createBy',
+          width: '120px',
+          align:"center",
+          sorter: true
+        },
+
+        {
+          title: '创建时间',
+          dataIndex: 'createTime',
+          align:"center",
+          sorter: true
+        },
+        // {
+        //   title: '操作时间',
+        //   dataIndex: 'createTime',
+        //   align:"center",
+        //   sorter: true
+        // },
+        // {
+        //   title: '提交申请时间',
+        //   dataIndex: 'applyTime',
+        //   /*customRender:function (text) {
+        //     if(text==1){
+        //       return "登录日志";
+        //     }else if(text==2){
+        //       return "操作日志";
+        //     }else{
+        //       return text;
+        //     }
+        //   },*/
+        //   align:"center",
+        // },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          scopedSlots: {customRender: 'action'},
+        }
+      ],
+      operateColumn:
+        {
+          title: '操作类型',
+          dataIndex: 'operateType_dictText',
+          align:"center",
+        },
+      labelCol: {
+        xs: { span: 1 },
+        sm: { span: 2 },
+      },
+      wrapperCol: {
+        xs: { span: 10 },
+        sm: { span: 16 },
+      },
+      searchForm: {
+        // 搜索框对应data对象
+        name: '',
+        Id: '',
+        applyer: '',
+        createTime_begin: '',
+        createTime_end: '',
+        assignee: ''
+      },
+      url: {
+        // list: "/actBusiness/listData",
+        list: "/actBusiness/backlogList",
+        getProcessDataList: "/activiti_process/listData",
+        delByIds:'/actBusiness/delByIds',
+        removes:'/actBusiness/removes',
+        getFirstNode:'/actProcessIns/getFirstNode',
+        applyBusiness:'/actBusiness/apply',
+        cancelApply:'/actBusiness/cancel',
+        pass: '/actTask/pass',
+        back: '/actTask/back',
+        backToTask: '/actTask/backToTask',
+        delegate: '/actTask/delegate',
+      },
+      processModalVisible: null,
+      activeKeyAll: [],
+      activeKey: [],
+      processDataMap: {},
+      searchProcessKey: null,
+      addApplyLoading: false,
+      tableId: '',
+      tableName: '',
+      lcModa: {
+        title:'',
+        isTable:'',
+        disabled:false,
+        visible:false,
+        formComponent : null,
+        isNew : false,
+        hieg: false,
+        procInstId:'',
+        pictureId:'',
+        itemId:'',
+      },
+      form:{
+        priority:0,
+        assignees:[],
+        sendMessage:true
+      },
+      modalVisible: false,
+      showAssign: false,
+      assigneeList: [],
+      isGateway: false,
+      dictPriority: [],
+      submitLoading: false,
+      error: "",
+      /*审批历史*/
+      modalLsVisible: false,
+      procInstId: '',
+      modalCancelVisible: false,
+      cancelForm: {},
+      loadingData: false
+    }
+  },
+  created(){
+    this.searchReset();
+  },
+  methods: {
+    changeBackTask(v) {
+      if (v == '-1') {
+        return
+      }
+      this.userLoading = true
+      let param = {}
+      param.tableName = this.tableName
+      param.tableId = this.tableId
+      param.nodeId = v
+      this.getAction(this.url.getNode, param).then(res => {
+        this.userLoading = false
+        if (res.success) {
+          if (res.result.users && res.result.users.length > 0) {
+            this.assigneeList = res.result.users
+            // 默认勾选
+            let ids = []
+            res.result.users.forEach(e => {
+              ids.push(e.username)
+            })
+            this.form.assignees = ids
+          }
+        }
+      })
+    },
+    getDataList() {
+      this.loading = true
+      this.getAction(this.url.list, this.queryParam).then(res => {
+        this.loading = false
+        if (res.success) {
+          this.data = res.result || []
+          this.total = this.data.leading
+        }
+      })
+    },
+    /*审批提交的方法*/
+    handelSubmit() {
+      if (this.form.comment == '') {
+        // console.log("zxzxzx++++++++",this.form.comment.toString().trim())
+        this.$message.error('请填写审批意见')
+        return
+      }
+      // console.log('提交')
+      // this.submitLoading = true
+      var formData = Object.assign({}, this.form)
+      formData.assignees = formData.assignees.join(',')
+      if (formData.type == 0) {
+        // 通过
+        if (this.showAssign && formData.assignees.length < 1) {
+          this.$message.error('请至少选择一个审批人')
+          this.submitLoading = false
+          return
+        } else {
+          this.error = ''
+        }
+        this.postFormAction(this.url.pass, formData).then(res => {
+          this.submitLoading = false
+
+          if (res.success) {
+            this.lcModa.visible = false
+            this.$message.success('操作成功')
+            this.modalTaskVisible = false;
+            this.form.comment=null;
+            this.getDataList()
+          } else {
+            console.log(res)
+            this.$message.error(res.message);
+            this.form.comment=null;
+            return
+          }
+        })
+      } else if (formData.type == 1) {
+        // 驳回
+        if (formData.backTaskKey == '-1') {
+          // 驳回至发起人
+          this.postFormAction(this.url.back, formData).then(res => {
+            this.submitLoading = false
+            if (res.success) {
+              this.lcModa.visible = false
+              this.$message.success('操作成功')
+              this.modalTaskVisible = false;
+              this.form.comment=null;
+              this.getDataList()
+            }
+          })
+        } else {
+          // 自定义驳回
+          if (formData.backTaskKey != '-1' && formData.assignees.length < 1) {
+            this.$message.error('请至少选择一个审批人')
+            this.submitLoading = false
+            return
+          } else {
+            this.error = ''
+          }
+          this.postFormAction(this.url.backToTask, formData).then(res => {
+            this.submitLoading = false
+            if (res.success) {
+              this.lcModa.visible = false
+              this.$message.success('操作成功')
+              this.modalTaskVisible = false;
+              this.form.comment=null;
+              this.getDataList()
+            }
+          })
+        }
+      } else if (formData.type == 2) {
+        // 委托
+        if (!formData.userId) {
+          this.$message.error('请选择一委托人')
+          this.submitLoading = false
+          return
+        } else {
+          this.error = ''
+        }
+        this.postFormAction(this.url.delegate, formData).then(res => {
+          this.submitLoading = false
+          if (res.success) {
+            this.$message.success('操作成功')
+            this.modalTaskVisible = false;
+            this.form.comment=null;
+            this.getDataList()
+          }
+        })
+      }
+
+      this.form.userId=null;
+    },
+    close(){
+      this.lcModa.visible=false,
+        this.lcModa.disabled = false
+    },
+    passTask(v) {
+      // console.log(v.procInstId, '33333333333333333')
+      this.lcModa.isBuyerName = false;
+      this.lcModa.lead = false;
+      this.modalTaskTitle = '审批通过'
+      this.form.id = v.id
+      this.form.procInstId = v.procInstId
+      this.form.priority = v.priority
+      this.form.type = 0
+      this.modalTaskVisible = true
+      this.userLoading = true;
+    },
+    backTask(v) {
+      this.modalTaskTitle = '审批驳回'
+      this.form.id = v.id
+      this.form.procInstId = v.procInstId
+      this.form.procDefId = v.procDefId
+      this.form.priority = v.priority
+      this.form.type = 1
+      this.showAssign = false
+      this.modalTaskVisible = true
+      // 获取可驳回节点
+      this.backList = [
+        {
+          key: '-1',
+          name: '发起人'
+        }
+      ]
+      this.form.backTaskKey = '-1'
+      this.backLoading = true
+      this.getAction(this.url.getBackList + v.procInstId).then(res => {
+        this.backLoading = false
+        if (res.success) {
+          res.result.forEach(e => {
+            this.backList.push(e)
+          })
+        }
+      })
+    },
+
+    async details(r) {
+      console.log("rrrr==================rrrrrrr",r)
+      if(r.name === '项目部经理' && r.processName === '物资出库流程' || r.name === '所属项目部经理' && r.processName === '物资出库流程'){
+        // console.log("项目部经理 出库流程 ===")
+        this.lcModa.actualNumber = false;
+      }else{
+        this.lcModa.actualNumber = true;
+      }
+
+      if(r.name === '生产供应站' && r.processName === '物资调拨流程'){
+        // console.log("生产供应站 物资调拨流程 =======")
+        this.lcModa.allotShuNumber = false;
+      }else{
+        // console.log("生产供应站 物资调拨流程 1111111111111")
+        this.lcModa.allotShuNumber = true;
+      }
+      if(r.processName === '物资报废流程'){
+
+        const str = r.name.replace(/\s*/g, '')
+        if(str === '项目部'|| str === '项目部主管科室'){
+          // console.log("项目部经理 出库流程 ===")
+          this.lcModa.allotBaoNumber = false;
+        }else{
+          this.lcModa.allotBaoNumber = true;
+        }
+      }
+
+
+      if (!r.routeName) {
+        this.$message.warning(
+          '该流程信息未配置表单，请联系开发人员！'
+        )
+        return
+      }
+      this.lcModa.disabled = true
+      this.tableName = r.tableName
+      this.tableId = r.tableId
+      this.lcModa.itemId=r.tableId
+      //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
+      if (r.processName === '预算计划采购流程') {
+        let userInfo = sessionStorage.getItem('USER_INFORMATION')
+        let res = JSON.parse(userInfo)
+
+
+        if(r.name === '主管领导'){
+          // console.log('-==========执行；11',r);
+          this.lcModa.lead = true;
+        }
+        let param = {}
+        // param.id = r.procDefId
+        param.id = r.procInstId
+        param.tableName = r.tableName
+        param.tableId = r.tableId
+        param.username = res.username
+        // let res2 =await this.getAction('/hy/processMaterialsAllot/getOne', param)
+        // if (res2.success) {
+        //   if (res2.result) {
+        //       this.lcModa.isPlanType = true;
+        //       this.lcModa.isSourceCapital = true;
+        //       this.lcModa.disabled = false;
+        //   }
+        // }
+        // let res1=await this.getAction('/hy/processMaterialsAllot/getLast', param)
+        // if (res1.success) {
+        //   if (res1.result) {
+        //     if (param.username==res1.result.username){
+        //       this.lcModa.isPlanType = true;
+        //       this.lcModa.isSourceCapital = true;
+        //       this.lcModa.disabled = false;
+        //     }
+        //   }
+        // }
+        //获取当前节点审批名称审批人username
+        let res3 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
+        if (res3.success) {
+          // console.log("-=-=44444444",res3.result);
+          if (res3.result) {
+            if(r.name === '计划经营科'){
+              // console.log('-==========执行；11',r);
+              if(!!res3.result.signboard){
+                this.lcModa.isBuyerName = true;
+              }
+            }else{
+              this.lcModa.isBuyerName = false;
+            }
+            this.lcModa.routePlanName = res3.result.name
+            this.lcModa.isPlanType = false
+            this.lcModa.isSourceCapital = false
+            this.lcModa.disabled = true
+            this.lcModa.hieg = true
+            if (param.username == res3.result.relateId) {
+              if (res3.result.name == '生产供应站' || res3.result.name == '物装公司' || res3.result.name == '采购员') {
+                this.lcModa.isPlanType = true
+                this.lcModa.isSourceCapital = true
+                this.lcModa.disabled = false
+                this.lcModa.hieg = false
+                this.lcModa.routePlanName = res3.result.name
+              }
+            }
+          }
+        }
+      }
+
+      if (r.processName === '物资入库流程') {
+        let userInfo = sessionStorage.getItem('USER_INFORMATION')
+        let res = JSON.parse(userInfo)
+        let param = {}
+        param.id = r.procInstId
+        param.tableName = r.tableName
+        param.tableId = r.tableId
+        param.username = res.username
+        let res1 = await this.getAction('/hy/processMaterialsAllot/getCurrent', param)
+        if (res1.success) {
+          if (res1.result) {
+            this.lcModa.isPlanType = false
+            this.lcModa.isSourceCapital = false
+            this.lcModa.disabled = true
+            if (param.username == res1.result.relateId) {
+              if (res1.result.name == '采购员') {
+                this.lcModa.isPlanType = true
+                this.lcModa.isSourceCapital = true
+                this.lcModa.disabled = false
+              }
+            }
+
+          }
+        }
+      }
+      this.lcModa.title = '查看流程业务信息：' + r.processName
+      this.lcModa.formComponent = this.getFormComponent(r.routeName).component
+      this.lcModa.processData = r
+      this.lcModa.isNew = false
+      this.lcModa.task = true
+      this.lcModa.procInstId = r.procInstId
+      this.lcModa.visible = true
+      this.lcModa.isTable=true;
+    },
+
+    //委托他人待办
+    delegateTask(v) {
+      this.modalTaskTitle = '委托他人代办'
+      this.form.id = v.id
+      this.form.procInstId = v.procInstId
+      this.form.type = 2
+      this.showAssign = false
+      this.modalTaskVisible = true
+    },
+    initDictConfig() {
+      //初始化字典 - 流程分类
+      initDictOptions('bpm_process_type').then((res) => {
+        if (res.success) {
+          this.dictOptions = res.result;
+        }
+      });
+    },
+    getQueryParams(){
+      var param = Object.assign({}, this.queryParam,this.isorter);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      delete param.createTimeRange; // 时间参数不传递后台
+      if (this.superQueryParams) {
+        param['superQueryParams'] = encodeURI(this.superQueryParams)
+        param['superQueryMatchType'] = this.superQueryMatchType
+      }
+      return filterObj(param);
+    },
+
+    // 重置
+    searchReset(){
+      var that = this;
+      var logType = that.queryParam.logType;
+      that.queryParam = {}; //清空查询区域参数
+      that.queryParam.logType = logType;
+      that.loadData(this.ipagination.current);
+    },
+    // 日志类型
+    callback(key){
+
+      // 动态添加操作类型列
+      if (key == 2) {
+        this.tabKey = '2';
+        this.columns.splice(7, 0, this.operateColumn);
+      }else if(this.columns.length == 9)
+      {
+        this.tabKey = '1';
+        this.columns.splice(7,1);
+      }
+
+      let that=this;
+      that.queryParam.logType=key;
+      that.loadData();
+    },
+    onDateChange: function (value, dateString) {
+      console.log(dateString[0],dateString[1]);
+      this.queryParam.createTime_begin=dateString[0];
+      this.queryParam.createTime_end=dateString[1];
+    },
+    onDateOk(value) {
+      console.log(value);
+    },
+    apply(v) {
+      this.loading=true
+      if (!v.procDefId || v.procDefId == "null") {
+        this.$message.error("流程定义为空");
+        return;
+      }
+      this.form.id = v.id;
+      this.form.procDefId = v.procDefId;
+      this.form.title = v.title;
+      // 加载审批人
+      this.getAction(this.url.getFirstNode,{procDefId:v.procDefId,tableId:v.tableId,tableName:v.tableName}).then(res => {
+        if (res.success) {
+          if (res.result.type == 3 || res.result.type == 4) {
+            this.isGateway = true;
+            this.modalVisible = true;
+            this.form.firstGateway = true;
+            this.showAssign = false;
+            this.error = "";
+            this.applySubmit();
+            return;
+          }
+          this.form.firstGateway = false;
+          this.isGateway = false;
+          if (res.result.users && res.result.users.length > 0) {
+            this.error = "";
+            this.assigneeList = res.result.users;
+            // 默认勾选
+            let ids = [];
+            res.result.users.forEach(e => {
+              ids.push(e.username);
+            });
+            this.form.assignees = ids;
+            this.showAssign = true;
+
+          } else {
+            this.form.assignees = [];
+            this.showAssign = true;
+            this.error = '审批节点未分配候选审批人员，请联系管理员！';
+          }
+          if (this.error){
+            this.$message.error(this.error)
+            return;
+          }
+          //this.modalVisible = true;
+          this.applySubmit();
+        }else {
+          this.$message.error(res.message)
+        }
+      });
+
+    },
+    applySubmit() {
+      if (this.showAssign && this.form.assignees.length < 1) {
+        this.error = "请至少选择一个审批人";
+        this.$message.error(this.error)
+        return;
+      } else {
+        this.error = "";
+      }
+      this.submitLoading = true;
+      var params = Object.assign({},this.form);
+      params.assignees = params.assignees.join(",")
+      this.postFormAction(this.url.applyBusiness,params).then(res => {
+        if (res.success) {
+          this.loading=false
+          this.$message.success("操作成功");
+          this.loadData();
+          this.modalVisible = false;
+        }else {
+          this.$message.error(res.message)
+        }
+      }).finally(()=>this.submitLoading = false);
+    },
+    edit(r,isView) {
+      if (!r.routeName) {
+        this.$message.warning(
+          "该流程信息未配置表单，请联系开发人员！"
+        );
+        return;
+      }
+      // console.log("isView>>>>>>>>>>>>",isView)
+      isView = isView||false;
+      this.lcModa.disabled = isView;
+      this.lcModa.hieg = isView;
+      this.lcModa.itemId=r.tableId
+      this.lcModa.title = '修改流程业务信息：'+r.title;
+      if (isView) this.lcModa.title = '查看流程业务信息：'+r.title;
+      this.lcModa.formComponent = this.getFormComponent(r.routeName).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;
+    },
+    remove(r) {
+      this.postFormAction(this.url.delByIds,{ids:r.id}).then((res)=>{
+        if (res.success){
+          this.$message.success(res.message)
+          this.loadData();
+        }else {
+          this.$message.error(res.message)
+        }
+      })
+    },
+    removes(r) {
+      console.log(r)
+      putAction(this.url.removes,r).then((res)=>{
+        if (res.success){
+          this.$message.success(res.message)
+          this.loadData();
+        }else {
+          this.$message.error(res.message)
+        }
+      })
+    },
+    cancel(v) {
+      this.cancelForm.id = v.id;
+      this.cancelForm.procInstId = v.procInstId;
+      this.modalCancelVisible = true;
+    },
+    handelSubmitCancel(v) {
+      // this.loading=true;
+      this.$confirm({
+        title: '撤回',
+        content: `您确定要撤回吗？`,
+        centered: true,
+        onOk: () => {
+          this.cancelForm.id = v.id;
+          this.cancelForm.procInstId = v.procInstId;
+          this.submitLoading = true;
+          this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
+            if (res.success) {
+              this.loading=false
+              this.$message.success("操作成功");
+              this.loadData();
+              this.modalCancelVisible = false;
+            }else {
+              this.$message.error(res.message);
+            }
+          }).finally(()=>this.submitLoading = false);
+        }
+      })
+
+    },
+    history(v) {
+      if (!v.procInstId) {
+        this.$message.error("流程实例ID不存在");
+        return;
+      }
+      this.procInstId = v.procInstId;
+      this.modalLsVisible = true;
+    },
+    detail(v) {
+      this.edit(v,true);
+    },
+    chooseProcess(v) {
+      if (!v.routeName) {
+        this.$message.warning(
+          "该流程信息未配置表单，请联系开发人员！"
+        );
+        return;
+      }
+      this.lcModa.formComponent = this.getFormComponent(v.routeName).component;
+      this.lcModa.title = '发起流程：'+v.name;
+      this.lcModa.isNew = true;
+      this.lcModa.processData = v;
+      this.lcModa.visible = true;
+      console.log("发起",v)
+    },
+    afterSub(formData){
+      this.lcModa.visible = false;
+      this.$message.success("操作成功！请前往我的申请列表提交审批！")
+    },
+    reloadData(){
+      this.loadData();
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+
+/deep/.ant-modal {
+  overflow-y: hidden;
+}
+/deep/.ant-modal-content{
+  height: 100%;
+  overflow-y: scroll;
+}
+/deep/.ant-modal-body{
+  height: 100%;
+  /*overflow-y: scroll;*/
+}
+/deep/.ant-modal{
+  top:45px
+}
+</style>
\ No newline at end of file