From 6d16076e72e10d05847d1988dfb76ab681e53d0d Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sun, 26 Apr 2020 08:56:42 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProjectPlanningManagementNew/index.vue | 2 +-
.../ProjectPlanningManagementQuery/index.vue | 2 +-
src/views/layout/components/TagsView.vue | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index c8b8708c..302140e2 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -32,7 +32,7 @@
-
+
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index f44e0ebd..971015c2 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -45,7 +45,7 @@
-
+
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index d26a78b8..edc4921d 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -67,14 +67,14 @@ export default {
document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
break
case 'ProjectPlanningManagementNew': // 项目计划管理
- document.getElementById('app-main').style.width = '1710px'
- document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
- document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+ document.getElementById('app-main').style.width = '1700px'
+ document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
+ document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
break
- case 'ProjectPlanningManagementQuery': // 项目计划管理
- document.getElementById('app-main').style.width = '1710px'
- document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1710px'
- document.getElementsByClassName('navbar')[0].style.minWidth = '1710px'
+ case 'ProjectPlanningManagementQuery': // 项目计划查询
+ document.getElementById('app-main').style.width = '1700px'
+ document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1700px'
+ document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
break
case 'CreatingPurchasingMaterials': // 外购备料
document.getElementById('app-main').style.width = '1865px'
From 08b06cee4f10c7dd6b197d558899526fa4e83ac0 Mon Sep 17 00:00:00 2001
From: liulujia <759670076@qq.com>
Date: Sun, 26 Apr 2020 15:05:32 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A0=BC=E5=BC=8F?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3V2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue | 4 ++--
src/views/PurchasingCenter/ReceiveCheck/index.vue | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 0e7d73f1..f79d7a47 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -27,7 +27,7 @@ export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFil
export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+ baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index b2803a67..2568d28c 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -335,10 +335,10 @@
{{ scope.row.零件数量 || '—' }}
-
+
{{ scope.row.采购数量 }}
- {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}
+
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index ec99731e..26a544fe 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -326,7 +326,7 @@ export default {
param[6] = ['机床号物料名称_check', check4]
param[7] = ['机床号物料名称', this.machinenum]
param[8] = ['合计', this.totalPrice]
- param[9] = ['表名', '采购核算']
+ param[9] = ['表名', '领用核算']
var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
this.exportExcel_NPOI(Data)
}
From f953291273a04b3deb52346c64c0ace0dae52479 Mon Sep 17 00:00:00 2001
From: liulujia <759670076@qq.com>
Date: Sun, 26 Apr 2020 15:53:16 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AF=BC=E5=87=BAV2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 34 +++++++++----------
.../AssemblyQualityInspection/index.vue | 4 +--
.../RequestApprovalQuery1/index.vue | 5 +++
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index f79d7a47..c09b5fd3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,24 +8,24 @@ export const name1 = `OP1000`
export const name3 = `OP2000`
export const name4 = `OP9999`
-export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
-export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
-export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery
-export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice
-export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
-export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement
-export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
-export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
-export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel
+export const readFile = `http://123.56.95.229:58010/webpage/file/` // invoice
+export const readImg = `http://123.56.95.229:58010/webpage/img/` // delivery/MS/performancebond
+export const upload = `http://123.56.95.229:58010/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `http://123.56.95.229:58010/submit/upload2.ashx` // delivery
+export const upload3 = `http://123.56.95.229:58010/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `http://123.56.95.229:58010/submit/uploadInvoiceScan.ashx` // invoice
+export const uploadInvoiceScan1 = `http://123.56.95.229:58010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
+export const download = `http://123.56.95.229:58010/submit/downloadFile.ashx` // ContractInformationManagement
+export const uploadPerson = `http://123.56.95.229:58010/submit/uploadPerson.ashx`
+export const uploadOP = `http://123.56.95.229:58010/submit/uploadOP.ashx`
+export const url = `http://123.56.95.229:58010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://123.56.95.229:58010/submit/MESCommonBase.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
-export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
-export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
-export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
-export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
-export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
+export const ServerIP = `http://123.56.95.229:58010/webpage/file/`
+export const uploadFileMachine = `http://123.56.95.229:58010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
+export const downloadFileMachine = `http://123.56.95.229:58010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
+export const MESUploadFile = `http://123.56.95.229:58010/submit/MESUploadFile.ashx`
+export const MESDownloadFile = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 2db35883..a7866bab 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -176,8 +176,8 @@ export default {
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
import('@/vendor/Export2Excel').then(excel => {
- const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注']
- const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
+ const tHeader = ['检验情况', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '质检时间', '质检员', '备注']
+ const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '质检时间', '姓名', '备注']
const list = response.data
const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
index 233c3946..efa7ce8a 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
@@ -66,6 +66,11 @@
{{ scope.row.审核情况内容 }}
+
+
+ {{ scope.row.未通过审核原因 }}
+
+
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
From f3e13b9b09fc35360ed394bae890436af236e1c6 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 27 Apr 2020 09:48:39 +0800
Subject: [PATCH 4/8] a
---
src/utils/request.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 0e7d73f1..f79d7a47 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -27,7 +27,7 @@ export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFil
export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+ baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
From 568100be44e6c17641112afb9560e91c2246a4ee Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 27 Apr 2020 14:51:27 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=88=86=E9=85=8D?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PartAssignment/index.vue | 30 +++++++++++++++++--
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 6d8f65b5..40f15cbf 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -198,15 +198,15 @@
placeholder="选择交货期"/>
制造:
- 制造部采购
+ 制造部采购
金工:
- 车间生产
+ 车间生产
采购:
- 采购部门采购
+ 采购部门采购
@@ -559,6 +559,9 @@ export default {
inject: ['reload'],
data() {
return {
+ purchaseRequisition_loading: false,
+ Production_loading: false,
+ PurchasingDepartment_loading: false,
handleAdd_disable: false,
dateRange: '',
partNumber: '',
@@ -1250,6 +1253,11 @@ export default {
this.multipleSelection11 = val
},
purchaseRequisition() {
+ this.purchaseRequisition_loading = true
+ var that = this
+ setTimeout(function() {
+ that.purchaseRequisition_loading = false
+ }, 5000)
if (this.RequisitionList !== '') {
if (this.time !== '' && this.time !== null) {
if (this.multipleSelection.length !== 0) {
@@ -1395,16 +1403,24 @@ export default {
}
}
} else {
+ this.purchaseRequisition_loading = false
this.$message.warning('请选择零件或物料')
}
} else {
+ this.purchaseRequisition_loading = false
this.$message.warning('请选择交货期')
}
} else {
+ this.purchaseRequisition_loading = false
this.$message.warning('请先选择请购单')
}
},
PurchasingDepartment() {
+ this.PurchasingDepartment_loading = true
+ var that = this
+ setTimeout(function() {
+ that.PurchasingDepartment_loading = false
+ }, 5000)
if (this.time !== '' && this.time !== null) {
if (this.multipleSelection.length !== 0) {
if (this.PartType === '基本件') {
@@ -1470,13 +1486,20 @@ export default {
})
}
} else {
+ this.PurchasingDepartment_loading = false
this.$message.warning('请选择零件或物料')
}
} else {
+ this.PurchasingDepartment_loading = false
this.$message.warning('请选择交货期')
}
},
Production() {
+ this.Production_loading = true
+ var that = this
+ setTimeout(function() {
+ that.Production_loading = false
+ }, 5000)
if (this.PartType === '基本件' && this.multipleSelection.length !== 0) {
this.MaterialNum = []
this.BasicPartsNumber = []
@@ -1504,6 +1527,7 @@ export default {
}
})
} else {
+ this.Production_loading = false
this.$message.warning('请选择基本件')
}
},
From bb585e5d1b092287bb64f4d7617e99208a39a169 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 27 Apr 2020 15:11:00 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../InitialProduction/index.vue | 31 +++++++++++++++++--
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index df759298..9d84274d 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -186,13 +186,13 @@
是否加急
- 备料投产
+ 备料投产
- 投产
+ 投产
- 打回
+ 打回
加急件
@@ -394,6 +394,9 @@ import Cookie from 'js-cookie'
export default {
data() {
return {
+ production10_Loading: false,
+ production_Loading: false,
+ back_Loading: false, // 20200427↑
openUrgentItem_disable: false,
checked_hebing: true,
checked_UrgentItem: false,
@@ -984,18 +987,26 @@ export default {
},
// 投产
production() {
+ this.production_Loading = true
+ var that = this
+ setTimeout(function() {
+ that.production_Loading = false
+ }, 5000)
this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
+ this.production_Loading = false
this.$message.error('请输入加工结束时间')
} else {
this.shijiancuo1 = Date.parse(this.time_machiningStart)
this.shijiancuo = Date.parse(this.time_machiningFinish)
this.jieguo = this.shijiancuo1 - this.shijiancuo
if (this.jieguo >= 0) {
+ this.production_Loading = false
this.$message.error('加工结束时间应大于开始时间')
} else {
if (this.multipleSelection.length === 0) {
+ this.production_Loading = false
this.$message.error('请至少选择一个零件')
} else {
if (this.checked_UrgentItem === true) {
@@ -1104,18 +1115,26 @@ export default {
},
// 备料投产
production10() {
+ this.production10_Loading = true
+ var that = this
+ setTimeout(function() {
+ that.production10_Loading = false
+ }, 5000)
this.result = 0
this.UrgentItem = 0
if (this.time_machiningFinish === '' || this.time_machiningFinish === null) {
+ this.production10_Loading = false
this.$message.error('请输入加工结束时间')
} else {
this.shijiancuo1 = Date.parse(this.time_machiningStart)
this.shijiancuo = Date.parse(this.time_machiningFinish)
this.jieguo = this.shijiancuo1 - this.shijiancuo
if (this.jieguo >= 0) {
+ this.production10_Loading = false
this.$message.error('加工结束时间应大于开始时间')
} else {
if (this.multipleSelection.length === 0) {
+ this.production10_Loading = false
this.$message.error('请至少选择一个零件')
} else {
if (this.checked_UrgentItem === true) {
@@ -1223,7 +1242,13 @@ export default {
}
},
back() {
+ this.back_Loading = true
+ var that = this
+ setTimeout(function() {
+ that.back_Loading = false
+ }, 5000)
if (this.multipleSelection.length === 0) {
+ this.back_Loading = false
this.$message.error('请至少选择一个零件')
} else {
this.a = 0
From c562ec4c92af671162e4a6e7112d8855bd29a050 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 27 Apr 2020 15:44:09 +0800
Subject: [PATCH 7/8] a
---
.../CreatePreparationBill/index.vue | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 3c5a1619..5e444455 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -8,10 +8,10 @@
查询
- 外购备料
+ 外购备料
- 自家备料
+ 自家备料
查询全部
@@ -149,6 +149,8 @@ import $ from 'jquery'
export default {
data() {
return {
+ edit2_loading: false,
+ edit_loading: false,
a: 0,
tableData2: [],
partName: '',
@@ -233,7 +235,13 @@ export default {
this.tableData2 = val
},
edit() {
+ this.edit_loading = true
+ var that = this
+ setTimeout(function() {
+ that.edit_loading = false
+ }, 5000)
if (this.tableData2.length === 0) {
+ this.edit_loading = false
this.$message.warning('暂无数据')
} else {
this.a = 0
@@ -250,8 +258,13 @@ export default {
}
},
edit2() {
- console.log(this.$store.state.user.id, 9090)
+ this.edit2_loading = true
+ var that = this
+ setTimeout(function() {
+ that.edit2_loading = false
+ }, 5000)
if (this.tableData2.length === 0) {
+ this.edit2_loading = false
this.$message.warning('暂无数据')
} else {
this.a = 0
From db99bb7b701127dfee81f664ebc13417c483f9e5 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 27 Apr 2020 16:46:42 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ProjectPlanningManagementNew/index.vue | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
index 302140e2..03b52e56 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -795,7 +795,21 @@ export default {
} else if (row.计划完成时间 < row.任务开始时间) {
this.$message.error('计划完成时间应大于任务开始时间')
} else {
- if (row.组件流水号 && row.任务名称 && row.负责人 && row.接收任务时间 && row.任务开始时间 && row.计划完成时间 && row.货期) {
+ if (!row.组件流水号) {
+ this.$message.error('请选择分组')
+ } else if (!row.任务名称) {
+ this.$message.error('请输入任务名称')
+ } else if (!row.负责人) {
+ this.$message.error('请选择负责人')
+ } else if (!row.接收任务时间) {
+ this.$message.error('请选择接收任务时间')
+ } else if (!row.任务开始时间) {
+ this.$message.error('请选择任务开始时间')
+ } else if (!row.计划完成时间) {
+ this.$message.error('请选择计划完成时间')
+ } else if (!row.货期) {
+ this.$message.error('请输入货期')
+ } else {
editTable2(row.组件计划流水号, row.组件流水号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
if (response.data[0].result === '1') {
row.edit = false
@@ -809,8 +823,6 @@ export default {
this.$message.error('信息修改失败')
}
})
- } else {
- this.$message.error('请未输入项')
}
}
},