+
@@ -33,7 +33,7 @@
{{ scope.row.姓名 }}
-
+
{{ scope.row.领料单备注 }}
diff --git a/src/views/Inventory/PickingListApproval/index.vue b/src/views/Inventory/PickingListApproval/index.vue
index c851bc39..2e129bf3 100644
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -171,6 +171,10 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
+ if (this.pickListTable2.length === 0) {
+ this.$message.error('空领料单,不能审批!')
+ return
+ }
const param = {
url: '',
method: 'post',
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index 6b2bbf95..ebde7af2 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -21,7 +21,7 @@
未提交
- 未外协
+ 未外协
未到货
已到货
@@ -73,7 +73,12 @@
- {{ scope.row.任务下达日期.split(' ')[0] }}
+ {{ scope.row.任务下达日期 ? scope.row.任务下达日期.split(' ')[0]:scope.row.任务下达日期 }}
+
+
+
+
+ {{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : scope.row.到货日期 }}
@@ -121,7 +126,7 @@ export default {
procedure: [],
procedureTime: [],
pageCurrent: 1,
- pageSize: 50,
+ pageSize: 500,
tableData1: []
}
},
@@ -186,7 +191,6 @@ export default {
check2 = 1
}
searchTable(check, this.supplierNameValue, check1, this.MaterialsValue, check2, this.timer[0], this.timer[1], this.pageSize, this.pageCurrent).then(response => {
- console.log(response, 1111)
this.tableData = response.data.result
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index f39141ba..b1312375 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -109,9 +109,9 @@
-
+
- {{ scope.row.机加工开始时间 }}
+ {{ scope.row.到货日期 }}
@@ -139,6 +139,16 @@
placeholder="下达任务日期"
value-format="yyyy-MM-dd"/>
+
+
+
{
+ addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.到货日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
title: '成功',
@@ -476,7 +487,7 @@ export default {
// 提交编辑
submitEdit() {
this.handleAdd_disable = true
- editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
+ editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain, this.form.到货日期).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 356be301..41b0cc01 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -35,11 +35,7 @@
收货
-
+
已收货
@@ -61,6 +57,11 @@
{{ scope.row.批次数量 }}
+
+
+ {{ scope.row.到货日期 }}
+
+
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index a1f0d211..f3b6439e 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -736,8 +736,8 @@ export default {
for (let i = 0; i < this.tableDataAll.length; i++) {
const data = this.tableDataAll[i]
const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
- console.log(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号)
const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号, this.id)
+
await sleep(10)
if (resp.data[0].result === '0') {
this.err++