From c9aeee5e4d8d280bc1a070640f0c91c96111809f Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Sat, 7 Sep 2024 18:43:31 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operationManage/liftingErectionWorks.vue  | 73 ++++++++++++-------
 .../quality/pouringOrderLedger.vue            | 35 +++++----
 2 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/src/views/projectFront/operationManage/liftingErectionWorks.vue b/src/views/projectFront/operationManage/liftingErectionWorks.vue
index 3ee48dc5..bf965150 100644
--- a/src/views/projectFront/operationManage/liftingErectionWorks.vue
+++ b/src/views/projectFront/operationManage/liftingErectionWorks.vue
@@ -49,10 +49,12 @@
                             {{ scope.row.applicantName }}
                         </template>
                     </el-table-column>
-                    <el-table-column align="center" label="作业装置" prop="operationEquipment" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="作业装置" prop="operationEquipmentName"
+                        show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="作业地点" prop="operationLocation"
                         show-overflow-tooltip></el-table-column>
-                    <el-table-column align="center" label="作业内容" prop="operationContent" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="作业内容" prop="operationContent"
+                        show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="级别" prop="level" show-overflow-tooltip>
                         <template slot-scope="scope">
                             {{ scope.row.level ? workCategoryList[scope.row.level - 1].workCategoryName :
@@ -129,8 +131,14 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="作业装置" prop="operationEquipment">
-                            <el-input v-model="cardForm.operationEquipment"
-                                :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                            <!-- <el-input v-model="cardForm.operationEquipment"
+                                :placeholder="$t('message.personnelPosition.please_enter')"></el-input> -->
+                            <el-select v-model="cardForm.operationEquipment"
+                                :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                                <el-option :label="item.deviceUnitName" :value="item.id"
+                                    v-for="(item, index) in deviceUnitList" :key="index">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="作业地点" prop="operationLocation">
                             <el-input v-model="cardForm.operationLocation"
@@ -451,7 +459,7 @@
                                 {{ workDetail.applicantName }}
                             </el-form-item>
                             <el-form-item label="作业装置：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.operationEquipment }}
+                                {{ workDetail.operationEquipmentName }}
                                 <!-- <el-tooltip class="item" style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;" effect="dark" :content="workDetail.jobContent"
                                       placement="top-start">
                                       <div>{{ workDetail.jobContent }}</div>
@@ -524,25 +532,25 @@
                 <template v-slot:gasanalysis>
                     <div class="gasanalysis-table1">
                         <table>
-                                <thead>
-                                    <tr>
-                                        <th>序号</th>
-                                        <th>安全措施名称</th>
-                                        <th>安全措施确认</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr v-for="(ele, eIndex) in workDetail.tableList" :key="ele.id">
-                                        <td>{{ eIndex + 1 }}</td>
-                                        <td>
-                                            {{ ele.titleName }}
-                                        </td>
-                                        <td>
-                                            {{ ele.isAffirm ? ele.isAffirm : '--' }}
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                            <thead>
+                                <tr>
+                                    <th>序号</th>
+                                    <th>安全措施名称</th>
+                                    <th>安全措施确认</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for="(ele, eIndex) in workDetail.tableList" :key="ele.id">
+                                    <td>{{ eIndex + 1 }}</td>
+                                    <td>
+                                        {{ ele.titleName }}
+                                    </td>
+                                    <td>
+                                        {{ ele.isAffirm ? ele.isAffirm : '--' }}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
                     </div>
                 </template>
                 <template v-slot:signature>
@@ -664,6 +672,9 @@ import {
     addLiftingOperationApi,
     editLiftingOperationApi,
 } from "@/assets/js/api/operationManage";
+import {
+    getDeviceUnitList
+} from "@/assets/js/api/project";
 import { getWorkerInfoList } from '@/assets/js/api/laborPerson.js'
 import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit";
 export default {
@@ -835,6 +846,7 @@ export default {
             }],
             cooperatorList: [], // 所有企业信息
             workerListOptions: [], // 工人列表
+            deviceUnitList: [], // 装置单位列表
         };
     },
     created() {
@@ -845,6 +857,7 @@ export default {
         this.getCooperatorList();
         this.getDutyPerson();
         this.getEnterpriseInfoList();
+        this.loadAllPerson();
     },
     mounted() { },
     watch: {
@@ -868,6 +881,16 @@ export default {
         },
     },
     methods: {
+        //获取监理单位
+        loadAllPerson() {
+            // getEnterpriseTypeList
+            let param = {
+                projectSn: this.$store.state.projectSn,
+            };
+            getDeviceUnitList(param).then((res) => {
+                this.deviceUnitList = res.result;
+            });
+        },
         isAddPoint(type, item) {
             this.isAdd = type;
             this.cardDialog = true;
@@ -891,7 +914,7 @@ export default {
                         });
                         return prev;
                     }, []),
-                     tableList2: JSON.parse(item.operatorLicenseNumber).reduce((prev, item) => {
+                    tableList2: JSON.parse(item.operatorLicenseNumber).reduce((prev, item) => {
                         prev.push({
                             id: "id-" + Math.random().toString(36).substr(2, 9),
                             specialOperationStaff: item["field6438549419062"] instanceof Array ? item["field6438549419062"][0] : item["field6438549419062"],
diff --git a/src/views/projectFront/quality/pouringOrderLedger.vue b/src/views/projectFront/quality/pouringOrderLedger.vue
index d5d70eba..eb455330 100644
--- a/src/views/projectFront/quality/pouringOrderLedger.vue
+++ b/src/views/projectFront/quality/pouringOrderLedger.vue
@@ -8,8 +8,7 @@
                         </el-input>
                     </el-form-item> -->
                     <el-form-item label="混凝土编号">
-                        <el-input placeholder="请输入" v-model="formInline.concreteNumber" clearable
-                            style="width: 200px">
+                        <el-input placeholder="请输入" v-model="formInline.concreteNumber" clearable style="width: 200px">
                         </el-input>
                     </el-form-item>
                     <el-form-item label="混泥土供应商">
@@ -51,9 +50,11 @@
                     </el-table-column>
                     <el-table-column align="center" label="混凝土编号" prop="concreteNumber"
                         show-overflow-tooltip></el-table-column>
-                    <el-table-column align="center" label="装置" prop="device" show-overflow-tooltip></el-table-column>
-                    <el-table-column align="center" label="浇筑部位" prop="castingLocation" show-overflow-tooltip></el-table-column>
-                    <el-table-column align="center" label="混凝土供应商" prop="concreteSupplierName" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="装置" prop="deviceName" show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="浇筑部位" prop="castingLocation"
+                        show-overflow-tooltip></el-table-column>
+                    <el-table-column align="center" label="混凝土供应商" prop="concreteSupplierName"
+                        show-overflow-tooltip></el-table-column>
                     <el-table-column align="center" label="项目组" prop="projectGroupName"></el-table-column>
                     <el-table-column align="center" label="EPC/PC承包商" prop="epcPcContractorName"></el-table-column>
                     <el-table-column align="center" label="计划方量" prop="plannedVolume"></el-table-column>
@@ -63,7 +64,7 @@
                             {{ scope.row.status == 1 ? '未浇筑' : scope.row.status == 2 ? '已浇筑' : '' }}
                         </template>
                     </el-table-column>
-                    
+
                     <!-- 操作 -->
                     <el-table-column align="center" :label="$t('message.dangerousBigProject.operation')">
                         <template slot-scope="scope">
@@ -121,8 +122,14 @@
                                 :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
                         </el-form-item>
                         <el-form-item label="装置" prop="device">
-                            <el-input v-model="cardForm.device"
-                                :placeholder="$t('message.personnelPosition.please_enter')"></el-input>
+                            <!-- <el-input v-model="cardForm.device"
+                                :placeholder="$t('message.personnelPosition.please_enter')"></el-input> -->
+                            <el-select v-model="cardForm.device"
+                                :placeholder="$t('message.personnelPosition.please_select')" filterable>
+                                <el-option :label="item.deviceUnitName" :value="item.id"
+                                    v-for="(item, index) in deviceUnitList" :key="index">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="浇筑时间" prop="hotWorkExecutionTime">
                             <el-date-picker v-model="cardForm.hotWorkExecutionTime" type="datetimerange"
@@ -195,14 +202,14 @@
                             <el-form-item label="混凝土编号：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.concreteNumber }}
                             </el-form-item>
-                             <el-form-item label="浇筑时间：" :label-width="formLabelWidthDetail">
+                            <el-form-item label="浇筑时间：" :label-width="formLabelWidthDetail">
                                 <el-date-picker v-model="workDetail.hotWorkExecutionTime" type="datetimerange"
                                     value-format="yyyy-MM-dd HH:mm:ss" :disabled="isDisabledDetail" range-separator="至"
                                     start-placeholder="开始日期" end-placeholder="结束日期">
                                 </el-date-picker>
                             </el-form-item>
                             <el-form-item label="装置：" :label-width="formLabelWidthDetail">
-                                {{ workDetail.device }}
+                                {{ workDetail.deviceName }}
                             </el-form-item>
                             <el-form-item label="项目组：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.projectGroupName }}
@@ -226,7 +233,7 @@
                             <el-form-item label="浇筑状态：" :label-width="formLabelWidthDetail">
                                 {{ workDetail.status == 2 ? "已浇筑" : workDetail.status == 1 ? "未浇筑" : '' }}
                             </el-form-item>
-                           
+
                             <!-- <el-form-item label="现场作业环境：" :label-width="formLabelWidthDetail">
                                 <div class="img-show">
                                     <el-image v-for="(item, index) in workDetail.fieldWorkingEnvironment" :key="index"
@@ -709,9 +716,9 @@ export default {
             getProjectGroupList(param).then((res) => {
                 this.projectGroupTypeList = res.result;
             });
-            // getDeviceUnitList(param).then((res) => {
-            //     this.deviceUnitList = res.result;
-            // });
+            getDeviceUnitList(param).then((res) => {
+                this.deviceUnitList = res.result;
+            });
 
         },
     },