Merge pull request 'master' (#859) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/859

src/assets/styles/index.scss

@@ -558,7 +558,7 @@ html, body, #app, .el-container, .el-aside, .el-main {
 // 操作页面底部按钮
 .oper-page-btn {
   position: fixed;
-  bottom: 15px;
+  top: 135px;
   right: 15px;
   z-index: 5;
 }

src/components/DetailComponent/Opinion.vue

@@ -171,20 +171,21 @@ const back = () => {
 }
 // 驳回
 const handleReject = async () => {
+  if (!_value.value) {
+  ElNotification({
+    title: '提示',
+    message: '请填写审核意见',
+    type: 'warning'
+  })
+  return
+}
   showBackNode.value = true
   backNode.value = {}
 }
 //回退节点
 const rollbackHandler = async () => {
   // const values = form.value.getValues()
-  if (!_value.value) {
+
-    ElNotification({
-      title: '提示',
-      message: '请填写审核意见',
-      type: 'warning'
-    })
-    return
-  }
   const params = {
     taskId: props.taskId,
     // ...values

src/components/steps/index.vue

@@ -2,9 +2,12 @@
   <div style="padding: 0 30px" id="printBox">
     <div style="display: flex;justify-content: space-between">
       <baseTitle title="项目基本信息"></baseTitle>
-      <el-button v-print="print"  color="#ded0b2" icon="Printer" style="margin-top: 15px" @click="handlePrint(print)"> 打印</el-button>
+      <div class="oper-page-btn" :style="{marginRight:taskId? '145px':'0'}">
+        <el-button v-print="print" color="#ded0b2" icon="Printer" @click="handlePrint(print)"> 打印</el-button>
+      </div>
     </div>
-    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left" style="margin-left: 15px"></fvForm>
+    <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"
+            style="margin-left: 15px"></fvForm>
     <div class="steps-box">
       <el-steps v-if="stepsShow" :active="localActive" finish-status="success">
         <el-step
@@ -43,6 +46,7 @@ import {getBaseInfoApi} from './api';
 import {useCacheStore} from '@/stores/cache.js'
 
 import {toThousands} from '@/utils/changePrice.js'
+
 const print = ref({
   id: 'printBox',//这里的id就是上面我们的打印区域id，实现指哪打哪
   popTitle: '配置页眉标题', // 打印配置页上方的标题
@@ -92,11 +96,16 @@ const props = defineProps({
   reportType: {
     type: String,
     default: ''
+  },
+  //是否显示审批驳回按钮
+  taskId: {
+    type: String,
+    default: ''
   }
 })
 const route = useRoute()
 const cacheStore = useCacheStore()
-const emits = defineEmits(['stepChange', 'setDetail','openPrint'])
+const emits = defineEmits(['stepChange', 'setDetail', 'openPrint'])
 const localData = reactive({})
 const localActive = ref(0) // 当前激活步骤
 const stepsShow = ref(false)
@@ -290,7 +299,7 @@ const schema = computed(() => {
           <div>
             {
               baseFormData.value?.economicEstimate ?
-                  <span>{ toThousands(baseFormData.value?.economicEstimate )}</span>
+                  <span>{toThousands(baseFormData.value?.economicEstimate)}</span>
                   : <span>{'--'}</span>
             }
           </div>
@@ -352,7 +361,7 @@ const schema = computed(() => {
           <div>
             {
               baseFormData.value?.specialFundAmount ?
-                  <span>{ toThousands(baseFormData.value?.specialFundAmount )}</span>
+                  <span>{toThousands(baseFormData.value?.specialFundAmount)}</span>
                   : <span>{'--'}</span>
             }
           </div>
@@ -369,8 +378,8 @@ const schema = computed(() => {
 })
 
 const localStepSuccess = ref([])
-const handlePrint=(print)=>{
+const handlePrint = (print) => {
-  emits('openPrint',print)
+  emits('openPrint', print)
 }
 // 格式化详情步骤条
 const formatProcedure = (data) => {
@@ -561,7 +570,7 @@ const getBaseInfo = async () => {
   try {
     const {code, data} = await getBaseInfoApi(route.query.projectId)
     // console.log('data.procedure', data.procedure, route.query.step)
-    if (route.query.step === '30'||route.query.step === '40') {
+    if (route.query.step === '30' || route.query.step === '40') {
       if (data.procedure.indexOf('30') == -1) {
         data.procedure.push('30')
       }

src/views/project-management/implementation/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <steps :active="route.query.id==='-1'?currentStep-1:currentStep" @setDetail="setDetail" @stepChange="stepChange"
-         :reportType="route.query.id==='-1'?'direct':''">
+         :reportType="route.query.id==='-1'?'direct':''" :taskId="detailData.taskId">
     <template #content v-if="detailShow">
       <collection-detail :formData="detailData.formData"
                          :data="detailData"