diff --git a/.env.production b/.env.production
index 18c6447..54499d6 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://bootapi.jeecg.com
+VUE_APP_API_BASE_URL=http://haoyi.scyp.ink/prod-api
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
diff --git a/package.json b/package.json
index 689fda5..5bf19f8 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
     "serve": "vue-cli-service serve",
     "build:test": "vue-cli-service build --mode test",
-    "build": "vue-cli-service build",
+    "build": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index b27871b..1a7d731 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -58,4 +58,8 @@
 }
 
 /**隐藏样式-modal确定按钮 */
-.jee-hidden{display: none}
\ No newline at end of file
+.jee-hidden{display: none}
+
+.common-table-cs{
+  height: 100%;
+}
\ No newline at end of file
diff --git a/src/components/jeecg/HPlan.vue b/src/components/jeecg/HPlan.vue
new file mode 100644
index 0000000..a711ed1
--- /dev/null
+++ b/src/components/jeecg/HPlan.vue
@@ -0,0 +1,212 @@
+<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-plan
+      ref="ProcessPlan"
+      :code="code"
+      :multi="multi"
+      :groupId="uniqGroupId"
+      :param="param"
+      @ok="callBack"
+    />
+
+  </div>
+</template>
+
+<script>
+  import ProcessPlan from './modal/ProcessPlan'
+
+  export default {
+    name: 'HPlan',
+    components: {
+      ProcessPlan
+    },
+    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) {
+          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.ProcessPlan.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) {
+        // 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(",")
+          }
+          // update--end--autor:lvdandan-----date:20200630------for：多选时未带回多个值------
+        }
+        if (this.triggerChange) {
+          //v-dec时即triggerChange为true时 将整个对象给form页面 让他自己setFieldsValue
+          this.$emit('callback', res)
+        } else {
+          //v-model时 需要传一个参数field 表示当前这个字段 从而根据这个字段的顺序找到原始值
+          // this.$emit("input",row[orgFieldsArr[destFieldsArr.indexOf(this.field)]])
+          this.$emit('input', this.showText, res)
+        }
+      }
+    }
+  }
+</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/JUpload.vue b/src/components/jeecg/JUpload.vue
index a52e9a5..a0f899f 100644
--- a/src/components/jeecg/JUpload.vue
+++ b/src/components/jeecg/JUpload.vue
@@ -314,7 +314,7 @@
           this.previewVisible = true;
         }else if (file.url) {
           // 此base地址可以配置到一个常量文件里
-          let base = "http://127.0.0.1:8012/onlinePreview?url="
+          let base = "http://182.92.73.21:8012/onlinePreview?url="
           let url = base+encodeURIComponent(this.$Base64.encode(file.url))
           window.open(url, '_blank')
         }
diff --git a/src/components/jeecg/index.js b/src/components/jeecg/index.js
index 8c21c85..0f46adf 100644
--- a/src/components/jeecg/index.js
+++ b/src/components/jeecg/index.js
@@ -1,6 +1,7 @@
 import JModal from './JModal'
 import JFormContainer from './JFormContainer.vue'
 import JPopup from './JPopup.vue'
+import HPlan from './HPlan'
 import JMarkdownEditor from './JMarkdownEditor'
 import JCodeEditor from './JCodeEditor.vue'
 import JEditor from './JEditor.vue'
@@ -48,6 +49,7 @@ export default {
     Vue.component('JImportModal', JImportModal)
     Vue.component('JInput', JInput)
     Vue.component('JPopup', JPopup)
+    Vue.component('HPlan', HPlan)
     Vue.component('JSelectMultiple', JSelectMultiple)
     Vue.component('JSlider', JSlider)
     Vue.component('JSuperQuery', JSuperQuery)
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
new file mode 100644
index 0000000..85a0b99
--- /dev/null
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -0,0 +1,460 @@
+<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">
+              <a-form-item label="需求时间">
+                <j-date placeholder="请选择需求时间" v-model="queryParam.needTime"></j-date>
+              </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" >
+          <ProcessUdgetPlanMaterialList :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 ProcessUdgetPlanMaterialList from '../../../views/processmaterials/ProcessUdgetPlanMaterialList'
+  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: 'ProcessPlan',
+    props: ['multi', 'code', 'groupId', 'param'],
+    components:{
+      ProcessUdgetPlanMaterialList,
+      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: '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: {
+          list: "/hy/processUdgetPlan/list",
+          delete: "/hy/processUdgetPlan/delete",
+          deleteBatch: "/hy/processUdgetPlan/deleteBatch",
+          exportXlsUrl: "/hy/processUdgetPlan/exportXls",
+          importExcelUrl: "hy/processUdgetPlan/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/jeecgbiz/JSelectUserByDep.vue b/src/components/jeecgbiz/JSelectUserByDep.vue
index eaa9b98..ab79700 100644
--- a/src/components/jeecgbiz/JSelectUserByDep.vue
+++ b/src/components/jeecgbiz/JSelectUserByDep.vue
@@ -5,7 +5,8 @@
       placeholder="请先选择用户"
       readOnly
       unselectable="on"
-      @search="onSearchDepUser">
+      @search="onSearchDepUser"
+    >
       <a-button slot="enterButton" :disabled="disabled">选择用户</a-button>
     </a-input-search>
     <j-select-user-by-dep-modal ref="selectModal" :modal-width="modalWidth" :multi="multi" @ok="selectOK" :user-ids="value" @initComp="initComp"/>
diff --git a/src/components/setting/SettingDrawer.vue b/src/components/setting/SettingDrawer.vue
index bf4b361..11c4b11 100644
--- a/src/components/setting/SettingDrawer.vue
+++ b/src/components/setting/SettingDrawer.vue
@@ -26,7 +26,7 @@
               </div>
             </a-tooltip>
 
-            <a-tooltip>
+<!--            <a-tooltip>
               <template slot="title">
                 亮色菜单风格
               </template>
@@ -36,7 +36,7 @@
                   <a-icon type="check"/>
                 </div>
               </div>
-            </a-tooltip>
+            </a-tooltip>-->
           </div>
         </div>
 
@@ -201,8 +201,12 @@
       if (this.multipage !== config.multipage) {
         this.$store.dispatch('ToggleMultipage', this.multipage)
       }
+      this.initData();
     },
     methods: {
+      initData(){
+        this.$store.dispatch('ToggleTheme', 'dark')
+      },
       showDrawer() {
         this.visible = true
       },
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 3814db4..3124ff9 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -219,10 +219,10 @@
             <a-select-option :value="2">紧急</a-select-option>
           </a-select>
         </a-form-item>
-        <a-form-item label="消息通知">
+        <a-form-item label="消息通知" v-show="false">
           <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
-          <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
-          <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>
+        <!--  <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
+          <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>-->
         </a-form-item>
         <div slot="footer">
           <a-button type="text" @click="modalVisible=false">取消</a-button>
diff --git a/src/views/activiti/doneManage.vue b/src/views/activiti/doneManage.vue
index 9034a9f..25b6fc7 100644
--- a/src/views/activiti/doneManage.vue
+++ b/src/views/activiti/doneManage.vue
@@ -109,7 +109,7 @@
     </a-card>
     <!---->
     <a-modal title="审批历史" v-model="modalLsVisible" :mask-closable="false" :width="'80%'" :footer="null">
-      <div v-if="modalLsVisible">
+     <div v-if="modalLsVisible">
         <component :is="historicDetail" :procInstId="procInstId"></component>
       </div>
     </a-modal>
@@ -213,6 +213,13 @@ export default {
         );
         return;
       }
+      this.lcModa.disabled = true
+      this.lcModa.title = '查看流程业务信息：' + r.processName
+      this.lcModa.formComponent = this.getFormComponent(r.routeName).component
+      this.lcModa.processData = r
+      this.lcModa.isNew = false
+      this.lcModa.isTask = true
+      this.lcModa.visible = true
     },
     history(r) {
       if (!r.procInstId) {
@@ -221,15 +228,6 @@ export default {
       }
       this.procInstId = r.procInstId;
       this.modalLsVisible = true;
-
-      this.lcModa.disabled = true
-      this.lcModa.title = '查看流程业务信息：' + r.processName
-      this.lcModa.formComponent = this.getFormComponent(r.routeName).component
-      this.lcModa.processData = r
-      this.lcModa.isNew = false
-      this.lcModa.isTask = true
-      this.lcModa.visible = true
-
     },
     remove(v) {
       this.postFormAction(this.url.deleteHistoricTask+v.id).then(res => {
diff --git a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
index a7f702f..24edf82 100644
--- a/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialBorrowingForm.vue
@@ -4,37 +4,37 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['updateFirm']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="被借用部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['borrowedDepartments']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -221,13 +221,15 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialBorrowing/add",
           edit: "/hy/processMaterialBorrowing/edit",
           queryById: "/hy/processMaterialBorrowing/queryById",
           processMaterialBorrowingList: {
             list: '/hy/processMaterialBorrowing/queryProcessMaterialBorrowingListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -300,9 +302,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -331,13 +331,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
+        let fieldval = pick(this.data,'updateFirm','createTime','sysOrgCode','createBy','materialType','borrowedDepartments','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialBorrowingList.list, params, this.processMaterialBorrowingListTable)
         }
       },
@@ -368,34 +368,45 @@
      },
       // handler
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
 
     }
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 2bd8076..1769d3e 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -4,47 +4,49 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="关联预算流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>
+             <!-- <a-input v-decorator="['processUdgetPlanId']" placeholder="请输入关联预算流程" ></a-input>-->
+              <h-plan v-model="processUdgetPlanId" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['materialType']" placeholder="请输入物资类型" style="width: 100%" dictCode="material_type"/>
+              <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type"
+                                 placeholder="请选择物资类型"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="入库目标库" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number v-decorator="['targetLibrary']" placeholder="请输入入库目标库" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="入库总批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number v-decorator="['warehousingBatch']" placeholder="请输入入库总批次" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -83,8 +85,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
 import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
@@ -135,92 +137,92 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           loading: false,
           dataSource: [],
           columns: [
-            {
-              title: '物料组',
-              key: 'materialGroup',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '物料号',
-              key: 'materialNumber',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '物料描述',
-              key: 'materialDescription',
-              type: FormTypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '仓储地点_id',
-              key: 'unitWasteWarehouseCodeId',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '生产时间',
-              key: 'productionTime',
-              type: FormTypes.date,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '保质期',
-              key: 'expirationDate',
-              type: FormTypes.date,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '是否到货',
-              key: 'arrivalNotice',
-              type: FormTypes.select,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '入库时间',
-              key: 'storageTime',
-              type: FormTypes.date,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '入库人',
-              key: 'librarySign',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '核算属性',
-              key: 'materialType',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
+            // {
+            //   title: '物料组',
+            //   key: 'materialGroup',
+            //   type: FormTypes.sel_search,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '物料号',
+            //   key: 'materialNumber',
+            //   type: FormTypes.sel_search,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '物料描述',
+            //   key: 'materialDescription',
+            //   type: FormTypes.input,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '仓储地点_id',
+            //   key: 'unitWasteWarehouseCodeId',
+            //   type: FormTypes.sel_search,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '生产时间',
+            //   key: 'productionTime',
+            //   type: FormTypes.date,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '保质期',
+            //   key: 'expirationDate',
+            //   type: FormTypes.date,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '是否到货',
+            //   key: 'arrivalNotice',
+            //   type: FormTypes.select,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '入库时间',
+            //   key: 'storageTime',
+            //   type: FormTypes.date,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '入库人',
+            //   key: 'librarySign',
+            //   type: FormTypes.sel_search,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '核算属性',
+            //   key: 'materialType',
+            //   type: FormTypes.sel_search,
+            //   dictCode:"",
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
             {
               title: '器材编号',
               key: 'equipment',
@@ -308,13 +310,16 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialWarehousing/add",
           edit: "/hy/processMaterialWarehousing/edit",
           queryById: "/hy/processMaterialWarehousing/queryById",
           processMaterialWarehousingList: {
             list: '/hy/processMaterialWarehousing/queryProcessMaterialWarehousingListByMainId'
           },
-        }
+        },
+        btndisabled: false,
+        processUdgetPlanId:''
       }
     },
     props: {
@@ -387,9 +392,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -409,34 +412,44 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
-
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
-              }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
           }
+          let formData = this.classifyIntoFormData(allValues)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
+              }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -448,13 +461,13 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','processUdgetPlanId','materialType','targetLibrary','warehousingBatch','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialWarehousingList.list, params, this.processMaterialWarehousingListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
index 5c4f4cd..fd59656 100644
--- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue
@@ -4,37 +4,38 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="被调拨部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['beAllotDepartment']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8
+" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +74,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -222,13 +223,15 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsAllot/add",
           edit: "/hy/processMaterialsAllot/edit",
           queryById: "/hy/processMaterialsAllot/queryById",
           processMaterialsAllotList: {
             list: '/hy/processMaterialsAllot/queryProcessMaterialsAllotListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -301,9 +304,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -323,34 +324,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -362,13 +374,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','beAllotDepartment','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsAllotList.list, params, this.processMaterialsAllotListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 2379bc8..016dcb4 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -4,37 +4,37 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="出库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择出库时间" v-decorator="['deliveryTime']" :trigger-change="true" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -230,13 +230,15 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsDelivery/add",
           edit: "/hy/processMaterialsDelivery/edit",
           queryById: "/hy/processMaterialsDelivery/queryById",
           processMaterialsDeliveryList: {
             list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -309,9 +311,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -331,34 +331,45 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -370,13 +381,13 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','deliveryTime','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsDeliveryList.list, params, this.processMaterialsDeliveryListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessMaterialsReturnForm.vue b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
index 58d8d81..f83efaa 100644
--- a/src/views/activiti/form/ProcessMaterialsReturnForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsReturnForm.vue
@@ -4,37 +4,37 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="关联借用流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['processBorrowId']" :trigger-change="true" dictCode="" placeholder="请选择关联借用流程" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -223,13 +223,15 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processMaterialsReturn/add",
           edit: "/hy/processMaterialsReturn/edit",
           queryById: "/hy/processMaterialsReturn/queryById",
           processMaterialsReturnList: {
             list: '/hy/processMaterialsReturn/queryProcessMaterialsReturnListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -302,9 +304,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -324,34 +324,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -363,13 +374,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processBorrowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processMaterialsReturnList.list, params, this.processMaterialsReturnListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index fc0ca5f..d799324 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -4,37 +4,37 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="关联出库流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-search-select-tag v-decorator="['processOutflowId']" dict=""  />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -224,13 +224,15 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processSmaterialsScrap/add",
           edit: "/hy/processSmaterialsScrap/edit",
           queryById: "/hy/processSmaterialsScrap/queryById",
           processSmaterialsScrapList: {
             list: '/hy/processSmaterialsScrap/queryProcessSmaterialsScrapListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -300,9 +302,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -322,34 +322,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -361,13 +372,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processOutflowId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processSmaterialsScrapList.list, params, this.processSmaterialsScrapListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
index 367820e..7ecb00e 100644
--- a/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
+++ b/src/views/activiti/form/ProcessSpecialMaterialsForm.vue
@@ -4,37 +4,37 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-company v-decorator="['company']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="8" >
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="关联归还流程" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-search-select-tag v-decorator="['processReturnId']" dict=""  />
             </a-form-item>
           </a-col>
-          <a-col :span="12" >
+          <a-col :span="8" >
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
@@ -73,8 +73,8 @@
 <script>
 
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { getAction,httpAction } from '@/api/manage'
+  import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -216,13 +216,15 @@
           ]
         },
         url: {
+          getForm:'/actBusiness/getForm',
           add: "/hy/processSpecialMaterials/add",
           edit: "/hy/processSpecialMaterials/edit",
           queryById: "/hy/processSpecialMaterials/queryById",
           processSpecialMaterialsList: {
             list: '/hy/processSpecialMaterials/queryProcessSpecialMaterialsListByMainId'
           },
-        }
+        },
+        btndisabled: false
       }
     },
     props: {
@@ -295,9 +297,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'name'))
-            });
+            this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -317,34 +317,45 @@
         this.$emit('backTask')
       },
       handleSubmit (e) {
-        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            let formData = Object.assign(this.data||{}, values)
-            formData.procDefId = this.processData.id;
-            formData.procDeTitle = this.processData.name;
-            if (!formData.tableName)formData.tableName = this.processData.businessTable;
-            formData.filedNames = _.keys(values).join(",");
-            console.log('formData', values)
+        this.getAllTable().then(tables => {
+          return validateFormAndTables(this.form, tables)
+        }).then(allValues=>{
+          console.log('所有数据',allValues)
+          if (typeof this.classifyIntoFormData !== 'function') {
+            throw this.throwNotFunction('classifyIntoFormData')
+          }
+          let formData = this.classifyIntoFormData(allValues)
 
-            var url = this.url.addApply;
-            if (!this.isNew){
-              url = this.url.editForm;
-            }
-            this.btndisabled = true;
-            this.postFormAction(url,formData).then((res)=>{
-              if (res.success){
-                this.$message.success("保存成功！")
-                //todo 将表单的数据传给父组件
-                this.$emit('afterSubmit',formData)
-              }else {
-                this.$message.error(res.message)
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
               }
-            }).finally(()=>{
-              this.btndisabled = false;
-            })
-          }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
+
       },
       addBefore(){
         this.form.resetFields()
@@ -356,13 +367,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
+        let fieldval = pick(this.data,'company','createTime','sysOrgCode','createBy','materialType','processReturnId','fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processSpecialMaterialsList.list, params, this.processSpecialMaterialsListTable)
         }
       },
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index c4a67bb..520b477 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -5,50 +5,55 @@
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
-          <a-col :span="12">
-            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-select-company v-decorator="['company']" multi/>
+          <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="12">
-            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true"
-                      date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+          <a-col :span="8">
+            <a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-company v-decorator="['company']" multi/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-depart v-decorator="['sysOrgCode']" multi/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-decorator="['createBy']"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
+            <a-form-item label="流程发起时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择流程发起时间" v-decorator="['createTime']" :trigger-change="true" :show-time="true"
+                      date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type"
                                  placeholder="请选择物资类型"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="流程计划" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-decorator="['processPlan']" :trigger-change="true" dictCode="process_plan"
                                  placeholder="请选择流程计划"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择需求时间" v-decorator="['needTime']" :trigger-change="true" style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number v-decorator="['orderNumber']" placeholder="请输入顺序号" style="width: 100%"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="8">
             <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
@@ -89,7 +94,7 @@
 
   const VALIDATE_NO_PASSED = Symbol()
   import pick from 'lodash.pick'
-  import { getAction } from '@/api/manage'
+  import { getAction,httpAction } from '@/api/manage'
   import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
   import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
   import JFormContainer from '@/components/jeecg/JFormContainer'
@@ -119,7 +124,7 @@
         },
         wrapperCol: {
           xs: { span: 24 },
-          sm: { span: 16 }
+          sm: { span: 18 }
         },
         labelCol2: {
           xs: { span: 24 },
@@ -158,70 +163,70 @@
               placeholder: '请输入${title}',
               defaultValue: ''
             },
-            {
-              title: '物料描述',
-              key: 'materialDescription',
-              type: FormTypes.input,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '仓储地点_id',
-              key: 'unitWasteWarehouseCodeId',
-              type: FormTypes.input,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '生产时间',
-              key: 'productionTime',
-              type: FormTypes.date,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '保质期',
-              key: 'expirationDate',
-              type: FormTypes.date,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '是否到货',
-              key: 'arrivalNotice',
-              type: FormTypes.inputNumber,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '入库时间',
-              key: 'storageTime',
-              type: FormTypes.date,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '入库人',
-              key: 'librarySign',
-              type: FormTypes.input,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
-            {
-              title: '核算属性',
-              key: 'materialType',
-              type: FormTypes.input,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
-            },
+            // {
+            //   title: '物料描述',
+            //   key: 'materialDescription',
+            //   type: FormTypes.input,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '仓储地点_id',
+            //   key: 'unitWasteWarehouseCodeId',
+            //   type: FormTypes.input,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '生产时间',
+            //   key: 'productionTime',
+            //   type: FormTypes.date,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '保质期',
+            //   key: 'expirationDate',
+            //   type: FormTypes.date,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '是否到货',
+            //   key: 'arrivalNotice',
+            //   type: FormTypes.inputNumber,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '入库时间',
+            //   key: 'storageTime',
+            //   type: FormTypes.date,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '入库人',
+            //   key: 'librarySign',
+            //   type: FormTypes.input,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
+            // {
+            //   title: '核算属性',
+            //   key: 'materialType',
+            //   type: FormTypes.input,
+            //   width: '200px',
+            //   placeholder: '请输入${title}',
+            //   defaultValue: ''
+            // },
             {
               title: '物料名称及规格型号',
               key: 'materialName',
@@ -384,9 +389,7 @@
             formData.tableName = r.tableName;
             this.data = formData;
             console.log("表单回显数据",this.data)
-            this.$nextTick(() => {
-              this.form.setFieldsValue(pick(this.data,'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId'))
-            });
+           this.editAfter();
             this.btndisabled = false;
           }else {
             this.$message.error(res.message)
@@ -419,13 +422,13 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
+        let fieldval = pick(this.data, 'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId')
         this.$nextTick(() => {
           this.form.setFieldsValue(fieldval)
         })
         // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
+        if (this.data.id) {
+          let params = { id: this.data.id }
           this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
         }
       },
@@ -465,35 +468,35 @@
             throw this.throwNotFunction('classifyIntoFormData')
           }
           let formData = this.classifyIntoFormData(allValues)
-          console.log('格式化后的数据',formData)
-          // this.form.validateFields((err, values) => {
-          //   if (!err) {
-          //     let formData = Object.assign(this.data||{}, values)
-          //     formData.procDefId = this.processData.id;
-          //     formData.procDeTitle = this.processData.name;
-          //     if (!formData.tableName)formData.tableName = this.processData.businessTable;
-          //     formData.filedNames = _.keys(values).join(",");
-          //     console.log('formData', values)
-          //     this.processUdgetPlanMaterialTable.dataSource=[]
-          //     console.log('子表数据')
-          //     var url = this.url.add;
-          //     if (!this.isNew){
-          //       url = this.url.edit;
-          //     }
-          //     //this.btndisabled = true;
-          //     // this.postFormAction(url,formData).then((res)=>{
-          //     //   if (res.success){
-          //     //     this.$message.success("保存成功！")
-          //     //     //todo 将表单的数据传给父组件
-          //     //     this.$emit('afterSubmit',formData)
-          //     //   }else {
-          //     //     this.$message.error(res.message)
-          //     //   }
-          //     // }).finally(()=>{
-          //     //   this.btndisabled = false;
-          //     // })
-          //   }
-          // })
+
+          this.form.validateFields((err, values) => {
+            if (!err) {
+              formData.procDefId = this.processData.id;
+              formData.procDeTitle = this.processData.name;
+              formData.title=this.processData.description;
+              if (!formData.tableName)formData.tableName = this.processData.businessTable;
+              console.log('格式化后的数据',formData)
+              var url = this.url.add;
+              let method='post';
+              if (!this.isNew){
+                url = this.url.edit;
+                method='put';
+              }
+              console.log('提交方法',method)
+              this.btndisabled = true;
+              httpAction(url,formData,method).then((res)=>{
+                if (res.success){
+                  this.$message.success("保存成功！")
+                  //todo 将表单的数据传给父组件
+                  this.$emit('afterSubmit',formData)
+                }else {
+                  this.$message.error(res.message)
+                }
+              }).finally(()=>{
+                this.btndisabled = false;
+              })
+            }
+          })
         })
 
       },
diff --git a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
index cfd7c7b..2830411 100644
--- a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
+++ b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
@@ -103,7 +103,7 @@
           if(!this.mainId){
             this.clearList()
           }else{
-            this.queryParam['processUdgetPlanId'] = val
+            this.queryParam['id'] = val
             this.loadData(1);
           }
         }
@@ -249,12 +249,12 @@
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:100,
             scopedSlots: { customRender: 'action' },
           }
         ],
         url: {
-          list: "/hy/processUdgetPlan/listProcessUdgetPlanMaterialByMainId",
+          list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId",
           delete: "/hy/processUdgetPlan/deleteProcessUdgetPlanMaterial",
           deleteBatch: "/hy/processUdgetPlan/deleteBatchProcessUdgetPlanMaterial",
           exportXlsUrl: "/hy/processUdgetPlan/exportProcessUdgetPlanMaterial",
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index 10982ef..308dd7d 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -41,7 +41,7 @@
         confirmLoading: false,
         confirmDirty: false,
         validatorRules:{
-          password:{
+         /* password:{
             // rules: [{
             //   required: true,
             //   pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
@@ -49,7 +49,7 @@
             // }, {
             //   validator: this.validateToNextPassword,
             // }],
-          },
+          },*/
           confirmpassword:{
             rules: [{
               required: true, message: '请重新输入登录密码!',
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 18bbbe5..07e78d1 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -11,7 +11,7 @@
               size="large"
               v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
               type="text"
-              placeholder="请输入帐户名 / admin">
+              placeholder="请输入帐户名">
               <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
             </a-input>
           </a-form-item>
@@ -22,7 +22,7 @@
               size="large"
               type="password"
               autocomplete="false"
-              placeholder="密码 / 123456">
+              placeholder="请输入密码">
               <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
             </a-input>
           </a-form-item>