From 14e6ab35ab68dc0b5485b2e5e47321fbc5f42064 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Tue, 2 Apr 2024 00:17:07 +0800
Subject: [PATCH] update code

---
 src/pages/components/JobWorkerDialog.vue     | 4 +++-
 src/pages/dlg/projectSpecialDlg.vue          | 6 ++++--
 src/pages/projectSafety.vue                  | 2 +-
 src/pages/quality/materialSealListDlg.vue    | 2 +-
 src/pages/quality/projectChecking.vue        | 4 ++--
 src/pages/quality/projectCheckingListDlg.vue | 2 +-
 src/pages/safe/projectInsuranceDlg.vue       | 2 +-
 src/pages/safe/workTrainListDlg.vue          | 2 +-
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/components/JobWorkerDialog.vue b/src/pages/components/JobWorkerDialog.vue
index 7ef2d80..d7710a6 100644
--- a/src/pages/components/JobWorkerDialog.vue
+++ b/src/pages/components/JobWorkerDialog.vue
@@ -40,7 +40,9 @@
                 <el-table-column label="进场时间" align="center" prop="inTime" v-if="1 == 2">
                     <template slot-scope="{row}">{{ row.enterDate | formatDate }}</template>
                 </el-table-column>
-                <el-table-column label="分包商名称" align="center" prop="companyName" />
+                <el-table-column label="分包商名称" align="center" prop="companyName">
+                    <template slot-scope="{row}">{{row.companyName||row.degreeName}}</template>
+                </el-table-column>
                 <el-table-column label="所属班组" align="center" >
                     <template slot-scope="{row}">{{ row.groupName||row.remark }}</template>
                 </el-table-column>
diff --git a/src/pages/dlg/projectSpecialDlg.vue b/src/pages/dlg/projectSpecialDlg.vue
index a7a14c0..8ec8ed5 100644
--- a/src/pages/dlg/projectSpecialDlg.vue
+++ b/src/pages/dlg/projectSpecialDlg.vue
@@ -1,5 +1,5 @@
 <template>
-    <MyDialog v-if="show" v-model="show" width="1200px" height="550px" class="projectSpecialDlg">
+    <MyDialog v-if="show" v-model="show" width="1200px" height="600px" class="projectSpecialDlg">
         <template slot="title">{{title}}</template>
         <div class="head-title-tab">
             <div :class="nav == 'all' ? 'head-nav active' : 'head-nav'" @click="doNav('all')">全部数据({{ tags.all }})</div>
@@ -22,7 +22,9 @@
             <el-table-column label="证书编号" align="center" prop="credentialNumber"></el-table-column>
             <el-table-column label="证书过期时间" align="center" prop="credentialExpirationTime"></el-table-column>
             <el-table-column label="证书类型" align="center" prop="credentialType" v-if="false"></el-table-column>
-            <el-table-column label="提交时间" align="center" prop="createTime" width="100"></el-table-column>
+            <el-table-column label="提交时间" align="center" prop="createTime" width="100">
+                <template slot-scope="scope">{{ scope.row.createTime|formatDate }}</template>
+            </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                     <el-button
diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue
index 35cb849..2cc1a1e 100644
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@@ -183,7 +183,7 @@
                                     <svg v-if="it.fileType=='MP4'" style="vertical-align: middle;fill: currentColor;overflow: hidden;" t="1692028772745" class="icon my-svg-icon2" viewBox="0 0 1117 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2072"><path d="M977.454545 0a139.636364 139.636364 0 0 1 139.403637 131.444364L1117.090909 139.636364v744.727272a139.636364 139.636364 0 0 1-131.444364 139.403637L977.454545 1024H139.636364a139.636364 139.636364 0 0 1-139.403637-131.444364L0 884.363636V139.636364A139.636364 139.636364 0 0 1 131.444364 0.232727L139.636364 0h837.818181z m46.545455 302.545455h-122.228364l-7.214545 5.818181-4.608-5.818181h-267.450182l-7.214545 5.818181-4.608-5.818181H343.226182l-7.214546 5.818181L331.403636 302.545455H93.090909V884.363636a46.545455 46.545455 0 0 0 41.099636 46.219637L139.636364 930.909091h837.818181a46.545455 46.545455 0 0 0 46.219637-41.099636L1024 884.363636V302.545455zM484.212364 422.818909l4.654545 2.420364 279.272727 162.909091a46.545455 46.545455 0 0 1 5.12 76.986181l-5.12 3.444364-279.272727 162.909091a46.545455 46.545455 0 0 1-69.678545-34.909091L418.909091 791.272727v-325.818182a46.545455 46.545455 0 0 1 65.303273-42.635636zM512 546.443636v163.793455l140.381091-81.92L512 546.443636zM163.84 93.090909H139.636364a46.545455 46.545455 0 0 0-46.219637 41.099636L93.090909 139.636364v69.818181h163.84l-93.090909-116.363636z m279.272727 0H282.996364l93.090909 116.363636h160.116363l-93.090909-116.363636z m279.272728 0h-160.116364l93.090909 116.363636h160.116364l-93.090909-116.363636zM977.454545 93.090909h-135.912727l93.090909 116.363636H1024V139.636364a46.545455 46.545455 0 0 0-41.099636-46.219637L977.454545 93.090909z" fill="#008df0" p-id="2073"></path></svg>
                                     <div style="flex-grow: 1;padding-left: 20px;line-height: 24px;width: 75%;">
                                         <div class="file-name">{{ it.fileName }}</div>
-                                        <div style="color: #aaa;" class="file-time">{{ it.createTime }}</div>
+                                        <div style="color: #aaa;" class="file-time">{{ it.createTime |formatDate }}</div>
                                         <div style="color: #aaa;" class="file-time"><svg style="vertical-align: text-bottom;cursor: pointer;" t="1697992702309" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4259" width="16" height="16"><path d="M512 768c-183.466667 0-328.533333-85.333333-426.666667-256 98.133333-170.666667 243.2-256 426.666667-256s328.533333 85.333333 426.666667 256c-98.133333 170.666667-243.2 256-426.666667 256z m8.533333-426.666667c-128 0-256 55.466667-328.533333 170.666667 72.533333 115.2 200.533333 170.666667 328.533333 170.666667s238.933333-55.466667 311.466667-170.666667c-72.533333-115.2-183.466667-170.666667-311.466667-170.666667z m-8.533333 298.666667c-72.533333 0-128-55.466667-128-128s55.466667-128 128-128 128 55.466667 128 128-55.466667 128-128 128z m0-85.333333c25.6 0 42.666667-17.066667 42.666667-42.666667s-17.066667-42.666667-42.666667-42.666667-42.666667 17.066667-42.666667 42.666667 17.066667 42.666667 42.666667 42.666667z" fill="#01A9FF" p-id="4260"></path></svg> <span style="color:#01A9FF;cursor: pointer;">{{it.readNum}}</span></div>
                                     </div>
                                     <div>
diff --git a/src/pages/quality/materialSealListDlg.vue b/src/pages/quality/materialSealListDlg.vue
index b38a3ca..24e47c2 100644
--- a/src/pages/quality/materialSealListDlg.vue
+++ b/src/pages/quality/materialSealListDlg.vue
@@ -17,7 +17,7 @@
             <el-table-column label="拟用品牌" align="center" prop="useBrand" width="120" />
             <el-table-column label="封样时间" align="center" prop="sealDate" >
                 <template slot-scope="scope">
-                    <span>{{ scope.row.sealDate | formatDateTime }}</span>
+                    <span>{{ scope.row.sealDate | formatDate }}</span>
                 </template>
             </el-table-column>
             <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
diff --git a/src/pages/quality/projectChecking.vue b/src/pages/quality/projectChecking.vue
index b1a50ca..15fbebb 100644
--- a/src/pages/quality/projectChecking.vue
+++ b/src/pages/quality/projectChecking.vue
@@ -59,7 +59,7 @@
                                 <div class="row-3">
                                     <div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
                                     <div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
-                                    <div class="sp-date">{{ it.checkingDate }}</div>
+                                    <div class="sp-date">{{ it.checkingDate|formatDate }}</div>
                                 </div>
                                 <div class="row-3">
                                     <span class="sp-label">项目:</span>
@@ -125,7 +125,7 @@
                                 <div class="row-3">
                                     <div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
                                     <div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
-                                    <div class="sp-date">{{ it.checkingDate }}</div>
+                                    <div class="sp-date">{{ it.checkingDate |formatDate }}</div>
                                 </div>
                                 <div class="row-3">
                                     <span class="sp-label">项目:</span>
diff --git a/src/pages/quality/projectCheckingListDlg.vue b/src/pages/quality/projectCheckingListDlg.vue
index dd842bd..d7908af 100644
--- a/src/pages/quality/projectCheckingListDlg.vue
+++ b/src/pages/quality/projectCheckingListDlg.vue
@@ -20,7 +20,7 @@
                                 <div class="row-3">
                                     <div v-if="it.checkResult == '1'" class="sp-lbl">验收合格</div>
                                     <div v-if="it.checkResult == '2'" class="sp-err">验收不合格</div>
-                                    <div class="sp-date">{{ it.checkingDate }}</div>
+                                    <div class="sp-date">{{ it.checkingDate |formatDate }}</div>
                                 </div>
                                 <div class="row-3">
                                     <span class="sp-label">项目:</span>
diff --git a/src/pages/safe/projectInsuranceDlg.vue b/src/pages/safe/projectInsuranceDlg.vue
index af560c6..b78ae31 100644
--- a/src/pages/safe/projectInsuranceDlg.vue
+++ b/src/pages/safe/projectInsuranceDlg.vue
@@ -69,7 +69,7 @@
                             </span>
                         </td>
                         
-                        <td><img src="images/title_icon.png"><span class="sp-label">办理时间:</span>{{it.createTime|formatDateTime}}</td>
+                        <td><img src="images/title_icon.png"><span class="sp-label">办理时间:</span>{{it.createTime|formatDate}}</td>
                         
                     </tr>
                 </table>
diff --git a/src/pages/safe/workTrainListDlg.vue b/src/pages/safe/workTrainListDlg.vue
index 7c3be51..70db7d4 100644
--- a/src/pages/safe/workTrainListDlg.vue
+++ b/src/pages/safe/workTrainListDlg.vue
@@ -24,7 +24,7 @@
                                         人</span>
                                 </div>
                                 <div>
-                                    <span>培训时间:</span><span>{{ it.beginDate }}</span>
+                                    <span>培训时间:</span><span>{{ it.beginDate|formatDate }}</span>
                                 </div>
                             </div>
                         </div>