diff --git a/src/views/activiti/form/ProcessUdgetPlan.vue b/src/views/activiti/form/ProcessUdgetPlan.vue
index ad2ba71..79cfd99 100644
--- a/src/views/activiti/form/ProcessUdgetPlan.vue
+++ b/src/views/activiti/form/ProcessUdgetPlan.vue
@@ -1,8 +1,6 @@
 <template>
   <a-card :bordered="true">
 
-    <a-tabs style="text-align: center"   @change="changeTables">
-      <a-tab-pane tab="电商采购" key="1" v-if="onlineDisabled" forceRender>
         <a-tabs style="text-align: center">
           <a-tab-pane tab="流程正文" key="1" forceRender>
             <process-udget-plan-form :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/>
@@ -15,24 +13,6 @@
             <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
           </a-tab-pane>
         </a-tabs>
-      </a-tab-pane>
-
-      <a-tab-pane tab="非电商采购" key="2" v-if="noDisabled" forceRender>
-        <a-tabs style="text-align: center">
-          <a-tab-pane tab="流程正文" key="1" forceRender>
-            <process-udget-plan-form :dianshang="planType" :isNew="isNew" :processData="processData" :disabled="disabled" @planType="showType" @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData"/>
-          </a-tab-pane>
-
-          <a-tab-pane tab="流程节点图" key="2" forceRender>
-            <historic-pictrue :pictureId="pictureId" :procInstId="procInstId" />
-          </a-tab-pane>
-          <a-tab-pane tab="审批历史" key="3" forceRender>
-            <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
-          </a-tab-pane>
-        </a-tabs>
-      </a-tab-pane>
-
-    </a-tabs>
 
    <!-- <a-tabs style="text-align: center">
       <a-tab-pane tab="流程正文" key="1" forceRender>
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 93ae1f9..6b4f462 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -10,11 +10,6 @@
               <a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :span="8" v-show="false">
-            <a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['planType']" 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']" disabled/>
@@ -59,20 +54,31 @@
           <a-col :span="8">
             <a-form-item label="序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number v-decorator="['sort',validatorRules.sort]" placeholder="请输入序号"
-                              style="width: 100%" />
+                              style="width: 100%"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" v-show="isPlanType">
+            <a-form-item label="采购类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['planType']"
+                                 :trigger-change="true" dictCode="plan_type"
+                                 placeholder="请选择采购类型电商或非电商"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" v-show="isSourceCapital">
+            <a-form-item label="资金来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag type="list" v-decorator="['sourceCapital']"
+                                 :trigger-change="true" dictCode="source_capital"
+                                 placeholder="请选择资金来源"/>
             </a-form-item>
           </a-col>
+
+
           <a-col :span="8">
             <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
-          <!--<a-col :span="24"  >
-            <a-form-item label="流程说明" >
-              <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
-              &lt;!&ndash;<a-input type="textarea" v-decorator="[ 'opinion' ]" :rows="4" />&ndash;&gt;
-            </a-form-item>
-          </a-col>-->
+
         </a-row>
       </a-form>
     </j-form-container>
@@ -92,21 +98,9 @@
           :isabled="isabled"
           :rowSelection="true"
           :actionButton="true"
-          @shifu = "shifu"
+          @shifu="shifu"
           @descriptionFetch="fetchMerchandiseNews"
         >
-          <!--          @selectRowChange="selectRowChange"-->
-          <!--          <template v-slot:group="props">-->
-          <!--            <a-auto-complete-->
-          <!--              v-decorator="[`materialGroup`]"-->
-          <!--              :data-source="bigIdRake"-->
-          <!--              placeholder="请选择"-->
-          <!--              @search="onSearchRake"-->
-          <!--              @select="onSelectRake(props,$event)"-->
-
-          <!--            />-->
-          <!--          </template>-->
-
           <template v-slot:action="props">
             <a-tooltip placement="top">
               <template v-slot:title="props">
@@ -121,40 +115,6 @@
 
     </a-tabs>
 
-    <!--    <a-table :columns="columns" :data-source="data" bordered>-->
-    <!--      <template-->
-    <!--        v-for="col in ['name', 'age', 'address']"-->
-    <!--        :slot="col"-->
-    <!--        slot-scope="text, record, index"-->
-    <!--      >-->
-    <!--        <div :key="col">-->
-    <!--          <a-input-->
-    <!--            v-if="record.editable"-->
-    <!--            style="margin: -5px 0"-->
-    <!--            :value="text"-->
-    <!--            @change="e => handleChange(e.target.value, record.key, col)"-->
-    <!--          />-->
-    <!--          <template v-else>-->
-    <!--            {{ text }}-->
-    <!--          </template>-->
-    <!--        </div>-->
-    <!--      </template>-->
-    <!--      <template slot="operation" slot-scope="text, record, index">-->
-    <!--        <div class="editable-row-operations">-->
-    <!--        <span v-if="record.editable">-->
-    <!--          <a @click="() => save(record.key)">Save</a>-->
-    <!--          <a-popconfirm title="Sure to cancel?" @confirm="() => cancel(record.key)">-->
-    <!--            <a>Cancel</a>-->
-    <!--          </a-popconfirm>-->
-    <!--        </span>-->
-    <!--          <span v-else>-->
-    <!--          <a :disabled="editingKey !== ''" @click="() => edit(record.key)">Edit</a>-->
-    <!--        </span>-->
-    <!--        </div>-->
-    <!--      </template>-->
-    <!--    </a-table>-->
-
-
     <j-form-container>
       <a-form :form="form">
         <a-row>
@@ -177,7 +137,7 @@
       </a-form-item>
       <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
         <a-button type="primary" @click="passTask">通过</a-button>
-<!--                <a-button type="primary"  @click="ewrold">下载</a-button>-->
+        <!--                <a-button type="primary"  @click="ewrold">下载</a-button>-->
         <a-button style="margin-left: 8px" @click="backTask">驳回</a-button>
       </a-form-item>
     </div>
@@ -259,6 +219,8 @@
         // columns,
         // editingKey: '',
         isabled: true,
+        isPlanType: false,
+        isSourceCapital: false,
         bigId: [],
         opinion: '',
         bigIdRake: [],
@@ -540,15 +502,16 @@
           materialType: { rules: [{ required: true, message: '请选择物资类型!' }] },
           needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
           processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
-          sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个字符)'},
-                          // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
-                          // {validator: this.lengthCheck}
-                        ]
+          sort: {
+            rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个字符)' }
+              // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
+              // {validator: this.lengthCheck}
+            ]
           }
         },
         isBu: undefined,
         planType: '',
-        isShifu:false
+        isShifu: false
       }
     },
     props: {
@@ -622,7 +585,7 @@
         immediate: true,
         handler: function(val) {
           this.planType = val
-          console.log("this.planType---",this.planType)
+          console.log('this.planType---', this.planType)
         }
       }
     },
@@ -636,7 +599,7 @@
       // userInfo.company=company;
       if (!this.isNew) {
         this.init()
-      }else {
+      } else {
         this.popupCallback(company, userInfo)
       }
       // this.descriptionFetchDatas();
@@ -647,18 +610,18 @@
       // this.form.setFieldsValue("materialGroup",123123);
     },
     methods: {
-      lengthCheck(rule, value, callback){
-        if (value.toString().length >= 12 ){
+      lengthCheck(rule, value, callback) {
+        if (value.toString().length >= 12) {
           // console.log("长度太长了");
-          callback("长度应当在0 ~ 12 字符")
+          callback('长度应当在0 ~ 12 字符')
         }
       },
       selectRowChange(a, b, c) {
         // console.log("执行了",a,b,c);
       },
-      shifu(){
-        console.log("执行了");
-        this.isShifu = true;
+      shifu() {
+        console.log('执行了')
+        this.isShifu = true
       },
 
       // handleChange(value, key, column) {
@@ -707,7 +670,7 @@
           this.hiegs = false
           // this.fetchData();
           // this.fetchDataRake()
-          this.fetchMerchandiseNews();
+          this.fetchMerchandiseNews()
         }
       },
       //物料组选择触发
@@ -804,8 +767,8 @@
         }
 
       },
-       //table 值改变触发
-      async onSelect   (record)  {
+      //table 值改变触发
+      async onSelect(record) {
 
         let isEr = true
         // if (!!record.row.materialGroup) {
@@ -837,22 +800,22 @@
         // }
         // console.log("5555出发了",record.row);
         // if ( !!record.row.materialNumber && isEr) {
-        let b = false;
-        if(this.isShifu){
+        let b = false
+        if (this.isShifu) {
           // console.log("0出发了",record);
           for (const res of this.bigIdMerchandiseNewsList) {
-            if(res.id === record.row.materialNumber ){
-              b = true;
+            if (res.id === record.row.materialNumber) {
+              b = true
             }
           }
-          if(!b){
+          if (!b) {
             // console.log("进来了111");
-            await this.fetchMerchandiseNews(null,record.row.materialNumber );
+            await this.fetchMerchandiseNews(null, record.row.materialNumber)
           }
         }
-        this.isShifu = false;
-        if(record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity'){
-          if ( !!record.row.materialNumber && this.isBu !== record.row.materialNumber ) {
+        this.isShifu = false
+        if (record.column.key !== 'materialPrice' && record.column.key !== 'materialQuantity') {
+          if (!!record.row.materialNumber && this.isBu !== record.row.materialNumber) {
             // console.log("2出发了");
             let materialName = {}
             this.bigIdMerchandiseNewsList.forEach(item => {
@@ -868,7 +831,7 @@
               }
             })
 
-            if (!!record.row.id && Object.keys(materialName).length > 0 ) {
+            if (!!record.row.id && Object.keys(materialName).length > 0) {
               await this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
                 // console.log("bbbbbbbbbbbbbb",b)
                 b.forEach(item => {
@@ -890,14 +853,13 @@
                     ]
                     // console.log("sadf1111")
                     this.$refs.processUdgetPlanMaterial.setValues(values)
-                    return ;
+                    return
 
                   }
                 })
 
               })
 
-
               this.processUdgetPlanMaterialTable.columns[0].options.push({
                 title: materialName.materialClassify,
                 value: materialName.descriptionId
@@ -917,15 +879,13 @@
                 }
               ]
               this.$refs.processUdgetPlanMaterial.setValues(values)
-              this.isBu = record.row.materialNumber;
+              this.isBu = record.row.materialNumber
               isEr = false
             }
           }
         }
 
-
-
-        if (!!record.row.materialQuantity && !!record.row.materialPrice &&  isEr ) {
+        if (!!record.row.materialQuantity && !!record.row.materialPrice && isEr) {
           // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
           // console.log("3出发了");
           //如果单价大于5万
@@ -955,13 +915,13 @@
         }
 
       },
-      fetchMerchandiseNews(value,id) { //查询物料清单信息
-        return new Promise((resolve, reject)=>{
+      fetchMerchandiseNews(value, id) { //查询物料清单信息
+        return new Promise((resolve, reject) => {
           //查询大品类数据
           let par = {
             delFlag: 0,
             descriptionId: value,
-            id:id
+            id: id
           }
           this.bigIdMerchandiseNews = []
           this.bigIdMerchandiseNewsList = []
@@ -970,14 +930,14 @@
           if (this.processUdgetPlanMaterialTable.columns[1].options.length > 0) {
             this.processUdgetPlanMaterialTable.columns[1].options = []
           }
-            this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
-              b.forEach(item => {
-                if (item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null) {
-                  numberList.push(item.materialNumber)
-                }
-              })
-
+          this.$refs.processUdgetPlanMaterial.getValues((a, b, c) => {
+            b.forEach(item => {
+              if (item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null) {
+                numberList.push(item.materialNumber)
+              }
             })
+
+          })
           getAction(this.url.merchandiseNewsList, par).then((res) => {
             // console.log('12312', res.result)
             // console.log('12312')
@@ -1012,12 +972,12 @@
                   })
                 })
               }
-              this.bigIdMerchandiseNewsList = res.result;
+              this.bigIdMerchandiseNewsList = res.result
               // resolve( this.bigIdMerchandiseNewsList );
             }
-            resolve( this.bigIdMerchandiseNewsList );
+            resolve(this.bigIdMerchandiseNewsList)
           })
-        });
+        })
 
       },
       //  fetchMerchandiseNews(value){ //查询物料清单信息
@@ -1116,8 +1076,8 @@
           id: r.tableId
         }).then((res) => {
           if (res.success) {
-            console.log("res.result.planType--",res.result.planType)
-            this.$emit('planType',res.result.planType)
+            console.log('res.result.planType--', res.result.planType)
+            this.$emit('planType', res.result.planType)
             this.planType = res.result.planType
             let formData = res.result
             formData.tableName = r.tableName
@@ -1202,8 +1162,8 @@
               formData.procDefId = this.processData.id
               formData.procDeTitle = this.processData.name
               formData.title = this.processData.description
-              formData.planType=this.planType;
-              console.log("this.planType++",this.planType)
+              formData.planType = this.planType
+              console.log('this.planType++', this.planType)
               if (!formData.tableName) formData.tableName = this.processData.businessTable
               var url = this.url.addFromTableApply
               let method = 'post'
@@ -1219,17 +1179,17 @@
               }
               this.btndisabled = true
               console.log(formData, '表单数据')
-              httpAction(url,formData,method).then((res)=>{
-                if (res.success){
-                  this.$message.success("提交申请成功！")
+              httpAction(url, formData, method).then((res) => {
+                if (res.success) {
+                  this.$message.success('提交申请成功！')
                   //todo 将表单的数据传给父组件
                   this.$emit('loadData')
-                  this.close();
-                }else {
+                  this.close()
+                } else {
                   this.$message.error(res.message)
                 }
-              }).finally(()=>{
-                this.btndisabled = false;
+              }).finally(() => {
+                this.btndisabled = false
               })
             }
           })
@@ -1255,7 +1215,7 @@
 
         }
         console.log(this.data, '数据回显')
-        let fieldval = pick(this.data, 'id','planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime','sort', 'orderNumber', 'fileId', 'opinion')
+        let fieldval = pick(this.data, 'id', 'planType', 'company', 'createTime', 'departId', 'createBy', 'materialType', 'processPlan', 'needTime', 'sort', 'orderNumber', 'fileId', 'opinion')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
@@ -1268,13 +1228,13 @@
         }
       },
 
-      descriptionId(val){
+      descriptionId(val) {
         let pam = {
           id: val
         }
-        getAction(this.url.descriptionRakeUrlId,pam).then(res =>{
+        getAction(this.url.descriptionRakeUrlId, pam).then(res => {
 
-          if(res.success){
+          if (res.success) {
             this.processUdgetPlanMaterialTable.columns[0].options.push({
               title: res.result.materialClassify,
               value: res.result.id
@@ -1305,8 +1265,7 @@
 
           for (let i = 0; i < this.listId.length; i++) {
             // console.log(this.listId[i])\
-            this.descriptionId(this.listId[i]);
-
+            this.descriptionId(this.listId[i])
 
             this.fetchMerchandiseNews(this.listId[i])
           }
@@ -1388,7 +1347,7 @@
               formData.procDefId = this.processData.id
               formData.procDeTitle = this.processData.name
               formData.title = this.processData.description
-              formData.planType=this.planType;
+              formData.planType = this.planType
               if (!formData.tableName) formData.tableName = this.processData.businessTable
               var url = this.url.add
               let method = 'post'
@@ -1398,16 +1357,16 @@
               }
               this.btndisabled = true
               console.log(formData, '格式化的数据')
-              httpAction(url,formData,method).then((res)=>{
-                if (res.success){
+              httpAction(url, formData, method).then((res) => {
+                if (res.success) {
                   //this.$message.success("保存成功！")
                   //todo 将表单的数据传给父组件
-                  this.$emit('afterSubmit',formData)
-                }else {
+                  this.$emit('afterSubmit', formData)
+                } else {
                   this.$message.error(res.message)
                 }
-              }).finally(()=>{
-                this.btndisabled = false;
+              }).finally(() => {
+                this.btndisabled = false
               })
             }
           })
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 4a5b7fb..9198720 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -467,25 +467,32 @@
           return
         }
         this.lcModa.disabled = true
-        //获取是不是第一个审核人
-        // if (r.processName === '物资调拨流程') {
-        //   let userInfo = sessionStorage.getItem('USER_INFORMATION')
-        //   let res = JSON.parse(userInfo)
-        //   console.log('userInfo>>>>>>>>>>>', res.username)
-        //   let param = {}
-        //   param.id = r.procDefId
-        //   param.tableName = r.tableName
-        //   param.tableId = r.tableId
-        //   param.username = res.username
-        //   this.getAction('/hy/processMaterialsAllot/getOne', param).then(res => {
-        //     console.log('res>>>>>>>>>>>>>>>>>>', res)
-        //     if (res.success) {
-        //       if (res.result) {
-        //         this.lcModa.disabled = false
-        //       }
-        //     }
-        //   })
-        // }
+        //获取是不是第一个审核人和最后一个审核人（第一个审核人和最后一个审核人需要对表单进行操作）
+        if (r.processName === '预算计划采购流程') {
+          let userInfo = sessionStorage.getItem('USER_INFORMATION')
+          let res = JSON.parse(userInfo)
+          let param = {}
+          param.id = r.procDefId
+          param.tableName = r.tableName
+          param.tableId = r.tableId
+          param.username = res.username
+          this.getAction('/hy/processMaterialsAllot/getOne', param).then(res => {
+            console.log('res>>>>>>>>>>>>>>>>>>', res)
+            if (res.success) {
+              if (res.result) {
+                this.lcModa.disabled = false
+              }
+            }
+          })
+          // this.getAction('/activiti_process/getNextNode', param).then(res => {
+          //   console.log('res>>>>>>>>>>>>>>>>>>', res)
+          //   if (res.success) {
+          //     if (res.result) {
+          //       this.lcModa.disabled = false
+          //     }
+          //   }
+          // })
+        }
         this.lcModa.title = '查看流程业务信息：' + r.processName
         this.lcModa.formComponent = this.getFormComponent(r.routeName).component
         this.lcModa.processData = r