wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

批量屏蔽经营企业和经营类型 

消除代码编译的警告、错误
dev
wangpeng 2024-04-02 08:23:59 +08:00
parent 456855000a
commit 57dfe8f8c5
23 changed files with 56 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
View File

@ -197,7 +197,6 @@ import { NETWORK_STATE } from "@/assets/js/constant.js";
import { reactive } from "vue"; import { reactive } from "vue";
import { setFreightTrailerImport } from "@/request/enterprise_management.js"; import { setFreightTrailerImport } from "@/request/enterprise_management.js";
const router = useRouter(); const router = useRouter();
const data = reactive({ const data = reactive({
importDialogVisible: false, importDialogVisible: false,

18
src/views/enterprise_management/user_practitioner/add.vue
View File

@ -350,7 +350,10 @@
<el-col :span="9"> <el-col :span="9">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期限（身份证）" prop="dates1"> <el-form-item
label="有效期限（身份证）"
prop="ID_CARD_VALIDITY"
>
<el-date-picker <el-date-picker
v-model="data.form.ID_CARD_VALIDITY" v-model="data.form.ID_CARD_VALIDITY"
type="daterange" type="daterange"
@ -450,7 +453,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期限" prop="dates2"> <el-form-item label="有效期限" prop="DRIVER_LICENSE_VALIDITY">
<el-date-picker <el-date-picker
v-model="data.form.DRIVER_LICENSE_VALIDITY" v-model="data.form.DRIVER_LICENSE_VALIDITY"
type="daterange" type="daterange"
@ -559,7 +562,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="有效期限" prop="dates3"> <el-form-item
label="有效期限"
prop="QUALIFICATION_CERTIFICATE_VALIDITY"
>
<el-date-picker <el-date-picker
v-model="data.form.QUALIFICATION_CERTIFICATE_VALIDITY" v-model="data.form.QUALIFICATION_CERTIFICATE_VALIDITY"
type="daterange" type="daterange"
@ -793,7 +799,7 @@ const rules = {
trigger: "blur", trigger: "blur",
}, },
], ],
dates1: [ ID_CARD_VALIDITY: [
{ {
required: true, required: true,
message: "请选择有效期限（身份证）", message: "请选择有效期限（身份证）",
@ -849,7 +855,7 @@ const rules = {
trigger: "change", trigger: "change",
}, },
], ],
dates2: [ DRIVER_LICENSE_VALIDITY: [
{ {
required: true, required: true,
message: "请选择有效期限", message: "请选择有效期限",
@ -898,7 +904,7 @@ const rules = {
trigger: "change", trigger: "change",
}, },
], ],
dates3: [ QUALIFICATION_CERTIFICATE_VALIDITY: [
{ {
required: true, required: true,
message: "请选择有效期限", message: "请选择有效期限",

4
src/views/labor_contract/components/add.vue
View File

@ -13,13 +13,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="合同文件" prop="file"> <el-form-item label="合同文件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

4
src/views/labor_contract/index.vue
View File

@ -66,8 +66,8 @@
<el-tag v-else>未生效</el-tag> <el-tag v-else>未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
<el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" /> <el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/management_staffing/components/add.vue
View File

@ -12,13 +12,13 @@
style="width: 300px" style="width: 300px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ operatingCompany }}</span> <span>{{ operatingCompany }}</span>
</el-form-item> </el-form-item>-->
<!-- <el-form-item--> <!-- <el-form-item-->
<!-- v-if="type === 'edit'"--> <!-- v-if="type === 'edit'"-->
<!-- label="经营类型"--> <!-- label="经营类型"-->

4
src/views/management_staffing/index.vue
View File

@ -65,8 +65,8 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
<el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" /> <el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

7
src/views/mechanical_files/inspect_annually/index.vue
View File

@ -78,7 +78,9 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label-width="10px" class="end"> <el-form-item label-width="10px" class="end">
<el-button type="primary" @click="fnImportDialogChangeShow">导入</el-button> <el-button type="primary" @click="fnImportDialogChangeShow"
>导入</el-button
>
<el-button type="primary" @click="fnExport">导出</el-button> <el-button type="primary" @click="fnExport">导出</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -328,7 +330,6 @@ const fnSubmitImport = async (formData) => {
const fnExport = async () => { const fnExport = async () => {
const selectionData = tableRef.value.getSelectionRows(); const selectionData = tableRef.value.getSelectionRows();
console.log("selectionData",selectionData);
if (selectionData.length === 0) { if (selectionData.length === 0) {
ElMessage.warning("请选择需要导出至excel报表的记录信息"); ElMessage.warning("请选择需要导出至excel报表的记录信息");
return; return;
@ -345,8 +346,6 @@ const fnExport = async () => {
"&DATA_IDS=" + "&DATA_IDS=" +
DATA_IDS; DATA_IDS;
}; };
</script> </script>
<style scoped></style> <style scoped></style>

4
src/views/occupational_hazards/components/add.vue
View File

@ -17,13 +17,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="职业危害告知书" prop="file"> <el-form-item label="职业危害告知书" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

24
src/views/occupational_hazards/index.vue
View File

@ -56,16 +56,8 @@
{{ serialNumber(pagination, $index) }} {{ serialNumber(pagination, $index) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="NEWOCCUPATIONALNAME" label="用户名称" />
prop="NEWOCCUPATIONALNAME" <el-table-column prop="OCCUPATIONALNAME" label="职业危害告知书" />
label="用户名称"
width="100"
/>
<el-table-column
prop="OCCUPATIONALNAME"
label="职业危害告知书"
width="250"
/>
<el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="100"> <el-table-column prop="COMPLETIONSTATUS" label="完成状态" width="100">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.COMPLETIONSTATUS === '1'">已上传</el-tag> <el-tag v-if="row.COMPLETIONSTATUS === '1'">已上传</el-tag>
@ -78,12 +70,12 @@
<el-tag v-else>未生效</el-tag> <el-tag v-else>未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="220" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="220" />
<el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" /> <el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" />
<el-table-column label="操作" width="180"> <el-table-column label="操作">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"

4
src/views/production_course_regulate/management_agreement/components/add.vue
View File

@ -16,13 +16,13 @@
style="width: 300px" style="width: 300px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="会议附件" prop="file"> <el-form-item label="会议附件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

2
src/views/production_course_regulate/management_agreement/index.vue
View File

@ -69,7 +69,7 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/safety_assessment/components/add.vue
View File

@ -13,13 +13,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ operatingCompany }}</span> <span>{{ operatingCompany }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="附件" prop="file"> <el-form-item label="附件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

2
src/views/safety_assessment/index.vue
View File

@ -65,7 +65,7 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/safety_culture/safety_activities/components/add.vue
View File

@ -12,13 +12,13 @@
style="width: 300px" style="width: 300px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ operatingCompany }}</span> <span>{{ operatingCompany }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="会议附件" prop="file"> <el-form-item label="会议附件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

2
src/views/safety_culture/safety_activities/index.vue
View File

@ -65,7 +65,7 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/safety_culture/safety_manual/components/add.vue
View File

@ -12,13 +12,13 @@
style="width: 300px" style="width: 300px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ operatingCompany }}</span> <span>{{ operatingCompany }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="会议附件" prop="file"> <el-form-item label="会议附件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

2
src/views/safety_culture/safety_manual/index.vue
View File

@ -65,7 +65,7 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/safety_production/components/add.vue
View File

@ -13,13 +13,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="会议附件" prop="file"> <el-form-item label="会议附件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

2
src/views/safety_production/index.vue
View File

@ -65,7 +65,7 @@
<el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag> <el-tag v-else-if="row.VALIDSTATUS === '0'">未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/safety_responsibility/components/add.vue
View File

@ -17,13 +17,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="岗位安全责任书" prop="file"> <el-form-item label="岗位安全责任书" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

4
src/views/safety_responsibility/index.vue
View File

@ -74,8 +74,8 @@
<el-tag v-else>未生效</el-tag> <el-tag v-else>未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
<el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" /> <el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />

4
src/views/security_commitment/components/add.vue
View File

@ -18,13 +18,13 @@
style="width: 300px" style="width: 300px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item <!-- <el-form-item
v-if="type === 'edit'" v-if="type === 'edit'"
label="经营企业" label="经营企业"
prop="OPERATINGCOMPANY" prop="OPERATINGCOMPANY"
> >
<span>{{ form.OPERATINGCOMPANY }}</span> <span>{{ form.OPERATINGCOMPANY }}</span>
</el-form-item> </el-form-item>-->
<el-form-item label="承诺书文件" prop="file"> <el-form-item label="承诺书文件" prop="file">
<layout-upload <layout-upload
v-model:file-list="form.file" v-model:file-list="form.file"

4
src/views/security_commitment/index.vue
View File

@ -70,8 +70,8 @@
<el-tag v-else>未生效</el-tag> <el-tag v-else>未生效</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CORP_NAME" label="经营企业" width="150" /> <!-- <el-table-column prop="CORP_NAME" label="经营企业" width="150" />
<el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" /> <el-table-column prop="OPERATIONTYPE" label="经营类型" width="150" />-->
<el-table-column prop="EXPIRYDATE" label="到期时间" width="150" /> <el-table-column prop="EXPIRYDATE" label="到期时间" width="150" />
<el-table-column prop="CREATETIME" label="创建时间" width="150" /> <el-table-column prop="CREATETIME" label="创建时间" width="150" />
<el-table-column prop="OPERATTIME" label="修改时间" width="150" /> <el-table-column prop="OPERATTIME" label="修改时间" width="150" />