diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
index da53b123..df774f6c 100644
--- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
@@ -27,8 +27,7 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2
type: '1',
name: '备料管理_外购备料_综合查询数据',
param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue +
- '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order,
- Pagination: pageCurrent + '&' + pageSize
+ '&下单时间_check=' + check3 + '&开始时间=' + starttime + '&结束时间=' + endtime + '&排序名称=' + ordername + '&排序方式=' + order + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index f53381dd..fe98b19c 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -232,9 +232,9 @@ export default {
预留工时系数: ''
},
rules: {
- 设备名称: [{ required: true, message: '请选择设备名称', change: 'blur' }],
- 设备编号: [{ required: true, message: '请选择设备编号', change: 'blur' }],
- 设备型号: [{ required: true, message: '请选择设备型号', change: 'blur' }],
+ 设备名称: [{ required: true, message: '请输入设备名称', change: 'blur' }],
+ 设备编号: [{ required: true, message: '请输入设备编号', change: 'blur' }],
+ 设备型号: [{ required: true, message: '请输入设备型号', change: 'blur' }],
设备加工工艺: [{ required: true, message: '请选择设备加工工艺', trigger: 'blur' }]
// 设备加工能力: [{ required: true, message: '请选择设备加工能力', change: 'blur' }],
// 班次类型: [{ required: true, message: '请选择班次类型', trigger: 'blur' }],
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index c8817402..2a30ef8d 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -39,7 +39,7 @@
查询
外协任务
-
+
{{ scope.row.表单号 }}
@@ -65,9 +65,9 @@
提交
-
- 保存
-
+
+
+
@@ -92,7 +92,7 @@
-
+
@@ -520,6 +520,9 @@ export default {
this.$message.warning('请选择外协加工任务单')
}
},
+ saveAct(row) {
+ getPrice(row.外协加工任务单明细流水号, row.加工价格_成交)
+ },
// 保存
confirmPrice() {
if (this.Number) {
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index 15f5e538..fb6509df 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -138,14 +138,7 @@
-
+
{{ scope.row.物料名称 }}
@@ -211,19 +204,9 @@
- 查询
+ 查询
-
+
{{ scope.row.供货商 }}
@@ -251,13 +234,7 @@
-
+
-
+
{{ scope.row.物料类别 }}
@@ -427,13 +398,7 @@
编辑
-
+
{{ scope.row.品种编号 }}
@@ -471,13 +436,9 @@
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
未到
已到
@@ -200,8 +182,8 @@ export default {
// this.getTableData()
},
methods: {
- formatJson(filterVal, jsonData) {
- return jsonData.map(v => filterVal.map(j => {
+ formatJson(column, tableData) {
+ return tableData.map(v => column.map(j => {
return v[j]
}))
},
@@ -283,9 +265,8 @@ export default {
check2 = 0
}
searchTable(check, this.supplierNameValue, check1, this.partNumber, check2, this.MaterialsValue, check3, this.dateRange[0], this.dateRange[1], this.ordername, this.order, this.pageSize, this.pageCurrent).then(response => {
- console.log(response)
- this.tableData = response.data.rows
- this.total = response.data.total
+ this.tableData = response.data.result
+ this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 7d782e06..3513bda8 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -43,6 +43,7 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
:header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+ :summary-method="getSummaries1"
border
stripe
style="margin-top: 3px;"
@@ -271,6 +272,31 @@ export default {
})
return sums
},
+ getSummaries1(param) { // 合计
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ } else if (index === 3) {
+ const values = data.map(item => Number(parseFloat(item['请款金额'])))
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] = sums[index].toFixed(2) + ' 元'
+ } else {
+ sums[index] = 'N/A'
+ }
+ }
+ })
+ return sums
+ },
exportExcel() {
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
this.supplierName0 ? this.check2 = 1 : (this.check2 = 0, this.supplierName0 = '')