diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
index b77b40aa..f41a9bdd 100644
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -44,7 +44,7 @@ export function initPerson() {
})
}
// 查询
-export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6) {
+export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3, val3, check4, val4, check5, val5, val6, val7) {
return request({
url: '',
method: 'post',
@@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
ModularID: router.currentRoute.path,
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
- param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+ param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&排序=${val7}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
}
})
}
diff --git a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js
index 6eae8111..0b5c34e8 100644
--- a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js
+++ b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js
@@ -55,3 +55,16 @@ export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people,
}
})
}
+export function reSpare(CutCode) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '2',
+ name: '报废补投_撤销报废_循环执行',
+ param: '工艺计划流水号组=' + CutCode
+ }
+ })
+}
diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index b19b8c49..531229f9 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -2,16 +2,6 @@ import request from '@/utils/request'
import state from '@/store'
import router from '@/router'
-// export function initProject() {
-// return request({
-// url: '',
-// method: 'post',
-// data: {
-// type: '1',
-// name: 'PDM_项目名称_查询数据_按时间排序'
-// }
-// })
-// }
export function intPartState() {
return request({
url: '',
@@ -62,3 +52,29 @@ export function searchTable(check1, machine, check2, groupNum, check3, partNumbe
}
})
}
+export function gettabledata1(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '车间生产管理工艺_追溯加工过程_查询工序',
+ param: '工艺计划流水号=' + num + '=int'
+ }
+ })
+}
+export function getPersons(num) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '1',
+ name: '车间生产管理工艺_自制件状态查询_每阶段操作者查询',
+ param: '工艺计划流水号=' + num
+ }
+ })
+}
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index cb59faee..0d34e61e 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -57,9 +57,20 @@
-
+
-
+
{{ scope.row.进程 }}
@@ -202,6 +213,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1, retu
export default {
data() {
return {
+ order: '',
finishTime: '',
partNumValue: [],
machineNumberValue: '',
@@ -329,7 +341,7 @@ export default {
this.PrNum ? check3 = 1 : check3 = 0
this.personValue ? check4 = 1 : check4 = 0
this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
- search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
+ search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1], this.order).then(response => {
this.tableData = response.data.result
this.tableData.map(v => {
this.$set(v)
@@ -342,6 +354,16 @@ export default {
this.loading = false
})
},
+ sortChange(column, prop, order) {
+ if (column.order === 'ascending') {
+ this.order = '进程'
+ } else if (column.order === 'descending') {
+ this.order = '进程 DESC'
+ } else {
+ this.order = 0
+ }
+ this.searchData()
+ },
click(row) {
this.零件图号 = row.零件图号
searchtable1(row.工艺计划流水号).then(response => {
diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
index b3fb3310..bbf19259 100644
--- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
+++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
@@ -22,7 +22,6 @@
style="width:240px;margin-left: 10px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
-
查询
-
- 提交补投
+
+ 提交补投
+ 撤销补投
@@ -72,7 +72,6 @@
-
{{ scope.row.零件图号 }}
@@ -179,11 +178,12 @@
+
+
+
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index a4788b33..51df0a95 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -2615,7 +2615,8 @@ export default {
flex-wrap: wrap;
}
.sudoku_item{
- margin-bottom: 20px;
+ margin-bottom: 15px;
+ margin-top: 15px;
margin-left: 20px;
/*border: 1px solid red;*/
display: flex;