From dd3263d3182c14ce3516a8728e510904f2c55fa0 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Mon, 25 Mar 2024 17:09:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=83=BD=E5=8A=9B=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=92=8C=E5=A4=96=E9=83=A8=E7=9B=91=E7=9D=A3=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervisionNew/mytask.vue    | 35 +++++++++++++++
 .../views/supervisionNew/oinspect_form.vue    | 15 +++++++
 client/src/views/supervisionNew/pt_form.vue   | 45 +++++++++++++++++++
 client/src/views/supervisionNew/taskdo.vue    | 30 +++++++++++++
 4 files changed, 125 insertions(+)

diff --git a/client/src/views/supervisionNew/mytask.vue b/client/src/views/supervisionNew/mytask.vue
index 60956b3..76def47 100644
--- a/client/src/views/supervisionNew/mytask.vue
+++ b/client/src/views/supervisionNew/mytask.vue
@@ -262,6 +262,8 @@
                 <el-table-column label="检查机构" prop="checker"></el-table-column>
                 <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
                 <el-table-column label="检查结果" prop="result"></el-table-column>
+                <el-table-column label="结果日期" prop="result_date"></el-table-column>
+                <el-table-column label="文件路径" prop="file_path"></el-table-column>
                 <el-table-column
                     align="center"
                     label="操作"
@@ -298,6 +300,8 @@
                 <el-table-column label="检查机构" prop="checker"></el-table-column>
                 <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
                 <el-table-column label="检查结果" prop="result"></el-table-column>
+                <el-table-column label="结果日期" prop="result_date"></el-table-column>
+                <el-table-column label="文件路径" prop="file_path"></el-table-column>
               </el-table>
             </el-card>
             <saveoin-dialog
@@ -477,6 +481,19 @@
                       <span>{{ handleOptions[scope.row.handle_result] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="证书日期" prop="certificate_date"></el-table-column>
+                <el-table-column label="领域">
+                  <template slot-scope="scope">
+                    <span v-for="item in Array"></span>
+                      <span>{{ fileOptions[scope.row.field] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否A类">
+                  <template slot-scope="scope">
+                        <el-tag v-if="scope.row.a_class" type="primary">是</el-tag>
+                        <el-tag v-else type="warning">否</el-tag>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     align="center"
                     label="操作"
@@ -520,6 +537,18 @@
                       <span>{{ handleOptions[scope.row.handle_result] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="证书日期" prop="certificate_date"></el-table-column>
+                <el-table-column label="领域">
+                  <template slot-scope="scope">
+                      <span>{{ fileOptions[scope.row.field] }}</span>
+                    </template>
+                </el-table-column>
+                  <el-table-column label="是否A类">
+                  <template slot-scope="scope">
+                        <el-tag v-if="scope.row.a_class" type="primary">是</el-tag>
+                        <el-tag v-else type="warning">否</el-tag>
+                    </template>
+                </el-table-column>
               </el-table>
             </el-card>
             <savept-dialog
@@ -832,6 +861,12 @@
                 20:'有问题',
                 30:'不满意'
               },
+              fileOptions:{
+                0:'建工',
+                10:'建材',
+                20:'环境',
+                30:'食农',
+              },
               handleOptions:{
                 10:'已整改',
                 20:'被暂停',
diff --git a/client/src/views/supervisionNew/oinspect_form.vue b/client/src/views/supervisionNew/oinspect_form.vue
index 532d585..6b7dc40 100644
--- a/client/src/views/supervisionNew/oinspect_form.vue
+++ b/client/src/views/supervisionNew/oinspect_form.vue
@@ -42,6 +42,19 @@
                 <el-form-item label="检查结果" >
                     <el-input v-model="form.result"></el-input>
                 </el-form-item>
+                <el-form-item label="结果日期" >
+                    <el-date-picker
+                        v-model="form.result_date"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        style="width:50%"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="文件路径" >
+                    <el-input v-model="form.file_path"></el-input>
+                </el-form-item>
             </el-form>
             <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -61,6 +74,8 @@
             checker: "",
             result: "",
             date_inspect: "",
+            result_date: "",
+            file_path: "",
             cate: 10,
             task2do: 0
         },
diff --git a/client/src/views/supervisionNew/pt_form.vue b/client/src/views/supervisionNew/pt_form.vue
index 449d8ef..e316404 100644
--- a/client/src/views/supervisionNew/pt_form.vue
+++ b/client/src/views/supervisionNew/pt_form.vue
@@ -54,6 +54,44 @@
                     </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item label="证书日期" >
+                    <el-date-picker
+                        v-model="form.certificate_date"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        style="width:50%"
+                    >
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="领域" >
+                    <el-select
+                        v-model="form.field"
+                        placeholder="领域"
+                    >
+                    <el-option
+                        v-for="item in fields"
+                        :key="item.value"
+                        :label="item.key"
+                        :value="item.value"
+                    >
+                    </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="是否A类" >
+                    <el-select
+                        v-model="form.a_class"
+                        placeholder="是否A类"
+                    >
+                    <el-option
+                        v-for="item in a_classes"
+                        :key="item.value"
+                        :label="item.key"
+                        :value="item.value"
+                    >
+                    </el-option>
+                    </el-select>
+                </el-form-item>
             </el-form>
             <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -88,12 +126,19 @@ import { options } from "runjs";
             {key:'有问题',value:20},
             {key:'不满意',value:30}
         ],
+        fields:[
+            {key:'建工',value:0},
+            {key:'建材',value:10},
+            {key:'环境',value:20},
+            {key:'食农',value:30}
+        ],
         handleOptions:[
             {key:'/',value:0},
             {key:'已整改',value:10},
             {key:'被暂停',value:20},
             {key:'已被撤销认可资格',value:30}
         ],
+        a_classes:[{key:'是',value:true},{key:'否',value:false}],
         isSaveing:false,
         dialogVisible:false,
         rules: {
diff --git a/client/src/views/supervisionNew/taskdo.vue b/client/src/views/supervisionNew/taskdo.vue
index b2a2746..02005de 100644
--- a/client/src/views/supervisionNew/taskdo.vue
+++ b/client/src/views/supervisionNew/taskdo.vue
@@ -330,6 +330,18 @@
                       <span>{{ handleOptions[scope.row.handle_result] }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="证书日期" prop="certificate_date"></el-table-column>
+                <el-table-column label="领域">
+                  <template slot-scope="scope">
+                      <span>{{ fileOptions[scope.row.field] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="是否A类">
+                  <template slot-scope="scope">
+                        <el-tag v-if="scope.row.a_class" type="primary">是</el-tag>
+                        <el-tag v-else type="warning">否</el-tag>
+                    </template>
+                </el-table-column>
               </el-table>
           </el-card>
         </el-col>
@@ -413,6 +425,8 @@
                 <el-table-column label="检查机构" prop="checker"></el-table-column>
                 <el-table-column label="检查日期" prop="date_inspect"></el-table-column>
                 <el-table-column label="检查结果" prop="result"></el-table-column>
+                <el-table-column label="结果日期" prop="result_date"></el-table-column>
+                <el-table-column label="文件路径" prop="file_path"></el-table-column>
               </el-table>
           </el-card>
         </el-col>
@@ -531,6 +545,12 @@ export default {
         20:'有问题',
         30:'不满意'
       },
+      fileOptions:{
+        0:'建工',
+        10:'建材',
+        20:'环境',
+        30:'食农',
+      },
       handleOptions:{
         0:'/',
         10:'已整改',
@@ -815,6 +835,9 @@ export default {
                   '结果': '',
                   '处理结果': '',
                   '单位名称': '',
+                  '证书日期': '',
+                  '领域': '',
+                  '是否A类': '',
             }];
             if (ptList.length > 0) {
               sheetObject3 = ptList.map((item3, iindex3) => {
@@ -829,6 +852,9 @@ export default {
                     '结果': result,
                     '处理结果': handle_result,
                     '单位名称': item3.belong_dept_name,
+                    '证书日期': item3.certificate_date,
+                    '领域': item3.field,
+                    '是否A类': item3.a_class
                 };
               });
             }
@@ -895,6 +921,8 @@ export default {
                             '检查机构': '',
                             '检查日期': '',
                             '检查结果': '',
+                            '检查日期': '',
+                            '文件路径': '',
                             '单位名称': '',
                     }];
                     if (oinspectList.length > 0) {
@@ -906,6 +934,8 @@ export default {
                               '检查机构': item6.checker,
                               '检查日期': item6.date_inspect,
                               '检查结果': item6.result,
+                              '结果日期': item6.result_date,
+                              '文件路径': item6.file_path,
                               '单位名称': item6.belong_dept_name,
                           };
                       });