From 79ebf22cc7d55677dcb6822c2dcdf18883816738 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 27 Oct 2022 18:08:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialsDeliveryForm.vue     |  34 +-
 .../activiti/form/ProcessUdgetPlanForm.vue    |  35 +-
 .../dictionaries/ProcessDictionariesList.vue  | 160 +++++--
 .../ProcessLibraryAssociationList.vue         | 234 +++++++++
 .../ProcessMerchandiseNewsList.vue            | 347 ++++++++++++++
 .../dictionaries/ProcessSupplierList.vue      | 231 +++++++++
 .../modules/ProcessDictionariesForm.vue       | 444 ------------------
 .../modules/ProcessDictionariesModal.vue      | 153 ++++--
 .../ProcessLibraryAssociationModal.vue        | 171 +++++++
 .../modules/ProcessMerchandiseNewsModal.vue   | 284 +++++++++++
 .../modules/ProcessSupplierModal.vue          | 224 +++++++++
 .../supplier/modules/ProcessSupplierForm.vue  |   4 +-
 .../ProcessSuppliesStrongerList.vue           |   2 +-
 .../ProcessSuppliesStrongerLists.vue          |   2 +-
 14 files changed, 1792 insertions(+), 533 deletions(-)
 create mode 100644 src/views/dictionaries/ProcessLibraryAssociationList.vue
 create mode 100644 src/views/dictionaries/ProcessMerchandiseNewsList.vue
 create mode 100644 src/views/dictionaries/ProcessSupplierList.vue
 delete mode 100644 src/views/dictionaries/modules/ProcessDictionariesForm.vue
 create mode 100644 src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
 create mode 100644 src/views/dictionaries/modules/ProcessMerchandiseNewsModal.vue
 create mode 100644 src/views/dictionaries/modules/ProcessSupplierModal.vue

diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 2779b1d..fead6c2 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>
@@ -216,22 +216,22 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               placeholder: '请输入${title}',
               defaultValue:'',
             },
-            {
-              title: '删除标志',
-              key: 'delFlag',
-              type: FormTypes.inputNumber,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '删除时间',
-              key: 'delTime',
-              type: FormTypes.date,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
+            // {
+            //   title: '删除标志',
+            //   key: 'delFlag',
+            //   type: FormTypes.inputNumber,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
+            // {
+            //   title: '删除时间',
+            //   key: 'delTime',
+            //   type: FormTypes.date,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
           ]
         },
         url: {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index b3fe185..d50ed7c 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -71,10 +71,25 @@
           :dataSource="processUdgetPlanMaterialTable.dataSource"
           @valueChange ="onSelect"
           :maxHeight="300"
+          :action-button="true"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true"/>
+          :actionButton="true">
+        <template v-slot:action="props">
+          <a-tooltip placement="top">
+            <template v-slot:title="props">
+              <p>23</p>
+              <p>45</p>
+              <p>56</p>
+              <p>12</p>
+            </template>
+            <a-button @click="chaKan(props)">查看</a-button>
+          </a-tooltip>
+<!--          <a-button @click="chaKan(props)">查看</a-button>-->
+        </template>
+        </j-editable-table>
       </a-tab-pane>
+
     </a-tabs>
     <div class="div_process">
       <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
@@ -278,11 +293,13 @@
             },
             {
               title: '对比单价',
-              key: 'contrastPrice',
-              type: FormTypes.normal,
-              width: '200px',
-              placeholder: '请输入${title}',
-              defaultValue: ''
+              key: 'action',
+             type: FormTypes.slot,
+              //width: '200px',
+              // placeholder: '请输入${title}',
+              // defaultValue: '',
+              slotName: 'action'
+              // scopedSlots: {customRender: 'fileSlot'}
             },
             {
               title: '数量',
@@ -406,6 +423,12 @@
       this.fetchData();
     },
     methods: {
+
+      chaKan(log){
+        console.log(log);
+      },
+
+
       onSelect(record) {
         // console.log(record.row);
         if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
diff --git a/src/views/dictionaries/ProcessDictionariesList.vue b/src/views/dictionaries/ProcessDictionariesList.vue
index ed06a6b..375264c 100644
--- a/src/views/dictionaries/ProcessDictionariesList.vue
+++ b/src/views/dictionaries/ProcessDictionariesList.vue
@@ -4,6 +4,24 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
+            <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="字典标号">
+              <a-input placeholder="请输入字典标号" v-model="queryParam.dictionaryLabel"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="类型名称">
+              <a-input placeholder="请输入类型名称" v-model="queryParam.typeName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -11,19 +29,13 @@
 
     <!-- 操作按钮区域 -->
     <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>
+
+<!--      <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>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
     </div>
 
     <!-- table区域-begin -->
@@ -44,7 +56,8 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+        :customRow="clickThenSelect"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
@@ -74,9 +87,6 @@
           <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>
@@ -89,7 +99,19 @@
       </a-table>
     </div>
 
-    <process-dictionaries-modal ref="modalForm" @ok="modalFormOk"/>
+    <a-tabs :activeKey="this.tabKey" >
+      <a-tab-pane tab="物资库信息" key="1" >
+        <ProcessLibraryAssociationList :mainId="selectedMainId" />
+      </a-tab-pane>
+      <a-tab-pane tab="供应商信息" key="2" forceRender>
+        <ProcessSupplierList :mainId="selectedMainId" />
+      </a-tab-pane>
+      <a-tab-pane tab="物资清单信息" key="3" forceRender>
+        <ProcessMerchandiseNewsList :mainId="selectedMainId" />
+      </a-tab-pane>
+    </a-tabs>
+
+    <processDictionaries-modal ref="modalForm" @ok="modalFormOk"></processDictionaries-modal>
   </a-card>
 </template>
 
@@ -97,6 +119,10 @@
 
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessDictionariesModal from './modules/ProcessDictionariesModal'
+  import { getAction } from '@/api/manage'
+  import ProcessLibraryAssociationList from './ProcessLibraryAssociationList'
+  import ProcessSupplierList from './ProcessSupplierList'
+  import ProcessMerchandiseNewsList from './ProcessMerchandiseNewsList'
   import '@/assets/less/TableExpand.less'
   import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
 
@@ -104,28 +130,22 @@
     name: "ProcessDictionariesList",
     mixins:[JeecgListMixin],
     components: {
+      ProcessLibraryAssociationList,
+      ProcessSupplierList,
+      ProcessMerchandiseNewsList,
       ProcessDictionariesModal,
       JSuperQuery
     },
     data () {
       return {
         description: '标准字典分类表管理页面',
+        tabKey: '1',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
           {
             title:'所属部门',
             align:"center",
-            dataIndex: 'sysOrgCode_dictText'
+            dataIndex: 'sysOrgCode_dictText',
           },
           {
             title:'字典标号',
@@ -157,9 +177,23 @@
           deleteBatch: "/dictionaries/processDictionaries/deleteBatch",
           exportXlsUrl: "/dictionaries/processDictionaries/exportXls",
           importExcelUrl: "dictionaries/processDictionaries/importExcel",
-
         },
-        dictOptions:{},
+        dictOptions:{
+         sysOrgCode:[],
+        },
+        /* 分页参数 */
+        ipagination:{
+          current: 1,
+          pageSize: 5,
+          pageSizeOptions: ['5', '10', '50'],
+          showTotal: (total, range) => {
+            return range[0] + "-" + range[1] + " 共" + total + "条"
+          },
+          showQuickJumper: true,
+          showSizeChanger: true,
+          total: 0
+        },
+        selectedMainId:'',
         superFieldList:[],
       }
     },
@@ -173,13 +207,71 @@
     },
     methods: {
       initDictConfig(){
+        // initDictOptions('sys_depart,depart_name,id').then((res) => {
+        //   if (res.success) {
+        //     this.$set(this.dictOptions, 'sysOrgCode', res.result)
+        //   }
+        // })
+      },
+      clickThenSelect(record) {
+        return {
+          on: {
+            click: () => {
+              this.onSelectChange(record.id.split(","), [record]);
+            }
+          }
+        }
+      },
+      onClearSelected() {
+        this.selectedRowKeys = [];
+        this.selectionRows = [];
+        this.selectedMainId=''
+      },
+      onSelectChange(selectedRowKeys, selectionRows) {
+        // this.tabKey= '3';
+        if(selectionRows[0].typeName === '库房编码'){
+          this.tabKey= '1';
+        }
+        if(selectionRows[0].typeName === '物资信息'){
+          this.tabKey= '3';
+        }
+        if(selectionRows[0].typeName === '供应商编码'){
+          this.tabKey= '2';
+        }
+         // console.log(selectedRowKeys,selectionRows)
+        this.selectedMainId=selectedRowKeys[0]
+        this.selectedRowKeys = selectedRowKeys;
+        this.selectionRows = selectionRows;
+      },
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.onClearSelected()
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records;
+            this.ipagination.total = res.result.total;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
       },
       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:''})
+        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
       }
     }
diff --git a/src/views/dictionaries/ProcessLibraryAssociationList.vue b/src/views/dictionaries/ProcessLibraryAssociationList.vue
new file mode 100644
index 0000000..73e7390
--- /dev/null
+++ b/src/views/dictionaries/ProcessLibraryAssociationList.vue
@@ -0,0 +1,234 @@
+<template>
+  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+    <!-- 查询区域 -->
+    <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.libraryName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+<!--              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" v-if="mainId">
+      <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"
+        :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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+
+      </a-table>
+    </div>
+
+    <processLibraryAssociation-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></processLibraryAssociation-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessLibraryAssociationModal from './modules/ProcessLibraryAssociationModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+
+  export default {
+    name: "ProcessLibraryAssociationList",
+    mixins:[JeecgListMixin],
+    components: { ProcessLibraryAssociationModal,JSuperQuery },
+    props:{
+      mainId:{
+        type:String,
+        default:'',
+        required:false
+      }
+    },
+    watch:{
+      mainId:{
+        immediate: true,
+        handler(val) {
+          if(!this.mainId){
+            this.clearList()
+          }else{
+            this.queryParam['processDictionariesId'] = val
+            this.loadData(1);
+          }
+        }
+      }
+    },
+    data () {
+      return {
+        description: '标准字典分类表管理页面',
+        disableMixinCreated:true,
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'物资库名',
+            align:"center",
+            dataIndex: 'libraryName'
+          },
+          // {
+          //   title:'状态',
+          //   align:"center",
+          //   dataIndex: 'state'
+          // },
+          {
+            title:'分类',
+            align:"center",
+            dataIndex: 'sort',
+            width:200,
+            customRender:function (t,r,index) {
+               console.log(t,r,index);
+              let name = '';
+              if(r.sort === 0){
+                name = "账外物资库房";
+              }else if(r.sort === 1){
+                name = "废旧物资库房";
+              }
+              return name;
+            }
+          },
+          // {
+          //   title:'删除状态',
+          //   align:"center",
+          //   dataIndex: 'delFlog'
+          // },
+          // {
+          //   title:'关联id',
+          //   align:"center",
+          //   dataIndex: 'processDictionariesId'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/dictionaries/processDictionaries/listProcessLibraryAssociationByMainId",
+          delete: "/dictionaries/processDictionaries/deleteProcessLibraryAssociation",
+          deleteBatch: "/dictionaries/processDictionaries/deleteBatchProcessLibraryAssociation",
+          exportXlsUrl: "/dictionaries/processDictionaries/exportProcessLibraryAssociation",
+          importUrl: "/dictionaries/processDictionaries/importProcessLibraryAssociation",
+        },
+        dictOptions:{
+         sysOrgCode:[],
+        },
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl(){
+        return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+      }
+    },
+    methods: {
+      clearList(){
+        this.dataSource=[]
+        this.selectedRowKeys=[]
+        this.ipagination.current = 1
+      },
+      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>
diff --git a/src/views/dictionaries/ProcessMerchandiseNewsList.vue b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
new file mode 100644
index 0000000..d7d5f57
--- /dev/null
+++ b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
@@ -0,0 +1,347 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品名称">
+              <a-input placeholder="请输入商品名称" v-model="queryParam.merchandiseName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物资编号">
+              <a-input placeholder="请输入物资编号" v-model="queryParam.materialsNumber"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="供应商">
+              <!--                <a-input placeholder="供应商" v-model="queryParam.materialsUnit"></a-input>-->
+              <!--                <a-select v-model="queryParam.materialsUnit" placeholder="请选择" @popupScroll="handlePopupScroll">-->
+              <!--                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.supplierName}}</a-select-option>-->
+              <!--                </a-select>-->
+              <a-auto-complete
+                v-model="queryParam.supplierId"
+                :data-source="bigId"
+                placeholder="请选择"
+                @select="onSelect"
+                @search="onSearch"
+              />
+              <!--                <a-select-->
+              <!--                  mode="multiple"-->
+              <!--                  label-in-value-->
+              <!--                  v-model="queryParam.materialsUnits"-->
+              <!--                  placeholder="请选择"-->
+              <!--                  style="width: 100%"-->
+              <!--                  :filter-option="false"-->
+              <!--                  :not-found-content="fetching ? undefined : null"-->
+              <!--                  @search="fetchUser"-->
+              <!--                  @change="handleChange"-->
+              <!--                >-->
+              <!--                  <a-spin v-if="fetching" slot="notFoundContent" size="small" />-->
+              <!--                  <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.supplierName}}</a-select-option>-->
+              <!--                </a-select>-->
+            </a-form-item>
+          </a-col>
+
+          <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+          <!--              <a-form-item label="物资单位">-->
+          <!--                <a-input placeholder="请输入物资单位" v-model="queryParam.materialsUnit"></a-input>-->
+          <!--              </a-form-item>-->
+          <!--            </a-col>-->
+          <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+          <!--              <a-form-item label="型号">-->
+          <!--                <a-input placeholder="请输入型号" v-model="queryParam.type"></a-input>-->
+          <!--              </a-form-item>-->
+          <!--            </a-col>-->
+          <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+          <!--              <a-form-item label="规格">-->
+          <!--                <a-input placeholder="请输入规格" v-model="queryParam.specification"></a-input>-->
+          <!--              </a-form-item>-->
+          <!--            </a-col>-->
+          <template v-if="toggleSearchStatus">
+          </template>
+          <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 -->
+
+    <!-- 操作按钮区域 -->
+    <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"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @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-merchandise-news-modal ref="modalForm" @ok="modalFormOk"></process-merchandise-news-modal>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import ProcessMerchandiseNewsModal from './modules/ProcessMerchandiseNewsModal'
+import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+import { getAction } from '@api/manage'
+
+export default {
+  name: 'ProcessMerchandiseNewsList',
+  mixins:[JeecgListMixin, mixinDevice],
+  components: {
+    ProcessMerchandiseNewsModal,
+    JSuperQuery,
+  },
+  data () {
+    // this.lastFetchId = 0;
+    // this.fetchUser = debounce(this.fetchUser, 800);
+    return {
+      data: [],
+      value: [],
+      fetching: false,
+      description: '物资清单表管理页面',
+      bigId:[],
+      // 表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key:'rowIndex',
+          width:60,
+          align:"center",
+          customRender:function (t,r,index) {
+            return parseInt(index)+1;
+          }
+        },
+        {
+          title:'商品名称',
+          align:"center",
+          dataIndex: 'merchandiseName'
+        },
+        {
+          title:'供应商',
+          align:"center",
+          dataIndex: 'supplierId'
+        },
+        {
+          title:'第三方商品编号',
+          align:"center",
+          dataIndex: 'partyNumber'
+        },
+        {
+          title:'品名分类',
+          align:"center",
+          dataIndex: 'descriptionId'
+        },
+        {
+          title:'物资编号',
+          align:"center",
+          dataIndex: 'materialsNumber'
+        },
+        {
+          title:'物资单位',
+          align:"center",
+          dataIndex: 'materialsUnit'
+        },
+        {
+          title:'型号',
+          align:"center",
+          dataIndex: 'type'
+        },
+        {
+          title:'规格',
+          align:"center",
+          dataIndex: 'specification'
+        },
+        {
+          title:'简介概要',
+          align:"center",
+          dataIndex: 'synopsis'
+        },
+        {
+          title:'分类',
+          align:"center",
+          dataIndex: 'classify'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          fixed:"right",
+          width:147,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: "/merchandisenews/processMerchandiseNews/list",
+        delete: "/merchandisenews/processMerchandiseNews/delete",
+        deleteBatch: "/merchandisenews/processMerchandiseNews/deleteBatch",
+        exportXlsUrl: "/merchandisenews/processMerchandiseNews/exportXls",
+        importExcelUrl: "merchandisenews/processMerchandiseNews/importExcel",
+        supplierId: "/supplier/processSupplier/list"
+
+      },
+      dictOptions:{},
+      superFieldList:[],
+    }
+  },
+  created() {
+    this.getSuperFieldList();
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+  },
+  methods: {
+
+    onSearch(searchText) {
+      console.log(searchText)
+      // this.dataSource = !searchText ? [] : [searchText];
+      this.fetchData(searchText);
+    },
+    onSelect(value) {
+      console.log('onSelect', value);
+    },
+
+    fetchData(value){
+      //查询大品类数据
+      let par = {
+        delFlag: 0,
+        state: 0,
+        supplierName: value,
+        pageSize: 100
+      }
+      this.bigId = [];
+      getAction(this.url.supplierId,par).then((res)=>{
+        if(res.success){
+          // console.log(res.result.records);
+          // this.bigId = res.result.records;
+          res.result.records.forEach( item => {
+            this.bigId.push(item.supplierName);
+          })
+        }
+      });
+    },
+    initDictConfig(){
+    },
+    getSuperFieldList(){
+      let fieldList=[];
+      fieldList.push({type:'string',value:'merchandiseName',text:'商品名称',dictCode:''})
+      fieldList.push({type:'string',value:'supplierId',text:'供应商ID',dictCode:''})
+      fieldList.push({type:'string',value:'partyNumber',text:'第三方商品编号',dictCode:''})
+      fieldList.push({type:'string',value:'descriptionId',text:'品名编号ID',dictCode:''})
+      fieldList.push({type:'string',value:'materialsNumber',text:'物资编号',dictCode:''})
+      fieldList.push({type:'string',value:'materialsUnit',text:'物资单位',dictCode:''})
+      fieldList.push({type:'string',value:'type',text:'型号',dictCode:''})
+      fieldList.push({type:'string',value:'specification',text:'规格',dictCode:''})
+      fieldList.push({type:'string',value:'synopsis',text:'简介概要',dictCode:''})
+      fieldList.push({type:'int',value:'classify',text:'分类',dictCode:''})
+      this.superFieldList = fieldList;
+      this.fetchData();
+      //查询大品类数据
+      // let par = {
+      //   delFlag: 0,
+      //   state: 0
+      // }
+      // this.bigId = [];
+      // getAction(this.url.supplierId,par).then((res)=>{
+      //   if(res.success){
+      //     console.log(res.result.records);
+      //     res.result.records.forEach( item => {
+      //       this.bigId.push(item.supplierName);
+      //     })
+      //
+      //   }
+      // });
+    }
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/dictionaries/ProcessSupplierList.vue b/src/views/dictionaries/ProcessSupplierList.vue
new file mode 100644
index 0000000..6a2069e
--- /dev/null
+++ b/src/views/dictionaries/ProcessSupplierList.vue
@@ -0,0 +1,231 @@
+<template>
+  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+    <!-- 查询区域 -->
+    <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.coding"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="供应商名称">
+              <a-input placeholder="请输入供应商名称" v-model="queryParam.supplierName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" v-if="mainId">
+      <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"
+        :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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+
+      </a-table>
+    </div>
+
+    <processSupplier-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></processSupplier-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessSupplierModal from './modules/ProcessSupplierModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+
+  export default {
+    name: "ProcessSupplierList",
+    mixins:[JeecgListMixin],
+    components: { ProcessSupplierModal,JSuperQuery },
+    props:{
+      mainId:{
+        type:String,
+        default:'',
+        required:false
+      }
+    },
+    watch:{
+      mainId:{
+        immediate: true,
+        handler(val) {
+          if(!this.mainId){
+            this.clearList()
+          }else{
+            this.queryParam['processDictionariesId'] = val
+            this.loadData(1);
+          }
+        }
+      }
+    },
+    data () {
+      return {
+        description: '标准字典分类表管理页面',
+        disableMixinCreated:true,
+        // 表头
+        columns: [
+          {
+            title: '序号',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'供应商编码',
+            align:"center",
+            dataIndex: 'coding'
+          },
+          {
+            title:'供应商名称',
+            align:"center",
+            dataIndex: 'supplierName'
+          },
+          {
+            title:'级别',
+            align:"center",
+            dataIndex: 'rank'
+          },
+          // {
+          //   title:'状态',
+          //   align:"center",
+          //   dataIndex: 'state_dictText',
+          // },
+          // {
+          //   title:'删除标志',
+          //   align:"center",
+          //   dataIndex: 'delFlag'
+          // },
+          // {
+          //   title:'关联id',
+          //   align:"center",
+          //   dataIndex: 'processDictionariesId'
+          // },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+        url: {
+          list: "/supplier/processSupplier/list",
+          delete: "/dictionaries/processDictionaries/deleteProcessSupplier",
+          deleteBatch: "/dictionaries/processDictionaries/deleteBatchProcessSupplier",
+          exportXlsUrl: "/dictionaries/processDictionaries/exportProcessSupplier",
+          importUrl: "/dictionaries/processDictionaries/importProcessSupplier",
+        },
+        dictOptions:{
+         sysOrgCode:[],
+        },
+        superFieldList:[],
+      }
+    },
+    created() {
+      this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl(){
+        return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
+      }
+    },
+    methods: {
+      clearList(){
+        this.dataSource=[]
+        this.selectedRowKeys=[]
+        this.ipagination.current = 1
+      },
+      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>
diff --git a/src/views/dictionaries/modules/ProcessDictionariesForm.vue b/src/views/dictionaries/modules/ProcessDictionariesForm.vue
deleted file mode 100644
index 3cfe23a..0000000
--- a/src/views/dictionaries/modules/ProcessDictionariesForm.vue
+++ /dev/null
@@ -1,444 +0,0 @@
-<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
index 65bf1a9..b381f17 100644
--- a/src/views/dictionaries/modules/ProcessDictionariesModal.vue
+++ b/src/views/dictionaries/modules/ProcessDictionariesModal.vue
@@ -1,45 +1,113 @@
 <template>
   <j-modal
     :title="title"
-    :width="1200"
+    :width="width"
     :visible="visible"
-    :maskClosable="false"
+    :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel">
-    <process-dictionaries-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <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-select  v-decorator="['typeName', validatorRules.typeName]" placeholder="请选择"  >
+                <a-select-option  value="库房编码">库房编码</a-select-option>
+                <a-select-option  value="物资信息">物资信息</a-select-option>
+                <a-select-option  value="供应商编码">供应商编码</a-select-option>
+              </a-select>
+            </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>
+    </a-spin>
   </j-modal>
 </template>
 
 <script>
 
-  import ProcessDictionariesForm from './ProcessDictionariesForm'
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
 
   export default {
-    name: 'ProcessDictionariesModal',
+    name: "ProcessDictionariesModal",
     components: {
-      ProcessDictionariesForm
+      JSelectDepart,
     },
-    data() {
+    data () {
       return {
-        title:'',
+        form: this.$form.createForm(this),
+        title:"操作",
         width:800,
         visible: false,
-        disableSubmit: false
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+          sysOrgCode: {
+            rules: [
+              { required: true, message: '请输入所属部门!'},
+            ]
+          },
+          dictionaryLabel: {
+            rules: [
+              { required: true, message: '请输入字典标号!'},
+            ]
+          },
+          typeName: {
+            rules: [
+              { required: true, message: '请输入类型名称!'},
+            ]
+          },
+        },
+        url: {
+          add: "/dictionaries/processDictionaries/add",
+          edit: "/dictionaries/processDictionaries/edit",
+        }
+
       }
     },
-    methods:{
+    created () {
+    },
+    methods: {
       add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
+        this.edit({});
       },
       edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'sysOrgCode','dictionaryLabel','typeName','explainType'))
         })
       },
       close () {
@@ -47,18 +115,45 @@
         this.visible = false;
       },
       handleOk () {
-        this.$refs.realForm.handleOk();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+
+        })
       },
       handleCancel () {
         this.close()
-      }
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'sysOrgCode','dictionaryLabel','typeName','explainType'))
+      },
+
+
     }
   }
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue b/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
new file mode 100644
index 0000000..02f9201
--- /dev/null
+++ b/src/views/dictionaries/modules/ProcessLibraryAssociationModal.vue
@@ -0,0 +1,171 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="物资库名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['libraryName',validatorRules.libraryName]" placeholder="请输入物资库名" ></a-input>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number v-decorator="['state']" placeholder="请输入状态" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :span="24">
+            <a-form-item label="库房分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--              <a-input v-decorator="['processDictionariesId']" placeholder="请输入分类" style="width: 100%" />-->
+              <a-select v-decorator="['sort',validatorRules.sort]" placeholder="请选择库房分类" style="width: 100%"   >
+                <a-select-option value= 0 >账外物资库房编码</a-select-option>
+                <a-select-option value= 1 >废旧物资库房编码</a-select-option>
+              </a-select>
+
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="删除状态" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number v-decorator="['delFlog']" placeholder="请输入删除状态" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="关联id" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input v-decorator="['processDictionariesId']" placeholder="请输入关联id" ></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import { getAction, httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: "ProcessLibraryAssociationModal",
+    components: {
+    },
+    props:{
+      mainId:{
+        type:String,
+        required:false,
+        default:''
+      }
+    },
+    data () {
+      return {
+        hideDis: true,
+        bigIder:[],
+        form: this.$form.createForm(this),
+        title:"操作",
+        width:800,
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+          libraryName: {
+            rules: [
+              { required: true, message: '请输入物资库名!'},
+            ]
+          },
+          sort: {
+            rules: [
+              { required: true, message: '请选择库房分类!'},
+            ]
+          },
+
+        },
+        url: {
+          add: "/dictionaries/processDictionaries/addProcessLibraryAssociation",
+          edit: "/dictionaries/processDictionaries/editProcessLibraryAssociation",
+
+        }
+
+      }
+    },
+    created () {
+    },
+    methods: {
+
+
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'libraryName'))
+          // this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','libraryName','state','sort','delFlog','processDictionariesId'))
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            formData['processDictionariesId'] = this.mainId
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','libraryName','state','sort','delFlog','processDictionariesId'))
+      },
+
+
+    }
+  }
+</script>
diff --git a/src/views/dictionaries/modules/ProcessMerchandiseNewsModal.vue b/src/views/dictionaries/modules/ProcessMerchandiseNewsModal.vue
new file mode 100644
index 0000000..db364a2
--- /dev/null
+++ b/src/views/dictionaries/modules/ProcessMerchandiseNewsModal.vue
@@ -0,0 +1,284 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="24">
+            <a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['merchandiseName',validatorRules.merchandiseName]" placeholder="请输入商品名称" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--              <a-input v-decorator="['supplierId']" placeholder="请输入供应商ID" ></a-input>-->
+              <a-auto-complete
+                v-decorator="['supplierId',validatorRules.supplierId]"
+                :data-source="bigId"
+                placeholder="请选择供应商"
+                @search="onSearchSupplier"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="第三方商品编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['partyNumber',validatorRules.partyNumber]" placeholder="请输入第三方商品编号" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="品名编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--              <a-input v-decorator="['descriptionId']" placeholder="请输入品名编号ID" ></a-input>-->
+              <a-auto-complete
+                v-decorator="['descriptionId',validatorRules.descriptionId]"
+                :data-source="bigIdRake"
+                placeholder="请选择"
+                @search="onSearchRake"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="物资编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialsNumber',validatorRules.materialsNumber]" placeholder="请输入物资编号" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="物资单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialsUnit',validatorRules.materialsUnit]" placeholder="请输入物资单位" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['type',validatorRules.type]" placeholder="请输入型号" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['specification']" placeholder="请输入规格" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-item label="简介概要" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['synopsis']" placeholder="请输入简介概要" ></a-input>
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="分类" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number v-decorator="['classify']" placeholder="请输入分类" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="关联id" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input v-decorator="['processDictionariesId']" placeholder="请输入关联id" ></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import { getAction, httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: "ProcessMerchandiseNewsModal",
+    components: {
+    },
+    props:{
+      mainId:{
+        type:String,
+        required:false,
+        default:''
+      }
+    },
+    data () {
+      return {
+        bigId:[],
+        bigIdRake:[],
+        form: this.$form.createForm(this),
+        title:"操作",
+        width:800,
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+
+          merchandiseName: {
+            rules: [
+              { required: true, message: '请输入商品名称!'},
+            ]
+          },
+          supplierId: {
+            rules: [
+              { required: true, message: '请选择供应商!'},
+            ]
+          },
+          partyNumber: {
+            rules: [
+              { required: true, message: '请输入第三方商品编号!'},
+            ]
+          },
+          descriptionId: {
+            rules: [
+              { required: true, message: '请选择品名编号!'},
+            ]
+          },
+          materialsNumber: {
+            rules: [
+              { required: true, message: '请输入物资编号!'},
+            ]
+          },
+          materialsUnit: {
+            rules: [
+              { required: true, message: '请输入物资单位!'},
+            ]
+          },
+          type: {
+            rules: [
+              { required: true, message: '请输入型号!'},
+            ]
+          },
+
+        },
+        url: {
+          add: "/dictionaries/processDictionaries/addProcessMerchandiseNews",
+          edit: "/dictionaries/processDictionaries/editProcessMerchandiseNews",
+          supplierId: "/supplier/processSupplier/list",
+          descriptionRake: "/description/processDescription/list",
+        }
+
+      }
+    },
+    created () {
+      this.fetchDataSupplier();
+      this.fetchDataRake();
+    },
+    methods: {
+      onSearchRake(searchText) {
+        console.log(searchText)
+        // this.dataSource = !searchText ? [] : [searchText];
+        this.fetchDataRake(searchText);
+      },
+      fetchDataRake(value){
+        //查询大品类数据
+        let par = {
+          delFlag: 0,
+          descriptionName: value,
+          pageSize: 50
+        }
+        this.bigIdRake = [];
+        getAction(this.url.descriptionRake,par).then((res)=>{
+          if(res.success){
+            console.log(res.result);
+            // this.bigId = res.result.records;
+            res.result.records.forEach( item => {
+              this.bigIdRake.push(item.descriptionName);
+            })
+          }
+        });
+      },
+
+      onSearchSupplier(searchText) {
+        console.log(searchText)
+        // this.dataSource = !searchText ? [] : [searchText];
+        this.fetchDataSupplier(searchText);
+      },
+
+      fetchDataSupplier(value){
+        //查询大品类数据
+        let par = {
+          delFlag: 0,
+          state: 0,
+          supplierName: value,
+          pageSize: 50
+        }
+        this.bigId = [];
+        getAction(this.url.supplierId,par).then((res)=>{
+          if(res.success){
+            // console.log(res.result.records);
+            // this.bigId = res.result.records;
+            res.result.records.forEach( item => {
+              this.bigId.push(item.supplierName);
+            })
+          }
+        });
+      },
+
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','processDictionariesId'))
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            formData['processDictionariesId'] = this.mainId
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify','processDictionariesId'))
+      },
+
+
+    }
+  }
+</script>
diff --git a/src/views/dictionaries/modules/ProcessSupplierModal.vue b/src/views/dictionaries/modules/ProcessSupplierModal.vue
new file mode 100644
index 0000000..b403953
--- /dev/null
+++ b/src/views/dictionaries/modules/ProcessSupplierModal.vue
@@ -0,0 +1,224 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="23">
+            <a-form-item label="供应商编码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['coding',validatorRules.coding]" placeholder="请输入供应商编码" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="23">
+            <a-form-item label="供应商名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['supplierName',validatorRules.supplierName]" placeholder="请输入供应商名称" ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="23">
+            <a-form-item label="级别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+<!--              <a-input v-decorator="['rank']" placeholder="请输入级别" ></a-input>-->
+              <a-select v-decorator="['rank',validatorRules.rank]" placeholder="请选择级别" v-if="!hideDis" >
+                <a-select-option v-for="(item,index) in bigIder" :key="index" :value="item.rank">{{item.rank}}</a-select-option>
+              </a-select>
+              <a-auto-complete
+                v-if="hideDis"
+                v-decorator="['rank',validatorRules.rank]"
+                :data-source="bigId"
+                placeholder="请选择级"
+                :filter-option="filterOption"
+                @mouseenter="getRank"
+              />
+            </a-form-item>
+          </a-col>
+<!--          <a-col :span="12">-->
+<!--            <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-dict-select-tag type="list" v-decorator="['state']" :trigger-change="true" dictCode="supplier_state" placeholder="请选择状态" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="删除标志" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input-number v-decorator="['delFlag']" placeholder="请输入删除标志" style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-item label="关联id" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <a-input v-decorator="['processDictionariesId']" placeholder="请输入关联id" ></a-input>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+
+import { getAction, httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JDictSelectTag from "@/components/dict/JDictSelectTag"
+
+  export default {
+    name: "ProcessSupplierModal",
+    components: {
+      JDictSelectTag,
+    },
+    props:{
+      mainId:{
+        type:String,
+        required:false,
+        default:''
+      }
+    },
+    data () {
+      return {
+        hideDis: true,
+        bigIder: [],
+        bigId: [],
+        form: this.$form.createForm(this),
+        title:"操作",
+        width:800,
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        validatorRules: {
+          coding: {
+            rules: [
+              { required: true, message: '请输入供应商编码!'},
+            ]
+          },
+          supplierName: {
+            rules: [
+              { required: true, message: '请输入供应商名称!'},
+            ]
+          },
+          rank: {
+            rules: [
+              { required: true, message: '请选择级别!'},
+            ]
+          },
+        },
+        url: {
+          supplierRake: "/supplier/processSupplier/supplierRake",
+          add: "/dictionaries/processDictionaries/addProcessSupplier",
+          edit: "/dictionaries/processDictionaries/editProcessSupplier",
+        }
+
+      }
+    },
+    created () {
+      getAction(this.url.supplierRake,null).then((res)=>{
+        if(res.success){
+          // console.log(res.result);
+          this.bigIder =  res.result;
+        }
+      });
+    },
+    methods: {
+      filterOption(input, option) {
+        return (
+          option.componentOptions.children[0].text.toUpperCase().indexOf(input.toUpperCase()) >= 0
+        );
+      },
+      getRank(){
+        this.bigId = [];
+        getAction(this.url.supplierRake,null).then((res)=>{
+          if(res.success){
+            // console.log(res.result);
+            res.result.forEach ( item => {
+              this.$nextTick(() => {
+                this.bigId.push( item.rank);
+              })
+            } );
+          }
+        });
+      },
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        let dis = false;
+        if(record.state !== undefined ){
+          dis =true;
+        }
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          if(dis){
+            this.hideDis = false;
+            if(this.model.state === 0){
+              this.model.state = "正常";
+            }else{
+              this.model.state = "停用"
+            }
+          }else{
+            this.hideDis = true;
+          }
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','coding','supplierName','rank','state','delFlag','processDictionariesId'))
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            formData['processDictionariesId'] = this.mainId
+            console.log("表单提交数据",formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','coding','supplierName','rank','state','delFlag','processDictionariesId'))
+      },
+
+
+    }
+  }
+</script>
diff --git a/src/views/supplier/modules/ProcessSupplierForm.vue b/src/views/supplier/modules/ProcessSupplierForm.vue
index 48784d5..b420b46 100644
--- a/src/views/supplier/modules/ProcessSupplierForm.vue
+++ b/src/views/supplier/modules/ProcessSupplierForm.vue
@@ -146,7 +146,7 @@
         this.edit({});
       },
       edit (record) {
-         console.log(record);
+         // console.log(record);
          let dis = false;
         if(record.state !== undefined ){
           dis =true;
@@ -162,6 +162,8 @@
             }else{
               this.model.state = "停用"
             }
+          }else{
+            this.hideDis = true;
           }
           this.form.setFieldsValue(pick(this.model,'coding','supplierName','rank','state','delFlag'))
         })
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index b171a17..cd19c1a 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -132,7 +132,7 @@
         bigId:[],
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index e8afa0e..7cacc54 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -172,7 +172,7 @@
         description: '物资总库管理详情页面',
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,