Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

需归模块完善

master
zth 7 months ago
parent
516ffea08f
commit
fdcb4ee744
8 changed files with 69 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
  2. 2
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
  3. 12
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue
  4. 157
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue
  5. 6
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue
  6. 4
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue
  7. 4
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue
  8. 5
      jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue

10
jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue
View File

@ -197,7 +197,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="checkPermi(['building:xmys:index'])" v-if="checkPermi(['building:xmys:index'])"
label="安全风险" label="安全风险管理"
name="securityRisk" name="securityRisk"
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
:lazy="true" :lazy="true"
@ -227,7 +227,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="checkPermi(['building:xmys:index'])" v-if="checkPermi(['building:xmys:index'])"
label="安全目标" label="安全目标管理"
name="safetyGoal" name="safetyGoal"
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
:lazy="true" :lazy="true"
@ -248,8 +248,8 @@ import { checkPermi, checkRole } from "@/utils/permission";
import baseMsg from "./baseMsg/index.vue"; import baseMsg from "./baseMsg/index.vue";
import firmInfo from "./firmInfo.vue"; import firmInfo from "./firmInfo.vue";
import contract from "./contract/index.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.vue";
import qualityControl from "./qualityControl/index.vue"; import qualityControl from "./qualityControl/index.vue";
import safetyRecord from "./safetyRecord.vue"; import safetyRecord from "./safetyRecord.vue";
@ -277,11 +277,11 @@ import { getProjectinfo } from "@/api/earlyStage/projectinfo";
export default { export default {
components: { components: {
preparationForConstruction,
contEvaluation, contEvaluation,
baseMsg, baseMsg,
firmInfo, firmInfo,
contract, contract,
preparationForConstruction,
qualityControl, qualityControl,
safetyRecord, safetyRecord,
designChangeInformation, designChangeInformation,

2
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/index.vue
View File

@ -1030,7 +1030,7 @@ export default {
// 跳转到选项卡页面 // 跳转到选项卡页面
this.$router.push({ this.$router.push({
path: path:
"/marketSupervision/enterpriseInformation/options?baseDataId=" + id, "/marketSupervision/enterpriseInformation/options?baseDataId=" + id+"&enterpriseType="+row.enterpriseType,
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

12
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/badBehavior.vue
View File

@ -10,9 +10,9 @@
/> />
<el-table-column <el-table-column
label="企业名称" label="项目名称"
align="center" align="center"
prop="enterpriseName" prop="projectName"
min-width="120" min-width="120"
/> />
<el-table-column <el-table-column
@ -110,10 +110,10 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企业名称" prop="enterpriseName"> <el-form-item label="项目名称" prop="projectName">
<el-input <el-input
v-model="form.enterpriseName" v-model="form.projectName"
placeholder="请输入企业名称" placeholder="请输入项目名称"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -169,6 +169,7 @@
v-model="form.deductionValuePeriod" v-model="form.deductionValuePeriod"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
@ -180,6 +181,7 @@
v-model="form.announcementValuePeriod" v-model="form.announcementValuePeriod"
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>

157
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/goodBehavior.vue
View File

@ -8,63 +8,19 @@
align="center" align="center"
fixed 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 <el-table-column
label="说明" label="项目名称"
align="center" align="center"
prop="explainPeople" prop="projectName"
min-width="120" 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="administrativeProcessing" <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="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 <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -110,79 +66,58 @@
<el-row :gutter="15"> <el-row :gutter="15">
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-col :span="12"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="人员名称" prop="personnelName"> <el-form-item label="人员名称" prop="personnelName">
<el-input <el-input v-model="form.personnelName" placeholder="请输入人员名称" />
v-model="form.personnelName" </el-form-item>
placeholder="请输入人员名称"
/>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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" </el-form-item>
placeholder="请输入不良行为"
/>
<template #label></template>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <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" </el-form-item>
placeholder="请输入行政处理"
/>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="扣除值" prop="deductionValue"> <el-form-item label="有效期" prop="termValidity">
<el-input <el-date-picker
v-model="form.deductionValue" style="width: 100%"
placeholder="请输入扣除值" v-model="form.termValidity"
/> value-format="yyyy-MM-dd"
</el-form-item> type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="扣分有效期" prop="deductionValuePeriod"> <el-form-item label="公告期" prop="announcementPeriod">
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="form.deductionValuePeriod" v-model="form.announcementPeriod"
type="date" value-format="yyyy-MM-dd"
placeholder="选择日期" type="date"
> placeholder="选择日期"
</el-date-picker> >
</el-form-item> </el-date-picker>
</el-col> </el-form-item>
<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-col> </el-col>
</el-form> </el-form>
</el-row> </el-row>

6
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/managementSystem.vue
View File

@ -220,7 +220,7 @@ export default {
pageSize: 10, pageSize: 10,
ids: null, ids: null,
data: { data: {
enterpriseId: null, enterpriseId: this.enterpriseId,
systemName: null, systemName: null,
validityPeriod: null, validityPeriod: null,
licenceIssuingAuthority: null, licenceIssuingAuthority: null,
@ -292,7 +292,7 @@ export default {
this.fileList = []; this.fileList = [];
this.form = { this.form = {
id: null, id: null,
enterpriseId: null, enterpriseId: this.enterpriseId,
systemName: null, systemName: null,
validityPeriod: null, validityPeriod: null,
licenceIssuingAuthority: null, licenceIssuingAuthority: null,
@ -314,7 +314,7 @@ export default {
pageSize: 10, pageSize: 10,
data: { data: {
id: null, id: null,
enterpriseId: null, enterpriseId: this.enterpriseId,
systemName: null, systemName: null,
validityPeriod: null, validityPeriod: null,
licenceIssuingAuthority: null, licenceIssuingAuthority: null,

4
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipment.vue
View File

@ -257,11 +257,11 @@ export default {
pageSize: 10, pageSize: 10,
data:{ data:{
id: null, id: null,
enterpriseId: null, enterpriseId: this.enterpriseId,
enterpriseName: null, enterpriseName: null,
quipmentName: null, quipmentName: null,
deviceType: null, deviceType: null,
equipmentStatus: "0", equipmentStatus: null,
numberOfDevices: null, numberOfDevices: null,
sectionName: null, sectionName: null,
sectionCode: null, sectionCode: null,

4
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/equipmentManagement.vue
View File

@ -238,11 +238,11 @@ export default {
pageSize: 10, pageSize: 10,
data:{ data:{
id: null, id: null,
enterpriseId: null, enterpriseId: this.enterpriseId,
enterpriseName: null, enterpriseName: null,
laboratoryName: null, laboratoryName: null,
laboratoryLocation: null, laboratoryLocation: null,
laboratoryStatus: "0", laboratoryStatus:null,
sectionName: null, sectionName: null,
sectionCode: null, sectionCode: null,
projectName: null, projectName: null,

5
jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/index.vue
View File

@ -102,7 +102,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="checkPermi(['market:eq:index'])" v-if="checkPermi(['market:eq:index'])&&$route.query.enterpriseType=='3'"
label="检测设备登记" label="检测设备登记"
name="equipment" name="equipment"
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
@ -115,7 +115,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="checkPermi(['market:eqma:index'])" v-if="checkPermi(['market:eqma:index'])&&$route.query.enterpriseType=='3'"
label="工程实验室管理" label="工程实验室管理"
name="equipmentManagement" name="equipmentManagement"
:disabled="!routeList[1].isEdit" :disabled="!routeList[1].isEdit"
@ -190,6 +190,7 @@ export default {
}, },
created() { created() {
this.routeList = JSON.parse(this.$store.state.basePageData.routeList); this.routeList = JSON.parse(this.$store.state.basePageData.routeList);
// if (this.routeList[1].isEdit) { // if (this.routeList[1].isEdit) {
// // this.formData = JSON.parse(this.$store.state.basePageData.baseFormData); // // this.formData = JSON.parse(this.$store.state.basePageData.baseFormData);
// this.formData = JSON.parse(this.$store.state.basePageData.baseFormData); // this.formData = JSON.parse(this.$store.state.basePageData.baseFormData);

Write Preview
Loading…
Cancel
Save