新增借款打印；

修改打印组件的位置等。

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-05 16:50:36
+ * @LastEditTime: 2024-08-07 09:41:32
 -->
 <template>
   <div class="app-container">
@@ -13,19 +13,6 @@
           <el-divider></el-divider>
           <el-form-item label="项目编号：" prop="projectId">
             <el-button type="primary" size="mini" @click="open = true" v-if="taskName == '合同拟稿'">选择项目</el-button>
-            <!-- <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
-              <el-descriptions-item label="项目编号" label-class-name="my-label">
-                {{ chooseProject.projectNumber }}</el-descriptions-item>
-              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
-              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA.partyAName
-                }}</el-descriptions-item>
-              <el-descriptions-item label="承担部门" label-class-name="my-label">
-                <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
-            </el-descriptions> -->
             <el-table :data="chooseProjectList" border v-if="isSelect">
               <el-table-column type="index" width="50" label="序号" />
               <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" />

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

@@ -0,0 +1,296 @@
+<template>
+  <div>
+    <div id="printBorrow">
+      <h2 class="text-center title">借款申请表</h2>
+      <table border="1">
+        <tr>
+          <td :colspan="2" class="fontbold" style="min-width:130px;">申请人</td>
+          <td :colspan="1"><span class="auditor">{{ getUserName(form.applier) }}</span></td>
+          <td :colspan="2" class="fontbold">申请部门</td>
+          <td :colspan="2">{{ getDeptName(form.applyDept) }}</td>
+          <td :colspan="2" class="fontbold">申请日期</td>
+          <td :colspan="2">{{ form.applyDate }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">费用类型</td>
+          <td :colspan="8">
+            {{ formartUsage(form.borrowUsage) }}
+          </td>
+        </tr>
+        <tr v-if="form.borrowUsage == '0'">
+          <td :colspan="2" class="fontbold">项目名称</td>
+          <td :colspan="4">{{ chooseProject.projectName }}</td>
+          <td :colspan="2" class="fontbold">项目编号</td>
+          <td :colspan="2">{{ chooseProject.projectNumber }}</td>
+        </tr>
+        <tr v-if="form.borrowUsage == '0'">
+          <td :colspan="2" class="fontbold">承担部门</td>
+          <td :colspan="4">{{ chooseProject.undertakingDeptName }}</td>
+          <td :colspan="2" class="fontbold">项目负责人</td>
+          <td :colspan="2">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : "" }}</td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">借款明细</td>
+          <td :colspan="8">
+            <table border="1" class="text-center">
+              <tr>
+                <td style="width:50px;">序号</td>
+                <td style="width:200px">开支项目</td>
+                <td>单位</td>
+                <td>单价</td>
+                <td>数量</td>
+                <td>申请金额</td>
+                <td v-if="form.borrowUsage == 0 || form.borrowUsage == 1">分管领导审核金额</td>
+              </tr>
+              <tr v-for="(detail, index) in detailList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  {{ detail.borrowItem }}
+                </td>
+                <td>
+                  {{ detail.unit }}
+                </td>
+                <td>
+                  {{ detail.price }}
+                </td>
+                <td>
+                  {{ detail.quantity }}
+                </td>
+                <td>
+                  {{ detail.applyAmount }}
+                </td>
+                <td>
+                  {{ detail.managerAmount }}
+                </td>
+              </tr>
+            </table>
+            <el-row class="mt10 text-center">
+              <el-col :span="6">申请金额：{{ form.applyAmount }}（元）</el-col>
+              <el-col :span="6">校准金额：{{ form.managerAmount }}（元）</el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">申请人说明</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.remark }}</div>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">部门负责人意见</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.deptComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.deptUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ form.deptTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">分管领导审核</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.managerComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ form.managerTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr v-if="form.borrowUsage != '0' && form.borrowUsage != '1'">
+          <td :colspan="2" class="fontbold">党工团审核</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.unionComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.unionUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ form.unionTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">总经理审批</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.zjlComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.zjlUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ form.zjlTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr v-if="form.borrowUsage == '0' && exceed">
+          <td :colspan="2" class="fontbold">董事长批准</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.dszComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.dszUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                审批日期：<span>{{ form.dszTime }}</span>
+              </el-col>
+            </el-row>
+          </td>
+        </tr>
+        <tr>
+          <td :colspan="2" class="fontbold">财务部处理</td>
+          <td :colspan="8">
+            <div class="minHeight">{{ form.cwComment }}</div>
+            <el-row>
+              <el-col :span="6" :offset="11">
+                签名：<span class="auditor">{{ getUserName(form.cwUserId) }}</span>
+              </el-col>
+              <el-col :span="6">
+                支付日期：<span>{{ form.cwTime }}</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: {
+    form: {
+      type: Object
+    },
+    chooseProject: {
+      type: Object
+    },
+    detailList: {
+      type: Array
+    },
+    exceed: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      print: {
+        id: 'printBorrow',
+        popTitle: '借款申请表', // 打印配置页上方标题
+        extraHead: '', //最上方的头部文字，附加在head标签上的额外标签,使用逗号分隔
+        preview: false, // 是否启动预览模式，默认是false（开启预览模式，可以先预览后打印）
+        previewTitle: '', // 打印预览的标题（开启预览模式后出现）,
+        previewPrintBtnLabel: '', // 打印预览的标题的下方按钮文本，点击可进入打印（开启预览模式后出现）
+        zIndex: '', // 预览的窗口的z-index，默认是 20002（此值要高一些，这涉及到预览模式是否显示在最上面）
+        previewBeforeOpenCallback() { }, //预览窗口打开之前的callback（开启预览模式调用）
+        previewOpenCallback() { }, // 预览窗口打开之后的callback（开启预览模式调用）
+        beforeOpenCallback() { }, // 开启打印前的回调事件
+        openCallback() { }, // 调用打印之后的回调事件
+        closeCallback() { }, //关闭打印的回调事件（无法确定点击的是确认还是取消）
+        url: '',
+        standard: '',
+        extraCss: ''
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    formartUsage(val) {
+      if (val == '0') {
+        return '项目借款'
+      } else if (val == '1') {
+        return '非项目借款'
+      } else if (val == '2') {
+        return '工会借款'
+      } else if (val == '3') {
+        return '党委借款'
+      } else {
+        return '团委借款'
+      }
+    }
+  }
+}
+</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: 20px;
+  font-weight: bold;
+  line-height: 30px;
+}
+
+.fontbold {
+  font-weight: bold;
+  text-align: center;
+}
+
+.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/finance/borrowForm.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
+    <el-button type="success" @click="printOpen = true">打印</el-button>
     <el-row :gutter="20">
       <el-col :span="flowDisabled ? 18 : 24" :xs="24">
         <h2 class="text-center">借款申请</h2>
@@ -38,12 +39,6 @@
           </el-form-item>
           <el-form-item label="项目编号" prop="projectId" v-if="taskForm.procDefName == '借款审批' && isProject">
             <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '借款申请'">选择项目</el-button>
-            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-              :disabled="taskName != '借款申请'" clearable>
-              <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
-                :value="item.projectId">
-              </el-option>
-            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: .125rem;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
                 }}</el-descriptions-item>
@@ -295,6 +290,11 @@
     <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
       <project-choose @chooseProject="confirmProject"></project-choose>
     </el-dialog>
+    <el-dialog title="打印预览" :visible.sync="printOpen" width="70%" append-to-body>
+      <borrow-print :form="form" :exceed="exceed" :chooseProject="chooseProject" :detailList="detailList"
+        @cancel="printOpen = false"></borrow-print>
+    </el-dialog>
+    <el-button type="success" @click="printOpen = true">打印</el-button>
   </div>
 </template>
 
@@ -312,12 +312,14 @@ import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 import { listBudget } from "@/api/oa/budget/budget";
 import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
 import FileItem from '../business/fileItem.vue';
+import BorrowPrint from '../components/print/borrowPrint.vue';
 
 export default {
   components: {
     flow,
     projectChoose,
-    FileItem
+    FileItem,
+    BorrowPrint
   },
   name: "Borrow",
   props: {
@@ -395,6 +397,7 @@ export default {
       dgtLabel: '工会审核意见',
       totalBudget: 0,
       hasBorrow: 0,
+      printOpen: false,
     };
   },
   created() {

oa-ui/src/views/flowable/form/inProgress/settleData.vue

@@ -54,7 +54,7 @@ import { MessageBox } from 'element-ui'
 import { listUser, getUser } from "@/api/system/user";
 import { Snowflake } from '@/utils/snowFlake.js'
 import SettleForm from '../settleForm.vue';
-import SettlePrint from '../components/settlePrint.vue';
+import SettlePrint from '../components/print/settlePrint.vue';
 export default {
   components: {
     SettleForm,

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

@@ -150,7 +150,7 @@ import {
   addTechnicalPlan,
   updateTechnicalPlan,
 } from "@/api/oa/technical/technicalPlan";
-import PlanPrint from '../components/planPrint.vue';
+import PlanPrint from '../components/print/planPrint.vue';
 export default {
   components: { technicalPlan, PlanPrint },
   props: {

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

@@ -72,7 +72,7 @@
 import { listSafe, getSafe, delSafe, addSafe, updateSafe } from "@/api/oa/safe/safe";
 import { listUser } from '@/api/system/user';
 import { getProject } from "@/api/oa/project/project";
-import safePrint from '../components/safePrint.vue';
+import safePrint from '../components/print/safePrint.vue';
 export default {
   components: { safePrint },
   props: {

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

@@ -81,7 +81,7 @@
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
 import { listUser } from '@/api/system/user';
 import { getProject } from "@/api/oa/project/project";
-import technicalPrint from '../components/technicalPrint.vue';
+import technicalPrint from '../components/print/technicalPrint.vue';
 export default {
   components: { technicalPrint },
   props: {

oa-ui/src/views/flowable/form/settleForm.vue

@@ -500,7 +500,7 @@ import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
 import { listBudget } from "@/api/oa/budget/budget";
 import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import SettlePrint from "./components/settlePrint.vue";
+import SettlePrint from "./components/print/settlePrint.vue";
 import { getDept } from "@/api/system/dept";
 import { getContract } from "@/api/oa/contract/contract";
 import ChooseProject from "./components/chooseProject.vue";

oa-ui/src/views/flowable/form/settleOther.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-08-07 13:30:38
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-08-07 14:15:44
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -37,7 +37,7 @@
             </el-col>
           </el-row>
           <el-form-item label="原始上报数据" prop="">
-            <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'项目结算/原始数据'"
+            <FileUpload v-if="taskName == '结算发起'" :limit="1" :filePathName="'其他结算/原始数据'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setSettleDocument">
             </FileUpload>
             <div v-if="form.settleDocument" class="upload-list">
@@ -51,7 +51,7 @@
             </div>
           </el-form-item>
           <el-form-item label="分管领导审核结算单" prop="">
-            <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'项目结算/分管领导审核结算单'"
+            <FileUpload v-if="taskName == '分管审核'" :limit="1" :filePathName="'其他结算/分管领导审核结算单'"
               :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setFinalDocument">
             </FileUpload>
             <div v-if="form.finalDocument" class="upload-list">
@@ -332,7 +332,7 @@ import { getUserByRole } from "@/api/system/role";
 import { getUserByPost } from "@/api/system/post";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept, } from "@/api/system/post.js";
-import SettlePrint from "./components/settlePrint.vue";
+import SettlePrint from "./components/print/settlePrint.vue";
 import { getDept } from "@/api/system/dept";
 export default {
   components: {

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-02 16:18:05
+ * @LastEditTime: 2024-08-07 14:12:06
 -->
 <template>
   <div class="app-container">
@@ -481,7 +481,7 @@ export default {
         || (this.taskForm.procDefName == '项目预算' && this.taskName != '预算审核') || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' ||
         this.taskForm.procDefName == '技术交底' || this.taskForm.procDefName == '技术方案' || this.taskForm.procDefName == '承接合同评审' || this.taskForm.procDefName == '分包合同评审'
         || this.taskForm.procDefName == '品牌项目支付' || this.taskForm.procDefName == '保证金审批' || this.taskForm.procDefName == '成果归档' || this.taskForm.procDefName == '项目结算'
-        || this.taskForm.procDefName == '项目变更') {
+        || this.taskForm.procDefName == '项目变更' || this.taskForm.procDefName == '其他结算') {
         return false
       } else {
         return true

oa-ui/src/views/oa/contract/subContract.vue

@@ -40,7 +40,7 @@
 
     <el-table v-loading="loading" border :data="subContractList" @selection-change="handleSelectionChange">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="合同名称" align="center" prop="subContractName" width="200px" />
+      <el-table-column label="合同名称" align="center" prop="subContractName" width="300px" />
       <el-table-column label="分包合同金额" align="center" prop="subAmount" />
       <el-table-column label="承接单位" align="center" prop="partner.partnerName" />
       <!-- <el-table-column label="承接单位联系人" align="center" prop="contactPerson" /> -->
@@ -51,13 +51,13 @@
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column label="拟稿日期" align="center" prop="draftTime" width="180">
+      <el-table-column label="拟稿日期" align="center" prop="draftTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.draftTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="合同备注" align="center" prop="remark" /> -->
-      <el-table-column label="签订日期" align="center" prop="signDate" width="180">
+      <el-table-column label="签订日期" align="center" prop="signDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.signDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -87,6 +87,8 @@
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
             v-hasPermi="['oa:subContract:query']">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:subContract:edit']">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -95,43 +97,68 @@
       @pagination="getList" />
 
     <!-- 添加或修改cmc分包合同评审对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="主合同id" prop="contractId">
-          <el-input v-model="form.contractId" placeholder="请输入主合同id" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="合同名称" prop="subContractName">
-          <el-input v-model="form.subContractName" placeholder="请输入合同名称" />
-        </el-form-item>
-        <el-form-item label="分包合同金额" prop="subAmount">
-          <el-input v-model="form.subAmount" placeholder="请输入分包合同金额" />
-        </el-form-item>
-        <el-form-item label="承接单位id" prop="partnerId">
-          <el-input v-model="form.partnerId" placeholder="请输入承接单位id" />
-        </el-form-item>
-        <el-form-item label="承接单位联系人" prop="contactPerson">
-          <el-input v-model="form.contactPerson" placeholder="请输入承接单位联系人" />
-        </el-form-item>
-        <el-form-item label="拟稿人" prop="drafter">
-          <el-input v-model="form.drafter" placeholder="请输入拟稿人" />
+          {{ form.subContractName }}
         </el-form-item>
         <el-form-item label="拟稿日期" prop="draftTime">
           <el-date-picker clearable v-model="form.draftTime" type="date" value-format="yyyy-MM-dd"
             placeholder="请选择拟稿日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="合同备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入合同备注" />
+        <el-form-item label="分管审批日期" prop="managerTime">
+          <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择分管审批日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理审批日期" prop="gmTime">
+          <el-date-picker clearable v-model="form.gmTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="签订日期" prop="signDate">
           <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="签订备注" prop="signRemark">
-          <el-input v-model="form.signRemark" placeholder="请输入签订备注" />
+        <el-form-item label="评审方式">
+          <el-tag :type="form.commentType == '2' ? 'success' : 'warning'">
+            {{ setCommentType(form.commentType) }}</el-tag>
         </el-form-item>
-        <el-form-item label="签订扫描件" prop="signScan">
-          <el-input v-model="form.signScan" placeholder="请输入签订扫描件" />
+        <el-form-item label="" label-width="0" v-if="form.commentType == '2'">
+          <table border="1" style="width:100%;">
+            <tr>
+              <td style="width: 50px;">序号</td>
+              <td>会审部门</td>
+              <td>会审人</td>
+              <td>会审意见</td>
+              <td style="width: 200px;">会审附件</td>
+              <td style="width: 100px;">日期</td>
+            </tr>
+            <tr v-for="(comment, index) in commentList" :key="index">
+              <td>
+                {{ index + 1 }}
+              </td>
+              <td>
+                {{ getDeptName(comment.deptId) }}
+              </td>
+              <td>
+                {{ getUserName(comment.userId) }}
+              </td>
+              <td>
+                {{ comment.comment }}
+              </td>
+              <td>
+                <el-link type="primary" @click="reviewWord(`${baseUrl}${'/profile/upload' + comment.document}`)">
+                  {{ getFileName(comment.document) }}
+                </el-link>
+              </td>
+              <td>
+                <el-date-picker v-model="comment.commentTime" type="date" value-format="yyyy-MM-dd" style="width:140px;"
+                  placeholder="选择日期"></el-date-picker>
+              </td>
+            </tr>
+          </table>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -154,6 +181,7 @@ import { listDefinition } from "@/api/flowable/definition";
 import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
 import { Snowflake } from '@/utils/snowFlake.js'
+import { listContractComment, addContractComment, updateContractComment, delContractComment } from "@/api/oa/contract/contractComment";
 
 export default {
   components: { subContract },
@@ -204,7 +232,9 @@ export default {
       },
       taskForm: {
         formId: ''
-      }
+      },
+      commentList: [],
+      commentOpen: false,
     };
   },
   created() {
@@ -279,7 +309,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc分包合同评审";
+      this.title = "新增分包合同评审_日期";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -288,7 +318,12 @@ export default {
       getSubContract(subContractId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc分包合同评审";
+        this.title = "修改分包合同评审_日期";
+        listContractComment({ pageNum: 1, pageSize: 100, contractId: subContractId }).then(res => {
+          if (res.rows && res.rows.length != 0) {
+            this.commentList = res.rows;
+          }
+        })
       });
     },
     async handleRegister() {
@@ -355,6 +390,9 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.subContractId != null) {
+            for (let comment of this.commentList) {
+              updateContractComment(comment);
+            }
             updateSubContract(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -410,3 +448,17 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+table {
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+  td {
+    padding: 5px;
+  }
+}
+</style>

oa-ui/src/views/oa/staff/index.vue

@@ -108,7 +108,7 @@
           <el-table-column label="职务" align="center" key="postName" prop="postName" v-if="columns[17].visible"
             :show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="职称" align="center" key="titles" prop="titles" v-if="columns[6].visible"
-            :show-overflow-tooltip="true">
+            :show-overflow-tooltip="true" sortable :sort-method="sortTitles">
             <template slot-scope="scope">
               {{ selectDictLabel(dict.type.sys_user_titles, scope.row.titles) }}
             </template>
@@ -122,7 +122,7 @@
           <el-table-column label="政治面貌" align="center" key="politicalAffiliation"
             :formatter="formatterPoliticalAffiliation" prop="politicalAffiliation" v-if="columns[14].visible" />
           <el-table-column label="民族" align="center" key="ethnic" prop="ethnic" v-if="columns[15].visible" />
-          <el-table-column label="入职时间" align="center" key="entryDate" prop="entryDate" v-if="columns[16].visible"
+          <el-table-column label="入职时间" sortable align="center" key="entryDate" prop="entryDate" v-if="columns[16].visible"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.entryDate, '{y}-{m}-{d}') }}</span>
@@ -233,8 +233,8 @@
               <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
             <el-form-item label="入职年月" prop="entryDate">
-              <el-date-picker v-model="form.entryDate" type="month" placeholder="请输入入职年月" style="width:100%;"
-                format="yyyy-MM" />
+              <el-date-picker v-model="form.entryDate" type="date" placeholder="请输入入职年月" style="width:100%;"
+                format="yyyy-MM-dd" />
             </el-form-item>
             <el-form-item label="合同签订" prop="contractSign">
               <el-date-picker v-model="form.contractSign" type="date" placeholder="请输入合同签订" style="width:100%;"
@@ -351,6 +351,7 @@ import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUs
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { number } from 'echarts';
 
 export default {
   name: "Staff",
@@ -475,7 +476,7 @@ export default {
       },
       certificates: '',
       postSalary: '',
-      postData:''
+      postData: ''
     };
   },
   watch: {
@@ -497,9 +498,9 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
-        this.userList.forEach(user => {
-          this.getPostByUser(user)
-        })
+        // this.userList.forEach(user => {
+        //   this.getPostByUser(user)
+        // })
         this.total = response.total;
         this.loading = false;
       }
@@ -546,15 +547,34 @@ export default {
         nickName: undefined,
         password: undefined,
         phonenumber: undefined,
-        email: undefined,
         sex: undefined,
         titles: undefined,
         status: "0",
         remark: undefined,
+        roleIds: [],
+        idCard: undefined,
+        nativePlace: undefined,
+        ethnic: undefined,
+        graduateSchool: undefined,
+        major: undefined,
+        degree: undefined,
+        homePlace: undefined,
+        entryDate: undefined,
+        contractSign: undefined,
+        contractExpire: undefined,
+        birthday: undefined,
+        politicalAffiliation: [],
+        titles: undefined,
+        certificates: [],
+        pmLevel: undefined,
+        engineerLevel: undefined,
+        operatorLevel: undefined,
         postIds: [],
-        roleIds: []
+        postLevel: undefined,
+        salaryLevel: undefined,
+        salaryLevel: undefined,
       };
-      this.resetForm("form");
+      // this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -591,13 +611,15 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
+      this.open = true;
+      this.title = "添加用户";
+      // getUser().then(response => {
+      //   this.postOptions = response.posts;
+      //   this.roleOptions = response.roles;
+      //   this.open = true;
+      //   this.title = "添加用户";
+      //   this.form.password = this.initPassword;
+      // });
     },
     // 查看人员详情按钮
     handleView(row) {
@@ -748,7 +770,7 @@ export default {
         const date = new Date(birthday);
         const formattedDate = this.parseTime(date, '{y}-{m}-{d}')
         return formattedDate;
-      }else{
+      } else {
         return null
       }
     },
@@ -807,6 +829,10 @@ export default {
       // 返回salaryLevel的差值  
       return aSalaryLevel - bSalaryLevel;
     },
+    sortTitles(a, b) {
+      let res = Number(b.titles) - Number(a.titles)
+      return res
+    },
     formatterDegree(row) {
       let v = this.selectDictLabel(this.dict.type.sys_user_degree, row.degree)
       return v
@@ -815,7 +841,7 @@ export default {
       let v = this.selectDictLabels(this.dict.type.sys_user_political, row.politicalAffiliation, ',')
       return v
     },
-    async getPostByUser(row){
+    async getPostByUser(row) {
       const userId = row.userId || this.ids;
       let resData = await getUser(userId);
       let postArr = [];
@@ -827,8 +853,8 @@ export default {
         }
       }
       let postStr = postArr.join('/');
-      this.$set(row,'postName',postStr)
-      
+      this.$set(row, 'postName', postStr)
+
     }
   }
 };