From a0186dbdbbe7b29ff79b1cfddd97a08bb7bc2ceb Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Fri, 31 Dec 2021 13:19:21 +0800
Subject: [PATCH] guochengjianyan
---
hb_client/src/api/workflow.js | 9 +
hb_client/src/api/wpm.js | 8 +
hb_client/src/views/qm/processtest.vue | 386 ++++++++++++++++++-------
hb_client/src/views/wpm/need.vue | 40 ++-
hb_client/src/views/wpm/worktask.vue | 19 +-
5 files changed, 349 insertions(+), 113 deletions(-)
diff --git a/hb_client/src/api/workflow.js b/hb_client/src/api/workflow.js
index 1b6189c..f5a13de 100644
--- a/hb_client/src/api/workflow.js
+++ b/hb_client/src/api/workflow.js
@@ -153,6 +153,15 @@ export function createTicket(data) {
method: 'post',
data
})
+}
+ //详情
+export function ticketread(id) {
+ return request({
+ url: `/wf/ticket/${id}/`,
+ method: 'get',
+
+ })
+
}
//接单
export function ticketAccpet(id,data) {
diff --git a/hb_client/src/api/wpm.js b/hb_client/src/api/wpm.js
index 0c16a1c..723bede 100644
--- a/hb_client/src/api/wpm.js
+++ b/hb_client/src/api/wpm.js
@@ -313,6 +313,14 @@ export function getRetrial(id) {
method: 'GET',
})
}
+//玻璃审批工单
+export function getwproductticketList(query) {
+ return request({
+ url: '/wpm/wproduct_ticket/',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index 65149f5..5e86257 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -1,91 +1,244 @@
-
-
-
-
-
- {{ scope.row.number }}
-
-
- {{ scope.row.product_.name }}
-
-
- {{
- scope.row.product_.specification
- }}
-
-
-
- {{ scope.row.process_json['01'].rate }}%
-
-
- {{ scope.row.process_json['02'].rate }}%
-
-
- {{ scope.row.process_json['03'].rate }}%
-
-
- {{ scope.row.process_json['04'].rate }}%
-
-
- {{ scope.row.process_json['05'].rate }}%
-
-
- {{ scope.row.process_json['06'].rate }}%
-
-
- {{ scope.row.process_json['07'].rate }}%
-
-
-
- {{ scope.row.create_time }}
-
-
-
-
- 详情
-
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{
+ scope.row.product_.name
+ }}
+
+
+ {{
+ scope.row.product_.specification
+ }}
+
+
+
+ {{ scope.row.process_json["01"].rate }}%
+
+
+ {{ scope.row.process_json["02"].rate }}%
+
+
+ {{ scope.row.process_json["03"].rate }}%
+
+
+ {{ scope.row.process_json["04"].rate }}%
+
+
+ {{ scope.row.process_json["05"].rate }}%
+
+
+ {{ scope.row.process_json["06"].rate }}%
+
+
+ {{ scope.row.process_json["07"].rate }}%
+
+
+
+ {{
+ scope.row.create_time
+ }}
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ {{ scope.row.number }}
+
+
+ {{
+ scope.row.order_.number
+ }}
+
+
+ {{
+ scope.row.product_.name
+ }}
+
+
+ {{
+ scope.row.product_.specification
+ }}
+
+
+ {{
+ scope.row.resp_process_.name
+ }}
+
+
+ {{
+ decision_[scope.row.decision]
+ }}
+
+
+ {{
+ scope.row.create_time
+ }}
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传文件
+
+
+
+
+
+
+
+
-
-
-
-
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 885df54..4f1a021 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -26,7 +26,8 @@
{{ actstate_[scope.row.act_state] }}
-
+
+
{{ scope.row.step_.name }}
@@ -237,15 +238,19 @@
{{ scope.row.step_.name }}
-
+
+
+ {{ ng_sign_[scope.row.ng_sign] }}
+
+
-
+
-
+
+
+ {{ ng_sign_[scope.row.ng_sign] }}
+
+
{{
scope.row.update_time
@@ -455,7 +459,7 @@
{{ scope.row.material_.name }}
-
+
{{
scope.row.warehouse_.name
@@ -765,6 +769,17 @@ export default {
26: "待夹层检验",
70: "报废",
},
+ ng_sign_: {
+ 10: "返工",
+ 20: "返修",
+ 30: "报废",
+ 40: "让步接受",
+ 50: "偏离许可",
+ 60: "降级使用",
+ 70: "退回供方",
+ 80: "召回",
+
+ },
state_: {
0: "制定中",
1: "已下达",