diff --git a/package.json b/package.json
index 18989cfd..ab9634e9 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
"time-formater": "^1.0.3",
"v-viewer": "^1.3.1",
"vue": "2.5.17",
+ "vue-count-to": "^1.0.13",
"vue-router": "3.0.1",
"vuex": "3.0.1",
"xlsx": "^0.14.0",
diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js
index 80900b5b..b31f7507 100644
--- a/src/api/ManufacturingCenter/GroupMatching.js
+++ b/src/api/ManufacturingCenter/GroupMatching.js
@@ -44,6 +44,17 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
}
})
}
+export function searchTable22(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_基本件成组配套_查询数据',
+ param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string'
+ }
+ })
+}
export function searchPurchaseTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) {
return request({
url: '',
diff --git a/src/api/WorkshopProcurement/costStatistics.js b/src/api/WorkshopProcurement/costStatistics.js
new file mode 100644
index 00000000..cb5b293f
--- /dev/null
+++ b/src/api/WorkshopProcurement/costStatistics.js
@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+
+export function initProject() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_项目名称_查询数据_成本分析'
+ }
+ })
+}
+export function searchPurchase(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: 'PDM_项目名称_查询数据_成本分析',
+ param: '项目流水号=' + num
+ }
+ })
+}
+export function searchOutsourcing(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_外协成本统计_查询数据',
+ param: '项目流水号=' + num
+ }
+ })
+}
+export function searchHome(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间生产管理工艺_项目成本统计_查询数据',
+ param: '项目流水号=' + num
+ }
+ })
+}
+export function searchWorkPurchase(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '车间采购管理_项目总价_明细_查询数据_总价',
+ param: '项目流水号=' + num
+ }
+ })
+}
diff --git a/src/icons/svg/外协工时.svg b/src/icons/svg/外协工时.svg
new file mode 100644
index 00000000..9ee26da5
--- /dev/null
+++ b/src/icons/svg/外协工时.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/自家工时.svg b/src/icons/svg/自家工时.svg
new file mode 100644
index 00000000..47320a87
--- /dev/null
+++ b/src/icons/svg/自家工时.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/车间采购.svg b/src/icons/svg/车间采购.svg
new file mode 100644
index 00000000..ffe5b193
--- /dev/null
+++ b/src/icons/svg/车间采购.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/采购采购.svg b/src/icons/svg/采购采购.svg
new file mode 100644
index 00000000..a3f4bf08
--- /dev/null
+++ b/src/icons/svg/采购采购.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index c4edcdbc..38aeec07 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index a8d981ee..54545849 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -45,7 +45,7 @@
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
- 查询
+ 查询
+
+