meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2020-05-14 18:17:03 +08:00
parent e1d611f964
commit 990052a70e
17 changed files with 200 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -93,6 +93,7 @@
<!--</template>-->
<!--</el-table-column>-->
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block">
<el-pagination
v-if="!loading"
@@ -162,7 +163,10 @@ export default {
pageSize: 30, // 每页显示条数
pageCurrent: 1, // 后台获取页
ordername: '',
order: ''
order: '',
gouxuan: 0,
totalnumber: 0
}
},
created() {
@@ -224,6 +228,7 @@ export default {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
this.totalnumber = response.data.rows.length
this.tableData = response.data.rows
this.total = response.data.total
this.loading = false
@@ -233,6 +238,7 @@ export default {
handleSelectionChange(val) {
this.tableData2 = []
this.tableData2 = val
this.gouxuan = val.length
},
edit() {
this.edit_loading = true

9
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -168,7 +168,8 @@
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 0px;">
<el-pagination
v-show="false"
:current-page="currentPage"
@@ -516,7 +517,9 @@ export default {
pageList3: 1, // 后台获取页
currentPage3: 1, // 显示当前页
listLoading: false,
listLoading1: false
listLoading1: false,
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -683,6 +686,7 @@ export default {
getTable(this.NumValue, this.pageList, this.pageSize).then(response => {
this.total = parseInt(response.data.total)
this.tableData = []
this.totalnumber = response.data.rows.length
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
零件图号: response.data.rows[i].零件图号,
@@ -741,6 +745,7 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
this.gouxuan = val.length
},
handleEditNumber(index, row) {
this.dialogFormVisible3 = true

24
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -1586,19 +1586,19 @@
{{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
</template>
</el-table-column>
<el-table-column align="center" label="总基本件数" width="120px">
<el-table-column align="center" label="总外购件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总基本件数 ? scope.row.总基本件数: '0' }}
{{ scope.row.总外购件数 ? scope.row.总外购件数: '0' }}
</template>
</el-table-column>
<el-table-column align="center" label="已采购基本件数" width="120px">
<el-table-column align="center" label="已采购外购件数" width="120px">
<template slot-scope="scope">
{{ scope.row.已采购基本件数 ? scope.row.已采购基本件数 : 0 }}
{{ scope.row.已采购外购件数 ? scope.row.已采购外购件数 : 0 }}
</template>
</el-table-column>
<el-table-column align="center" label="总到货数基本件数" width="120px">
<el-table-column align="center" label="总到货数外购件数" width="120px">
<template slot-scope="scope">
{{ scope.row.总到货数基本件数 ? scope.row.总到货数基本件数 : 0 }}
{{ scope.row.总到货数外购件数 ? scope.row.总到货数外购件数 : 0 }}
</template>
</el-table-column>
</el-table>
@@ -3777,14 +3777,14 @@ export default {
type: '3',
name: `
select 组号,组件名称
,SUM(基本件数) as 总基本件数
,SUM(已采购基本件数) as 已采购基本件数
,SUM(已到货基本件数 ) as 总到货数基本件数
,SUM(外购件数) as 总外购件数
,SUM(已采购外购件数) as 已采购外购件数
,SUM(已到货外购件数 ) as 总到货数外购件数
from (
select 组号,组件名称,
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null) as 基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null) as 外购件数,
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购外购件数,
(select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货外购件数
from 车间采购_综合查询视图 where 机床流水号 =${this.machineValue1}
) as a
group by a.组号,a.组件名称 order by 组号`

30
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -87,8 +87,9 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-tab-pane>
<el-tab-pane label="外购件">
<el-tab-pane :disabled="checked" label="外购件">
<el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" min-width="180">
@@ -137,8 +138,9 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-tab-pane>
<el-tab-pane label="标准件">
<el-tab-pane :disabled="checked" label="标准件">
<el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
<el-table-column align="center" width="50" type="selection"/>
<el-table-column label="物料代码" align="center" min-width="180">
@@ -187,6 +189,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-tab-pane>
</el-tabs>
<el-card style="padding: 3px">
@@ -653,7 +656,9 @@ export default {
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
checked: false
checked: false,
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -979,22 +984,31 @@ export default {
this.tableData2 = []
this.tableData3 = []
this.loading = false
this.totalnumber = 0
this.gouxuan = 0
this.searchPart()
})
},
selectPart(val) {
let num
this.PartType = val.label
this.checked ? num = 1 : num = 0
this.totalnumber = 0
this.gouxuan = 0
if (this.PartType === '基本件') {
searchPart(this.groupFloatValue).then(response => {
searchPart(this.groupFloatValue, num).then(response => {
this.tableData1 = response.data
this.totalnumber = response.data.length
})
} else if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2).then(response => {
searchPart1(this.groupFloatValue, 2, num).then(response => {
this.tableData2 = response.data
this.totalnumber = response.data.length
})
} else if (this.PartType === '标准件') {
searchPart1(this.groupFloatValue, 1).then(response => {
searchPart1(this.groupFloatValue, 1, num).then(response => {
this.tableData3 = response.data
this.totalnumber = response.data.length
})
}
},
@@ -1013,14 +1027,17 @@ export default {
if (this.PartType === '基本件') {
searchPart(this.groupFloatValue, num).then(response => {
this.tableData1 = response.data
this.totalnumber = response.data.length
})
} else if (this.PartType === '外购件') {
searchPart1(this.groupFloatValue, 2, num).then(response => {
this.tableData2 = response.data
this.totalnumber = response.data.length
})
} else if (this.PartType === '标准件') {
searchPart1(this.groupFloatValue, 1, num).then(response => {
this.tableData3 = response.data
this.totalnumber = response.data.length
})
}
},
@@ -1274,6 +1291,7 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
this.gouxuan = val.length
},
handleSelectionChange10(val) {
this.multipleSelection10 = val

7
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -67,6 +67,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-show="!loading0"
@@ -134,7 +135,9 @@ export default {
工艺计划流水号组: [],
通用件图号: [],
通用件规格: [],
工艺员: []
工艺员: [],
gouxuan: 0,
totalnumber: 0
}
},
created() {
@@ -195,6 +198,7 @@ export default {
this.tableData = []
getTable(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
this.total = response.data.total
this.totalnumber = response.data.rows.length
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
零件图号: response.data.rows[i].零件图号,
@@ -226,6 +230,7 @@ export default {
},
handleSelectionChange(val) {
this.multipleSelection = val
this.gouxuan = val.length
},
// 全选
selectAll(rows) {

7
src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
View File

@@ -162,6 +162,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block">
<el-pagination
v-if="!loading"
@@ -206,7 +207,9 @@ export default {
outTime: '',
order: '',
operaPeople: [],
procedureGroup1: []
procedureGroup1: [],
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -277,6 +280,7 @@ export default {
searchtable(check, this.machineNameValue, check1, this.partName, check7, this.outTime[0], this.outTime[1], check10, this.ProcessingResultValue, this.pageCurrent, this.pageSize).then(response => {
console.log(response.data, 123)
this.tableData = response.data.result
this.totalnumber = this.tableData.length
this.loading = false
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
@@ -365,6 +369,7 @@ export default {
// 20200509↑
handleSelectionChange(val) {
this.procedureGroup = val
this.gouxuan = val.length
},
// 分页
handleSizeChange(val) {