fix : 修改打印范围, 详情增加项目实施模块

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

@@ -23,6 +23,9 @@
                       :fileListShow="fileListShow"
                       :preProcessShow="preProcessShow"
                       v-model:value="auditOpinion"/>
+      <div v-if="showActive == '30'&&!editShow">
+        <project-attachment/>
+      </div>
       <ApprovalDetail type="execute"
                       v-if="showActive == '40'&&!editShow"
                       :formData="detailData.formData"
@@ -49,7 +52,8 @@
     </template>
   </steps>
   <div style="width: 100%;height: 30px"></div>
-  <opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId" :taskUserOptionList="detailData.taskUserOptionList"
+  <opinion v-if="detailData.taskId" :formData="detailData.formData" :taskId="detailData.taskId"
+           :taskUserOptionList="detailData.taskUserOptionList"
            v-model:value="auditOpinion"/>
 </template>
 
@@ -75,8 +79,9 @@ const auditOpinion = ref('')
 // const step = ref(route.query.step)
 route.query.step == '10' && (currentStep.value = 1)
 route.query.step == '20' && (currentStep.value = 2)
-route.query.step == '40' && (currentStep.value = 3)
-route.query.step == '50' && (currentStep.value = 4)
+route.query.step == '30' && (currentStep.value = 3)
+route.query.step == '40' && (currentStep.value = 4)
+route.query.step == '50' && (currentStep.value = 5)
 const showActive = ref()
 const detailShow = ref(false)
 const detailData = ref({})
@@ -88,6 +93,8 @@ localStorage.removeItem('projectChargePersonUserList')
 localStorage.removeItem('projectPersonUserList')
 localStorage.removeItem('optionalChargeLeadershipList')
 localStorage.removeItem('originallySelectedList')
+
+
 const getAllInfo = async (state) => {
   const loading = ElLoading.service({fullscreen: true})
   detailData.value = {
@@ -148,18 +155,28 @@ const changeModel = (active, mode) => {
       applyTitle.value = 'apply'
     } else if (active === '40') {
       applyTitle.value = 'check'
-    }else if ( active === '50') {
+    } else if (active === '50') {
       applyTitle.value = 'filing'
     }
   })
 }
 const setDetail = (active) => {
   showActive.value = active
+  if (active == '30') {
+    changeModel(30, 'view')
+    detailShow.value = true
+    return;
+  }
   getAllInfo(active)
 }
 
 const stepChange = (data) => {
   showActive.value = data.active
+  if (data.active == '30') {
+    changeModel(30, 'view')
+    detailShow.value = true
+    return;
+  }
   getAllInfo(data.active)
 }
 </script>

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

@@ -297,14 +297,14 @@ const tableConfig = reactive({
           btn.push({label: '验收', prem: ['mosr:implementation:check'], func: () => handleCheck(row), type: 'primary'})
         }
         if (buttons.has("edit")) {
-        btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
+          btn.push({label: '编辑', prem: ['mosr:implementation:resubmit'], func: () => handleEdit(row), type: 'primary'})
         }
         if (buttons.has("standing")) {
           btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'})
         }
-        if (buttons.has("attachments")) {
-        btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
-        }
+        // if (buttons.has("attachments")) {
+        // btn.push({label: '附件', prem: ['project:management:implementation:attachment'], func: () => handleAttachment(row), type: 'primary'})
+        // }
         if (buttons.has("viewAllocation")) {
           btn.push({label: '查看分摊', prem: ['project:management:implementation:share'], func: () => handleShare(row), type: 'primary'})
         }
@@ -355,13 +355,19 @@ const search = (val) => {
 }
 
 const handleDetail = (row) => {
+  let step=''
+  if(row.state==0){
+    step='30'
+  }else {
+    step='40'
+  }
   router.push({
     name: 'Implementation/detail',
     query: {
       id: row.requirementId,
       projectId: row.projectId,
       state: row.state,
-      step: '40'
+      step: step
     }
   })
 }

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

@@ -483,7 +483,7 @@ const handleSubmit = async (instance) => {
               id: route.query.id,
               projectId: route.query.projectId,
               state: route.query.state,
-              step: '40'
+              step: '30'
             }
           })
         }

src/views/workflow/common/OperationRender.vue

@@ -1,8 +1,8 @@
 <template>
-  <div>
-    <el-button v-print="print" color="#ded0b2" icon="Printer"> 打印</el-button>
-  </div>
-  <div style="margin: 10px" id="printBox">
+<!--  <div>-->
+<!--    <el-button v-print="print" color="#ded0b2" icon="Printer"> 打印</el-button> id="printBox"-->
+<!--  </div>-->
+  <div style="margin: 10px" >
     <el-timeline>
       <el-timeline-item v-for="(operation,index) in operationList"
                         :key="index" :timestamp="operation.startTime"
@@ -104,34 +104,6 @@ const timeline = ref({
   icon: '',
   context: ''
 })
-const print = ref({
-  id: 'printBox',//这里的id就是上面我们的打印区域id，实现指哪打哪
-  popTitle: '配置页眉标题', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  previewTitle: '预览的标题', // 打印预览的标题
-  previewPrintBtnLabel: '预览结束，开始打印', // 打印预览的标题下方的按钮文本，点击可进入打印
-  zIndex: 20002, // 预览窗口的z-index，默认是20002，最好比默认值更高
-  previewBeforeOpenCallback() {
-    console.log('正在加载预览窗口！');
-  }, // 预览窗口打开之前的callback
-  previewOpenCallback() {
-    console.log('已经加载完预览窗口，预览打开了！')
-  }, // 预览窗口打开时的callback
-  beforeOpenCallback() {
-    console.log('开始打印之前！')
-  }, // 开始打印之前的callback
-  openCallback() {
-    console.log('执行打印了！')
-  }, // 调用打印时的callback
-  closeCallback() {
-    console.log('关闭了打印工具！')
-  }, // 关闭打印的callback(无法区分确认or取消)
-  clickMounted() {
-    console.log('点击v-print绑定的按钮了！')
-  },
-
-})
 
 const init = () => {
   switch (props.state) {