修改登录界面

oa-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = CMC综合办公系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# CMC综合办公系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

oa-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = CMC综合办公系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# CMC综合办公系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

oa-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = CMC综合办公系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# CMC综合办公系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

oa-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.7",
-  "description": "若依管理系统",
+  "description": "CMC综合办公系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

oa-ui/src/assets/datas/CWContent.js

@@ -0,0 +1,177 @@
+export const CWContent = [
+  {
+    label: '账务处理',
+    value: 'f01',
+    children: [
+      {
+        label: '原始凭证审核',
+        value: 'f0101',
+        unit: '项'
+      },
+      {
+        label: '凭证编制',
+        value: 'f0102',
+        unit: '项'
+      },
+      {
+        label: '凭证审核',
+        value: 'f0103',
+        unit: '项'
+      },
+      {
+        label: '凭证装订成册',
+        value: 'f0104',
+        unit: '项'
+      },
+      {
+        label: '财务报表编制',
+        value: 'f0105',
+        unit: '项'
+      },
+      {
+        label: '登记合同台账',
+        value: 'f0106',
+        unit: '项'
+      },
+      {
+        label: '费用核算',
+        value: 'f0107',
+        unit: '项'
+      },
+      {
+        label: '业务结算核查',
+        value: 'f0108',
+        unit: '项'
+      }
+    ]
+  },
+  {
+    label: '税务管理',
+    value: 'f02',
+    children: [
+      {
+        label: '税务申报',
+        value: 'f0201',
+        unit: '项'
+      },
+      {
+        label: '纳税报表编制申报',
+        value: 'f0202',
+        unit: '项'
+      },
+      {
+        label: '股权交易税务处理',
+        value: 'f0203',
+        unit: '项'
+      }
+    ]
+  },
+  {
+    label: '分子公司财务银行管理',
+    value: 'f03',
+    children: [
+      {
+        label: '账套管理',
+        value: 'f0301',
+        unit: '项'
+      },
+      {
+        label: '税务申报',
+        value: 'f0302',
+        unit: '项'
+      },
+      {
+        label: '账务核算',
+        value: 'f0303',
+        unit: '项'
+      },
+      {
+        label: '业务结算核查',
+        value: 'f0304',
+        unit: '项'
+      },
+      {
+        label: '网银管理',
+        value: 'f0305',
+        unit: '项'
+      },
+      {
+        label: '银行对账',
+        value: 'f0306',
+        unit: '项'
+      },
+      {
+        label: '现金及银行收付处理',
+        value: 'f0307',
+        unit: '项'
+      }
+    ]
+  },
+  {
+    label: '银行业务',
+    value: 'f04',
+    children: [
+      {
+        label: '账户维护',
+        value: 'f0401',
+        unit: '项'
+      },
+      {
+        label: '银行开户、销户',
+        value: 'f0402',
+        unit: '项'
+      },
+      {
+        label: '现金及银行收付处理',
+        value: 'f0403',
+        unit: '项'
+      },
+      {
+        label: '贷款申请办理',
+        value: 'f0404',
+        unit: '项'
+      },
+      {
+        label: '银行对账',
+        value: 'f0405',
+        unit: '项'
+      },
+      {
+        label: '相关银行补助申报',
+        value: 'f0406',
+        unit: '项'
+      },
+      {
+        label: '贷后检查',
+        value: 'f0407',
+        unit: '项'
+      },
+      {
+        label: '担保、保函业务',
+        value: 'f0408',
+        unit: '项'
+      }
+    ]
+  },
+  {
+    label: '相关系统数据申报',
+    value: 'f05',
+    children: [
+      {
+        label: '统计联网直报',
+        value: 'f0501',
+        unit: '项'
+      },
+      {
+        label: '新经济管理系统',
+        value: 'f0502',
+        unit: '项'
+      },
+      {
+        label: '成都市科技项目申报系统',
+        value: 'f0503',
+        unit: '项'
+      }
+    ]
+  }
+]

oa-ui/src/assets/styles/index.scss

@@ -189,3 +189,8 @@ aside {
 .multiselect--active {
   z-index: 1000 !important;
 }
+
+@font-face {
+  font-family: 'CMCTitle'; // 根据自己用的去重命名字体名 
+  src: url('~@/assets/font/cmctitle/cmctitle.woff');
+}

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-20 17:17:50
+ * @LastEditTime: 2024-02-21 10:54:40
 -->
 <template>
   <div>
@@ -28,7 +28,7 @@
           <el-scrollbar style="height: 500px;">
             <div v-for="ass in AssessmentContent" v-if="ass.label == item">
               <table border="1" cellspacing="0" align="center" cellpadding="5">
-                <tr style="background-color:#409EFF;color: #fff;">
+                <tr style="background-color:#409EFF;color:#fff;">
                   <td>等级、比例尺等</td>
                   <td>工作量</td>
                   <td>单位</td>
@@ -49,12 +49,12 @@
                   <td>{{ child.unit }}</td>
                 </tr>
                 <tr>
-                  <td>参与情况</td>
+                  <td>熟练程度</td>
                   <td colspan="2">
-                    <el-radio-group v-model="form['role' + ass.value.slice(-2)]">
-                      <el-radio label="00">主办</el-radio>
-                      <el-radio label="01">参与</el-radio>
-                      <el-radio label="02">协助</el-radio>
+                    <el-radio-group v-model="form['familiar' + ass.value.slice(-2)]">
+                      <el-radio :label="0">生疏</el-radio>
+                      <el-radio :label="2">熟练</el-radio>
+                      <el-radio :label="3">精通</el-radio>
                     </el-radio-group>
                   </td>
                 </tr>
@@ -81,26 +81,26 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <ZhTable :tableForm="noNullForm" ref="zhTable" @submit="submit"></ZhTable>
+      <CwTable :tableForm="noNullForm" ref="cwTable" @submit="submit" @close="taskOpen = false"></CwTable>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { ZHContent } from '@/assets/datas/ZHContent'
+import { CWContent } from '@/assets/datas/CWContent'
 import { MessageBox } from 'element-ui'
 import { Snowflake } from '@/utils/snowFlake.js'
 import { submitAssess } from '@/api/oa/assess/assess.js'
 import { listProject } from '@/api/oa/project/project.js'
 import { getProject } from '@/api/oa/project/project'
-import ZhTable from './zhTable.vue';
+import CwTable from './cwTable.vue';
 export default {
   dicts: ['cmc_skill'],
-  components: { ZhTable },
+  components: { CwTable },
   data() {
     return {
       checkedBtn: [],
-      AssessmentContent: ZHContent,
+      AssessmentContent: CWContent,
       projectList: [],
       form: {},
       noNullForm: {},
@@ -166,8 +166,8 @@ export default {
       }
       if (flag) {
         this.taskOpen = true;
-        if (this.$refs.zhTable != undefined) {
-          this.$refs.zhTable.formatForm();
+        if (this.$refs.cwTable != undefined) {
+          this.$refs.cwTable.formatForm();
         }
       }
     },
@@ -185,7 +185,7 @@ export default {
       if (index !== -1) {
         this.checkedBtn.splice(index, 1);
       }
-      for (let i of ZHContent) {
+      for (let i of CWContent) {
         if (i.label == item) {
           number = i.value;
         }
@@ -221,7 +221,7 @@ export default {
       }
     },
     changeLabelToValue(label) {
-      for (let s of ZHContent) {
+      for (let s of CWContent) {
         if (s.label == label) {
           return s.value.slice(-2)
         }

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

@@ -0,0 +1,686 @@
+<template>
+  <div style="padding:10px">
+    <h2 style="text-align: center;">财务部考核表</h2>
+    <table class="table" ref="tableDatas">
+      <tr>
+        <td class="table-title">姓名</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
+        <td class="table-title">考核年度</td>
+        <td> {{ tableForm.assessTime }}</td>
+        <td colspan="3" class="table-title">部门负责人考核意见</td>
+        <td colspan="3" class="table-title" style="width:300px;">分管领导考核意见</td>
+      </tr>
+      <tr>
+        <td class="table-title">所在部门</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.deptName }}</td>
+        <td colspan="3">
+          <el-radio-group v-model="tableForm.deptAssessment" :disabled="!isDeptLeader">
+            <el-radio v-for="dict in dict.type.cmc_accessment" :key="dict.value" :label="dict.value">
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </td>
+        <td colspan="3">
+          <el-radio-group v-model="tableForm.managerAssessment" :disabled="!isManager">
+            <el-radio v-for="dict in dict.type.cmc_accessment" :key="dict.value" :label="dict.value">
+              {{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </td>
+      </tr>
+      <tr>
+        <td class="table-title">部门职务</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
+        <td colspan="3" rowspan="3">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice"
+            :disabled="!isDeptLeader">
+          </el-input>
+          <el-row justify="center" type="flex">
+            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isDeptLeader"></el-input> </el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
+                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+          </el-row>
+        </td>
+        <td colspan="3" rowspan="3">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice"
+            :disabled="!isManager">
+          </el-input>
+          <el-row justify="center">
+            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isManager"></el-input></el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
+                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+          </el-row>
+        </td>
+      </tr>
+      <tr>
+        <td class="table-title">技术职称</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.titles }}</td>
+      </tr>
+      <tr>
+        <td class="table-title">入职年月</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
+        <td class="table-title">年龄</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
+      </tr>
+      <tr>
+        <td rowspan="2" class="table-title">考核内容</td>
+        <td colspan="5" class="table-title">被考核人填写</td>
+        <td colspan="3" class="table-title" style="width:300px;">项目负责人考核</td>
+      </tr>
+      <tr>
+        <td class="table-title">工作内容</td>
+        <td class="table-title">单位</td>
+        <td class="table-title">工作量</td>
+        <td class="table-title">熟练程度</td>
+        <td class="table-title">备注</td>
+        <td class="table-title">工作量</td>
+        <td class="table-title">岗位综合表现</td>
+        <td class="table-title">考核建议</td>
+      </tr>
+      <tr>
+        <td rowspan="8">账务处理</td>
+        <td>原始凭证审核</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0101 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0101"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
+            <div><el-radio :label="0">生疏</el-radio></div>
+            <div><el-radio :label="2">熟练</el-radio></div>
+            <div><el-radio :label="3">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+
+        <td rowspan="8">
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload01')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.assessment01" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment01')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>凭证编制</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0102 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0102"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>凭证审核</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0103 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0103"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>凭证装订成册</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0104 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0104"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>财务报表编制</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0105 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0105"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>登记合同台账</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0106 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0106">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>费用核算</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0107 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0107">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>业务结算核查</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0108 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0108">
+          </el-input>
+        </td>
+      </tr>
+      <!--  -->
+      <tr>
+        <td rowspan="3">税务管理</td>
+        <td>税务申报</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0201 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0201"></el-input>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
+            <div><el-radio :label="0">生疏</el-radio></div>
+            <div><el-radio :label="2">熟练</el-radio></div>
+            <div><el-radio :label="3">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload02')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.assessment02" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment02')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice02" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>纳税报表编制申报</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0202 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0202"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>股权交易税务处理</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0203 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0203"></el-input>
+        </td>
+      </tr>
+
+
+      <!--  -->
+      <tr>
+        <td rowspan="7">分子公司财务银行管理</td>
+        <td>账套管理</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0301 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0301"></el-input>
+        </td>
+        <td rowspan="7">
+          <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
+            <div><el-radio :label="0">生疏</el-radio></div>
+            <div><el-radio :label="2">熟练</el-radio></div>
+            <div><el-radio :label="3">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+        <td rowspan="7">
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="7">
+          <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload03')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="7">
+          <el-radio-group v-model="tableForm.assessment03" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment03')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="7">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice03" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>税务申报</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0302 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0302"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>账务核算</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0303 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0303"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>业务结算核查</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0304 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0304"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>网银管理</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0305 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0305"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>银行对账</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0306 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0306"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>现金及银行收付处理</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0307 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0307"></el-input>
+        </td>
+      </tr>
+      <!--  -->
+      <tr>
+        <td rowspan="8">银行业务</td>
+        <td>账户维护</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0401 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0401"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.familiar04" :disabled="!isStaff">
+            <div><el-radio :label="0">生疏</el-radio></div>
+            <div><el-radio :label="2">熟练</el-radio></div>
+            <div><el-radio :label="3">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload04')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.assessment04" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice04" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>银行开户、销户</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0402 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0402"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>现金及银行收付处理</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0403 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0403"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>贷款申请办理</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0404 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0404"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>银行对账</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0405 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0405"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>相关银行补助申报</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0406 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0406"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>贷后检查</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0407 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0407"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>担保、保函业务</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0408 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0408"></el-input>
+        </td>
+      </tr>
+      <!--  -->
+      <tr>
+        <td rowspan="3">相关系统数据申报</td>
+        <td>统计联网直报</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0501 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0501"></el-input>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
+            <div><el-radio :label="0">生疏</el-radio></div>
+            <div><el-radio :label="2">熟练</el-radio></div>
+            <div><el-radio :label="3">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload05')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <el-radio-group v-model="tableForm.assessment05" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="3">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice05" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>新经济管理系统</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0502 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0502"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>成都市科技项目申报系统</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0503 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0503"></el-input>
+        </td>
+      </tr>
+      <!--  -->
+      <tr style="height:90px;">
+        <td>其他工作</td>
+        <td colspan="9">
+          <span v-if="!isStaff">{{ tableForm.otherWork }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.otherWork" type="textarea" :rows="2"></el-input>
+        </td>
+      </tr>
+      <tr style="height:90px;">
+        <td>年度自述</td>
+        <td colspan="9">
+          <span v-if="!isStaff">{{ tableForm.selfAssess }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.selfAssess" type="textarea" :rows="2"></el-input>
+        </td>
+      </tr>
+    </table>
+    <el-row justify="center" type="flex" style="margin-top:20px;"
+      v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
+      <el-button type="primary" @click="submit">提交</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { XMContent } from '@/assets/datas/XMContent'
+import { getDicts as getDicts } from '@/api/system/dict/data'
+export default {
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment', 'cmc_workload'],
+  props: {
+    tableForm: {
+      type: Object,
+      required: true
+    },
+  },
+  watch: {
+    tableForm: function (newval, oldval) {
+      this.formatForm();
+    }
+  },
+  data() {
+    return {
+      form: {},
+      radio1: "",
+      radio2: "",
+      textarea1: "",
+      textarea2: "",
+      isDeptLeader: false,
+      isPiLeader: false,
+      isManager: false,
+      isStaff: false,
+    }
+  },
+  created() {
+    this.initForm();
+  },
+  mounted() {
+    this.formatForm();
+  },
+  methods: {
+    initForm() {
+
+    },
+    formatForm() {
+      if (this.tableForm.taskName == '项目负责人审核') {
+        this.isPiLeader = true;
+        this.isDeptLeader = false;
+        this.isManager = false;
+        this.isStaff = false;
+      } else if (this.tableForm.taskName == '部门审核') {
+        this.isPiLeader = false;
+        this.isDeptLeader = true;
+        this.isManager = false;
+        this.isStaff = false;
+      } else if (this.tableForm.taskName == '分管领导审核') {
+        this.isPiLeader = false;
+        this.isDeptLeader = false;
+        this.isManager = true;
+        this.isStaff = false;
+      } else if (this.tableForm.taskName == '员工修改') {
+        this.isPiLeader = false;
+        this.isDeptLeader = false;
+        this.isManager = false;
+        this.isStaff = true;
+      }
+    },
+    submit() {
+      if (!this.isStaff) {
+        this.$emit('submit', this.tableForm);
+      } else {
+        this.$emit('submit', this.tableForm);
+      }
+
+    },
+    cancelSelect(value, name) {
+      debugger
+      if (!this.isPiLeader) {
+        return
+      }
+      if (this.tableForm[name] == value) {
+        this.tableForm[name] = null
+      } else {
+
+        if (this.tableForm[name] !== undefined)
+          this.tableForm[name] = value
+      }
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.table {
+  border-collapse: collapse;
+  width: 100%;
+}
+
+.table-title {
+  background-color: #dad4d4;
+}
+
+.table,
+th,
+td {
+  border: 1px solid black;
+  text-align: center;
+}
+
+td {
+  height: 24px;
+  width: 100px;
+}
+
+.head {
+  background-color: #ccc;
+}
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
+  border-color: #fff;
+}
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
+  background-color: #409eff;
+  border-color: #409eff;
+}
+
+::v-deep .el-checkbox__input.is-disabled+span.el-checkbox__label {
+  color: #000;
+}
+
+::v-deep .el-checkbox__label {
+  font-size: 12px;
+}
+
+::v-deep .el-radio__input.is-disabled .el-radio__inner,
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #f1f1f1;
+  border-color: #f1f1f1;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #000;
+}
+
+
+::v-deep .el-radio__input.is-checked .el-radio__inner::after {
+  content: "";
+  width: 10px;
+  height: 5px;
+  border: 2px solid #409eff;
+  border-top: transparent;
+  border-right: transparent;
+  text-align: center;
+  display: block;
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  vertical-align: middle;
+  transform: rotate(-45deg);
+  border-radius: 0px;
+  background: none;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-20 10:40:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-20 10:58:38
+ * @LastEditTime: 2024-02-21 10:00:38
 -->
 <template>
   <!-- 技术质量部 -->
@@ -82,7 +82,7 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <JsTable :tableForm="noNullForm" ref="jsTable" @submit="submit"></JsTable>
+      <JsTable :tableForm="noNullForm" ref="jsTable" @submit="submit" @close="taskOpen = false"></JsTable>
     </el-dialog>
   </div>
 </template>

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

@@ -96,7 +96,8 @@
         </td>
         
         <td rowspan="6">
-          <div>{{ tableForm.remark01 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
         </td>
         <!-- 工作量 -->
         <td rowspan="6">
@@ -192,7 +193,8 @@
           </el-radio-group>
         </td>
         <td rowspan="4">
-          <div>{{ tableForm.remark02 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
         </td>
         <!-- 工作量 -->
         <td rowspan="4">
@@ -271,7 +273,8 @@
           </el-radio-group>
         </td>
         <td rowspan="13">
-          <div>{{ tableForm.remark03 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
         </td>
         <!-- 工作量 -->
         <td rowspan="13">
@@ -423,14 +426,15 @@
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark04 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
         </td>
         <!-- 工作量 -->
         <td rowspan="5">
           <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload05')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload04')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -511,7 +515,8 @@
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <div>{{ tableForm.remark05 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
         </td>
         <!-- 工作量 -->
         <td rowspan="3">
@@ -585,7 +590,7 @@
     <el-row justify="center" type="flex" style="margin-top:20px;"
       v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
       <el-button type="primary" @click="submit">提交</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>

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

@@ -81,7 +81,7 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <JyTable :tableForm="noNullForm" ref="jyTable" @submit="submit"></JyTable>
+      <JyTable :tableForm="noNullForm" ref="jyTable" @submit="submit" @close="taskOpen = false"></JyTable>
     </el-dialog>
   </div>
 </template>

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

@@ -18,7 +18,7 @@
         <td class="table-title">考核年度</td>
         <td> {{ tableForm.assessTime }}</td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
-        <td colspan="3" class="table-title">分管领导考核意见</td>
+        <td colspan="3" class="table-title" style="width:300px;">分管领导考核意见</td>
       </tr>
       <tr>
         <td class="table-title">所在部门</td>
@@ -41,7 +41,7 @@
       <tr>
         <td class="table-title">部门职务</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
-        <td colspan="3" rowspan="5">
+        <td colspan="3" rowspan="3">
           <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
@@ -49,7 +49,7 @@
             <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.deptTime" style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
           </el-row>
         </td>
-        <td colspan="3" rowspan="5">
+        <td colspan="3" rowspan="3">
           <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
           </el-input>
           <el-row justify="center">
@@ -58,18 +58,10 @@
           </el-row>
         </td>
       </tr>
-      <tr>
-        <td class="table-title">项目经理</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.pmLevel }}</td>
-      </tr>
       <tr>
         <td class="table-title">技术职称</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.titles }}</td>
       </tr>
-      <tr>
-        <td class="table-title">作业类别</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.remark }}</td>
-      </tr>
       <tr>
         <td class="table-title">入职年月</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
@@ -79,7 +71,7 @@
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
         <td colspan="5" class="table-title">被考核人填写</td>
-        <td colspan="3" class="table-title" style="width:300px;">项目负责人考核</td>
+        <td colspan="3" class="table-title">项目负责人考核</td>
       </tr>
       <tr>
         <td class="table-title">等级、比例尺等</td>
@@ -87,8 +79,8 @@
         <td class="table-title">工作量</td>
         <td class="table-title">熟练程度</td>
         <td class="table-title">备注</td>
-        <td class="table-title">产品质量</td>
-        <td class="table-title">技能掌握</td>
+        <td class="table-title">工作量</td>
+        <td class="table-title">岗位综合表现</td>
         <td class="table-title">考核建议</td>
       </tr>
       <tr>
@@ -108,22 +100,23 @@
         </td>
         
         <td rowspan="6">
-          <div>{{ tableForm.remark01 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
-          <el-radio-group v-model="tableForm.quality01" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality01')">
+          <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload01')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-radio-group v-model="tableForm.skill01" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01')">
+          <el-radio-group v-model="tableForm.accessment01" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'accessment01')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -191,22 +184,23 @@
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <div>{{ tableForm.remark02 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.quality02" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality02')">
+          <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload02')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.skill02" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02')">
+          <el-radio-group v-model="tableForm.accessment02" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'accessment02')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -249,22 +243,23 @@
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <div>{{ tableForm.remark03 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.quality03" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality03')">
+          <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'workload03')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.skill03" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03')">
+          <el-radio-group v-model="tableForm.accessment03" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'accessment03')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -310,7 +305,7 @@
     <el-row justify="center" type="flex" style="margin-top:20px;"
       v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
       <el-button type="primary" @click="submit">提交</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
@@ -319,7 +314,7 @@
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 export default {
-  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment'],
+  dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment','cmc_workload'],
   props: {
     tableForm: {
       type: Object,

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

@@ -96,7 +96,7 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <ScTable :tableForm="noNullForm" ref="scTable" @submit="submit"></ScTable>
+      <ScTable :tableForm="noNullForm" ref="scTable" @submit="submit" @close="taskOpen = false"></ScTable>
     </el-dialog>
   </div>
 </template>

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

@@ -117,6 +117,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality01" :disabled="!isPiLeader">
@@ -203,6 +204,7 @@
         </td>
         <td rowspan="10">
           <div>{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
           <el-radio-group v-model="tableForm.quality02" :disabled="!isPiLeader">
@@ -326,6 +328,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality03" :disabled="!isPiLeader">
@@ -409,6 +412,7 @@
         </td>
         <td rowspan="4">
           <div>{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality04" :disabled="!isPiLeader">
@@ -481,6 +485,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality05" :disabled="!isPiLeader">
@@ -568,6 +573,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark06 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark06"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality06" :disabled="!isPiLeader">
@@ -655,6 +661,7 @@
         </td>
         <td rowspan="4">
           <div>{{ tableForm.remark07 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark07"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality07" :disabled="!isPiLeader">
@@ -727,6 +734,7 @@
         </td>
         <td rowspan="3">
           <div>{{ tableForm.remark08 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark08"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.quality08" :disabled="!isPiLeader">
@@ -792,6 +800,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark09 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark09"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality09" :disabled="!isPiLeader">
@@ -880,6 +889,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark10 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark10"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality10" :disabled="!isPiLeader">
@@ -960,6 +970,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark11 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark11"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality11" :disabled="!isPiLeader">
@@ -1048,6 +1059,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark12 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark12"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality12" :disabled="!isPiLeader">
@@ -1128,6 +1140,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark13 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark13"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality13" :disabled="!isPiLeader">
@@ -1216,6 +1229,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark14 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark14"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality14" :disabled="!isPiLeader">
@@ -1304,6 +1318,7 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark15 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark15"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality15" :disabled="!isPiLeader">
@@ -1392,6 +1407,7 @@
         </td>
         <td rowspan="4">
           <div>{{ tableForm.remark16 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark16"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality16" :disabled="!isPiLeader">
@@ -1463,6 +1479,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark17 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark17"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality17" :disabled="!isPiLeader">
@@ -1538,7 +1555,7 @@
     <el-row justify="center" type="flex" style="margin-top:20px;"
       v-if="tableForm.taskName == undefined || tableForm.taskName == '员工填报'">
       <el-button type="primary" @click="submit">提交</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-20 15:08:09
+ * @LastEditTime: 2024-02-21 09:59:59
 -->
 <template>
   <div>
@@ -81,7 +81,7 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <XmTable :tableForm="noNullForm" ref="xmTable" @submit="submit"></XmTable>
+      <XmTable :tableForm="noNullForm" ref="xmTable" @submit="submit" @close="taskOpen = false"></XmTable>
     </el-dialog>
   </div>
 </template>

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

@@ -91,12 +91,13 @@
         
         <td rowspan="6">
           <div>{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
-          <el-radio-group v-model="tableForm.quality01" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality01')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload01')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -176,12 +177,13 @@
         </td>
         <td rowspan="6">
           <div>{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
-          <el-radio-group v-model="tableForm.quality02" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality02')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload02')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -262,12 +264,13 @@
         </td>
         <td rowspan="3">
           <div>{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
-          <el-radio-group v-model="tableForm.quality03" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'quality03')">
+                @click.native.prevent="cancelSelect(dict.value, 'workload03')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -322,7 +325,7 @@
     <el-row justify="center" type="flex" style="margin-top:20px;"
       v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
       <el-button type="primary" @click="submit">提交</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>

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

@@ -81,7 +81,7 @@
       </el-row>
     </el-form>
     <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
-      <ZhTable :tableForm="noNullForm" ref="zhTable" @submit="submit"></ZhTable>
+      <ZhTable :tableForm="noNullForm" ref="zhTable" @submit="submit" @close="taskOpen = false"></ZhTable>
     </el-dialog>
   </div>
 </template>
@@ -156,7 +156,7 @@ export default {
       }
       for (let btn of this.checkedBtn) {
         let ids = this.changeLabelToValue(btn);
-        if (this.form['familiar' + ids] == undefined) {
+        if (this.form['role' + ids] == undefined) {
           this.$message.error('熟练程度为必填项，请完善！');
           flag = 0
           break

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

@@ -97,6 +97,7 @@
 
         <td rowspan="9">
           <div>{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="9">
           <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
@@ -210,6 +211,7 @@
         </td>
         <td rowspan="8">
           <div>{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
@@ -311,6 +313,7 @@
         </td>
         <td rowspan="5">
           <div>{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
@@ -387,6 +390,7 @@
         </td>
         <td rowspan="7">
           <div>{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
@@ -479,6 +483,7 @@
         </td>
         <td rowspan="10">
           <div>{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
           <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
@@ -594,6 +599,7 @@
         </td>
         <td rowspan="7">
           <div>{{ tableForm.remark06 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark06"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.workload06" :disabled="!isPiLeader">
@@ -685,6 +691,7 @@
         </td>
         <td rowspan="2">
           <div>{{ tableForm.remark07 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark07"  type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="2">
           <el-radio-group v-model="tableForm.workload07" :disabled="!isPiLeader">
@@ -738,7 +745,7 @@
     <el-row justify="center" type="flex" style="margin-top:20px;"
       v-if="tableForm.taskName == undefined || tableForm.taskName == '员工修改'">
       <el-button type="primary" @click="submit">提交</el-button>
-      <el-button>取消</el-button>
+      <el-button @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>

oa-ui/src/views/flowable/task/myProcess/send/index.vue

@@ -22,6 +22,7 @@
           <zh-form @submit="submitForm" v-else-if="deployName == '综合事务部考核'"></zh-form>
           <js-form @submit="submitForm" v-else-if="deployName == '技术质量部考核'"></js-form>
           <xm-form @submit="submitForm" v-else-if="deployName == '项目管理部考核'"></xm-form>
+          <cw-form @submit="submitForm" v-else-if="deployName == '财务部考核'"></cw-form>
           <el-col :span="16" :offset="4" v-else>
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="formConf" @submit="submitForm" ref="parser"
@@ -61,6 +62,7 @@ import JyForm from '../../../form/jyForm.vue';
 import ZhForm from '../../../form/zhForm.vue';
 import JsForm from '../../../form/jsForm.vue';
 import XmForm from '../../../form/xmForm.vue';
+import CwForm from '../../../form/cwForm.vue';
 
 export default {
   name: "Record",
@@ -73,7 +75,8 @@ export default {
     JyForm,
     ZhForm,
     JsForm,
-    XmForm
+    XmForm,
+    CwForm
 },
   props: {},
   data() {

oa-ui/src/views/index.vue

@@ -80,10 +80,10 @@
               <el-row class="item-icon"><i class="el-icon-tickets"></i></el-row>
               <el-row>新建申请</el-row>
             </el-col>
-            <el-col :span="4" class="item" style="background-color: #40A9FF;padding:3px">
+            <!-- <el-col :span="4" class="item" style="background-color: #40A9FF;padding:3px">
               <el-row class="item-icon"><i class="el-icon-s-order"></i></el-row>
               <el-row>新建项目</el-row>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-col>
         <el-col :span="12" class="meau-right">

oa-ui/src/views/login.vue

@@ -1,29 +1,32 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-01-03 09:23:11
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-02-21 17:20:33
+-->
 <template>
-  <div class="login">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
-      <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
-        </el-input>
-      </el-form-item>
-      <!-- <el-form-item prop="code" v-if="captchaEnabled">
+  <el-row class="login-wrapper">
+    <el-col :xs="0" class="login-bg">
+      <div class="logo-title">
+        <div class="logo-img"></div>
+        <div class="logo-text">四川中水成勘院测绘工程有限责任公司</div>
+      </div>
+    </el-col>
+    <el-col :xs="18" class="login-box">
+      <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+        <h3 class="title">CMC综合办公系统</h3>
+        <el-form-item prop="username">
+          <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
+            <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="password">
+          <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
+            @keyup.enter.native="handleLogin">
+            <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          </el-input>
+        </el-form-item>
+        <!-- <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
           auto-complete="off"
@@ -37,28 +40,23 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item> -->
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
-          <span v-if="!loading">登 录</span>
-          <span v-else>登 录 中...</span>
-        </el-button>
-        <div style="float: right;" v-if="register">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
-        </div>
-      </el-form-item>
-    </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
-    </div>
-  </div>
+        <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+        <el-form-item style="width:100%;">
+          <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+            @click.native.prevent="handleLogin">
+            <span v-if="!loading">登 录</span>
+            <span v-else>登 录 中...</span>
+          </el-button>
+          <div style="float: right;" v-if="register">
+            <router-link class="link-type" :to="'/register'">立即注册</router-link>
+          </div>
+        </el-form-item>
+      </el-form>
+      <!-- <div class="el-login-footer">
+        <span>Copyright © 2023-2024 四川中水成勘院测绘工程有限责任公司 All Rights Reserved.</span>
+      </div> -->
+    </el-col>
+  </el-row>
 </template>
 
 <script>
@@ -66,6 +64,7 @@ import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
+
 export default {
   name: "Login",
   data() {
@@ -97,7 +96,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
       immediate: true
@@ -141,7 +140,7 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$router.push({ path: this.redirect || "/" }).catch(() => { });
           }).catch(() => {
             this.loading = false;
             if (this.captchaEnabled) {
@@ -152,68 +151,104 @@ export default {
       });
     }
   }
-};
+}
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
-.login {
+<style lang="scss" scoped>
+.login-wrapper {
+  width: 100%;
+  height: 100vh;
   display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
-  background-size: cover;
-}
-.title {
-  margin: 0px auto 30px auto;
-  text-align: center;
-  color: #707070;
+
+  .login-bg {
+    flex: 1.8;
+    min-width: 0%;
+    background: url('../assets/images/xizang02.jpg') no-repeat;
+    position: relative;
+  }
+
+  // .login-bg::after {
+  //   content: '';
+  //   position: absolute;
+  //   left: 0;
+  //   top: 0;
+  //   width: 100%;
+  //   height: 100%;
+  //   background-color: rgba($color: #2144b4, $alpha: 0.3);
+  // }
+
+  .login-box {
+    flex: 1.5;
+    min-width: 45%;
+    position: relative;
+  }
+
+  .login-box::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: -166px;
+    width: 100%;
+    height: 100%;
+    background-color: #fff;
+    transform: skew(-15deg);
+    transform-origin: 0;
+  }
 }
 
 .login-form {
-  border-radius: 6px;
-  background: #ffffff;
-  width: 400px;
-  padding: 25px 25px 5px 25px;
-  .el-input {
-    height: 38px;
-    input {
-      height: 38px;
-    }
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -55%);
+  width: 380px;
+  height: 500px;
+  padding: 0 20px;
+
+  .title {
+    font-size: 40px;
+    margin-bottom: 40px;
+    color: #504d4d;
+    font-family: 'CMCTitle';
   }
-  .input-icon {
-    height: 39px;
-    width: 14px;
-    margin-left: 2px;
+
+  .el-login-footer {
+    position: absolute;
+    left: 50%;
+    bottom: 10px;
+    transform: translate(-50%, -0%);
+    height: 40px;
+    line-height: 40px;
+    position: fixed;
+    bottom: 0;
+    text-align: center;
+    color: #2e9de7;
+    font-family: Arial;
+    font-size: 12px;
+    letter-spacing: 1px;
   }
 }
-.login-tip {
-  font-size: 13px;
-  text-align: center;
-  color: #bfbfbf;
-}
-.login-code {
-  width: 33%;
-  height: 38px;
-  float: right;
-  img {
-    cursor: pointer;
+
+.login-bg {
+  .logo-title {
+    z-index: 999;
     vertical-align: middle;
+    display: flex;
+    align-items: center;
+    padding-top: 20px;
+    padding-left: 20px;
+    .logo-img{
+      background: url('~@/assets/images/logo.png')no-repeat;
+      background-size: 100% 100%;
+      width: 74px;
+      height: 64px;
+    }
+    .logo-text{
+      padding-left: 10px;
+      color: #fff;
+      font-weight: bold;
+      font-size: 25px;
+    }
   }
 }
-.el-login-footer {
-  height: 40px;
-  line-height: 40px;
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  text-align: center;
-  color: #fff;
-  font-family: Arial;
-  font-size: 12px;
-  letter-spacing: 1px;
-}
-.login-code-img {
-  height: 38px;
-}
-</style>
+</style>

oa-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">CMC综合办公系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

oa-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || 'CMC综合办公系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口