diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index eabc005f..0da69aef 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -43,14 +43,14 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9
}
})
}
-export function editTable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
+export function editTable(num1, num2, num3, num5, num6, num7, num8, num9, num10, num11, num12) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '项目计划管理_项目总计划_编辑数据',
- param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&数量=' + num4 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
+ param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
}
})
}
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index 833d38f6..10f38414 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -207,7 +207,7 @@ export function submitMachine() {
data: {
type: '2',
name: '创建合同_机床名称_增加数据',
- param: '项目流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2]
+ param: '项目流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3]
}
})
}
@@ -218,7 +218,7 @@ export function editMachine() {
data: {
type: '2',
name: '创建合同_机床名称_修改数据',
- param: '机床流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2]
+ param: '机床流水号=' + arguments[0] + '&机床图号=' + arguments[1] + '&机床名称=' + arguments[2] + '&机床数量=' + arguments[3]
}
})
}
diff --git a/src/icons/svg/ProjectPlanningQuery.svg b/src/icons/svg/ProjectPlanningQuery.svg
new file mode 100644
index 00000000..60fcb677
--- /dev/null
+++ b/src/icons/svg/ProjectPlanningQuery.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/costStatistics.svg b/src/icons/svg/costStatistics.svg
new file mode 100644
index 00000000..3640e64f
--- /dev/null
+++ b/src/icons/svg/costStatistics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
index 0f554b04..5044af69 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -34,7 +34,7 @@
-
+
@@ -44,37 +44,32 @@
-
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.机床名称 }}
-
+
-
-
-
-
- {{ scope.row.数量 }}
-
+ {{ scope.row.机床数量 }}
-
+
{{ scope.row.合同签订日期 }}
-
+
{{ scope.row.发货节点 }}
@@ -94,7 +89,7 @@
-
+
@@ -104,7 +99,7 @@
-
+
@@ -114,7 +109,7 @@
-
+
@@ -124,7 +119,7 @@
-
+
@@ -134,7 +129,7 @@
-
+
@@ -407,7 +402,7 @@ export default {
项目名称: response.data.rows[i].项目名称,
机床图号: response.data.rows[i].机床图号,
机床名称: response.data.rows[i].机床名称,
- 数量: response.data.rows[i].数量,
+ 机床数量: response.data.rows[i].机床数量,
合同签订日期: response.data.rows[i].合同签订日期,
发货节点: response.data.rows[i].发货节点,
客户名称: response.data.rows[i].客户名称,
@@ -431,7 +426,7 @@ export default {
},
// 表格1保存
confirmEdit(row) {
- editTable(row.项目流水号, row.机床流水号, row.项目编号, row.数量, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
+ editTable(row.项目流水号, row.机床流水号, row.项目编号, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
if (response.data[0].result === '1') {
row.edit = false
this.$notify({
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index 9f706899..48cfcce6 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -320,30 +320,78 @@ export default {
if (this.projectValue !== '') {
if (this.machineValue !== '') {
searchtable(this.projectValue, this.machineValue).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].合同签订日期 !== '' && response.data[i].合同签订日期 !== null) {
+ response.data[i].合同签订日期 = response.data[i].合同签订日期.split(' ')[0]
+ }
+ if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
+ response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
+ }
+ }
this.loading = false
this.tableData = response.data
}).then(() => {
searchtable2(this.machineValue, 1).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+ response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+ }
+ if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+ response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+ }
+ }
this.loading1 = false
console.log(response.data, 2)
this.tableData1 = response.data
})
searchtable2(this.machineValue, 2).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+ response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+ }
+ if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+ response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+ }
+ }
this.loading1 = false
console.log(response.data, 3)
this.tableData2 = response.data
})
searchtable2(this.machineValue, 3).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+ response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+ }
+ if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+ response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+ }
+ }
this.loading1 = false
console.log(response.data, 4)
this.tableData3 = response.data
})
searchtable2(this.machineValue, 4).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+ response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+ }
+ if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+ response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+ }
+ }
this.loading1 = false
console.log(response.data, 5)
this.tableData4 = response.data
})
searchtable2(this.machineValue, 5).then(response => {
+ for (let i = 0; i < response.data.length; i++) {
+ if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+ response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+ }
+ if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+ response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+ }
+ }
this.loading1 = false
console.log(response.data, 6)
this.tableData5 = response.data
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index fe387b51..b61b36a6 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -50,7 +50,7 @@
@expand-change="selectMachine">
-
+
{{ scope.row.机床图号 }}
@@ -61,6 +61,11 @@
{{ scope.row.机床名称 }}
+
+
+ {{ scope.row.机床数量 }}
+
+
+
+
+