Переглянути джерело

Merge branch 'dev_info' into 'master'

Dev info

See merge request spfm/spfm-market-front!169
徐兴安 2 роки тому
батько
коміт
f7c31b9f50

+ 3 - 3
src/pages/main/performance/components/sheet.vue

@@ -222,11 +222,11 @@
       </el-form>
       <template v-slot:footer>
         <div>
-          <el-button @click.prevent="handleApprove('1')">结束</el-button>
-          <el-button @click.prevent="handleApprove('4')" type="primary"
+          <el-button @click.prevent="handleApprove('1')" type="primary">结束</el-button>
+          <el-button @click.prevent="handleApprove('4')"
             >转副总审批</el-button
           >
-          <el-button @click.prevent="handleApprove('3')" type="primary"
+          <el-button @click.prevent="handleApprove('3')"
             >转总经理审批</el-button
           >
         </div>

+ 7 - 7
src/pages/main/performance/department.vue

@@ -126,19 +126,19 @@
       <template v-slot:footer
         ><div>
           <div v-if="type === '1'">
-            <el-button @click="handleTurn('finish')">结束</el-button>
-            <el-button @click="handleTurn('transfer')" type="primary"
+            <el-button @click="handleTurn('finish')" type="primary">结束</el-button>
+            <el-button @click="handleTurn('transfer')" 
               >转副总审批</el-button
             >
-            <el-button @click="handleTurn('transfermanger')" type="primary"
+            <el-button @click="handleTurn('transfermanger')"
               >转总经理审批</el-button
             >
           </div>
           <div v-else-if="type === '2'">
-            <el-button @click="handleTurn('finish')">结束</el-button>
-            <el-button @click="handleTurn('return')">退回</el-button>
-            <el-button @click="handleTurn('back')">打回</el-button>
-            <el-button @click="handleTurn('transfer')" type="primary"
+            <el-button @click="handleTurn('finish')" type="primary">结束</el-button>
+            <el-button @click="handleTurn('return')" type="primary">退回</el-button>
+            <el-button @click="handleTurn('back')" type="primary">打回</el-button>
+            <el-button @click="handleTurn('transfer')" 
               >转总经理审批</el-button
             >
           </div>