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

时间添加默认时间放开作业编辑

This commit is contained in:
shijing 2023-03-15 09:12:21 +08:00
parent 22b3a8cf02
commit 3fb7918c2e
6 changed files with 76 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/model/opm.js
View File

@ -70,6 +70,14 @@ export default {
data); data);
} }
}, },
patch: {
name: "字段更新",
req: async function (id, data) {
return await http.patch(
`${config.API_URL}/opm/operation/${id}/`,
data);
}
},
create: { create: {
name: "创建", name: "创建",
req: async function (data) { req: async function (data) {

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

@ -132,7 +132,7 @@
>查看 >查看
</el-button> </el-button>
<el-button <el-button
v-if="scope.row.state === 10" v-if="scope.row.state!==50"
link link
type="warning" type="warning"
size="small" size="small"

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

@ -18,32 +18,35 @@
<el-row> <el-row>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="作业简介" prop="name"> <el-form-item label="作业简介" prop="name">
<el-input v-model="form.name" type="text" clearable></el-input> <el-input v-model="form.name" type="text" clearable :disabled="mode == 'edit'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24"> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="开始时间" prop="start_time"> <el-form-item label="开始时间" prop="start_time">
<el-date-picker <el-date-picker
:disabled="mode == 'edit'"
v-model="form.start_time" v-model="form.start_time"
type="datetime" type="datetime"
placeholder="选择开始时间" placeholder="选择开始时间"
:default-time="defaultTime_start"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24"> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="结束时间" prop="end_time"> <el-form-item label="结束时间" prop="end_time">
<el-date-picker <el-date-picker
:disabled="mode == 'edit'"
v-model="form.end_time" v-model="form.end_time"
type="datetime" type="datetime"
placeholder="选择结束时间" placeholder="选择结束时间"
:default-time="defaultTime"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="12" :xs="24"> <el-col :md="12" :sm="12" :xs="24">
<el-form-item label="生产状态" prop="state_work"> <el-form-item label="生产状态" prop="state_work">
<el-select v-model="form.state_work" placeholder="选择生产状态"> <el-select v-model="form.state_work" placeholder="选择生产状态" :disabled="mode == 'edit'">
<el-option <el-option
v-for="item in stateoptions" v-for="item in stateoptions"
:key="item.id" :key="item.id"
@ -55,7 +58,7 @@
</el-col> </el-col>
<el-col :md="12" :sm="24" :xs="24"> <el-col :md="12" :sm="24" :xs="24">
<el-form-item label="作业区域" prop="area"> <el-form-item label="作业区域" prop="area">
<el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange" clearable> <el-select v-model="form.area" placeholder="选择作业区域" @change="areaChange" clearable :disabled="mode == 'edit'">
<el-option <el-option
v-for="item in areaoptions" v-for="item in areaoptions"
:key="item.id" :key="item.id"
@ -65,12 +68,11 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="24" :sm="12" :xs="24"> <el-col :md="24" :sm="12" :xs="24">
<el-form-item label="具体地点" prop="place"> <el-form-item label="具体地点" prop="place">
<el-input v-model="form.place" type="text" clearable></el-input> <el-input v-model="form.place" type="text" clearable :disabled="mode == 'edit'"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" :xs="24"> <el-col :md="12" :sm="24" :xs="24">
<el-form-item label="业务部门" prop="dept_bus"> <el-form-item label="业务部门" prop="dept_bus">
<el-cascader <el-cascader
@ -89,15 +91,14 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" :xs="24"> <el-col :md="12" :sm="24" :xs="24">
<el-form-item label="部门协调员" prop="coordinator"> <el-form-item label="部门协调员" prop="coordinator">
<el-input <el-input
v-model="form.coordinator_name" v-model="form.coordinator_name"
disabled disabled
style="width:200px" style="width:220px"
></el-input> ></el-input>
<ehsUserSelect :multiple="false" @submit="getUser"/> <ehsUserSelect :multiple="false" @submit="getUser" v-if="mode == 'add'"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" :xs="24"> <el-col :md="12" :sm="24" :xs="24">
@ -138,9 +139,7 @@
</el-form> </el-form>
</el-main> </el-main>
<el-footer> <el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit" <el-button type="primary" :loading="isSaveing" @click="submit" v-if="mode!=='show'">保存</el-button>
>保存</el-button
>
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
@ -160,6 +159,8 @@ export default {
edit: "编辑", edit: "编辑",
show: "查看", show: "查看",
}, },
defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
defaultTime:new Date(2000, 1, 1, 18, 0, 0),
form: {}, form: {},
rules: { rules: {
name: [{ required: true, message: "请输入作业简介" }], name: [{ required: true, message: "请输入作业简介" }],
@ -244,14 +245,18 @@ export default {
res = await this.$API.opm.operation.create.req(this.form); res = await this.$API.opm.operation.create.req(this.form);
this.form.id = res.id; this.form.id = res.id;
} else if (this.mode == "edit") { } else if (this.mode == "edit") {
res = await this.$API.opm.operation.update.req(
let form = {};
form.vchannels = this.form.vchannels;
res = await this.$API.opm.operation.patch.req(
this.form.id, this.form.id,
this.form form
); );
} }
this.isSaveing = false; this.isSaveing = false;
this.$emit("success", this.form, this.mode); this.$emit("success", this.form, this.mode);
this.visible = false; this.visible = false;
console.log(res)
this.$message.success("操作成功"); this.$message.success("操作成功");
return res; return res;
} catch (err) { } catch (err) {

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

@ -58,7 +58,8 @@
<el-date-picker <el-date-picker
v-model="rpjform.come_time" v-model="rpjform.come_time"
type="datetime" type="datetime"
placeholder="选择结束时间" placeholder="选择进厂时间"
:default-time="defaultTime_start"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -67,7 +68,8 @@
<el-date-picker <el-date-picker
v-model="rpjform.leave_time" v-model="rpjform.leave_time"
type="datetime" type="datetime"
placeholder="选择结束时间" placeholder="选择离厂时间"
:default-time="defaultTime"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -426,6 +428,8 @@ export default {
come_time: [{ required: true, message: "请选择" }], come_time: [{ required: true, message: "请选择" }],
leave_time: [{ required: true, message: "请选择" }], leave_time: [{ required: true, message: "请选择" }],
}, },
defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
defaultTime:new Date(2000, 1, 1, 18, 0, 0),
}; };
}, },
mounted() { mounted() {

50
src/views/vm/visit_detial.vue
View File

@ -5,41 +5,27 @@
<el-main> <el-main>
<el-card header="基本信息" shadow="hover"> <el-card header="基本信息" shadow="hover">
<el-descriptions :column="2"> <el-descriptions :column="2">
<el-descriptions-item label="来访概述:">{{ <el-descriptions-item label="来访概述:">{{form.name}}</el-descriptions-item>
form.name <el-descriptions-item label="来访级别:">{{levelOptions[form.level]}}</el-descriptions-item>
}}</el-descriptions-item> <el-descriptions-item label="来访单位:">{{form.company}}</el-descriptions-item>
<el-descriptions-item label="来访级别:">{{
levelOptions[form.level]
}}</el-descriptions-item>
<el-descriptions-item label="来访单位:">{{
form.company
}}</el-descriptions-item>
<el-descriptions-item label="来访人数:"> <el-descriptions-item label="来访人数:">
<el-tag size="small">{{ form.count_people }}人</el-tag> <el-tag size="small">{{ form.count_people }}人</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="来访人员:"> <el-descriptions-item label="来访人员:">
<el-tag size="small" v-for="item in form.visitors_" :key="item.id">{{ item.visitor_.name }}</el-tag> <el-tag size="small" v-for="item in form.visitors_" :key="item.id">{{ item.visitor_.name }}</el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="状态:">{{ <el-descriptions-item label="状态:">{{state_[form.state]}}</el-descriptions-item>
state_[form.state] <el-descriptions-item label="来访时间:">{{form.visit_time}}</el-descriptions-item>
}}</el-descriptions-item> <el-descriptions-item label="离开时间:">{{form.leave_time}}</el-descriptions-item>
<el-descriptions-item label="来访时间:">{{ <el-descriptions-item label="来访事由:">{{purpose_[form.purpose]}}</el-descriptions-item>
form.visit_time <el-descriptions-item label="来访详述:">{{form.description}}</el-descriptions-item>
}}</el-descriptions-item> <el-descriptions-item label="接待人:" v-if="form.receptionist_">{{ form.receptionist_.name }}</el-descriptions-item>
<el-descriptions-item label="离开时间:">{{
form.leave_time
}}</el-descriptions-item>
<el-descriptions-item label="来访事由:">{{
purpose_[form.purpose]
}}</el-descriptions-item>
<el-descriptions-item label="来访详述:">{{
form.description
}}</el-descriptions-item>
<el-descriptions-item label="接待人:" v-if="form.receptionist_">
{{ form.receptionist_.name }}
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div v-if="form.vehicle_photos_">
<span style="vertical-align: top;">车辆照片:</span>
<el-image v-for="item in form.vehicle_photos_" :key="item.id" :src="item.path"
style="width:100px;height:100px"></el-image>
</div>
</el-card> </el-card>
<el-card style="margin-top: 8px" shadow="hover" header="访客信息"> <el-card style="margin-top: 8px" shadow="hover" header="访客信息">
<scTable ref="table" :data="peoplelist" row-key="id" height="auto" stripe hideDo hidePagination> <scTable ref="table" :data="peoplelist" row-key="id" height="auto" stripe hideDo hidePagination>
@ -97,6 +83,7 @@
</template> </template>
<script> <script>
import config from "@/config"
import ScBind from "@/components/scBind/index.vue"; import ScBind from "@/components/scBind/index.vue";
export default { export default {
emits: ["success", "closed"], emits: ["success", "closed"],
@ -206,8 +193,13 @@ export default {
setData(data) { setData(data) {
this.loading = true this.loading = true
this.$API.vm.visit.read.req(data.id).then((res) => { this.$API.vm.visit.read.req(data.id).then((res) => {
this.loading = false this.loading = false;
let urls = config.API_URL.slice(0,-4);
this.form = res; this.form = res;
this.form.vehicle_photos_.forEach(item=>{
item.path = urls+item.path
})
}).catch(e => { this.loading = false }); }).catch(e => { this.loading = false });
this.$API.vm.people.list.req({ visit: data.id, page: 0 }).then((res) => { this.$API.vm.people.list.req({ visit: data.id, page: 0 }).then((res) => {

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

@ -52,13 +52,15 @@
v-model="form.visit_time" v-model="form.visit_time"
type="datetime" type="datetime"
placeholder="选择来访时间" placeholder="选择来访时间"
:default-time="defaultTime_start"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="8" :sm="12" :xs="24"> <el-col :md="8" :sm="12" :xs="24">
<el-form-item label="离开时间" prop="leave_time"> <el-form-item label="离开时间">
<el-date-picker <el-date-picker
:default-time="defaultTime"
v-model="form.leave_time" v-model="form.leave_time"
type="datetime" type="datetime"
placeholder="选择离开时间" placeholder="选择离开时间"
@ -362,7 +364,13 @@ export default {
measureOptions: ['集中隔离','居家隔离','居家健康检测','排除风险'], measureOptions: ['集中隔离','居家隔离','居家健康检测','排除风险'],
active: 0, active: 0,
stepSuc: [0], stepSuc: [0],
form: {purpose:10, level:10}, form: {
purpose:10,
level:10,
leave_time:'',
},
defaultTime_start:new Date(2000, 1, 1, 10, 0, 0),
defaultTime:new Date(2000, 1, 1, 18, 0, 0),
stepTitle: ["基本信息", "选择访客"], stepTitle: ["基本信息", "选择访客"],
receptionistoptions: [], receptionistoptions: [],
purposeoptions: [ purposeoptions: [
@ -479,13 +487,13 @@ export default {
this.$refs.dialogForm.validate(async (valid) => { this.$refs.dialogForm.validate(async (valid) => {
if (valid) { if (valid) {
if(this.visitid){ if(this.visitid){
this.$API.vm.visit.update this.$API.vm.visit.update
.req(this.visitid, this.form) .req(this.visitid, this.form)
.then((res) => { .then((res) => {
this.$message.success("基本信息更新成功"); this.$message.success("基本信息更新成功");
this.getInit(); this.getInit();
this.active = 1; this.active = 1;
}) })
}else{ }else{
this.$API.vm.visit.create.req(this.form).then(res=>{ this.$API.vm.visit.create.req(this.form).then(res=>{
this.visitid = res.id; this.visitid = res.id;