diff --git a/src/api/model/rpm.js b/src/api/model/rpm.js
index 6e00bbd4..10f1ac89 100644
--- a/src/api/model/rpm.js
+++ b/src/api/model/rpm.js
@@ -133,6 +133,14 @@ export default {
);
}
},
+ item: {
+ name: "获取",
+ req: async function (id) {
+ return await http.get(
+ `${config.API_URL}/rpm/rpj/${id}/`,
+ );
+ }
+ },
read:{
name: "详情",
req: async function (id) {
@@ -241,4 +249,4 @@ export default {
}
},
-}
\ No newline at end of file
+}
diff --git a/src/components/scUpload/index.vue b/src/components/scUpload/index.vue
index ffe05c18..6b93f843 100644
--- a/src/components/scUpload/index.vue
+++ b/src/components/scUpload/index.vue
@@ -233,12 +233,13 @@
param.onProgress({percent: complete})
}
}).then(res => {
- var response = config.parseData(res);
- if(response.code == config.successCode){
- param.onSuccess(res)
- }else{
- param.onError(response.msg || "未知错误")
- }
+ config.parseData(res);
+ param.onSuccess(res)
+ // if(response.code == config.successCode){
+ // param.onSuccess(res)
+ // }else{
+ // param.onError(response.msg || "未知错误")
+ // }
}).catch(err => {
param.onError(err)
})
diff --git a/src/views/ops/log_request.vue b/src/views/ops/log_request.vue
index f37af7e1..5f89bc5a 100644
--- a/src/views/ops/log_request.vue
+++ b/src/views/ops/log_request.vue
@@ -11,11 +11,12 @@
-
-
+
-
+
+
+
{{scope.row.status_code}}
diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue
index a9032695..bb400172 100644
--- a/src/views/rpm/rpj.vue
+++ b/src/views/rpm/rpj.vue
@@ -1,228 +1,251 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ type_[scope.row.type] }}
-
-
-
-
- {{ state_[scope.row.state] }}
-
-
-
-
-
-
-
-
- 继续编辑
-
- 查看
- 编辑
-
-
- 删除
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ type_[scope.row.type] }}
+
+
+
+
+
+
+ {{ state_[scope.row.state] }}
+
+
+
+ {{scope.row.ticket_.state_.name }}
+ {{act_states[scope.row.ticket_.act_state]}}
+
+
+
+
+
+
+
+
+
+
+ 继续编辑
+
+
+ 查看
+
+ 编辑
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ return res;
+ })
+ .catch((err) => {
+ return err;
+ });
+ },
+ next_add(row) {
+ this.$router.push({
+ name: "rpjadd",
+ query: {
+ rpjid: row.id, //入场项目id
+ },
+ });
+ },
+
+ //本地更新数据
+ handleSaveSuccess(data, mode) {
+ if (mode == "add") {
+ this.$refs.table.refresh();
+ } else if (mode == "edit") {
+ this.$refs.table.refresh();
+ }
+ },
+ resetQuery() {
+ this.query = {};
+ },
+ },
+ };
+
diff --git a/src/views/rpm/rpj_form.vue b/src/views/rpm/rpj_form.vue
index c452fc58..3d051d0f 100644
--- a/src/views/rpm/rpj_form.vue
+++ b/src/views/rpm/rpj_form.vue
@@ -1,215 +1,213 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 取消
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+ 取消
+
+
+
diff --git a/src/views/rpm/rpjadd.vue b/src/views/rpm/rpjadd.vue
index b8eb2d63..8a0b087a 100644
--- a/src/views/rpm/rpjadd.vue
+++ b/src/views/rpm/rpjadd.vue
@@ -1,570 +1,602 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ clearable
+ style="width: 100%"
+ >
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
- 下一步
-
-
-
-
-
+
+
+
+ 下一步
+
+
+
+
+
+
-
-
-
-
-
-
- {{ scope.row.file_cate_.name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
+
+
+
+
+
+
+ {{ scope.row.file_cate_.name }}
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
-
-
- 上传
-
-
- 删除
-
-
-
-
-
- 上一步
- 下一步
-
-
-
-
-
-
- 上传附件
-
-
-
-
-
-
- 取 消
- 确 定
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.remployee_.name }}
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
+
+
+ 上传
+
+
+
+ 删除
+
+
+
+
+
+ 上一步
+
+ 下一步
+
+
+
+
+
+
+
+ 上传附件
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.remployee_.name }}
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取 消
- 确 定
-
-
- 上一步
- 退出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+ 上一步
+ {{item.name}}
+ 退出
+
+
-
\ No newline at end of file
+ //渲染工单提交按钮
+ getInit(){
+ this.$API.wf.workflow.initkey.req('rparty').then((res) => {
+ this.initForm = res;
+ });
+ },
+
+ //提交,创建工单
+ submitTicketCreate(id){
+ let ticket={};
+ ticket.workflow=this.initForm.workflow;
+ ticket.ticket_data={rpj:this.rpjId};
+ ticket.transition=id;
+ this.$API.wf.ticket.create.req(ticket).then((res) => {
+ this.$message.success("提交成功");
+ this.$router.push({
+ name: "rpj",
+ query: {},
+ });
+ });
+ }
+ },
+ };
+
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index 3f155985..4db80452 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -136,6 +136,15 @@
},
});
break;
+ case 'rparty':
+ this.$router.push({
+ name: "visitdetail",
+ query: {
+ id: row.id,
+ visitID:row.ticket_data.visit
+ },
+ });
+ break;
}
},
handleLogs(row) {
diff --git a/src/views/wf/ownerwork.vue b/src/views/wf/ownerwork.vue
index 1047ea0c..79466074 100644
--- a/src/views/wf/ownerwork.vue
+++ b/src/views/wf/ownerwork.vue
@@ -33,7 +33,7 @@
-
+
查看详情
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index 8928028c..df254156 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -180,6 +180,13 @@
+
+
+
{
if(res.err_msg){}else{
this.limitedDeliver = false;
- this.$router.push("/dutywork");
+ this.$router.push("dutywork");
}
})
},
@@ -234,7 +234,7 @@
params.suggestion = this.form.suggestion;
this.$API.wf.ticket.ticketHandle.req(this.ticketId,params).then(res=>{
if(res.err_msg){}else{
- this.$router.push("/dutywork");
+ this.$router.push("dutywork");
}
})
},