diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index db98467d..595f97a0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -51,39 +51,38 @@
未分配
-
-
-
- {{ scope.row.零件名称 }}
-
-
-
-
-
- {{ scope.row.零件图号 }}
-
-
-
-
- {{ scope.row.批次数量 }}
-
-
-
-
- {{ scope.row.材料 }}
-
-
-
-
- {{ scope.row.重量 }}
-
-
-
-
- {{ scope.row.工艺要求 }}
-
-
-
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.批次数量 }}
+
+
+
+
+ {{ scope.row.材料 }}
+
+
+
+
+ {{ scope.row.重量 }}
+
+
+
+
+ {{ scope.row.工艺要求 }}
+
+
+
{
- searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
- console.log(response)
- if (response.data.total === 0) {
- this.loading = false
- } else {
+ if (response.data.total === 0) {
+ this.loading = false
+ } else {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
- this.Data = response.data.rows
- this.total = response.data.total
- }
- }).then(() => {
- for (let i = 0; i < this.Data.length; i++) {
- searchtable2(this.Data[i].工艺计划流水号).then(response => {
- this.tableData.push({
- 工艺计划流水号: this.Data[i].工艺计划流水号,
- 零件名称: this.Data[i].零件名称,
- 零件图号: this.Data[i].零件图号,
- 备料打印: this.Data[i].备料打印,
- 是否外购备料: this.Data[i].是否外购备料,
- 工艺要求: response.data[0].工艺要求,
- 材料: this.Data[i].材料,
- 重量: this.Data[i].重量,
- 批次数量: this.Data[i].批次数量
- })
+ this.Data = response.data.rows
+ this.total = response.data.total
+ }
+ }).then(() => {
+ for (let i = 0; i < this.Data.length; i++) {
+ searchtable2(this.Data[i].工艺计划流水号).then(response => {
+ this.tableData.push({
+ 工艺计划流水号: this.Data[i].工艺计划流水号,
+ 零件名称: this.Data[i].零件名称,
+ 零件图号: this.Data[i].零件图号,
+ 备料打印: this.Data[i].备料打印,
+ 是否外购备料: this.Data[i].是否外购备料,
+ 工艺要求: response.data[0].工艺要求,
+ 材料: this.Data[i].材料,
+ 重量: this.Data[i].重量,
+ 批次数量: this.Data[i].批次数量
})
- this.loading = false
- }
- })
+ })
+ this.loading = false
+ }
})
},
handleSelectionChange(val) {
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 05fdda97..58c26498 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -1,6 +1,6 @@
-
+
请款时间段:
请款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ scope.row.供应商名称 }}
@@ -78,51 +80,47 @@
{{ scope.row.姓名 }}
-
-
- {{ scope.row.请款时间 | formatTime }}
-
-
-
-
- {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-
-
-
-
- 未审批
- 已通过
- 不通过
- {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-
-
-
-
- {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-
-
-
-
- 未操作
- 已同意
- 不同意
-
-
-
-
- {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+
+
+
+
+ 未审批
+ 已通过
+ 不通过
+
+
+
+
+ {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+
+
+
+
+ 未操作
+ 已同意
+ 不同意
+
+
+
+
+ {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+