新增任务通知单打印

oa-ui/src/utils/deleteResource.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-13 17:07:59
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-02 17:02:24
+ * @LastEditTime: 2024-08-09 15:00:11
  */
 import request from '@/utils/request'
 
@@ -68,7 +68,28 @@ const apiEndpoints = [
     apiUrl: [
       '/oa/projectChange/:id',
     ]
-  }
+  },
+  {
+    procDefName: '成果归档',
+    apiUrl: [
+      '/oa/archive/:id',
+    ]
+  },
+  {
+    procDefName: '其他结算',
+    apiUrl: [
+      '/oa/settle/:id',
+      '/oa/settleSummary/:id',
+      '/oa/settleWork/:id',
+    ]
+  },
+  {
+    procDefName: '品牌项目支付',
+    apiUrl: [
+      '/oa/brand/:id',
+      '/oa/brandPayment/:id'
+    ]
+  },
 ]
 
 // 编写一个方法来处理删除请求，并同时发送所有API请求  

oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -99,8 +99,7 @@
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm" v-if="taskName == '支付申请'">确 定</el-button>
-          <el-button @click="cancel" v-if="taskName == '支付申请'">取 消</el-button>
+          <el-button type="primary" @click="submitForm" v-if="taskName == '支付申请'">提 交</el-button>
           <el-button @click="preserve()" type="warning" v-if="taskName == '财务反馈'">保 存</el-button>
           <el-button @click="submitForm" type="danger" v-if="taskName == '财务反馈'">保存并结束</el-button>
         </div>

oa-ui/src/views/flowable/form/components/print/projectPrint.vue

@@ -0,0 +1,212 @@
+<template>
+  <div>
+    <div id="printProject">
+      <h2 class="text-center title">任务通知单</h2>
+      <table border="1">
+        <tr>
+          <td class="fontbold">项目名称</td>
+          <td>{{ project.projectName }}</td>
+          <td class="fontbold">项目编号</td>
+          <td :colspan="3">{{ project.projectNumber }}</td>
+        </tr>
+        <tr>
+          <td class="fontbold">项目类型</td>
+          <td>{{ project.projectType }}</td>
+          <td class="fontbold">项目来源</td>
+          <td :colspan="3">{{ project.projectSource == '0' ? '院内' : '院外' }}</td>
+        </tr>
+        <tr>
+          <td class="fontbold">承担部门</td>
+          <td>{{ getDeptNames(project.undertakingDept) }}</td>
+          <td class="fontbold">项目负责人</td>
+          <td :colspan="3">{{ getUserName(project.projectLeader) }}</td>
+        </tr>
+        <tr>
+          <td class="fontbold">甲方单位</td>
+          <td>{{ project.partyA ? project.partyA.partyAName : '' }}</td>
+          <td class="fontbold">联系人及电话</td>
+          <td :colspan="3">{{ project.contactPerson + '/' + project.telephone }}</td>
+        </tr>
+        <tr>
+          <td :colspan="10" class="header bg text-center">测绘项目计划工作量</td>
+        </tr>
+        <tr class="text-center">
+          <td class="fontbold">序号</td>
+          <td class="fontbold">工作内容</td>
+          <td class="fontbold">比例尺或等级</td>
+          <td class="fontbold">单位</td>
+          <td class="fontbold">工作量</td>
+          <td class="fontbold">要求完成时间</td>
+        </tr>
+        <tr v-for="(work, index) in workList" class="text-center">
+          <td>{{ index + 1 }}</td>
+          <td>{{ work.content }}</td>
+          <td>{{ work.scale }}</td>
+          <td>{{ work.unit }}</td>
+          <td>{{ work.workload }}</td>
+          <td>{{ work.price }}</td>
+        </tr>
+        <!-- page-break-after:always  自动分页代码-->
+        <tr>
+          <td :colspan="10" class="header bg text-center">审核情况</td>
+        </tr>
+        <tr>
+          <td class="fontbold">
+            经营发展部审核
+          </td>
+          <td :colspan="5">
+            <div class="minHeight">{{ projectComment.jyComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(projectComment.jyApprover) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ projectComment.jyApprovalTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td class="fontbold">
+            分管领导批准
+          </td>
+          <td :colspan="5">
+            <div class="minHeight">{{ projectComment.manageComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(projectComment.manageApprover) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ projectComment.manageApprovalTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td class="fontbold">
+            生产部门确认
+          </td>
+          <td :colspan="5">
+            <div class="minHeight">{{ projectComment.scComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ projectComment.scApproverName }}</span>
+              </el-col>
+              <el-col :span="6" style="min-width:180px;">
+                审批日期：<span>{{ projectComment.scApprovalTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+      </table>
+    </div>
+    <div class="text-center mt20">
+      <el-button type="primary" v-print="print">确认打印</el-button>
+      <el-button @click="$emit('cancel')">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    project: {
+      type: Object
+    },
+    workList: {
+      type: Array
+    },
+    projectComment: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      print: {
+        id: 'printProject',
+        popTitle: '任务通知单', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  width: 90%;
+  // text-align: center;
+  border-collapse: collapse;
+  margin: 0 auto;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 10px;
+    // line-height: 30px;
+  }
+}
+
+.header {
+  font-family: '黑体';
+  font-size: 16px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.bg {
+  background-color: #eee;
+  -webkit-print-color-adjust: exact;
+}
+
+.title {
+  font-family: '黑体';
+  font-size: 25px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  text-align: center;
+  max-width: 200px;
+}
+
+.conment-width {
+  // max-width: 200px;
+}
+
+
+
+@page {
+  size: auto;
+  /* 去除页脚 */
+  margin-bottom: 0;
+  // 横向A4
+  // size:A4 landscape;
+}
+
+@media print {
+  #print table {
+    width: 100%;
+  }
+  
+}
+
+.minHeight {
+  min-height: 80px;
+}
+</style>

oa-ui/src/views/flowable/form/projectProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-08 16:19:34
+ * @LastEditTime: 2024-08-09 15:26:54
 -->
 
 <template>
@@ -60,7 +60,6 @@
         </el-card>
       </el-col>
     </el-row>
-
   </div>
 </template>
 

oa-ui/src/views/oa/device/detail.vue

@@ -102,19 +102,21 @@
           </div>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddExpense" v-hasPermi="['device:record:add']">新增</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddExpense"
+                v-hasPermi="['device:record:add']">新增</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
                 @click="handleDeleteExpense" v-hasPermi="['device:record:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini"
-                @click="handleExportExpense" v-hasPermi="['device:record:export']">导出</el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportExpense"
+                v-hasPermi="['device:record:export']">导出</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="info" plain icon="el-icon-s-release" size="mini" @click="handleScrap" v-hasPermi="['device:record:add']">{{ scrapButtonName
-              }}</el-button>
+              <el-button type="info" plain icon="el-icon-s-release" size="mini" @click="handleScrap"
+                v-hasPermi="['device:record:add']">{{ scrapButtonName
+                }}</el-button>
             </el-col>
           </el-row>
           <el-table v-loading="loading" :data="expenseList" @selection-change="handleSelectionExpenseChange">
@@ -127,7 +129,7 @@
             <el-table-column label="费用类型" align="center" prop="expenseType">
               <template slot-scope="scope">
                 <el-tag :type="expenseTypeStyle(scope.row.expenseType)">{{ expenseTypeText(scope.row.expenseType)
-                }}</el-tag>
+                  }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column label="费用金额" align="center" prop="expense" />
@@ -137,19 +139,25 @@
               </template>
             </el-table-column>
             <el-table-column label="备注" align="center" prop="remark" />
-            <el-table-column label="附件" align="center" prop="document" />
+            <el-table-column label="附件" align="center" prop="document">
+              <template slot-scope="scope">
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + scope.row.document}`)">
+                  {{ getFileName(scope.row.document) }}
+                </el-link>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-edit"
-                  @click="handleUpdateExpense(scope.row)" v-hasPermi="['device:record:edit']">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete"
-                  @click="handleDeleteExpense(scope.row)" v-hasPermi="['device:record:remove']">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateExpense(scope.row)"
+                  v-hasPermi="['device:record:edit']">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteExpense(scope.row)"
+                  v-hasPermi="['device:record:remove']">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
 
-          <pagination v-show="expenseTotal > 0" :total="expenseTotal" :autoScroll="false" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getExpenseList" />
+          <pagination v-show="expenseTotal > 0" :total="expenseTotal" :autoScroll="false"
+            :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getExpenseList" />
         </el-card>
       </el-col>
       <el-col :span="12" :xs="24">
@@ -160,15 +168,16 @@
           </div>
           <el-row v-if="routeType == 'supply'" :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddHandover" v-hasPermi="['device:record:add']">新增</el-button>
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddHandover"
+                v-hasPermi="['device:record:add']">新增</el-button>
             </el-col>
             <el-col :span="1.5">
               <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
                 @click="handleDeleteHandover" v-hasPermi="['device:record:remove']">删除</el-button>
             </el-col>
             <el-col :span="1.5">
-              <el-button type="warning" plain icon="el-icon-download" size="mini"
-                @click="handleExportHandover" v-hasPermi="['device:record:export']">导出</el-button>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportHandover"
+                v-hasPermi="['device:record:export']">导出</el-button>
             </el-col>
           </el-row>
           <!-- 设备申领记录 -->
@@ -210,8 +219,8 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination v-show="approvalTotal > 0" :total="approvalTotal" :autoScroll="false" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getApprovalList" />
+          <pagination v-show="approvalTotal > 0" :total="approvalTotal" :autoScroll="false"
+            :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getApprovalList" />
 
           <!-- 设备移交记录 -->
           <el-table v-if="routeType == 'supply'" v-loading="loading" :data="handoverList"
@@ -247,10 +256,10 @@
             <el-table-column label="备注" align="center" prop="remark" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-edit"
-                  @click="handleUpdateHandover(scope.row)" v-hasPermi="['device:record:edit']">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete"
-                  @click="handleDeleteHandover(scope.row)" v-hasPermi="['device:record:remove']">删除</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdateHandover(scope.row)"
+                  v-hasPermi="['device:record:edit']">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteHandover(scope.row)"
+                  v-hasPermi="['device:record:remove']">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -289,8 +298,8 @@
           <el-input v-model="expenseForm.remark" placeholder="请输入备注" />
         </el-form-item>
         <el-form-item label="附件" prop="document">
-          <FileUpload :limit="1" :filePathName="expenseName" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']"
-            @input="getExpensePath"></FileUpload>
+          <FileUpload :limit="1" :filePathName="expenseName"
+            :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="getExpensePath"></FileUpload>
           <div v-if="expenseModifyOpen">
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
               tag="ul">
@@ -401,7 +410,8 @@
             <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
               tag="ul">
               <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                <el-link :href="`${baseUrl}${'/profile/upload' + scrapForm.document}`" :underline="false" target="_blank">
+                <el-link :href="`${baseUrl}${'/profile/upload' + scrapForm.document}`" :underline="false"
+                  target="_blank">
                   <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
                     {{ getFileName(scrapForm.document) }}
                   </span>
@@ -849,29 +859,20 @@ export default {
       }
     },
     stateTypeText(row) {
-      if (row.repairDevices) {
-        if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
-          return '完好'
-        }
-        else {
-          return '需维修'
-        }
+      if (!row.repairDevices || row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
+        return '完好'
+      }
+      else {
+        return '需维修'
       }
-      else 
-      return '完好'
     },
     stateTypeStyle(row) {
-
-      if (row.repairDevices) {
-        if (row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
-          return 'success'
-        }
-        else {
-          return 'danger'
-        }
-      }
-      else 
+      if (!row.repairDevices || row.repairDevices.indexOf(this.$route.query.deviceId) == -1) {
         return 'success'
+      }
+      else {
+        return 'danger'
+      }
     },
     statusTypeText(row) {
       if (row == '0') {

oa-ui/src/views/oa/project/info.vue

@@ -2,6 +2,7 @@
   <div class="app-container">
     <div class="header">
       <el-button icon="el-icon-d-arrow-left" plain type="primary" class="back" @click="goBack">返回</el-button>
+      <el-button type="success" plain @click="printOpen = true" class="print" icon="el-icon-printer">打印任务通知单</el-button>
       <h1>{{ '【' + project.projectNumber + '】' + project.projectName }}</h1>
       <el-button icon="el-icon-search" type="primary" class="records" @click="clickRecords">流转记录</el-button>
       <el-button icon="el-icon-connection" type="success" class="flow" @click="clickProcess">流程图</el-button>
@@ -490,6 +491,9 @@
         <el-button @click="deptOpen = false">取消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="打印预览" :visible.sync="printOpen" width="1000px" append-to-body>
+      <project-print :project="project" :workList="workList" :projectComment="projectComment" @cancel="printOpen = false"></project-print>
+    </el-dialog>
     <el-drawer title="流程图" :visible.sync="drawerOpen" direction="rtl">
       <div class="app-container">
         <flow :flowData="flowData" />
@@ -528,9 +532,10 @@ import { listProjectChange } from "@/api/oa/project/projectChange";
 import { flowXmlAndNodeByFormId } from "@/api/flowable/definition";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import RowDetail from '@/views/flowable/task/myProcess/send/rowDetail.vue';
+import projectPrint from '@/views/flowable/form/components/print/projectPrint.vue';
 
 export default {
-  components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople, flow, RowDetail },
+  components: { budgetInfo, SafeTab, TechnicalTab, PlanTab, SettleData, BorrowData, BudgetTab, achiData, choosePeople, flow, RowDetail, projectPrint },
   created() {
     this.getUserList();
     this.getDeviceList();
@@ -585,7 +590,8 @@ export default {
         procInsId: '',
         deployId: ''
       },
-      isProjectLeader: false
+      isProjectLeader: false,
+      printOpen: false,
     }
   },
   methods: {
@@ -777,6 +783,12 @@ export default {
     top: -10px;
   }
 
+  .print {
+    position: absolute;
+    left: 102px;
+    top: -10px;
+  }
+
   .records {
     position: absolute;
     right: 120px;