Merge remote-tracking branch 'origin/dev' into dev

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -948,7 +948,7 @@
               this.heid = false
               this.descriptionFetchData(this.materialTypeRecord,value);
             }else {
-              this.$message.error("请选择正确的部门！")
+              this.$message.error("请选择正确项目部！")
               this.heid = true;
               return
             }

src/views/activiti/processInsManage.vue

@@ -95,10 +95,10 @@
                 <a href="javascript:void(0);" style="color: green;" @click="editStatus(1,r)" >激活</a>
                 <a-divider type="vertical" />
               </template>
-              <template v-else>
+          <!--    <template v-else>
                 <a href="javascript:void(0);" style="color: orange;" @click="editStatus(0,r)" >挂起</a>
                 <a-divider type="vertical" />
-              </template>
+              </template>-->
               <!--<a href="javascript:void(0);" style="color: blue;" @click="history(r)" >审批详情</a>
               <a-divider type="vertical" />-->
               <a href="javascript:void(0);" style="color: #999;" @click="detail(r)" >流程数据</a>

src/views/dictionaries/ProcessMerchandiseNewsList.vue

@@ -255,7 +255,6 @@ export default {
           title: '操作',
           dataIndex: 'action',
           align:"center",
-          fixed:"right",
           width:147,
           scopedSlots: { customRender: 'action' }
         }