From fdf420953483ed31bb13e6cc2570ffe6a112b9bc Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 14 Nov 2023 11:09:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E2=80=9C=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=E2=80=9D?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=9C=E7=9B=B8=E5=85=B3=E6=96=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E2=80=9D=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=B9=E4=BA=8E=20=E2=80=9C=E7=BB=9F=E4=B8=80=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E2=80=9D=E5=9C=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F=E4=B8=8D?=
 =?UTF-8?q?=E4=BA=88=E6=98=BE=E7=A4=BA=E3=80=82=EF=BC=88=E5=90=84=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E6=9C=89=E5=A1=AB=E5=86=99=E4=B9=9F=E6=9C=89=E6=9C=AA?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99=E6=83=85=E5=86=B5=EF=BC=89=202.=20=E2=80=9C?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=8E=B0=E5=9C=BA=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=AE=A1=E7=90=86=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9C?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E2=80=9D=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A1=AB=E5=86=99=E5=86=85=E5=AE=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E5=86=85=E5=AE=B9=E5=BA=94=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E3=80=82=203.=20=E2=80=9C?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=8E=B0=E5=9C=BA=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E7=AE=A1=E7=90=86=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9C?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E2=80=9D=E4=B8=AD=E5=A6=82=E6=B6=89=E5=8F=8A=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E2=80=9C=E7=9B=91=E7=90=86=E5=8D=95=E4=BD=8D=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E5=BA=94=E6=98=BE=E7=A4=BA=E2=80=9C=E6=97=A0=E2=80=9D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/outsourced/components/list.vue | 7 ++++++-
 src/views/keyprojects/personnelmanagement/index.vue  | 8 ++++----
 src/views/keyprojects/units/components/list.vue      | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 726f257..fcf3c44 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -130,7 +130,12 @@
           <span v-else>{{ row.DEPARTMENT_NAME }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" show-overflow-tooltip />
+      <el-table-column label="监理单位" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          <span v-if="row.MANAGE_CORPS_NAME"> {{ row.MANAGE_CORPS_NAME }} </span>
+          <span v-else>无</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="STATE" label="状态" width="100" >
         <template slot-scope="{row}">
           <span v-if="row.STATE == 1">进行中</span>
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index 2819c4f..4283f76 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -66,12 +66,12 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column prop="JOBTYPE" label="作业类别" />
-      <el-table-column prop="OPERATIONITEM" label="操作项目" />
+      <!--<el-table-column prop="JOBTYPE" label="作业类别" />
+      <el-table-column prop="OPERATIONITEM" label="操作项目" />-->
       <el-table-column prop="NAME" label="姓名" width="100" />
-      <el-table-column prop="SEX" label="性别" width="50" />
+      <!--<el-table-column prop="SEX" label="性别" width="50" />
       <el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" />
-      <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />
+      <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />-->
       <el-table-column label="操作" align="left" width="400">
         <template slot-scope="{row}">
           <el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button>
diff --git a/src/views/keyprojects/units/components/list.vue b/src/views/keyprojects/units/components/list.vue
index e51ce26..b72577f 100644
--- a/src/views/keyprojects/units/components/list.vue
+++ b/src/views/keyprojects/units/components/list.vue
@@ -48,7 +48,7 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip />
-      <el-table-column prop="CODE" label="统一社会信用代码" width="200" />
+      <!--<el-table-column prop="CODE" label="统一社会信用代码" width="200" />-->
       <el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip />
       <el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" />
       <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />