diff --git a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
index 14ae7554..1dc278d1 100644
--- a/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
+++ b/src/api/ManufacturingCenter/DiscardedPartsInquiry.js
@@ -41,7 +41,7 @@ export function searchTable(entryValue, machineValue, check2, GroupNumValue, che
data: {
type: '1',
name: '车间生产管理工艺_传递后_零件报废补投_查询数据_综合查询',
- param: '项目流水号_check=1&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
+ param: '项目流水号_check=0&项目流水号=' + entryValue + '&机床流水号_check=1&机床流水号=' + machineValue + '&组件流水号_check=' + check2 + '&组件流水号=' + GroupNumValue + '&组件零件基本件流水号_check=0&工艺计划流水号_check=0&工艺计划流水号_补投前_check=0&零件图号_check=' + check3 + '&零件图号=' + PartDrawingNumber,
pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/router/index.js b/src/router/index.js
index e5a0832e..4a9b79b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -33,10 +33,6 @@ export const constantRouterMap = [
path: 'http://192.168.1.231:8005/#/TVF',
meta: { title: '设备运行监控', icon: 'MaterialManagement' }
},
- {
- path: 'http://192.168.1.231:8005/#/TVA',
- meta: { title: 'MES工作站', icon: 'MaterialManagement' }
- },
{
path: 'http://192.168.1.231:8005/#/TVD',
meta: { title: '设备状态监控', icon: 'MaterialManagement' }
diff --git a/src/utils/request.js b/src/utils/request.js
index 059fb22e..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel
+export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
- baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index b28e0396..de58c121 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -21,7 +21,7 @@
机床图号:
-
+
{
+ console.log(response.data)
this.tableData = response.data.rows
this.total = response.data.total
this.listLoading = false
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index 9bd0afac..f7a8ec02 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -10,7 +10,7 @@
-
+
{{ scope.row.物料名称 }}
@@ -26,21 +26,21 @@
{{ scope.row.物料规格 }}
-
-
- {{ scope.row.物料来源 }}
-
-
-
-
-
-
-
-
-
- {{ scope.row.货位名称 }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -220,7 +220,7 @@ export default {
method: 'post',
data: {
type: '1',
- name: `库存管理_库存盘点_物料货位数量_查询数据`,
+ name: `库存管理_库存盘点_物料货位数量_查询数据_新`,
param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}`,
Pagination: this.pageCurrent + '&' + this.pageSize
}
diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
index 6cd658d1..94c8f275 100644
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -142,6 +142,7 @@ export default {
this.search2()
this.search4()
this.search5()
+ this.search6()
},
methods: {
fetchData() {
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 361a99eb..2eb8064b 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -327,18 +327,28 @@ export default {
},
// 保存行价格
saveRowPrice() {
+ this.count = 0
+ for (let i = 0; i < this.tableData2.length; i++) {
+ if (this.checkBox[i] === false) {
+ this.count = this.count + 1
+ }
+ }
if (this.tableData2.length === 0) {
this.$message.error('请选择零件')
} else {
- this.a = 0
- for (let i = 0; i < this.tableData2.length; i++) {
- saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => {
- this.a += parseInt(response.data[0].result)
- if (this.a === this.tableData2.length) {
- this.$message.success('保存成功')
- this.searchTable()
- }
- })
+ if (this.count !== this.tableData2.length) {
+ this.a = 0
+ for (let i = 0; i < this.tableData2.length; i++) {
+ saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => {
+ this.a += parseInt(response.data[0].result)
+ if (this.a === this.tableData2.length) {
+ this.$message.success('保存成功')
+ this.searchTable()
+ }
+ })
+ }
+ } else {
+ this.$message.error('请选择需要外协工序')
}
}
},
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index 5a1db1b3..c84da4e1 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -2,7 +2,7 @@
项目名称
-
+
机床图号
-
+
组号
-
+