From 5a2371a7efbb06cde5a96718271137a55efa0ac0 Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 17 Sep 2021 09:59:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=BF=BD=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/retrospect/product.js | 33 ++ src/assets/imgs/status-39.png | Bin 0 -> 1760 bytes src/assets/imgs/status-40.png | Bin 0 -> 2242 bytes src/views/retrospect/product/index.vue | 303 ++++++++++++++++++ .../product/traceabilityDetails.vue | 221 +++++++++++++ 5 files changed, 557 insertions(+) create mode 100644 src/api/retrospect/product.js create mode 100644 src/assets/imgs/status-39.png create mode 100644 src/assets/imgs/status-40.png create mode 100644 src/views/retrospect/product/index.vue create mode 100644 src/views/retrospect/product/traceabilityDetails.vue diff --git a/src/api/retrospect/product.js b/src/api/retrospect/product.js new file mode 100644 index 0000000..09ded1d --- /dev/null +++ b/src/api/retrospect/product.js @@ -0,0 +1,33 @@ +import request from '@/utils/request' +// 查询所有数据 +export function getProjectList (params) { + return request({ + url: '/admin/me/project/query', + method: 'get', + params + }) +} +// 查询订单管理所有数据 +export function getWorkorderList (params) { + return request({ + url: '/admin/om/workorder/query', + method: 'get', + params + }) +} +// 订单明细 +export function getSerialOrder (params) { + return request({ + url: '/admin/om/serialorder/query', + method: 'get', + params + }) +} +// 获取工单工序追溯数据 +export function getPotrace (params) { + return request({ + url: '/admin/om/serialorder/potrace', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/assets/imgs/status-39.png b/src/assets/imgs/status-39.png new file mode 100644 index 0000000000000000000000000000000000000000..04ad3daf2be225634353130dd91c7f7138431c55 GIT binary patch literal 1760 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 +
+ + + + + + + + + + + + + + + + + + + 搜索 + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/views/retrospect/product/traceabilityDetails.vue b/src/views/retrospect/product/traceabilityDetails.vue new file mode 100644 index 0000000..aa0cdf3 --- /dev/null +++ b/src/views/retrospect/product/traceabilityDetails.vue @@ -0,0 +1,221 @@ + + + \ No newline at end of file From 2826b495aaba8bf7864a5203df42f7d9363cd7ee Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 17 Sep 2021 10:34:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/retrospect/product/index.vue | 6 ++++-- src/views/retrospect/product/traceabilityDetails.vue | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/views/retrospect/product/index.vue b/src/views/retrospect/product/index.vue index 70e7dbd..940256c 100644 --- a/src/views/retrospect/product/index.vue +++ b/src/views/retrospect/product/index.vue @@ -65,11 +65,12 @@ v-loading="loading" :data="tableData" @expand-change="loadOrderData" + @row-click="setItem" border > + \ No newline at end of file diff --git a/src/views/retrospect/product/traceabilityDetails.vue b/src/views/retrospect/product/traceabilityDetails.vue deleted file mode 100644 index 9a19094..0000000 --- a/src/views/retrospect/product/traceabilityDetails.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/retrospect/workOrderTraceability/index.vue b/src/views/retrospect/workOrderTraceability/index.vue new file mode 100644 index 0000000..02b38af --- /dev/null +++ b/src/views/retrospect/workOrderTraceability/index.vue @@ -0,0 +1,301 @@ + + \ No newline at end of file From 4953c10b03345cc8e4fda8966f7e42d4d4aab2fe Mon Sep 17 00:00:00 2001 From: liwei Date: Fri, 17 Sep 2021 17:11:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/retrospect/product.js | 8 ++++++++ src/views/retrospect/product/index.vue | 26 +++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/api/retrospect/product.js b/src/api/retrospect/product.js index c7dedd2..d9e62af 100644 --- a/src/api/retrospect/product.js +++ b/src/api/retrospect/product.js @@ -1,4 +1,12 @@ import request from '@/utils/request' +// 导出产品追溯明细 +export function exportheadexcel (params) { + return request({ + url: '/admin/om/serialorder/exporttrace', + method: 'get', + params + }) +} // 获取工单工序追溯数据 export function getPotrace (params) { return request({ diff --git a/src/views/retrospect/product/index.vue b/src/views/retrospect/product/index.vue index f28bd29..e0c3518 100644 --- a/src/views/retrospect/product/index.vue +++ b/src/views/retrospect/product/index.vue @@ -39,7 +39,7 @@ @@ -74,7 +74,7 @@ @@ -90,6 +90,13 @@ @click="handleQuery" >搜索 + 导出
@@ -145,7 +152,7 @@