修改查看按钮显示错误

oa-ui/src/views/flowable/form/components/settlePrint.vue

@@ -92,38 +92,38 @@
         <tr>
           <td :colspan="2" class="fontbold">综合事务部(设备领用情况)</td>
           <td :colspan="4" class="conment-width">{{ form.zhComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.zhUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.zhTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.zhUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.zhTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">技术质量部(质量及工作量)</td>
           <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jsUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.jsTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jsUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jsTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">经营发展部(校核)</td>
           <td :colspan="4" class="conment-width">{{ form.jyComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.jyUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.jyTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jyUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jyTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">分管领导(审核)</td>
           <td :colspan="4" class="conment-width">{{ form.managerComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.managerUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.managerTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.managerUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.managerTime }}</td>
         </tr>
         <tr>
           <td :colspan="2" class="fontbold">总经理(审批)</td>
           <td :colspan="4" class="conment-width">{{ form.gmComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.gmUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.gmTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.gmUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.gmTime }}</td>
         </tr>
         <tr v-if="form.dszTime">
           <td :colspan="2" class="fontbold">董事长（批准）</td>
           <td :colspan="4" class="conment-width">{{ form.dszComment }}</td>
-          <td :colspan="2" style="text-align:left;">签名：<span class="auditor">{{ form.dszUserName }}</span></td>
-          <td :colspan="2" style="text-align:left;">日期：{{ form.dszTime }}</td>
+          <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.dszUserId) }}</span></td>
+          <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.dszTime }}</td>
         </tr>
       </table>
     </div>
@@ -186,7 +186,6 @@ export default {
   },
   methods: {
     initTable() {
-      console.log(this.settleList);
       this.deductionsList = []
       this.deptSettleList = []
       for (let s of this.settleList) {
@@ -254,7 +253,7 @@ table {
 }
 
 .conment-width {
-  max-width: 200px;
+  // max-width: 200px;
 }
 
 

oa-ui/src/views/flowable/form/finance/depositForm.vue

@@ -248,6 +248,11 @@ export default {
       default: true
     }
   },
+  watch:{
+    'taskForm.formId'(){
+      this.initForm();
+    }
+  },
   name: "Deposit",
   data() {
     return {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="mt20" style="width:99%">
+  <div class="mt20" style="width:100%">
     <div class="nav-btn" v-if="taskName != ''">
       <div>
         <el-button class="mb20" type="primary" plain size="mini" icon="el-icon-plus" @click="addAchi">成果汇交</el-button>
@@ -36,10 +36,10 @@
       <el-table-column label="质量检查时间" prop="qualityTime" show-overflow-tooltip width="120" />
       <el-table-column label="生产部门检查时间" prop="produceTime" show-overflow-tooltip width="130" />
       <el-table-column label="归档时间" prop="archiveTime" show-overflow-tooltip width="120" />
-      <el-table-column label="生产部门意见" prop="produceComment" show-overflow-tooltip width="120" />
+      <!-- <el-table-column label="生产部门意见" prop="produceComment" show-overflow-tooltip width="120" />
       <el-table-column label="质量检查意见" prop="qualityComment" show-overflow-tooltip width="120" />
       <el-table-column label="技术质量与安全部审核意见" prop="deptComment" show-overflow-tooltip width="120" />
-      <el-table-column label="归档意见" prop="archiveComment" show-overflow-tooltip width="120" />
+      <el-table-column label="归档意见" prop="archiveComment" show-overflow-tooltip width="120" /> -->
       <el-table-column label="操作" fixed="right" header-align="center">
         <template slot-scope="scope">
           <el-button icon="el-icon-view" type="text" size="mini" @click="handleLook(scope.row)">查看明细</el-button>

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-11 20:14:35
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-12 10:12:15
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -530,8 +530,10 @@ export default {
     }
   },
   watch: {
-    'taskForm.formId'() {
-
+    'chooseProject.projectId'(val) {
+      this.getBudgetSettle();
+    },
+    'taskForm.formId'(){
       this.initForm();
     }
   },
@@ -539,7 +541,7 @@ export default {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
       printOpen: false,
-      loading: true,
+      loading: false,
       drawer: false,
       prOpen: false,
       flag: false,
@@ -603,11 +605,6 @@ export default {
       isModify: false, //是否可以修改结算工作量
     };
   },
-  watch: {
-    'chooseProject.projectId'(val) {
-      this.getBudgetSettle();
-    }
-  },
   created() {
     this.getProjectList(); //获取项目列表
     this.getContractDataList(); //获取合同编码和编号
@@ -636,6 +633,7 @@ export default {
   methods: {
     // 初始化表单
     async initForm() {
+      this.loading = true
       const res = await listSettle({ settleId: this.taskForm.formId });
       if (res.total === 1) {
         this.form = res.rows[0];

oa-ui/src/views/oa/brand/brandProject.vue

@@ -459,6 +459,7 @@ export default {
     async handleUpdate(row) {
       this.reset();
       this.isView = false;
+      const projectId = row.projectId
       let brandFormData = await listBrand({ projectId })
       let brandId;
       if (brandFormData.total == 1) {

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

@@ -94,6 +94,7 @@ import { listBudget, getBudget, delBudget, addBudget, updateBudget } from "@/api
 import { listProject } from '@/api/oa/project/project';
 import budgetInfo from '../../flowable/form/budget/budgetInfo.vue';
 import FormData from './formData.vue';
+import { checkPermi } from '@/utils/permission';
 export default {
   name: "Budget",
   components: { budgetInfo, FormData, },

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

@@ -60,7 +60,7 @@
           <span>{{ parseTime(scope.row.reportTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="工作量上报说明" align="center" prop="workloadReport" />
+      <!-- <el-table-column label="工作量上报说明" align="center" prop="workloadReport" /> -->
       <el-table-column label="结算说明" align="center" prop="settleComment" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">