zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

This commit is contained in:
caoqianming 2022-11-01 14:09:14 +08:00
parent c5a5477f05 2199a470cc
commit ee23a453d5
6 changed files with 742 additions and 685 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/opm/operation.vue
View File

@ -342,7 +342,12 @@ export default {
//本地更新数据
handleSaveSuccess(data, mode) {
if (mode == "add") {
this.$refs.tableoperation.refresh();
this.$router.push({
name: "opl",
query: {
id: data.id,
},
});
} else if (mode == "edit") {
this.$refs.tableoperation.refresh();
}

4
src/views/opm/operation_form.vue
View File

@ -194,7 +194,7 @@ export default {
methods: {
//所属部门,属地部门，业务部门
getDept() {
this.$API.system.dept.list.req({ page: 0 }).then((res) => {
this.$API.system.dept.list.req({ page: 0 , type__in: 'dept, rparty'}).then((res) => {
this.deptoptions = genTree(res);
});
@ -243,7 +243,7 @@ export default {
var res;
if (this.mode == "add") {
res = await this.$API.opm.operation.create.req(this.form);
console.log(this.form);
this.form.id = res.id;
} else if (this.mode == "edit") {
res = await this.$API.opm.operation.update.req(
this.form.id,

47
src/views/rpm/rpj.vue
View File

@ -88,21 +88,6 @@
<el-table-column label="项目类型" prop="type" width="180">
<template #default="scope">{{ type_[scope.row.type] }} </template>
</el-table-column>
<el-table-column
label="合同编号"
prop="contract_number"
width="180"
></el-table-column>
<el-table-column
label="进厂时间"
prop="come_time"
width="180"
></el-table-column>
<el-table-column
label="离厂时间"
prop="leave_time"
width="180"
></el-table-column>
<el-table-column label="状态" prop="state" width="100">
<template #default="scope">{{ state_[scope.row.state] }}</template>
</el-table-column>
@ -135,6 +120,21 @@
</el-tag>
</template>
</el-table-column>
<el-table-column
label="进厂时间"
prop="come_time"
width="180"
></el-table-column>
<el-table-column
label="离厂时间"
prop="leave_time"
width="180"
></el-table-column>
<el-table-column
label="合同编号"
prop="contract_number"
width="180"
></el-table-column>
<el-table-column
label="所属部门"
prop="belong_dept_name"
@ -193,13 +193,13 @@
</el-main>
</el-container>
<save-dialog
<!-- <save-dialog
v-if="dialog.save"
ref="saveDialog"
@success="handleSaveSuccess"
@closed="dialog.save = false"
>
</save-dialog>
</save-dialog> -->
<show-dialog
v-if="dialog.show"
ref="showDialog"
@ -207,13 +207,13 @@
></show-dialog>
</template>
<script>
import saveDialog from "./rpj_form.vue";
// import saveDialog from "./rpj_form.vue";
import showDialog from "./rpj_show.vue";
export default {
name: "remployee",
components: {
saveDialog,
// saveDialog,
showDialog,
},
data() {
@ -304,9 +304,12 @@ export default {
methods: {
//添加
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
// this.dialog.save = true;
// this.$nextTick(() => {
// this.$refs.saveDialog.open("add");
// });
this.$router.push({
name: "rpjadd",
});
},
//编辑

1204
src/views/rpm/rpjadd.vue
View File

File diff suppressed because it is too large Load Diff

13
src/views/vm/visit.vue
View File

@ -191,13 +191,13 @@
</el-container>
</template>
<script>
import saveDialog from "./visit_form.vue";
// import saveDialog from "./visit_form.vue";
import detialDialog from "./visit_detial.vue";
export default {
name: "visit",
components: {
saveDialog,
// saveDialog,
detialDialog,
},
data() {
@ -252,9 +252,12 @@ export default {
methods: {
//添加
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
// this.dialog.save = true;
// this.$nextTick(() => {
// this.$refs.saveDialog.open("add");
// });
this.$router.push({
name: "vistoradd",
});
},
addpepple(row) {

152
src/views/vm/vistoradd.vue
View File

@ -28,57 +28,8 @@
style="margin: 40px 40px 40px 40px"
>
<el-row>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访概述">
<el-input v-model="form.name" type="text" clearable></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访时间">
<el-date-picker
v-model="form.visit_time"
type="datetime"
placeholder="选择来访时间"
/>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="离开时间">
<el-date-picker
v-model="form.leave_time"
type="datetime"
placeholder="选择离开时间"
/>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访单位">
<el-input v-model="form.company" type="text" clearable></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :sm="24" :xs="24">
<el-form-item label="来访级别">
<el-radio-group v-model="form.level">
<el-radio-button label="10">一般</el-radio-button>
<el-radio-button label="20">重要</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访人数">
<el-input-number
v-model="form.count_people"
:min="0"
:max="32767"
controls-position="right"
></el-input-number>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访事由">
<el-col :md="8" :sm="12" :xs="24" >
<el-form-item label="来访事由" prop="purpose">
<el-select v-model="form.purpose" placeholder="选择来访事由">
<el-option
v-for="item in purposeoptions"
@ -89,8 +40,57 @@
</el-select>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访概述" prop="name">
<el-input v-model="form.name" type="text" clearable></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访时间" prop="visit_time">
<el-date-picker
v-model="form.visit_time"
type="datetime"
placeholder="选择来访时间"
/>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="离开时间" prop="leave_time">
<el-date-picker
v-model="form.leave_time"
type="datetime"
placeholder="选择离开时间"
/>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访单位" prop="company">
<el-input v-model="form.company" type="text" clearable></el-input>
</el-form-item>
</el-col>
<el-col :md="8" :sm="24" :xs="24">
<el-form-item label="来访级别" prop="level">
<el-radio-group v-model="form.level">
<el-radio-button label="10">一般</el-radio-button>
<el-radio-button label="20">重要</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :md="8" :sm="12" :xs="24">
<el-form-item label="来访人数" prop="count_people">
<el-input-number
v-model="form.count_people"
:min="0"
:max="32767"
controls-position="right"
></el-input-number>
</el-form-item>
</el-col>
<el-col :md="16" :sm="12" :xs="24">
<el-form-item label="来访详述">
<el-form-item label="来访详述" prop="description">
<el-input
v-model="form.description"
type="text"
@ -99,7 +99,7 @@
</el-form-item>
</el-col>
<el-col :md="8" :sm="24" :xs="24">
<el-form-item label="接待人">
<el-form-item label="接待人" prop="receptionist">
<span style="display:flex">
<el-input readonly v-model="form.receptionist_name"></el-input>
<ehsUserSelect :multiple="false" @submit="getReceptionist"/>
@ -353,7 +353,7 @@ export default {
measureOptions: ['集中隔离','居家隔离','居家健康检测','排除风险'],
active: 0,
stepSuc: [0],
form: [],
form: {purpose:10, level:10},
stepTitle: ["基本信息", "选择访客"],
receptionistoptions: [],
purposeoptions: [
@ -391,7 +391,14 @@ export default {
is_main: false,
is_reported: true,
},
rules: { },
rules: {
purpose: [{ required: true, message: "请输入" }],
name: [{ required: true, message: "来访概述" }],
visit_time: [{ required: true, message: "请输入" }],
leave_time: [{ required: true, message: "请输入" }],
receptionist: [{ required: true, message: "请输入" }],
level: [{ required: true, message: "请输入" }]
},
peopleRules:{
visitor: [{ required: true, message: "请选择来访人员" }],
return_date: [{ required: true, message: "请选择返乡日期" }],
@ -411,8 +418,10 @@ export default {
},
mounted() {
this.visitid = this.$route.query.visitid; //作业ID
this.getRpj();
this.getpeoplelistlist();
if(this.visitid){
this.getRpj();
this.getpeoplelistlist();
}
this.getvisitorlist();
},
methods: {
@ -450,18 +459,27 @@ export default {
//组件点击下一步
handleNextStep() {
if (this.active == 0) {
this.$API.vm.visit.update
.req(this.form.id, this.form)
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
if(this.visitid){
this.$API.vm.visit.update
.req(this.visitid, this.form)
.then((res) => {
this.$message.success("基本信息更新成功！");
return res;
this.$message.success("基本信息更新成功");
this.getInit();
this.active = 1;
})
.catch((err) => {
return err;
});
this.getInit();
this.active = 1;
}else{
this.$API.vm.visit.create.req(this.form).then(res=>{
this.visitid = res.id;
this.$message.success("项目创建成功");
this.getInit();
this.active = 1;
})
}
}
});
} else {
this.active = 1;
}