Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/oa/IncidentTicketList.vue

@@ -151,7 +151,7 @@
           </a-button>
         </template>
         <span slot="state" slot-scope="text, record">
-          <span v-if="record.state =='6'">已完成</span>
+          <span v-if="record.state =='6'">已完结</span>
           <span v-if="record.state =='5'">已提交</span>
           <span v-if="record.state =='4'">已推送</span>
           <span v-if="record.state =='3'">已反馈通知</span>