From df0c739189f3eb006f3b23227b2ffeb56a64415b Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 18 Oct 2022 16:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9F=BA=E7=A1=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/JeecgListMixin.js                  |   1 +
 .../description/ProcessDescriptionList.vue    | 212 ++++++++++++++
 .../modules/ProcessDescriptionForm.vue        | 166 +++++++++++
 .../modules/ProcessDescriptionModal.vue       |  60 ++++
 .../ProcessDescriptionModal__Style#Drawer.vue |  83 ++++++
 .../ProcessMaterialStorageList.vue            | 244 ++++++++++++++++
 .../modules/ProcessMaterialStorageForm.vue    | 188 +++++++++++++
 .../modules/ProcessMaterialStorageModal.vue   |  60 ++++
 ...cessMaterialStorageModal__Style#Drawer.vue |  83 ++++++
 .../ProcessMerchandiseNewsList.vue            | 264 ++++++++++++++++++
 .../modules/ProcessMerchandiseNewsForm.vue    | 201 +++++++++++++
 .../modules/ProcessMerchandiseNewsModal.vue   |  60 ++++
 ...cessMerchandiseNewsModal__Style#Drawer.vue |  83 ++++++
 src/views/supplier/ProcessSupplierList.vue    |  30 +-
 14 files changed, 1720 insertions(+), 15 deletions(-)
 create mode 100644 src/views/description/ProcessDescriptionList.vue
 create mode 100644 src/views/description/modules/ProcessDescriptionForm.vue
 create mode 100644 src/views/description/modules/ProcessDescriptionModal.vue
 create mode 100644 src/views/description/modules/ProcessDescriptionModal__Style#Drawer.vue
 create mode 100644 src/views/materialstorage/ProcessMaterialStorageList.vue
 create mode 100644 src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
 create mode 100644 src/views/materialstorage/modules/ProcessMaterialStorageModal.vue
 create mode 100644 src/views/materialstorage/modules/ProcessMaterialStorageModal__Style#Drawer.vue
 create mode 100644 src/views/merchandisenews/ProcessMerchandiseNewsList.vue
 create mode 100644 src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
 create mode 100644 src/views/merchandisenews/modules/ProcessMerchandiseNewsModal.vue
 create mode 100644 src/views/merchandisenews/modules/ProcessMerchandiseNewsModal__Style#Drawer.vue

diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 6fec21c..4dafc61 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -289,6 +289,7 @@ export const JeecgListMixin = {
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList);
       }
+      console.log(info.file, info.fileList);
       if (info.file.status === 'done') {
         if (info.file.response.success) {
           // this.$message.success(`${info.file.name} 文件上传成功`);
diff --git a/src/views/description/ProcessDescriptionList.vue b/src/views/description/ProcessDescriptionList.vue
new file mode 100644
index 0000000..744d59f
--- /dev/null
+++ b/src/views/description/ProcessDescriptionList.vue
@@ -0,0 +1,212 @@
+<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.materialClassify"></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.descriptionName"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="分类名称">
+                <a-input placeholder="请输入分类名称" v-model="queryParam.classifyName"></a-input>
+              </a-form-item>
+            </a-col>
+          </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-description-modal ref="modalForm" @ok="modalFormOk"></process-description-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessDescriptionModal from './modules/ProcessDescriptionModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessDescriptionList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessDescriptionModal,
+      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: 'materialClassify'
+          },
+          {
+            title:'品名名称',
+            align:"center",
+            dataIndex: 'descriptionName'
+          },
+          {
+            title:'分类名称',
+            align:"center",
+            dataIndex: 'classifyName'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/description/processDescription/list",
+          delete: "/description/processDescription/delete",
+          deleteBatch: "/description/processDescription/deleteBatch",
+          exportXlsUrl: "/description/processDescription/exportXls",
+          importExcelUrl: "description/processDescription/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'materialClassify',text:'物料分类编号',dictCode:''})
+        fieldList.push({type:'string',value:'descriptionName',text:'品名名称',dictCode:''})
+        fieldList.push({type:'string',value:'classifyName',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/description/modules/ProcessDescriptionForm.vue b/src/views/description/modules/ProcessDescriptionForm.vue
new file mode 100644
index 0000000..8dc5a16
--- /dev/null
+++ b/src/views/description/modules/ProcessDescriptionForm.vue
@@ -0,0 +1,166 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="物料分类编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialClassify']" placeholder="请输入物料分类编号"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="品名名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['descriptionName']" placeholder="请输入品名名称"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['classifyName']" placeholder="请输入分类名称"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+
+  export default {
+    name: 'ProcessDescriptionForm',
+    components: {
+      JFormContainer,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/description/processDescription/add",
+          edit: "/description/processDescription/edit",
+          queryById: "/description/processDescription/queryById"
+        }
+      }
+    },
+    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: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'materialClassify','descriptionName','classifyName'))
+        })
+      },
+      //渲染流程表单数据
+      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);
+            }
+          });
+        }
+      },
+      submitForm () {
+        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;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'materialClassify','descriptionName','classifyName'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/description/modules/ProcessDescriptionModal.vue b/src/views/description/modules/ProcessDescriptionModal.vue
new file mode 100644
index 0000000..2b4139f
--- /dev/null
+++ b/src/views/description/modules/ProcessDescriptionModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <process-description-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-description-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessDescriptionForm from './ProcessDescriptionForm'
+  export default {
+    name: 'ProcessDescriptionModal',
+    components: {
+      ProcessDescriptionForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/description/modules/ProcessDescriptionModal__Style#Drawer.vue b/src/views/description/modules/ProcessDescriptionModal__Style#Drawer.vue
new file mode 100644
index 0000000..47a5957
--- /dev/null
+++ b/src/views/description/modules/ProcessDescriptionModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-description-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-description-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ProcessDescriptionForm from './ProcessDescriptionForm'
+
+  export default {
+    name: 'ProcessDescriptionModal',
+    components: {
+      ProcessDescriptionForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue
new file mode 100644
index 0000000..a96a196
--- /dev/null
+++ b/src/views/materialstorage/ProcessMaterialStorageList.vue
@@ -0,0 +1,244 @@
+<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="供应商ID">
+              <a-input placeholder="请输入供应商ID" v-model="queryParam.supplierId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="物料详情ID">
+              <a-input placeholder="请输入物料详情ID" v-model="queryParam.merchandiseNewsId"></a-input>
+            </a-form-item>
+          </a-col>
+          <template v-if="toggleSearchStatus">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="品名类ID">
+                <a-input placeholder="请输入品名类ID" v-model="queryParam.descriptionId"></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.inventoryAddress"></a-input>
+              </a-form-item>
+            </a-col>
+          </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-material-storage-modal ref="modalForm" @ok="modalFormOk"></process-material-storage-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import ProcessMaterialStorageModal from './modules/ProcessMaterialStorageModal'
+  import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
+
+  export default {
+    name: 'ProcessMaterialStorageList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessMaterialStorageModal,
+      JSuperQuery,
+    },
+    data () {
+      return {
+        description: '物资储存地址表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'供应商ID',
+            align:"center",
+            dataIndex: 'supplierId'
+          },
+          {
+            title:'物料详情ID',
+            align:"center",
+            dataIndex: 'merchandiseNewsId'
+          },
+          {
+            title:'品名类ID',
+            align:"center",
+            dataIndex: 'descriptionId'
+          },
+          {
+            title:'库存地点',
+            align:"center",
+            dataIndex: 'inventoryAddress'
+          },
+          {
+            title:'单位',
+            align:"center",
+            dataIndex: 'unit'
+          },
+          {
+            title:'删除标志',
+            align:"center",
+            dataIndex: 'delFlag'
+          },
+          {
+            title:'删除时间',
+            align:"center",
+            dataIndex: 'delTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/materialstorage/processMaterialStorage/list",
+          delete: "/materialstorage/processMaterialStorage/delete",
+          deleteBatch: "/materialstorage/processMaterialStorage/deleteBatch",
+          exportXlsUrl: "/materialstorage/processMaterialStorage/exportXls",
+          importExcelUrl: "materialstorage/processMaterialStorage/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'supplierId',text:'供应商ID',dictCode:''})
+        fieldList.push({type:'string',value:'merchandiseNewsId',text:'物料详情ID',dictCode:''})
+        fieldList.push({type:'string',value:'descriptionId',text:'品名类ID',dictCode:''})
+        fieldList.push({type:'string',value:'inventoryAddress',text:'库存地点',dictCode:''})
+        fieldList.push({type:'string',value:'unit',text:'单位',dictCode:''})
+        fieldList.push({type:'int',value:'delFlag',text:'删除标志',dictCode:''})
+        fieldList.push({type:'date',value:'delTime',text:'删除时间'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue b/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
new file mode 100644
index 0000000..2d0e9aa
--- /dev/null
+++ b/src/views/materialstorage/modules/ProcessMaterialStorageForm.vue
@@ -0,0 +1,188 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="供应商ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['supplierId']" placeholder="请输入供应商ID"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="物料详情ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['merchandiseNewsId']" placeholder="请输入物料详情ID"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="品名类ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['descriptionId']" placeholder="请输入品名类ID"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="库存地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['inventoryAddress']" placeholder="请输入库存地点"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['unit']" placeholder="请输入单位"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <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="8">
+            <a-form-item label="删除时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-date placeholder="请选择删除时间" v-decorator="['delTime']" :trigger-change="true" style="width: 100%" />
+            </a-form-item>
+          </a-col>
+          <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+  import JDate from '@/components/jeecg/JDate'  
+
+  export default {
+    name: 'ProcessMaterialStorageForm',
+    components: {
+      JFormContainer,
+      JDate,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/materialstorage/processMaterialStorage/add",
+          edit: "/materialstorage/processMaterialStorage/edit",
+          queryById: "/materialstorage/processMaterialStorage/queryById"
+        }
+      }
+    },
+    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: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'supplierId','merchandiseNewsId','descriptionId','inventoryAddress','unit','delFlag','delTime'))
+        })
+      },
+      //渲染流程表单数据
+      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);
+            }
+          });
+        }
+      },
+      submitForm () {
+        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;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'supplierId','merchandiseNewsId','descriptionId','inventoryAddress','unit','delFlag','delTime'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/materialstorage/modules/ProcessMaterialStorageModal.vue b/src/views/materialstorage/modules/ProcessMaterialStorageModal.vue
new file mode 100644
index 0000000..c1bc613
--- /dev/null
+++ b/src/views/materialstorage/modules/ProcessMaterialStorageModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <process-material-storage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-material-storage-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessMaterialStorageForm from './ProcessMaterialStorageForm'
+  export default {
+    name: 'ProcessMaterialStorageModal',
+    components: {
+      ProcessMaterialStorageForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/materialstorage/modules/ProcessMaterialStorageModal__Style#Drawer.vue b/src/views/materialstorage/modules/ProcessMaterialStorageModal__Style#Drawer.vue
new file mode 100644
index 0000000..a5e731f
--- /dev/null
+++ b/src/views/materialstorage/modules/ProcessMaterialStorageModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-material-storage-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-material-storage-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ProcessMaterialStorageForm from './ProcessMaterialStorageForm'
+
+  export default {
+    name: 'ProcessMaterialStorageModal',
+    components: {
+      ProcessMaterialStorageForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
new file mode 100644
index 0000000..f90bbb4
--- /dev/null
+++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue
@@ -0,0 +1,264 @@
+<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>
+          <template v-if="toggleSearchStatus">
+            <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>
+          <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'
+
+  export default {
+    name: 'ProcessMerchandiseNewsList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      ProcessMerchandiseNewsModal,
+      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: 'merchandiseName'
+          },
+          {
+            title:'供应商ID',
+            align:"center",
+            dataIndex: 'supplierId'
+          },
+          {
+            title:'第三方商品编号',
+            align:"center",
+            dataIndex: 'partyNumber'
+          },
+          {
+            title:'品名编号ID',
+            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",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      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
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue b/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
new file mode 100644
index 0000000..b5929a6
--- /dev/null
+++ b/src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
@@ -0,0 +1,201 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form :form="form" slot="detail">
+        <a-row>
+          <a-col :span="8">
+            <a-form-item label="商品名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['merchandiseName']" placeholder="请输入商品名称"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="供应商ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['supplierId']" placeholder="请输入供应商ID"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="第三方商品编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['partyNumber']" placeholder="请输入第三方商品编号"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="品名编号ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['descriptionId']" placeholder="请输入品名编号ID"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="物资编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialsNumber']" placeholder="请输入物资编号"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="物资单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['materialsUnit']" placeholder="请输入物资单位"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['type']" placeholder="请输入型号"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['specification']" placeholder="请输入规格"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <a-form-item label="简介概要" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input v-decorator="['synopsis']" placeholder="请输入简介概要"  ></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="8">
+            <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 v-if="showFlowSubmitButton" :span="24" style="text-align: center">
+            <a-button @click="submitForm">提 交</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import { validateDuplicateValue } from '@/utils/util'
+  import JFormContainer from '@/components/jeecg/JFormContainer'
+
+  export default {
+    name: 'ProcessMerchandiseNewsForm',
+    components: {
+      JFormContainer,
+    },
+    props: {
+      //流程表单data
+      formData: {
+        type: Object,
+        default: ()=>{},
+        required: false
+      },
+      //表单模式：true流程表单 false普通表单
+      formBpm: {
+        type: Boolean,
+        default: false,
+        required: false
+      },
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        form: this.$form.createForm(this),
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/merchandisenews/processMerchandiseNews/add",
+          edit: "/merchandisenews/processMerchandiseNews/edit",
+          queryById: "/merchandisenews/processMerchandiseNews/queryById"
+        }
+      }
+    },
+    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: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify'))
+        })
+      },
+      //渲染流程表单数据
+      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);
+            }
+          });
+        }
+      },
+      submitForm () {
+        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;
+            })
+          }
+         
+        })
+      },
+      popupCallback(row){
+        this.form.setFieldsValue(pick(row,'merchandiseName','supplierId','partyNumber','descriptionId','materialsNumber','materialsUnit','type','specification','synopsis','classify'))
+      },
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal.vue b/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal.vue
new file mode 100644
index 0000000..6b84a1a
--- /dev/null
+++ b/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal.vue
@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <process-merchandise-news-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></process-merchandise-news-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import ProcessMerchandiseNewsForm from './ProcessMerchandiseNewsForm'
+  export default {
+    name: 'ProcessMerchandiseNewsModal',
+    components: {
+      ProcessMerchandiseNewsForm
+    },
+    data () {
+      return {
+        title:'',
+        width:1024,
+        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.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal__Style#Drawer.vue b/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal__Style#Drawer.vue
new file mode 100644
index 0000000..6f41ace
--- /dev/null
+++ b/src/views/merchandisenews/modules/ProcessMerchandiseNewsModal__Style#Drawer.vue
@@ -0,0 +1,83 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    :visible="visible">
+    <process-merchandise-news-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></process-merchandise-news-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import ProcessMerchandiseNewsForm from './ProcessMerchandiseNewsForm'
+
+  export default {
+    name: 'ProcessMerchandiseNewsModal',
+    components: {
+      ProcessMerchandiseNewsForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:1024,
+        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;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue
index 0b45898..df035a6 100644
--- a/src/views/supplier/ProcessSupplierList.vue
+++ b/src/views/supplier/ProcessSupplierList.vue
@@ -16,19 +16,19 @@
       <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-upload-->
-<!--        name="file"-->
-<!--        :multiple="false"-->
-<!--        :action="minioUploadAction"-->
-<!--        :headers="tokenHeader"-->
-<!--        :showUploadList="false"-->
-<!--        :beforeUpload="beforeUpload"-->
-<!--        @change="handleChange">-->
-<!--        <a-button>-->
-<!--          <a-icon type="upload"/>-->
-<!--          MINIO上传签名照-->
-<!--        </a-button>-->
-<!--      </a-upload>-->
+      <a-upload
+        name="file"
+        :multiple="false"
+        :action="minioUploadAction"
+        :headers="tokenHeader"
+        :showUploadList="false"
+        :beforeUpload="beforeUpload"
+        @change="handleChange">
+        <a-button>
+          <a-icon type="upload"/>
+          MINIO上传签名照
+        </a-button>
+      </a-upload>
 
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
@@ -187,10 +187,10 @@
           exportXlsUrl: "/supplier/processSupplier/exportXls",
           importExcelUrl: "supplier/processSupplier/importExcel",
           minioUpload: "/sys/upload/uploadMinio"
-          
+
         },
         dictOptions:{},
-        superFieldList:[],   
+        superFieldList:[],
       }
     },
     created() {