1

src/views/tasks/components/hc-data/task-review.vue

@@ -87,68 +87,67 @@
                                 <div v-if="tabKey === '2'" class="hc-task-body-table-form">
                                     <template v-if="rowInfo.meterType === 1 || rowInfo.meterType === 3">
                                         <div class="title-box">
-                                            <div class="title">名称（开发中...）</div>
+                                            <div v-if="meterApproveOpinion1.projectName" class="title">{{ meterApproveOpinion1.projectName }}</div>
                                             <div class="text">审批意见</div>
                                         </div>
-
-                                        <div class="name">总监理工程师意见：</div>
-                                        <div v-if="meterApproveOpinion1.chiefSupervisor" class="text-box hc-bt-0">
-                                            <div class="content">{{ meterApproveOpinion1.chiefSupervisor }}</div>
-                                            <div v-if="meterApproveOpinion1.chiefSupervisorUserName" class="sign-name">
-                                                <div class="user-name">工程部：{{ meterApproveOpinion1.chiefSupervisorUserName }}</div>
-                                                <div class="user-time">{{ meterApproveOpinion1.chiefSupervisorTime }}</div>
+                                        <div class="name">计量工程师意见：</div>
+                                        <div v-if="meterApproveOpinion1.meterEngineer" class="text-box hc-bt-0">
+                                            <div class="content">{{ meterApproveOpinion1.meterEngineer }}</div>
+                                            <div v-if="meterApproveOpinion1.meterEngineerUserName" class="sign-name">
+                                                <div class="user-name">工程部：{{ meterApproveOpinion1.meterEngineerUserName }}</div>
+                                                <div class="user-time">{{ meterApproveOpinion1.meterEngineerTime }}</div>
                                             </div>
                                         </div>
                                         <div v-else class="input hc-bt-0">
-                                            <el-input v-model="meterApproveOpinion2.chiefSupervisor" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
+                                            <el-input v-model="meterApproveOpinion2.meterEngineer" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                                         </div>
 
                                         <div class="name hc-bt-0">项目经理意见：</div>
-                                        <div v-if="meterApproveOpinion1.supervisorAudit19" class="text-box hc-bt-0">
-                                            <div class="content">{{ meterApproveOpinion1.supervisorAudit19 }}</div>
-                                            <div v-if="meterApproveOpinion1.supervisorAudit19" class="sign-name">
-                                                <div class="user-name">工程部：{{ meterApproveOpinion1.supervisorAudit19 }}</div>
-                                                <div class="user-time">{{ meterApproveOpinion1.supervisorAudit19 }}</div>
+                                        <div v-if="meterApproveOpinion1.projectManager" class="text-box hc-bt-0">
+                                            <div class="content">{{ meterApproveOpinion1.projectManager }}</div>
+                                            <div v-if="meterApproveOpinion1.projectManagerUserName" class="sign-name">
+                                                <div class="user-name">工程部：{{ meterApproveOpinion1.projectManagerUserName }}</div>
+                                                <div class="user-time">{{ meterApproveOpinion1.projectManagerTime }}</div>
                                             </div>
                                         </div>
                                         <div v-else class="input hc-bt-0">
-                                            <el-input v-model="meterApproveOpinion2.supervisorAudit19" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="开发中..." />
+                                            <el-input v-model="meterApproveOpinion2.projectManager" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                                         </div>
 
                                         <div class="name hc-bt-0">合同监理工程师意见：</div>
-                                        <div v-if="meterApproveOpinion1.supervisorAudit20" class="text-box hc-bt-0">
-                                            <div class="content">{{ meterApproveOpinion1.supervisorAudit20 }}</div>
-                                            <div v-if="meterApproveOpinion1.supervisorAudit20" class="sign-name">
-                                                <div class="user-name">工程部：{{ meterApproveOpinion1.supervisorAudit20 }}</div>
-                                                <div class="user-time">{{ meterApproveOpinion1.supervisorAudit20 }}</div>
+                                        <div v-if="meterApproveOpinion1.contractSupervisorEngineer" class="text-box hc-bt-0">
+                                            <div class="content">{{ meterApproveOpinion1.contractSupervisorEngineer }}</div>
+                                            <div v-if="meterApproveOpinion1.contractSupervisorEngineerUserName" class="sign-name">
+                                                <div class="user-name">工程部：{{ meterApproveOpinion1.contractSupervisorEngineerUserName }}</div>
+                                                <div class="user-time">{{ meterApproveOpinion1.contractSupervisorEngineerTime }}</div>
                                             </div>
                                         </div>
                                         <div v-else class="input hc-bt-0">
-                                            <el-input v-model="meterApproveOpinion2.supervisorAudit20" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="开发中..." />
+                                            <el-input v-model="meterApproveOpinion2.contractSupervisorEngineer" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                                         </div>
 
                                         <div class="name hc-bt-0">业主代表意见：</div>
-                                        <div v-if="meterApproveOpinion1.supervisorAudit21" class="text-box hc-bt-0">
-                                            <div class="content">{{ meterApproveOpinion1.supervisorAudit21 }}</div>
-                                            <div v-if="meterApproveOpinion1.supervisorAudit21" class="sign-name">
-                                                <div class="user-name">工程部：{{ meterApproveOpinion1.supervisorAudit21 }}</div>
-                                                <div class="user-time">{{ meterApproveOpinion1.supervisorAudit21 }}</div>
+                                        <div v-if="meterApproveOpinion1.ownerDelegate" class="text-box hc-bt-0">
+                                            <div class="content">{{ meterApproveOpinion1.ownerDelegate }}</div>
+                                            <div v-if="meterApproveOpinion1.ownerDelegateUserName" class="sign-name">
+                                                <div class="user-name">工程部：{{ meterApproveOpinion1.ownerDelegateUserName }}</div>
+                                                <div class="user-time">{{ meterApproveOpinion1.ownerDelegateTime }}</div>
                                             </div>
                                         </div>
                                         <div v-else class="input hc-bt-0">
-                                            <el-input v-model="meterApproveOpinion2.supervisorAudit21" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="开发中..." />
+                                            <el-input v-model="meterApproveOpinion2.ownerDelegate" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                                         </div>
 
                                         <div class="name hc-bt-0">总监理工程师意见：</div>
-                                        <div v-if="meterApproveOpinion1.supervisorAudit22" class="text-box hc-bt-0">
-                                            <div class="content">{{ meterApproveOpinion1.supervisorAudit22 }}</div>
-                                            <div v-if="meterApproveOpinion1.supervisorAudit22" class="sign-name">
-                                                <div class="user-name">工程部：{{ meterApproveOpinion1.supervisorAudit22 }}</div>
-                                                <div class="user-time">{{ meterApproveOpinion1.supervisorAudit22 }}</div>
+                                        <div v-if="meterApproveOpinion1.chiefSupervisor" class="text-box hc-bt-0">
+                                            <div class="content">{{ meterApproveOpinion1.chiefSupervisor }}</div>
+                                            <div v-if="meterApproveOpinion1.chiefSupervisorUserName" class="sign-name">
+                                                <div class="user-name">工程部：{{ meterApproveOpinion1.chiefSupervisorUserName }}</div>
+                                                <div class="user-time">{{ meterApproveOpinion1.chiefSupervisorTime }}</div>
                                             </div>
                                         </div>
                                         <div v-else class="input hc-bt-0">
-                                            <el-input v-model="meterApproveOpinion2.supervisorAudit22" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="开发中..." />
+                                            <el-input v-model="meterApproveOpinion2.chiefSupervisor" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                                         </div>
 
                                         <template v-if="rowInfo.meterType === 3">
@@ -733,10 +732,10 @@ const tabsChange = ({ key }) => {
                 margin-bottom: 10px;
                 .title {
                     font-size: 18px;
+                    margin-bottom: 20px;
                 }
                 .text {
                     font-size: 15px;
-                    margin-top: 20px;
                 }
             }
             .text-box {