@@ -83,8 +94,8 @@
- 启用
- 禁用
+ 已删
+ 在用
@@ -102,8 +103,10 @@ export default {
},
submitForm() {
let sform = {
+ "id_number":this.form.id_number,
+ "photo": this.form.photo,
"phone": this.form.phone,
- "email": this.form.email
+ "email": this.form.email,
}
this.saveLoading = true
this.$API.hrm.employee.improve_info.req(sform).then(res=>{
diff --git a/src/views/vm/visit_detial.vue b/src/views/vm/visit_detial.vue
index 56f57e2d..f09a1da3 100644
--- a/src/views/vm/visit_detial.vue
+++ b/src/views/vm/visit_detial.vue
@@ -5,41 +5,27 @@
- {{
- form.name
- }}
- {{
- levelOptions[form.level]
- }}
- {{
- form.company
- }}
+ {{form.name}}
+ {{levelOptions[form.level]}}
+ {{form.company}}
{{ form.count_people }}人
{{ item.visitor_.name }}
- {{
- state_[form.state]
- }}
- {{
- form.visit_time
- }}
- {{
- form.leave_time
- }}
- {{
- purpose_[form.purpose]
- }}
- {{
- form.description
- }}
-
-
- {{ form.receptionist_.name }}
-
+ {{state_[form.state]}}
+ {{form.visit_time}}
+ {{form.leave_time}}
+ {{purpose_[form.purpose]}}
+ {{form.description}}
+ {{ form.receptionist_.name }}
+
+ 车辆照片:
+
+
@@ -55,6 +41,15 @@
是
否
+
+
+
{{ scope.row.come_place }}
-
是
否
-
@@ -312,12 +303,14 @@
style="margin-right:4px">上一步
- {{item.name}}
-
-
- 退出
+ {{item.name}}
+
+ 退出
@@ -362,7 +355,13 @@ export default {
measureOptions: ['集中隔离','居家隔离','居家健康检测','排除风险'],
active: 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: ["基本信息", "选择访客"],
receptionistoptions: [],
purposeoptions: [
@@ -430,6 +429,7 @@ export default {
},
mounted() {
this.visitid = this.$route.query.visitid; //作业ID
+ this.isSaving = false;
if(this.visitid){
this.getRpj();
this.getpeoplelistlist();
@@ -478,23 +478,29 @@ export default {
if (this.active == 0) {
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
+ this.isSaving = true;
if(this.visitid){
- this.$API.vm.visit.update
- .req(this.visitid, this.form)
- .then((res) => {
- this.$message.success("基本信息更新成功");
- this.getInit();
- this.active = 1;
- })
+ this.$API.vm.visit.update
+ .req(this.visitid, this.form)
+ .then((res) => {
+ this.$message.success("基本信息更新成功");
+ this.getInit();
+ this.active = 1;
+ this.isSaving = false;
+ }).catch(()=>{
+ this.isSaving = false;
+ })
}else{
this.$API.vm.visit.create.req(this.form).then(res=>{
this.visitid = res.id;
this.$message.success("项目创建成功");
this.getInit();
- this.active = 1;
+ this.active = 1;
+ this.isSaving = false;
+ }).catch(()=>{
+ this.isSaving = false;
})
}
-
}
});
} else {
@@ -577,19 +583,21 @@ export default {
},
//提交工单
submitticket(id){
- this.ticket={};
- this.ticket.title = this.form.name;
+ this.ticket={};
+ this.isSaving = true;
+ this.ticket.title = this.form.name;
this.ticket.workflow=this.initform.workflow;
- this.ticket.ticket_data={visit:this.visitid,name:this.form.name};
- this.ticket.transition=id;
- this.$API.wf.ticket.create.req(this.ticket).then((res) => {
+ this.ticket.ticket_data={visit:this.visitid,name:this.form.name};
+ this.ticket.transition=id;
+ this.$API.wf.ticket.create.req(this.ticket).then((res) => {
this.$message.success("提交成功");
this.$router.push({
- name: "visit",
- query: {},
+ name: "visit",
+ query: {},
+ });
+ }).catch(()=>{
+ this.isSaving = false;
});
- });
-
}
},
};
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 9c17e863..d48afb4e 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -70,8 +70,8 @@
link
size="small"
v-if="
- (scope.row.act_state === 1 || scope.row.act_state === 3) &&
- scope.row.state_.type === 0
+ (scope.row.act_state === 1&&scope.row.state_.type === 0) || (scope.row.act_state === 3&&
+ scope.row.state_.type === 0) ||scope.row.act_state === 2
"
type="primary"
@click="handleDetail(scope.row)"
diff --git a/src/views/wf/steps.vue b/src/views/wf/steps.vue
index cb84be1b..58301b81 100644
--- a/src/views/wf/steps.vue
+++ b/src/views/wf/steps.vue
@@ -28,7 +28,10 @@ export default {
},
mounted() {
// this.workId = this.ticket?this.ticket:this.$route.query.id;
- this.workId = this.$route.query.id;
+ debugger;
+ console.log(this.ticket)
+ this.workId = this.ticket.id;
+ this.$route.query.id;
this.getFlowSteps();
},
methods: {
diff --git a/src/views/wf/ticketdetail.vue b/src/views/wf/ticketdetail.vue
index b2b6dbd3..4b8bcdca 100644
--- a/src/views/wf/ticketdetail.vue
+++ b/src/views/wf/ticketdetail.vue
@@ -167,7 +167,7 @@