From fdcb4ee7444fce898136cd0cc81ccfbd2ea97b30 Mon Sep 17 00:00:00 2001
From: zth <1205836521@qq.com>
Date: Wed, 18 Sep 2024 04:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E5=BD=92=E6=A8=A1=E5=9D=97=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectInfo/projectProcess/index.vue      |  10 +-
 .../enterpriseInformation/index.vue           |   2 +-
 .../options/components/badBehavior.vue        |  12 +-
 .../options/components/goodBehavior.vue       | 157 +++++-------------
 .../options/components/managementSystem.vue   |   6 +-
 .../options/equipment.vue                     |   4 +-
 .../options/equipmentManagement.vue           |   4 +-
 .../enterpriseInformation/options/index.vue   |   5 +-
 8 files changed, 69 insertions(+), 131 deletions(-)

diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
index 52fb503c..fdf9bfd9 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
@@ -197,7 +197,7 @@
       </el-tab-pane>
       <el-tab-pane
         v-if="checkPermi(['building:xmys:index'])"
-        label="安全风险"
+        label="安全风险管理"
         name="securityRisk"
         :disabled="!routeList[1].isEdit"
         :lazy="true"
@@ -227,7 +227,7 @@
       </el-tab-pane>
       <el-tab-pane
         v-if="checkPermi(['building:xmys:index'])"
-        label="安全目标"
+        label="安全目标管理"
         name="safetyGoal"
         :disabled="!routeList[1].isEdit"
         :lazy="true"
@@ -248,8 +248,8 @@ import { checkPermi, checkRole } from "@/utils/permission";
 import baseMsg from "./baseMsg/index.vue";
 import firmInfo from "./firmInfo.vue";
 import contract from "./contract/index.vue";
-import preparationForConstruction from "./preparationForConstruction.vue";
-// import preparationForConstruction from './preparationConstruction/index.vue'
+// import preparationForConstruction from "./preparationForConstruction.vue";
+import preparationForConstruction from './preparationConstruction/index.vue'
 // import qualityControl from "./qualityControl.vue";
 import qualityControl from "./qualityControl/index.vue";
 import safetyRecord from "./safetyRecord.vue";
@@ -277,11 +277,11 @@ import { getProjectinfo } from "@/api/earlyStage/projectinfo";
 
 export default {
   components: {
+    preparationForConstruction,
     contEvaluation,
     baseMsg,
     firmInfo,
     contract,
-    preparationForConstruction,
     qualityControl,
     safetyRecord,
     designChangeInformation,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
index 62d10f41..0809e13e 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
@@ -1030,7 +1030,7 @@ export default {
       // 跳转到选项卡页面
       this.$router.push({
         path:
-          "/marketSupervision/enterpriseInformation/options?baseDataId=" + id,
+          "/marketSupervision/enterpriseInformation/options?baseDataId=" + id+"&enterpriseType="+row.enterpriseType,
       });
     },
     /** 提交按钮 */
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue
index ae370369..5f91db64 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue
@@ -10,9 +10,9 @@
       />
 
       <el-table-column
-        label="企业名称"
+        label="项目名称"
         align="center"
-        prop="enterpriseName"
+        prop="projectName"
         min-width="120"
       />
       <el-table-column
@@ -110,10 +110,10 @@
       <el-row :gutter="15">
         <el-form ref="form" :model="form" :rules="rules" label-width="110px">
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="enterpriseName">
+            <el-form-item label="项目名称" prop="projectName">
               <el-input
-                v-model="form.enterpriseName"
-                placeholder="请输入企业名称"
+                v-model="form.projectName"
+                placeholder="请输入项目名称"
               />
             </el-form-item>
           </el-col>
@@ -169,6 +169,7 @@
                 v-model="form.deductionValuePeriod"
                 type="date"
                 placeholder="选择日期"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
             </el-form-item>
@@ -180,6 +181,7 @@
                 v-model="form.announcementValuePeriod"
                 type="date"
                 placeholder="选择日期"
+                value-format="yyyy-MM-dd"
               >
               </el-date-picker>
             </el-form-item>
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue
index 0ba7a349..aa6e0fb9 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue
@@ -8,63 +8,19 @@
         align="center"
         fixed
       />
-
-      <el-table-column
-        label="企业名称"
-        align="center"
-        prop="enterpriseName"
-        min-width="120"
-      />
-      <el-table-column
-        label="人员名称"
-        align="center"
-        prop="personnelName"
-        min-width="120"
-      />
-
-      <el-table-column
-        label="不良行为"
-        align="center"
-        prop="badBehavior"
-        min-width="120"
-      />
-      <el-table-column
-        label="等级"
-        align="center"
-        prop="grade"
-        min-width="120"
-      />
       <el-table-column
-        label="说明"
+        label="项目名称"
         align="center"
-        prop="explainPeople"
+        prop="projectName"
         min-width="120"
       />
-      <el-table-column
-        label="行政处理"
-        align="center"
-        prop="administrativeProcessing"
-        min-width="120"
-      />
-      <el-table-column
-        label="扣除值"
-        align="center"
-        prop="deductionValue"
-        min-width="120"
-      />
-      <el-table-column
-        label="扣分有效期"
-        align="center"
-        prop="deductionValuePeriod"
-        min-width="120"
-      />
-      <el-table-column
-        label="公告有效期"
-        align="center"
-        prop="announcementValuePeriod"
-        min-width="120"
-      />
-
+      <el-table-column label="人员名称" align="center" prop="personnelName" min-width="120"/>
+      <el-table-column label="良好行为" align="center" prop="goodBehavior" min-width="120"/>
+      <el-table-column label="表彰级别" align="center" prop="commendationLevel" min-width="120"/>
+      <el-table-column label="颁发机构" align="center" prop="issuingAgency" min-width="120"/>
+      <el-table-column label="加分值" align="center" prop="bonusPoints" min-width="120"/>
+      <el-table-column label="有效期" align="center" prop="termValidity" min-width="120"/>
+      <el-table-column label="公告期" align="center" prop="announcementPeriod" min-width="120"/>
       <el-table-column
         label="操作"
         align="center"
@@ -110,79 +66,58 @@
       <el-row :gutter="15">
         <el-form ref="form" :model="form" :rules="rules" label-width="110px">
           <el-col :span="12">
-            <el-form-item label="企业名称" prop="enterpriseName">
-              <el-input
-                v-model="form.enterpriseName"
-                placeholder="请输入企业名称"
-              />
+            <el-form-item label="项目名称" prop="projectName">
+              <el-input v-model="form.projectName" placeholder="请输入人员名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="人员名称" prop="personnelName">
-              <el-input
-                v-model="form.personnelName"
-                placeholder="请输入人员名称"
-              />
-            </el-form-item>
+          <el-form-item label="人员名称" prop="personnelName">
+            <el-input v-model="form.personnelName" placeholder="请输入人员名称" />
+          </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="不良行为" prop="badBehavior">
-              <el-input
-                v-model="form.badBehavior"
-                placeholder="请输入不良行为"
-              />
-              <template #label></template>
-            </el-form-item>
+          <el-form-item label="良好行为" prop="goodBehavior">
+            <el-input v-model="form.goodBehavior" placeholder="请输入良好行为" />
+          </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="等级" prop="grade">
-              <el-input v-model="form.grade" placeholder="请输入等级" />
-            </el-form-item>
+          <el-form-item label="表彰级别" prop="commendationLevel">
+            <el-input v-model="form.commendationLevel" placeholder="请输入表彰级别" />
+          </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="说明" prop="explainPeople">
-              <el-input v-model="form.explainPeople" placeholder="请输入说明" />
-            </el-form-item>
+          <el-form-item label="颁发机构" prop="issuingAgency">
+            <el-input v-model="form.issuingAgency" placeholder="请输入颁发机构" />
+          </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="行政处理" prop="administrativeProcessing">
-              <el-input
-                v-model="form.administrativeProcessing"
-                placeholder="请输入行政处理"
-              />
-            </el-form-item>
+          <el-form-item label="加分值" prop="bonusPoints">
+            <el-input v-model="form.bonusPoints" placeholder="请输入加分值" />
+          </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="扣除值" prop="deductionValue">
-              <el-input
-                v-model="form.deductionValue"
-                placeholder="请输入扣除值"
-              />
-            </el-form-item>
+          <el-form-item label="有效期" prop="termValidity">
+            <el-date-picker
+              style="width: 100%"
+              v-model="form.termValidity"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="扣分有效期" prop="deductionValuePeriod">
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.deductionValuePeriod"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="公告有效期" prop="announcementValuePeriod">
-              <el-date-picker
-                style="width: 100%"
-                v-model="form.announcementValuePeriod"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
+          <el-form-item label="公告期" prop="announcementPeriod">
+            <el-date-picker
+              style="width: 100%"
+              v-model="form.announcementPeriod"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
           </el-col>
         </el-form>
       </el-row>
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue
index e9cd47d2..03edf9ca 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue
@@ -220,7 +220,7 @@ export default {
         pageSize: 10,
         ids: null,
         data: {
-          enterpriseId: null,
+          enterpriseId: this.enterpriseId,
           systemName: null,
           validityPeriod: null,
           licenceIssuingAuthority: null,
@@ -292,7 +292,7 @@ export default {
       this.fileList = [];
       this.form = {
         id: null,
-        enterpriseId: null,
+        enterpriseId: this.enterpriseId,
         systemName: null,
         validityPeriod: null,
         licenceIssuingAuthority: null,
@@ -314,7 +314,7 @@ export default {
         pageSize: 10,
         data: {
           id: null,
-          enterpriseId: null,
+          enterpriseId: this.enterpriseId,
           systemName: null,
           validityPeriod: null,
           licenceIssuingAuthority: null,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue
index 9be93207..42d649ee 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue
@@ -257,11 +257,11 @@ export default {
         pageSize: 10,
           data:{
                                                           id: null,
-                                                                            enterpriseId: null,
+                                                                            enterpriseId: this.enterpriseId,
                                                                             enterpriseName: null,
                                                                             quipmentName: null,
                                                                             deviceType: null,
-                                                                        equipmentStatus: "0",
+                                                                            equipmentStatus: null,
                                                                             numberOfDevices: null,
                                                                             sectionName: null,
                                                                             sectionCode: null,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue
index 72ae74d0..0f41d8c7 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue
@@ -238,11 +238,11 @@ export default {
         pageSize: 10,
           data:{
                                                           id: null,
-                                                                            enterpriseId: null,
+                                                                            enterpriseId: this.enterpriseId,
                                                                             enterpriseName: null,
                                                                             laboratoryName: null,
                                                                             laboratoryLocation: null,
-                                                                        laboratoryStatus: "0",
+                                                                        laboratoryStatus:null,
                                                                             sectionName: null,
                                                                             sectionCode: null,
                                                                             projectName: null,
diff --git a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue
index 9f587b3c..b55ae1ef 100644
--- a/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue
+++ b/jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue
@@ -102,7 +102,7 @@
       </el-tab-pane>
 
       <el-tab-pane
-        v-if="checkPermi(['market:eq:index'])"
+        v-if="checkPermi(['market:eq:index'])&&$route.query.enterpriseType=='3'"
         label="检测设备登记"
         name="equipment"
         :disabled="!routeList[1].isEdit"
@@ -115,7 +115,7 @@
       </el-tab-pane>
 
       <el-tab-pane
-        v-if="checkPermi(['market:eqma:index'])"
+        v-if="checkPermi(['market:eqma:index'])&&$route.query.enterpriseType=='3'"
         label="工程实验室管理"
         name="equipmentManagement"
         :disabled="!routeList[1].isEdit"
@@ -190,6 +190,7 @@ export default {
   },
   created() {
     this.routeList = JSON.parse(this.$store.state.basePageData.routeList);
+
     // if (this.routeList[1].isEdit) {
     //   // this.formData = JSON.parse(this.$store.state.basePageData.baseFormData);
     //   this.formData = JSON.parse(this.$store.state.basePageData.baseFormData);