From f6908d87cc7e3fe432b03b6763b580e0251dc6bb Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 3 Dec 2019 17:13:16 +0800
Subject: [PATCH 01/17] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
.../CompletionOfWorkshopComponents/index.vue | 74 ++++++++++++++-----
2 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -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.1.231:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 75fdae4d..76e64941 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -23,15 +23,14 @@
-
-
+
{{ scope.row.工艺名称 }}
-
+
- {{ scope.row.员工姓名 }}
+ {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
@@ -39,17 +38,22 @@
{{ scope.row.投产数量 }}
+
+
+ {{ scope.row.工序状态 === 4 ? '已完成' : '未完成' }}
+
+
-
+
机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}
-
+
-
+
@@ -159,8 +163,11 @@ export default {
firstLevel.children = []
for (let j = 0; j < response.data.length; j++) {
firstLevel.children.push({
- label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称'),
+ label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '' : '\xa0\xa0\xa0\xa0\xa0\xa0外购'),
value: response.data[j].工艺计划流水号,
+ 考核状态: response.data[j].考核状态,
+ 采购状态: response.data[j].采购状态,
+ 零件类型: response.data[j].零件类型,
father: false
})
}
@@ -173,18 +180,41 @@ export default {
onClick(num) {
this.tableData1 = []
this.tableData2 = []
- if (num.father === true) {
- selectParts(1, num.value, 0, 0).then(response => {
- this.tableData2 = response.data
- })
- } else {
- selectParts(0, 0, 1, num.value).then(response => {
- this.tableData2 = response.data
- })
+ if (num.father === false) {
+ if (num.零件类型 === 1) {
+ selectProcedure(num.value).then(response => {
+ this.tableData1 = response.data
+ })
+ }
}
+ // if (num.father === true) {
+ // selectParts(1, num.value, 0, 0).then(response => {
+ // this.tableData2 = response.data
+ // })
+ // } else {
+ // selectParts(0, 0, 1, num.value).then(response => {
+ // this.tableData2 = response.data
+ // })
+ // }
},
renderContent(h, { node, data, store }) {
- return ({node.label})
+ if (node.data.father === false) {
+ if (node.data.零件类型 === 1) { // 自制
+ if (parseInt(node.data.考核状态) > 6) {
+ return ({node.label})
+ } else {
+ return ({node.label})
+ }
+ } else { // 外购
+ if (node.data.采购状态 === '已完成') {
+ return ({node.label})
+ } else {
+ return ({node.label})
+ }
+ }
+ } else {
+ return ({node.label})
+ }
},
searchTable1(row) {
this.tableData1 = []
@@ -205,7 +235,11 @@ export default {
background-color: #ccc !important;
}
}
- .treeNotes {
- background-color: green;
+ .treeNotesComplate {
+ color: black;
+ background-color: #67C23A;
+ }
+ .treeNotesUnComplate {
+ color: black;
}
From 266a82f423bdc7c8d67a209566ea1523bdda1287 Mon Sep 17 00:00:00 2001
From: liushuai
Date: Tue, 3 Dec 2019 18:01:28 +0800
Subject: [PATCH 02/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ContractInformationManagement/index.vue | 1 +
.../CreateInquirySheet/index.vue | 69 ++++----
.../PurchaseTaskAllocate/index.vue | 158 ++++++++++--------
3 files changed, 126 insertions(+), 102 deletions(-)
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 6b1e4638..5cdd64f2 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -992,6 +992,7 @@ export default {
this.form.付款方式 = parseInt(row.付款方式代码)
this.biddingNumber = row.招标保证金流水号
this.form.bidding = row.招标企业
+ this.form.contractAmount = row.合同总金额
this.disabled = true
this.temp = 2
this.isTrue = false
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index aad45b46..ab4a225d 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -16,22 +16,22 @@
-
-
- 刷新 | 待采购零件数
-
-
-
-
-
-
- {{ machine.机床图号 }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+ 调整采购任务
+
@@ -1443,7 +1450,7 @@ export default {
where 采购管理_采购合同_采购部.是否未通过 = 0
) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
- where 询价状态编号 = 1 and 采购状态编号 = 1 and 零件类型 = 2
+ where 询价状态编号 = 1 and 采购状态编号 = 1
and 人员编号 = ${this.id}
group by 项目流水号,机床流水号,机床图号,人员编号
union all
@@ -1715,7 +1722,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
- searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
+ searchMaterial(this.pageCurrent11, this.pageSize11, 3, check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData11 = response.data.rows
this.total11 = response.data.total
const remark = []
@@ -1754,7 +1761,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
- searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
@@ -1789,7 +1796,7 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
- searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
+ searchPart(this.pageCurrent12, this.pageSize12, 3, check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
this.tableData12 = response.data.rows
this.total12 = response.data.total
const remark = []
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index d55e39f8..ff1732ee 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -29,7 +29,7 @@
-
+
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -113,7 +115,7 @@
-
+
@@ -183,27 +185,27 @@
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
-
+
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -295,7 +299,7 @@
-
+
@@ -365,27 +369,27 @@
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
-
+
-->
- 查询
+ 查询
+ 未分配
+ 已分配
采购员:
@@ -452,7 +458,7 @@
-
+
@@ -512,27 +518,27 @@
{{ scope.row.供货商 }}
-
-
- {{ scope.row.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.操作日期.split(' ')[0] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.姓名 ? scope.row.姓名 : '—' }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '—' }}
-
-
-
+
+
+
+
+
+
{
for (let i = 0; i < response.data.length; i++) {
this.project.push({
@@ -850,6 +857,7 @@ export default {
}
},
searchTable0() { // 查询标准件
+ this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -860,12 +868,14 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
// this.dateRange ? check4 = 0 : (check4 = 0, this.dateRange = '')
- searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
+ searchTable1(this.pageCurrent0, this.pageSize0, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
+ this.loading = false
})
},
searchTable1() { // 查询外购件
+ this.loading = true
this.MaterialCategoryValue ? this.check1 = 1 : this.check1 = 0
this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
this.projectValue ? this.check3 = 1 : this.check3 = 0
@@ -875,12 +885,14 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
- searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
+ searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, check0, this.machineValue, check1, this.groupValue, this.check4, this.materialName, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 2).then(response => {
this.tableData1 = response.data.rows
this.total1 = response.data.total
+ this.loading = false
})
},
searchTable2() { // 查询基本件
+ this.loading = true
this.projectValue ? this.check3 = 1 : this.check3 = 0
let check1, check2, check3, check4, check5, check6
this.partNum ? check1 = 1 : check1 = 0
@@ -889,9 +901,10 @@ export default {
this.partMaterial ? check4 = 1 : check4 = 0
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
- searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
+ searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
+ this.loading = false
})
},
handleSelectionChange1(val) { // 标准件和外购件多选
@@ -1086,6 +1099,9 @@ export default {
width:150px;
margin-right: 10px;
}
+ .el-radio{
+ margin-right: 0px;
+ }
From eb3927f39e5f5088f870739eaade15404de4aa73 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 5 Dec 2019 09:56:34 +0800
Subject: [PATCH 07/17] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/ManufacturingCenter/StatusQuery.js | 24 +-
.../ManufacturingCenter/StatusQuery/index.vue | 442 ++++--------------
2 files changed, 96 insertions(+), 370 deletions(-)
diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index d7f4f7ed..17de0620 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -20,15 +20,14 @@ export function intPartState() {
}
})
}
-export function searchmachine(num, check, pageCurrent, pageSize) {
+export function searchmachine(num, check) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: 'PDM_机床名称_查询数据',
- param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0',
- Pagination: pageCurrent + '&' + pageSize
+ param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0'
}
})
}
@@ -39,30 +38,19 @@ export function searchgroup(num, pageCurrent, pageSize) {
data: {
type: '1',
name: 'PDM_组件名称_查询数据',
- param: '机床流水号=' + num,
- Pagination: pageCurrent + '&' + pageSize
+ param: '机床流水号=' + num
}
})
}
-export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) {
+export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
- param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int'
- }
- })
-}
-export function editData(num, state) {
- return request({
- url: '',
- method: 'post',
- data: {
- type: '2',
- name: '车间生产管理工艺_零件工艺计划_考核状态',
- param: '工艺计划流水号=' + num + '=int&考核状态=' + state + '=int'
+ param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
+ Pagination: pageCurrent + '&' + pageSize
}
})
}
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index dbc730b1..950cbf21 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -2,32 +2,27 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
查询
-
-
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
@@ -84,12 +62,12 @@
{{ scope.row.批次数量 }}
-
+
{{ scope.row.传递时间 }}
-
+
@@ -102,200 +80,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.机床图号 }}
-
-
-
-
- {{ scope.row.机床名称 }}
-
-
-
-
- {{ scope.row.机床开始时间 }}
-
-
-
-
- {{ scope.row.机床结束时间 }}
-
-
-
-
- {{ scope.row.工位属性 }}
-
-
-
-
- {{ scope.row.机床主管 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.机床图号 }}
-
-
-
-
- {{ scope.row.机床名称 }}
-
-
-
-
- {{ scope.row.组号 }}
-
-
-
-
- {{ scope.row.组件名称 }}
-
-
-
-
- {{ scope.row.组件介绍 }}
-
-
-
-
-
-
-
-
+
+
From 66d55c2c6aa75af09c32337d34f73c47667e8f35 Mon Sep 17 00:00:00 2001
From: liushuai
Date: Thu, 5 Dec 2019 17:24:12 +0800
Subject: [PATCH 12/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PurchasingCenter/CreateInquirySheet.js | 12 +
.../OutsourcingMaterialsSearch.js | 27 ++
src/utils/request.js | 2 +-
.../CreateInquirySheet/index.vue | 24 +-
.../OfflineContract/index.vue | 75 ++++--
.../OutsourcingMaterialsSearch/index.vue | 242 ++++++++++++++++++
6 files changed, 360 insertions(+), 22 deletions(-)
create mode 100644 src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
create mode 100644 src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index ea17dc07..0538d1d9 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -75,6 +75,18 @@ export function getExport2(num) {
}
})
}
+// 使用库存
+export function changeNum(num, num1, num2, num3, num4) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_离线采购_占用数量_插入',
+ param: `物料流水号=${num}&使用库存数=${num1}&机床流水号=${num2}&组件零件流水号=${num3}&数量=${num4}`
+ }
+ })
+}
// 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
return request({
diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
new file mode 100644
index 00000000..4f16735a
--- /dev/null
+++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js
@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_供应商_查询数据_根据条件',
+ param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
+ }
+ })
+}
+// 查询备料
+export function searchTable(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '备料管理_外购备料_综合查询数据',
+ param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..2954d36b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -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.110:8002/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.103:8074/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})
export default service
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index e966b67b..c1da8bed 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -174,12 +174,18 @@
- {{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
+ {{ Number(scope.row.零件类型) === 1 ? scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
-
+
- {{ Number(scope.row.货位存量) }}
+ {{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
+
+
+
+
+ -
+
@@ -1086,7 +1092,7 @@
+
+
From 50521d5e0014cd584189ff4a5e86375b4b6a77ba Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 6 Dec 2019 12:20:42 +0800
Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../maintainInformation.js | 84 +++++
.../maintainInformation/index.vue | 317 +++++++++++++++++-
2 files changed, 387 insertions(+), 14 deletions(-)
diff --git a/src/api/ManufacturingCenter/maintainInformation.js b/src/api/ManufacturingCenter/maintainInformation.js
index 98bd5d0d..546892c5 100644
--- a/src/api/ManufacturingCenter/maintainInformation.js
+++ b/src/api/ManufacturingCenter/maintainInformation.js
@@ -33,3 +33,87 @@ export function getTableData3(num) {
}
})
}
+// 表1 编辑
+export function editType(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `update [基础数据_设备工位点检表] set 点检表类型 = ${num1} where ID = ${num2}`
+ }
+ })
+}
+export function confirmEdit1(num1, num2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `update [基础数据_点检类型名称] set 点检表类型名称 = '${num1}' where 点检表类型流水号 = ${num2}`
+ }
+ })
+}
+export function confirmEdit2(num1, num2, num3) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `update 基础数据_点检内容 set 保养周期 = ${num1} ,保养项目 = '${num2}' where ID = ${num3}`
+ }
+ })
+}
+export function openDelete1(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `delete 基础数据_点检类型名称 where 点检表类型流水号 = ${num1}`
+ }
+ })
+}
+export function selectCount(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '3',
+ name: `SELECT 工位号 FROM [基础数据_设备工位点检表] where 点检表类型 = ${num1}`
+ }
+ })
+}
+export function openDelete2(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `delete 基础数据_点检内容 where ID = ${num1}`
+ }
+ })
+}
+export function submit1(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: `insert into 基础数据_点检类型名称 (点检表类型名称) values ('${num1}')`
+ }
+ })
+}
+export function submit2(num1, num2, num3) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '4',
+ name: ` declare @id int = 0
+ SELECT top 1 @id = ID FROM [ERPTOOL_GJ].[dbo].基础数据_点检内容 order by ID desc
+ set @id = @id + 1
+ insert into 基础数据_点检内容 (点检任务编号,点检表类型,保养项目,保养周期) values (@id,${num1},'${num2}',${num3})`
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 30fbc699..ad39056d 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -21,7 +21,7 @@
-
+
- {{ scope.row.点检表类型名称 }}
+
+
+
+ {{ scope.row.点检表类型名称 }}
+
+
+
+
+ 新增
+
+
+ 确定
+ 取消
+ 编辑
+ 删除
@@ -49,26 +63,83 @@
- 天
- 周
- 月
- 季
- 年
+
+
+
+
+
+
+ 日
+ 周
+ 月
+ 季
+ 年
+
- {{ scope.row.保养项目 }}
+
+
+
+ {{ scope.row.保养项目 }}
+
+
+
+
+ 新增
+
+
+ 确定
+ 取消
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue
new file mode 100644
index 00000000..e7383d2c
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchasingEfficiencyAnalysis/index.vue
@@ -0,0 +1,127 @@
+
+
+
+ 时间段:
+
+ ~
+
+ 查询
+
+
+
+
+
{{ 机床图号 }} {{ 机床名称 }}
+ {{ 机床图号 }} {{ 机床名称 }}
@@ -89,11 +88,12 @@