需归模块完善

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 "./preparationForConstruction.vue";
-// import preparationForConstruction from './preparationConstruction/index.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,

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,
       });
     },
     /** 提交按钮 */

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"
+                v-model="form.projectName"
-                placeholder="请输入企业名称"
+                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>

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="不良行为"
+        label="项目名称"
         align="center"
-        prop="badBehavior"
+        prop="projectName"
         min-width="120"
       />
-      <el-table-column
+      <el-table-column label="人员名称" align="center" prop="personnelName" min-width="120"/>
-        label="等级"
+      <el-table-column label="良好行为" align="center" prop="goodBehavior" min-width="120"/>
-        align="center"
+      <el-table-column label="表彰级别" align="center" prop="commendationLevel" min-width="120"/>
-        prop="grade"
+      <el-table-column label="颁发机构" align="center" prop="issuingAgency" min-width="120"/>
-        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
+      <el-table-column label="公告期" align="center" prop="announcementPeriod" min-width="120"/>
-        label="说明"
-        align="center"
-        prop="explainPeople"
-        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"
@@ -110,63 +66,41 @@
       <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
+              <el-input v-model="form.projectName" placeholder="请输入人员名称" />
-                v-model="form.enterpriseName"
-                placeholder="请输入企业名称"
-              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
           <el-form-item label="人员名称" prop="personnelName">
-              <el-input
+            <el-input v-model="form.personnelName" placeholder="请输入人员名称" />
-                v-model="form.personnelName"
-                placeholder="请输入人员名称"
-              />
           </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="不良行为" prop="badBehavior">
+          <el-form-item label="良好行为" prop="goodBehavior">
-              <el-input
+            <el-input v-model="form.goodBehavior" placeholder="请输入良好行为" />
-                v-model="form.badBehavior"
-                placeholder="请输入不良行为"
-              />
-              <template #label></template>
           </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="等级" prop="grade">
+          <el-form-item label="表彰级别" prop="commendationLevel">
-              <el-input v-model="form.grade" placeholder="请输入等级" />
+            <el-input v-model="form.commendationLevel" placeholder="请输入表彰级别" />
           </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="说明" prop="explainPeople">
+          <el-form-item label="颁发机构" prop="issuingAgency">
-              <el-input v-model="form.explainPeople" placeholder="请输入说明" />
+            <el-input v-model="form.issuingAgency" placeholder="请输入颁发机构" />
           </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="行政处理" prop="administrativeProcessing">
+          <el-form-item label="加分值" prop="bonusPoints">
-              <el-input
+            <el-input v-model="form.bonusPoints" placeholder="请输入加分值" />
-                v-model="form.administrativeProcessing"
-                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-col>
           <el-col :span="12">
-            <el-form-item label="扣分有效期" prop="deductionValuePeriod">
+          <el-form-item label="有效期" prop="termValidity">
             <el-date-picker
               style="width: 100%"
-                v-model="form.deductionValuePeriod"
+              v-model="form.termValidity"
+              value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
             >
@@ -174,10 +108,11 @@
           </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="公告有效期" prop="announcementValuePeriod">
+          <el-form-item label="公告期" prop="announcementPeriod">
             <el-date-picker
               style="width: 100%"
-                v-model="form.announcementValuePeriod"
+              v-model="form.announcementPeriod"
+              value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
             >

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,

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,

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,

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);