审批意见修改

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

@@ -253,71 +253,22 @@
                                             </div>
                                             <div class="text">审批意见</div>
                                         </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.meterEngineer" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
-                                        </div>
-
-                                        <div class="name hc-bt-0">项目经理意见：</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.projectManager" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
-                                        </div>
-
-                                        <div class="name hc-bt-0">合同监理工程师意见：</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.contractSupervisorEngineer" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
-                                        </div>
-
-                                        <div class="name hc-bt-0">业主代表意见：</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.ownerDelegate" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
-                                        </div>
-                                        -->
+                              
 
                                         <div class="name">
                                             总监理工程师意见：
                                         </div>
-                                        <div
-                                            v-if="
-                                                meterApproveOpinion1.chiefSupervisor
-                                                  
-                                            "
-                                            class="hc-bt-0 text-box"
-                                        >
-                                            <div class="content">
-                                                {{
+                                        <div class="hc-bt-0 input">
+                                            <el-input
+                                                v-model="
                                                     meterApproveOpinion1.chiefSupervisor
-                                                }}
-                                            </div>
+                                                "
+                                                :autosize="{
+                                                    minRows: 2,
+                                                    maxRows: 4,
+                                                }"
+                                                type="textarea"
+                                            />
                                             <div
                                                 v-if="
                                                     meterApproveOpinion1.chiefSupervisorUserName
@@ -336,18 +287,6 @@
                                                 </div>
                                             </div>
                                         </div>
-                                        <div v-else class="hc-bt-0 input">
-                                            <el-input
-                                                v-model="
-                                                    meterApproveOpinion2.chiefSupervisor
-                                                "
-                                                :autosize="{
-                                                    minRows: 2,
-                                                    maxRows: 4,
-                                                }"
-                                                type="textarea"
-                                            />
-                                        </div>
 
                                         <template
                                             v-if="rowInfo.meterType === 3"
@@ -355,18 +294,17 @@
                                             <div class="name hc-bt-0">
                                                 监理审核意见：
                                             </div>
-                                            <div
-                                                v-if="
-                                                    meterApproveOpinion1.supervisorAudit
-                                                        && !meterApproveOpinion1.supervisorAuditDefault
-                                                "
-                                                class="text-box hc-bt-0"
-                                            >
-                                                <div class="content">
-                                                    {{
+                                            <div class="input hc-bt-0 textarea-container">
+                                                <el-input
+                                                    v-model="
                                                         meterApproveOpinion1.supervisorAudit
-                                                    }}
-                                                </div>
+                                                    "
+                                                    :autosize="{
+                                                        minRows: 2,
+                                                        maxRows: 4,
+                                                    }"
+                                                    type="textarea"
+                                                />
                                                 <div
                                                     v-if="
                                                         meterApproveOpinion1.supervisorAuditUserName
@@ -384,19 +322,7 @@
                                                         }}
                                                     </div>
                                                 </div>
-                                            </div>
-                                            <div v-else class="input hc-bt-0 textarea-container">
-                                                <el-input
-                                                    v-model="
-                                                        meterApproveOpinion2.supervisorAudit
-                                                    "
-                                                    :autosize="{
-                                                        minRows: 2,
-                                                        maxRows: 4,
-                                                    }"
-                                                    type="textarea"
-                                                />
-                                                <div v-if="!meterApproveOpinion1.supervisorAuditDefault" class="suffix-icon">
+                                                <div v-if="!meterApproveOpinion1.supervisorAudit" class="suffix-icon">
                                                     <span>(不填写默认为拟同意)</span>
                                                 </div>
                                             </div>
@@ -408,17 +334,19 @@
                                                     工程建设部意见：
                                                 </div>
                                                 <div
-                                                    v-if="
-                                                        meterApproveOpinion1.projectBuild
-                                                            && !meterApproveOpinion1.projectBuildDefault
-                                                    "
-                                                    class="text-box hc-bt-0"
+                                                    
+                                                    class="input hc-bt-0 textarea-container"
                                                 >
-                                                    <div class="content">
-                                                        {{
+                                                    <el-input
+                                                        v-model="
                                                             meterApproveOpinion1.projectBuild
-                                                        }}
-                                                    </div>
+                                                        "
+                                                        :autosize="{
+                                                            minRows: 2,
+                                                            maxRows: 4,
+                                                        }"
+                                                        type="textarea"
+                                                    />
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.projectBuildUserName
@@ -436,14 +364,23 @@
                                                             }}
                                                         </div>
                                                     </div>
+                                                    <div v-if="!meterApproveOpinion1.projectBuild" class="suffix-icon">
+                                                        <span>(不填写默认为拟同意)</span>
+                                                    </div>
                                                 </div>
+                                            </div>
+                                            <div class="box">
+                                                <div class="name hc-bt-0 no-b">
+                                                    分管领导意见：
+                                                </div>
+                                          
                                                 <div
-                                                    v-else
-                                                    class="input hc-bt-0 textarea-container"
+                                                   
+                                                    class="input no-b hc-bt-0 textarea-container"
                                                 >
                                                     <el-input
                                                         v-model="
-                                                            meterApproveOpinion2.projectBuild
+                                                            meterApproveOpinion1.projectBuildLeader
                                                         "
                                                         :autosize="{
                                                             minRows: 2,
@@ -451,27 +388,6 @@
                                                         }"
                                                         type="textarea"
                                                     />
-                                                    <div v-if="!meterApproveOpinion1.projectBuildDefault" class="suffix-icon">
-                                                        <span>(不填写默认为拟同意)</span>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="box">
-                                                <div class="name hc-bt-0 no-b">
-                                                    分管领导意见：
-                                                </div>
-                                                <div
-                                                    v-if="
-                                                        meterApproveOpinion1.projectBuildLeader
-                                                            && !meterApproveOpinion1.projectBuildLeaderDefault
-                                                    "
-                                                    class="text-box no-b hc-bt-0"
-                                                >
-                                                    <div class="content">
-                                                        {{
-                                                            meterApproveOpinion1.projectBuildLeader
-                                                        }}
-                                                    </div>
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.projectBuildLeaderUserName
@@ -489,22 +405,7 @@
                                                             }}
                                                         </div>
                                                     </div>
-                                                </div>
-                                                <div
-                                                    v-else
-                                                    class="input no-b hc-bt-0 textarea-container"
-                                                >
-                                                    <el-input
-                                                        v-model="
-                                                            meterApproveOpinion2.projectBuildLeader
-                                                        "
-                                                        :autosize="{
-                                                            minRows: 2,
-                                                            maxRows: 4,
-                                                        }"
-                                                        type="textarea"
-                                                    />
-                                                    <div v-if="!meterApproveOpinion1.projectBuildLeaderDefault" class="suffix-icon">
+                                                    <div v-if="!meterApproveOpinion1.projectBuildLeader" class="suffix-icon">
                                                         <span>(不填写默认为拟同意)</span>
                                                     </div>
                                                 </div>
@@ -518,18 +419,21 @@
                                                 <div class="name hc-bt-0">
                                                     安全管理部意见：
                                                 </div>
+                                         
                                                 <div
-                                                    v-if="
-                                                        meterApproveOpinion1.safetyManager
-                                                            && !meterApproveOpinion1.safetyManagerDefault
-                                                    "
-                                                    class="text-box hc-bt-0"
+                                                   
+                                                    class="input hc-bt-0 textarea-container"
                                                 >
-                                                    <div class="content">
-                                                        {{
+                                                    <el-input
+                                                        v-model="
                                                             meterApproveOpinion1.safetyManager
-                                                        }}
-                                                    </div>
+                                                        "
+                                                        :autosize="{
+                                                            minRows: 2,
+                                                            maxRows: 4,
+                                                        }"
+                                                        type="textarea"
+                                                    />
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.safetyManagerUserName
@@ -547,14 +451,23 @@
                                                             }}
                                                         </div>
                                                     </div>
+                                                    <div v-if="!meterApproveOpinion1.safetyManager" class="suffix-icon">
+                                                        <span>(不填写默认为拟同意)</span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="box">
+                                                <div class="name no-b hc-bt-0">
+                                                    分管领导意见：
                                                 </div>
+                                     
                                                 <div
-                                                    v-else
-                                                    class="input hc-bt-0 textarea-container"
+                                                  
+                                                    class="input no-b hc-bt-0 textarea-container"
                                                 >
                                                     <el-input
                                                         v-model="
-                                                            meterApproveOpinion2.safetyManager
+                                                            meterApproveOpinion1.safetyManagerLeader
                                                         "
                                                         :autosize="{
                                                             minRows: 2,
@@ -562,27 +475,6 @@
                                                         }"
                                                         type="textarea"
                                                     />
-                                                    <div v-if="!meterApproveOpinion1.safetyManagerDefault" class="suffix-icon">
-                                                        <span>(不填写默认为拟同意)</span>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="box">
-                                                <div class="name no-b hc-bt-0">
-                                                    分管领导意见：
-                                                </div>
-                                                <div
-                                                    v-if="
-                                                        meterApproveOpinion1.safetyManagerLeader
-                                                            && !meterApproveOpinion1.safetyManagerLeaderDefault
-                                                    "
-                                                    class="text-box no-b hc-bt-0"
-                                                >
-                                                    <div class="content">
-                                                        {{
-                                                            meterApproveOpinion1.safetyManagerLeader
-                                                        }}
-                                                    </div>
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.safetyManagerLeaderUserName
@@ -600,22 +492,7 @@
                                                             }}
                                                         </div>
                                                     </div>
-                                                </div>
-                                                <div
-                                                    v-else
-                                                    class="input no-b hc-bt-0 textarea-container"
-                                                >
-                                                    <el-input
-                                                        v-model="
-                                                            meterApproveOpinion2.safetyManagerLeader
-                                                        "
-                                                        :autosize="{
-                                                            minRows: 2,
-                                                            maxRows: 4,
-                                                        }"
-                                                        type="textarea"
-                                                    />
-                                                    <div v-if="!meterApproveOpinion1.safetyManagerLeaderDefault" class="suffix-icon">
+                                                    <div v-if="!meterApproveOpinion1.safetyManagerLeader" class="suffix-icon">
                                                         <span>(不填写默认为拟同意)</span>
                                                     </div>
                                                 </div>
@@ -626,18 +503,21 @@
                                                 <div class="name hc-bt-0">
                                                     合同部意见：
                                                 </div>
+                                    
                                                 <div
-                                                    v-if="
-                                                        meterApproveOpinion1.contractDept
-                                                            && !meterApproveOpinion1.contractDeptDefault
-                                                    "
-                                                    class="text-box hc-bt-0"
+                                                  
+                                                    class="input hc-bt-0 textarea-container"
                                                 >
-                                                    <div class="content">
-                                                        {{
+                                                    <el-input
+                                                        v-model="
                                                             meterApproveOpinion1.contractDept
-                                                        }}
-                                                    </div>
+                                                        "
+                                                        :autosize="{
+                                                            minRows: 2,
+                                                            maxRows: 4,
+                                                        }"
+                                                        type="textarea"
+                                                    />
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.contractDeptUserName
@@ -655,14 +535,23 @@
                                                             }}
                                                         </div>
                                                     </div>
+                                                    <div v-if="!meterApproveOpinion1.contractDept" class="suffix-icon">
+                                                        <span>(不填写默认为拟同意)</span>
+                                                    </div>
                                                 </div>
+                                            </div>
+                                            <div class="box">
+                                                <div class="name no-b hc-bt-0">
+                                                    分管领导意见：
+                                                </div>
+                                 
                                                 <div
-                                                    v-else
-                                                    class="input hc-bt-0 textarea-container"
+                                                 
+                                                    class="input no-b hc-bt-0 textarea-container"
                                                 >
                                                     <el-input
                                                         v-model="
-                                                            meterApproveOpinion2.contractDept
+                                                            meterApproveOpinion1.contractDeptLeader
                                                         "
                                                         :autosize="{
                                                             minRows: 2,
@@ -670,27 +559,6 @@
                                                         }"
                                                         type="textarea"
                                                     />
-                                                    <div v-if="!meterApproveOpinion1.contractDeptDefault" class="suffix-icon">
-                                                        <span>(不填写默认为拟同意)</span>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="box">
-                                                <div class="name no-b hc-bt-0">
-                                                    分管领导意见：
-                                                </div>
-                                                <div
-                                                    v-if="
-                                                        meterApproveOpinion1.contractDeptLeader
-                                                            && !meterApproveOpinion1.contractDeptLeaderDefault
-                                                    "
-                                                    class="text-box no-b hc-bt-0"
-                                                >
-                                                    <div class="content">
-                                                        {{
-                                                            meterApproveOpinion1.contractDeptLeader
-                                                        }}
-                                                    </div>
                                                     <div
                                                         v-if="
                                                             meterApproveOpinion1.contractDeptLeaderUserName
@@ -708,22 +576,7 @@
                                                             }}
                                                         </div>
                                                     </div>
-                                                </div>
-                                                <div
-                                                    v-else
-                                                    class="input no-b hc-bt-0 textarea-container"
-                                                >
-                                                    <el-input
-                                                        v-model="
-                                                            meterApproveOpinion2.contractDeptLeader
-                                                        "
-                                                        :autosize="{
-                                                            minRows: 2,
-                                                            maxRows: 4,
-                                                        }"
-                                                        type="textarea"
-                                                    />
-                                                    <div v-if="!meterApproveOpinion1.contractDeptLeaderDefault" class="suffix-icon">
+                                                    <div v-if="!meterApproveOpinion1.contractDeptLeader" class="suffix-icon">
                                                         <span>(不填写默认为拟同意)</span>
                                                     </div>
                                                 </div>
@@ -733,18 +586,18 @@
                                         <div class="name hc-bt-0">
                                             总经理意见：
                                         </div>
-                                        <div
-                                            v-if="
-                                                meterApproveOpinion1.generalManager
-                                                    && !meterApproveOpinion1.generalManagerDefault
-                                            "
-                                            class="text-box no-b hc-bt-0"
-                                        >
-                                            <div class="content">
-                                                {{
+                           
+                                        <div class="input hc-bt-0 textarea-container">
+                                            <el-input
+                                                v-model="
                                                     meterApproveOpinion1.generalManager
-                                                }}
-                                            </div>
+                                                "
+                                                :autosize="{
+                                                    minRows: 2,
+                                                    maxRows: 4,
+                                                }"
+                                                type="textarea"
+                                            />
                                             <div
                                                 v-if="
                                                     meterApproveOpinion1.generalManagerUserName
@@ -762,11 +615,19 @@
                                                     }}
                                                 </div>
                                             </div>
+                                            <div v-if="!meterApproveOpinion1.generalManager" class="suffix-icon">
+                                                <span>(不填写默认为拟同意)</span>
+                                            </div>
                                         </div>
-                                        <div v-else class="input hc-bt-0 textarea-container">
+
+                                        <div class="name no-b hc-bt-0">
+                                            董事长意见：   
+                                        </div>
+                          
+                                        <div class="input no-b hc-bt-0 textarea-container">
                                             <el-input
                                                 v-model="
-                                                    meterApproveOpinion2.generalManager
+                                                    meterApproveOpinion1.chiefExecutive
                                                 "
                                                 :autosize="{
                                                     minRows: 2,
@@ -774,26 +635,6 @@
                                                 }"
                                                 type="textarea"
                                             />
-                                            <div v-if="!meterApproveOpinion1.generalManagerDefault" class="suffix-icon">
-                                                <span>(不填写默认为拟同意)</span>
-                                            </div>
-                                        </div>
-
-                                        <div class="name no-b hc-bt-0">
-                                            董事长意见：   
-                                        </div>
-                                        <div
-                                            v-if="
-                                                meterApproveOpinion1.chiefExecutive
-                                                    && !meterApproveOpinion1.chiefExecutiveDefault
-                                            "
-                                            class="text-box no-b hc-bt-0"
-                                        >
-                                            <div class="content">
-                                                {{
-                                                    meterApproveOpinion1.chiefExecutive
-                                                }}
-                                            </div>
                                             <div
                                                 v-if="
                                                     meterApproveOpinion1.chiefExecutiveUserName
@@ -811,19 +652,7 @@
                                                     }}
                                                 </div>
                                             </div>
-                                        </div>
-                                        <div v-else class="input no-b hc-bt-0 textarea-container">
-                                            <el-input
-                                                v-model="
-                                                    meterApproveOpinion2.chiefExecutive
-                                                "
-                                                :autosize="{
-                                                    minRows: 2,
-                                                    maxRows: 4,
-                                                }"
-                                                type="textarea"
-                                            />
-                                            <div v-if="!meterApproveOpinion1.chiefExecutiveDefault" class="suffix-icon">
+                                            <div v-if="!meterApproveOpinion1.chiefExecutive" class="suffix-icon">
                                                 <span>(不填写默认为同意)</span>
                                             </div>
                                         </div>
@@ -1077,7 +906,8 @@ const getTableDetail = async () => {
 }
 const setDefaultValue = (field, defaultOpinion) => {
     if (isNullES(meterApproveOpinion1.value[field])) {
-        meterApproveOpinion2.value[field] = defaultOpinion
+        //meterApproveOpinion2.value[field] = defaultOpinion
+        meterApproveOpinion1.value[field] = defaultOpinion
         meterApproveOpinion1.value[`${field}Default`] = true
     } else if (meterApproveOpinion1.value[field] === defaultOpinion) {
         meterApproveOpinion1.value[`${field}Default`] = true
@@ -1525,6 +1355,15 @@ const tabsChange = ({ key }) => {
         color: red;
     }
 }
+.input{
+    .sign-name{
+        position: absolute;
+        top:15px;
+        right: 10px;
+        font-size: smaller;
+    }
+}
+
 //html表单模式
 .hc-task-body .hc-task-form.is-tab-key3 .hc-task-body-card {
     .el-scrollbar__view {