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

src/views/plan/requisition/index.vue

@@ -60,7 +60,7 @@
       </template>
       <div style="width:100%; height: 30px;">
 <!--        <el-steps :active="1" finish-status="success">-->
-        <el-steps :active="form.state === '6' ? 1: 0" finish-status="success">
+        <el-steps :active="form.state === '8' ? 3: (form.state === '9' ? 2 : 1)" finish-status="success">
           <el-step :title="form.sendOrg" />
           <el-step title="运输中" />
           <el-step :title="form.applyOrg" />