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

src/views/approveData/index.vue

@@ -45,6 +45,7 @@
         <span v-else-if="scope.row.checkType == 'HYCK-FY'">海运出口费用</span>
         <span v-else-if="scope.row.checkType == 'HYJK-DJ'">海运进口</span>
         <span v-else-if="scope.row.checkType == 'HYJK-FY'">海运进口费用</span>
+        <span v-else-if="scope.row.checkType == 'XSTD'">销售退单请核</span>
       </template>
       <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批