diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index ba3159c..9483528 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -439,7 +439,7 @@
             ids.push(val[i].id);
           }
         }
-        this.processUdgetPlanIds=ids.join(",");
+        this.processOutflowIds=ids.join(",");
         this.processSmaterialsScrapListTable.dataSource.forEach(item =>{
           let par = { id : item.materialGroup,}
           let param = {id : item.equipment,}
diff --git a/src/views/dictionaries/ProcessMerchandiseNewsList.vue b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
index d7d5f57..927ad14 100644
--- a/src/views/dictionaries/ProcessMerchandiseNewsList.vue
+++ b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
@@ -113,6 +113,9 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         class="j-table-force-nowrap"
         @change="handleTableChange">
+         <span slot="merchandiseName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="20"/>
+          </span>
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -200,7 +203,8 @@ export default {
         {
           title:'商品名称',
           align:"center",
-          dataIndex: 'merchandiseName'
+          dataIndex: 'merchandiseName',
+          scopedSlots: { customRender: 'merchandiseName' },
         },
         {
           title:'供应商',
@@ -237,16 +241,16 @@ export default {
           align:"center",
           dataIndex: 'specification'
         },
-        {
-          title:'简介概要',
-          align:"center",
-          dataIndex: 'synopsis'
-        },
-        {
-          title:'分类',
-          align:"center",
-          dataIndex: 'classify'
-        },
+        // {
+        //   title:'简介概要',
+        //   align:"center",
+        //   dataIndex: 'synopsis'
+        // },
+        // {
+        //   title:'分类',
+        //   align:"center",
+        //   dataIndex: 'classify'
+        // },
         {
           title: '操作',
           dataIndex: 'action',