diff --git a/src/views/dictionaries/ProcessDictionariesList.vue b/src/views/dictionaries/ProcessDictionariesList.vue
new file mode 100644
index 0000000..ed06a6b
--- /dev/null
+++ b/src/views/dictionaries/ProcessDictionariesList.vue
@@ -0,0 +1,190 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <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>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </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">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        class="j-table-force-nowrap"
+        :scroll="{x:true}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @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>
+
+        <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 @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <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>
+
+    <process-dictionaries-modal ref="modalForm" @ok="modalFormOk"/>
+  </a-card>
+</template>
+
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessDictionariesModal from './modules/ProcessDictionariesModal'
+  import '@/assets/less/TableExpand.less'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: "ProcessDictionariesList",
+    mixins:[JeecgListMixin],
+    components: {
+      ProcessDictionariesModal,
+      JSuperQuery
+    },
+    data () {
+      return {
+        description: '标准字典分类表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'所属部门',
+            align:"center",
+            dataIndex: 'sysOrgCode_dictText'
+          },
+          {
+            title:'字典标号',
+            align:"center",
+            dataIndex: 'dictionaryLabel'
+          },
+          {
+            title:'类型名称',
+            align:"center",
+            dataIndex: 'typeName'
+          },
+          {
+            title:'类型说明',
+            align:"center",
+            dataIndex: 'explainType'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/dictionaries/processDictionaries/list",
+          delete: "/dictionaries/processDictionaries/delete",
+          deleteBatch: "/dictionaries/processDictionaries/deleteBatch",
+          exportXlsUrl: "/dictionaries/processDictionaries/exportXls",
+          importExcelUrl: "dictionaries/processDictionaries/importExcel",
+
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+         fieldList.push({type:'sel_depart',value:'sysOrgCode',text:'所属部门'})
+         fieldList.push({type:'string',value:'dictionaryLabel',text:'字典标号',dictCode:''})
+         fieldList.push({type:'string',value:'typeName',text:'类型名称',dictCode:''})
+         fieldList.push({type:'string',value:'explainType',text:'类型说明',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/dictionaries/modules/ProcessDictionariesForm.vue b/src/views/dictionaries/modules/ProcessDictionariesForm.vue
new file mode 100644
index 0000000..3cfe23a
--- /dev/null
+++ b/src/views/dictionaries/modules/ProcessDictionariesForm.vue
@@ -0,0 +1,444 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <!-- 主表单区域 -->
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="24" >
+            <a-form-item label="所属部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-depart v-decorator="['sysOrgCode', validatorRules.sysOrgCode]" multi />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24" >
+            <a-form-item label="字典标号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['dictionaryLabel', validatorRules.dictionaryLabel]" placeholder="请输入字典标号" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24" >
+            <a-form-item label="类型名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['typeName', validatorRules.typeName]" placeholder="请输入类型名称" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24" >
+            <a-form-item label="类型说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['explainType']" placeholder="请输入类型说明" ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+      <!-- 子表单区域 -->
+    <a-tabs v-model="activeKey" @change="handleChangeTabs">
+      <a-tab-pane tab="物资库关联表" :key="refKeys[0]" :forceRender="true">
+        <j-editable-table
+          :ref="refKeys[0]"
+          :loading="processLibraryAssociationTable.loading"
+          :columns="processLibraryAssociationTable.columns"
+          :dataSource="processLibraryAssociationTable.dataSource"
+          :maxHeight="300"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :actionButton="true"/>
+      </a-tab-pane>
+      <a-tab-pane tab="供应商信息" :key="refKeys[1]" :forceRender="true">
+        <j-editable-table
+          :ref="refKeys[1]"
+          :loading="processSupplierTable.loading"
+          :columns="processSupplierTable.columns"
+          :dataSource="processSupplierTable.dataSource"
+          :maxHeight="300"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :actionButton="true"/>
+      </a-tab-pane>
+      <a-tab-pane tab="物资清单表" :key="refKeys[2]" :forceRender="true">
+        <j-editable-table
+          :ref="refKeys[2]"
+          :loading="processMerchandiseNewsTable.loading"
+          :columns="processMerchandiseNewsTable.columns"
+          :dataSource="processMerchandiseNewsTable.dataSource"
+          :maxHeight="300"
+          :disabled="formDisabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          :actionButton="true"/>
+      </a-tab-pane>
+    </a-tabs>
+  </a-spin>
+</template>
+
+<script>
+
+  import pick from 'lodash.pick'
+  import { getAction } from '@/api/manage'
+  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
+  import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+
+  export default {
+    name: 'ProcessDictionariesForm',
+    mixins: [JEditableTableMixin],
+    components: {
+      JFormContainer,
+      JSelectDepart,
+    },
+    data() {
+      return {
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 6 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        labelCol2: {
+          xs: { span: 24 },
+          sm: { span: 3 },
+        },
+        wrapperCol2: {
+          xs: { span: 24 },
+          sm: { span: 20 },
+        },
+        // 新增时子表默认添加几行空数据
+        addDefaultRowNum: 1,
+        validatorRules: {
+          sysOrgCode: {
+            rules: [
+              { required: true, message: '请输入所属部门!'},
+            ]
+          },
+          dictionaryLabel: {
+            rules: [
+              { required: true, message: '请输入字典标号!'},
+            ]
+          },
+          typeName: {
+            rules: [
+              { required: true, message: '请输入类型名称!'},
+            ]
+          },
+        },
+        refKeys: ['processLibraryAssociation', 'processSupplier', 'processMerchandiseNews', ],
+        tableKeys:['processLibraryAssociation', 'processSupplier', 'processMerchandiseNews', ],
+        activeKey: 'processLibraryAssociation',
+        // 物资库关联表
+        processLibraryAssociationTable: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '库名',
+              key: 'libraryName',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '状态',
+              key: 'state',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '分类',
+              key: 'sort',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '删除状态',
+              key: 'delFlog',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '关联id',
+              key: 'processDictionariesId',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+          ]
+        },
+        // 供应商信息
+        processSupplierTable: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '供应商编码',
+              key: 'coding',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '供应商名称',
+              key: 'supplierName',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '级别',
+              key: 'rank',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '状态',
+              key: 'state',
+              type: FormTypes.select,
+              dictCode:"",
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '删除标志',
+              key: 'delFlag',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '关联id',
+              key: 'processDictionariesId',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+          ]
+        },
+        // 物资清单表
+        processMerchandiseNewsTable: {
+          loading: false,
+          dataSource: [],
+          columns: [
+            {
+              title: '商品名称',
+              key: 'merchandiseName',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '供应商ID',
+              key: 'supplierId',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '第三方商品编号',
+              key: 'partyNumber',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '品名编号ID',
+              key: 'descriptionId',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '物资编号',
+              key: 'materialsNumber',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '物资单位',
+              key: 'materialsUnit',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '型号',
+              key: 'type',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '规格',
+              key: 'specification',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '简介概要',
+              key: 'synopsis',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '分类',
+              key: 'classify',
+              type: FormTypes.inputNumber,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '关联id',
+              key: 'processDictionariesId',
+              type: FormTypes.input,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+          ]
+        },
+        url: {
+          add: "/dictionaries/processDictionaries/add",
+          edit: "/dictionaries/processDictionaries/edit",
+          queryById: "/dictionaries/processDictionaries/queryById",
+          processLibraryAssociation: {
+            list: '/dictionaries/processDictionaries/queryProcessLibraryAssociationByMainId'
+          },
+          processSupplier: {
+            list: '/dictionaries/processDictionaries/queryProcessSupplierByMainId'
+          },
+          processMerchandiseNews: {
+            list: '/dictionaries/processDictionaries/queryProcessMerchandiseNewsByMainId'
+          },
+        }
+      }
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：false流程表单 true普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    computed: {
+      formDisabled(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return false
+          }
+          return true
+        }
+        return this.disabled
+      },
+      showFlowSubmitButton(){
+        if(this.formBpm===true){
+          if(this.formData.disabled===false){
+            return true
+          }
+        }
+        return false
+      }
+    },
+    created () {
+      //如果是流程中表单，则需要加载流程表单data
+      this.showFlowData();
+    },
+    methods: {
+      addBefore(){
+        this.form.resetFields()
+        this.processLibraryAssociationTable.dataSource=[]
+        this.processSupplierTable.dataSource=[]
+        this.processMerchandiseNewsTable.dataSource=[]
+      },
+      getAllTable() {
+        let values = this.tableKeys.map(key => getRefPromise(this, key))
+        return Promise.all(values)
+      },
+      /** 调用完edit()方法之后会自动调用此方法 */
+      editAfter() {
+        let fieldval = pick(this.model,'sysOrgCode','dictionaryLabel','typeName','explainType')
+        this.$nextTick(() => {
+          this.form.setFieldsValue(fieldval)
+        })
+        // 加载子表数据
+        if (this.model.id) {
+          let params = { id: this.model.id }
+          this.requestSubTableData(this.url.processLibraryAssociation.list, params, this.processLibraryAssociationTable)
+          this.requestSubTableData(this.url.processSupplier.list, params, this.processSupplierTable)
+          this.requestSubTableData(this.url.processMerchandiseNews.list, params, this.processMerchandiseNewsTable)
+        }
+      },
+      /** 整理成formData */
+      classifyIntoFormData(allValues) {
+        let main = Object.assign(this.model, allValues.formValue)
+        return {
+          ...main, // 展开
+          processLibraryAssociationList: allValues.tablesValue[0].values,
+          processSupplierList: allValues.tablesValue[1].values,
+          processMerchandiseNewsList: allValues.tablesValue[2].values,
+        }
+      },
+      //渲染流程表单数据
+      showFlowData(){
+        if(this.formBpm === true){
+          let params = {id:this.formData.dataId};
+          getAction(this.url.queryById,params).then((res)=>{
+            if(res.success){
+              this.edit (res.result);
+            }
+          })
+        }
+      },
+      validateError(msg){
+        this.$message.error(msg)
+      },
+     popupCallback(row){
+       this.form.setFieldsValue(pick(row,'sysOrgCode','dictionaryLabel','typeName','explainType'))
+     },
+
+    }
+  }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/dictionaries/modules/ProcessDictionariesModal.vue b/src/views/dictionaries/modules/ProcessDictionariesModal.vue
new file mode 100644
index 0000000..65bf1a9
--- /dev/null
+++ b/src/views/dictionaries/modules/ProcessDictionariesModal.vue
@@ -0,0 +1,64 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="1200"
+    :visible="visible"
+    :maskClosable="false"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel">
+    <process-dictionaries-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessDictionariesForm from './ProcessDictionariesForm'
+
+  export default {
+    name: 'ProcessDictionariesModal',
+    components: {
+      ProcessDictionariesForm
+    },
+    data() {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods:{
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.handleOk();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/standarddictionary/Dictionary.vue b/src/views/standarddictionary/Dictionary.vue
index aa78396..f49bf9f 100644
--- a/src/views/standarddictionary/Dictionary.vue
+++ b/src/views/standarddictionary/Dictionary.vue
@@ -1,19 +1,19 @@
 <template>
   <div style="display: flex;align-items: center;justify-content: center">
-    <div style="width:50%;height: 800px;padding: 0px 30px;">
+    <div style="width:45%;height: 800px;padding: 0px 0px;">
       <span style="font-size: 16px">数据字典</span>
-      <div style="height: 95%;width: 95%;border: 1px solid #000000">
-        <div >
+      <div style="height: 95%;width: 95%;border: 1px solid #bbb9b9">
+
           <dictionary-list/>
-        </div>
+
       </div>
     </div>
-    <div  style="width:50%;height: 800px;padding: 0px 20px;">
+    <div  style="width:55%;height: 800px;padding: 0px 0px;">
       <span style="font-size: 16px">字典内容-一级供应商</span>
-      <div style="height: 95%;width: 95%;border: 1px solid #000000">
-        <div >
+      <div style="height: 95%;width: 100%;border: 1px solid #afadad">
+
           <dictionary-details/>
-        </div>
+
       </div>
     </div>
   </div>
diff --git a/src/views/standarddictionary/DictionaryList.vue b/src/views/standarddictionary/DictionaryList.vue
index a72aec9..662921a 100644
--- a/src/views/standarddictionary/DictionaryList.vue
+++ b/src/views/standarddictionary/DictionaryList.vue
@@ -11,7 +11,7 @@
               </a-button>
           </a-col>
           <a-col :md="10" :sm="24">
-            <a-form-item label="规则编号">
+            <a-form-item >
               <a-input v-model="queryParam.id" placeholder="请输入"/>
             </a-form-item>
           </a-col>
diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
index 9517470..d5f1921 100644
--- a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
+++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue
@@ -157,12 +157,12 @@
             dataIndex: 'unit'
           },
           {
-            title:'账外物资编码',
+            title:'账外物资库编码',
             align:"center",
             dataIndex: 'libraryAssociationIdInvisible'
           },
           {
-            title:'废旧物资编码',
+            title:'废旧物资库编码',
             align:"center",
             dataIndex: 'libraryAssociationIdWaste'
           },