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

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
Vergil
2020-05-15 09:47:04 +08:00
parent 922080dde9 2503108a9b
commit ad91c0649d
16 changed files with 199 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -23,7 +23,7 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px">基本件</span>
<span style="font-size: 20px">自制件</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
</el-tooltip>
@@ -91,6 +91,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<!--<div class="block" style="margin-top: 10px;">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent"-->
@@ -104,7 +105,7 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px">外购件和标准件</span>
<span style="font-size: 20px">外购件</span>
<el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
<el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldeleteWB()">全部删除</el-button>
</el-tooltip>
@@ -660,7 +661,10 @@ export default {
// total6: 0,
pageCurrent7: 1,
pageSize7: 10,
total7: 0
total7: 0,
gouxuan: 0,
totalnumber: 0
// pageCurrentWB: 1,
// pageSizeWB: 10,
// totalWB: 0
@@ -765,6 +769,7 @@ export default {
})
},
handleSelectionChange(val) {
this.gouxuan = val.length
this.BasicGroup = []
for (let i = 0; i < val.length; i++) {
this.BasicGroup.push(val[i].基本件流水号)
@@ -823,6 +828,7 @@ export default {
console.log(response, 111)
this.loading = false
const res = response.data
this.totalnumber = response.data.length
this.total = res.total
this.tableData = res.map(item => {
if (item.整改类型 === '1') {

25
src/views/Inventory/CreatePickingList/index.vue
View File

@@ -106,6 +106,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block">
<el-pagination
:current-page="pageCurrent0"
@@ -177,6 +178,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block">
<el-pagination
:current-page="pageCurrent1"
@@ -253,6 +255,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block">
<el-pagination
:current-page="pageCurrent2"
@@ -294,6 +297,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent4"
@@ -583,7 +587,9 @@ export default {
listDetailsName: '',
listDetailsPicnum: '',
listDetailsSpecifications: '',
listMachinenum: ''
listMachinenum: '',
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -769,9 +775,12 @@ export default {
console.log(this.PickingValue, 111)
if (this.PickingValue === false) {
this.loading0 = true
this.totalnumber = 0
this.gouxuan = 0
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent0, this.pageSize0, 1).then(response => {
console.log(response.data.rows, 1111)
this.tableData0 = response.data.rows
this.totalnumber = response.data.rows.length
this.total0 = response.data.total
this.loading0 = false
}).catch(() => {
@@ -781,6 +790,7 @@ export default {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent0, this.pageSize0, 1).then(response => {
this.tableData0 = response.data.rows
this.total0 = response.data.total
this.totalnumber = response.data.rows.length
})
}
},
@@ -790,12 +800,15 @@ export default {
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0
this.totalnumber = 0
this.gouxuan = 0
console.log(this.PickingValue, 111)
if (this.PickingValue === false) {
this.loading1 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => {
console.log(response, 2)
this.tableData1 = response.data.rows
this.totalnumber = response.data.rows.length
this.total1 = response.data.total
this.loading1 = false
}).catch(() => {
@@ -804,6 +817,7 @@ export default {
} else {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => {
this.tableData1 = response.data.rows
this.totalnumber = response.data.rows.length
this.total1 = response.data.total
})
}
@@ -814,11 +828,14 @@ export default {
this.machineNumberValue ? check1 = 1 : check1 = 0
this.groupNumberValue ? check2 = 1 : check2 = 0
this.Name ? check3 = 1 : check3 = 0
this.totalnumber = 0
this.gouxuan = 0
console.log(this.PickingValue, 111)
if (this.PickingValue === false) {
this.loading2 = true
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData2 = response.data.rows
this.totalnumber = response.data.rows.length
this.total2 = response.data.total
this.loading2 = false
}).catch(() => {
@@ -828,6 +845,7 @@ export default {
searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => {
this.tableData2 = response.data.rows
this.total2 = response.data.total
this.totalnumber = response.data.rows.length
})
}
},
@@ -835,10 +853,13 @@ export default {
searchTable4() {
this.listLoading = true
this.tableDataBasic = []
this.totalnumber = 0
this.gouxuan = 0
let check1
this.Name ? check1 = 1 : check1 = 0
searchPart(check1, this.Name, this.pageCurrent4, this.pageSize4).then(response => {
this.tableDataBasic = response.data.rows
this.totalnumber = response.data.rows.length
this.total4 = response.data.total
this.listLoading = false
}).catch(() => {
@@ -1005,9 +1026,11 @@ export default {
// 多选
handleSelectionChange(val) {
this.multipleSelection = val
this.gouxuan = val.length
},
handleSelectionChange1(val) {
this.multipleSelection1 = val
this.gouxuan = val.length
},
// 选入
selectInto() {

7
src/views/Inventory/MaterialOut/index.vue
View File

@@ -116,6 +116,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-card>
</div>
</el-tab-pane>
@@ -370,7 +371,9 @@ export default {
请购单明细流水号: '',
最大归还量: '',
审批未通过: true,
占用数量: 0
占用数量: 0,
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -596,6 +599,7 @@ export default {
row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
searchListDetail(this.pickingListNum).then(res => {
this.pickListTable2 = res.data
this.totalnumber = res.data.length
})
},
tableRowClassName({ row }) {
@@ -616,6 +620,7 @@ export default {
},
// 多选
handleSelectionChange(val) {
this.gouxuan = val.length
this.StockNumberTable = val
this.multipleSelection = []
this.basePartNum = []

11
src/views/Inventory/MaterialOut/index2.vue
View File

@@ -44,7 +44,7 @@
</el-table-column>
<el-table-column label="库存" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.货位存量1 ? scope.row.货位存量1 : 0 }}
{{ scope.row.货位存量1 }}
</template>
</el-table-column>
<el-table-column label="已领" align="center" width="70">
@@ -58,6 +58,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent1"
@@ -140,7 +141,10 @@ export default {
outTypeValue: [{ required: true, message: '请选择' }]
},
multipleSelection1: [],
StockNumberTable: []
StockNumberTable: [],
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -194,10 +198,10 @@ export default {
var check
this.pickingListNumber ? check = 1 : check = 0
searchList222(check, this.pickingListNumber, this.pageCurrent1, this.pageSize1).then(response => {
console.log(response, 123)
this.loading1 = false
this.total1 = response.data.total
this.pickListTable2 = response.data.rows
this.totalnumber = response.data.rows.length
})
},
tableRowClassName1({ row }) {
@@ -211,6 +215,7 @@ export default {
},
// 多选
handleSelectionChange(val) {
this.gouxuan = val.length
this.StockNumberTable = val
this.multipleSelection = []
this.basePartNum = []

7
src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
View File

@@ -80,6 +80,7 @@
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div class="block" style="margin-top: 10px;">
<el-pagination
:current-page="pageCurrent"
@@ -158,7 +159,9 @@ export default {
keyichuku: 1,
outgoingQuantity: [],
departments: [], // 部门
leaders: [] // 领料人
leaders: [], // 领料人
gouxuan: 0,
totalnumber: 0
}
},
created() {
@@ -173,6 +176,7 @@ export default {
const groupNumberValue_check = this.groupNumberValue === '' ? 0 : 1
const partNumber_check = this.partNumber === '' || this.partNumber === null ? 0 : 1
searchdata(entryNameValue_check, this.entryNameValue, machineToolValue_check, this.machineToolValue, groupNumberValue_check, this.groupNumberValue, partNumber_check, this.partNumber, this.pageCurrent, this.pageSize).then(response => {
this.totalnumber = response.data.rows.length
if (response.data.rows.length !== 0) {
for (let i = 0; i < response.data.rows.length; i++) {
this.tableData.push({
@@ -267,6 +271,7 @@ export default {
handleSelectionChange(val) {
this.shuzu = []
this.shuzu = val
this.gouxuan = val.length
// val.map(v => {
// this.multipleSelection.push(v.工艺计划流水号)
// this.outgoingQuantity.push(v.出库数量)

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) {

44
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -144,6 +144,7 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<!--<div class="block" style="margin: 10px 0 0 0;display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent11"-->
@@ -155,7 +156,7 @@
<!--@size-change="handleSizeChange11"-->
<!--@current-change="handleCurrentChange11"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div class="block" style="display: inline-block;width:1000px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent11"
@@ -184,7 +185,7 @@
style="width: 680px;max-height: 500px;"
height="300px"
size="mini"
@selection-change="handleSelectionChange1"
@selection-change="handleSelectionChange2"
@select="handleSelection1">
<el-table-column align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="170" show-overflow-tooltip>
@@ -211,6 +212,7 @@
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="primary" size="small" icon="el-icon-bottom" plain style="margin: 5px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<span style="font-size: 5px">共{{ totalnumber1 }}条信息，选择{{ gouxuan1 }}条</span>
<!--<div class="block" style="display: inline-block">-->
<!--<el-pagination-->
<!--:current-page="pageCurrent22"-->
@@ -222,7 +224,7 @@
<!--@size-change="handleSizeChange22"-->
<!--@current-change="handleCurrentChange22"/>-->
<!--</div>-->
<div class="block" style="display: inline-block;width:1150px;float: right;">
<div class="block" style="display: inline-block;width:1000px;float: right;">
<div style="display: inline-block;float: right;">
<el-pagination
:current-page="pageCurrent22"
@@ -863,7 +865,11 @@ export default {
tongguo: '',
total22: 0,
pageCurrent22: 1,
pageSize22: 20
pageSize22: 20,
gouxuan: 0,
totalnumber: 0,
gouxuan1: 0,
totalnumber1: 0
}
},
computed: {
@@ -1106,14 +1112,14 @@ export default {
tabClick(tab) {
if (tab.name === '外购件') {
this.tabName = '外购件'
this.searchTable11()
} else if (tab.name === '标准件') {
this.tabName = '标准件'
this.searchTable11()
} else if (tab.name === '基本件') {
this.tabName = '基本件'
this.searchTable12()
} else {
this.tabName = '仓库'
this.searchTable22()
}
},
searchTable2() { // 查询离线合同列表
@@ -1623,12 +1629,34 @@ export default {
this.idNumGroup.push(val[i].id)
this.NumGroup.push(val[i].待采购数量)
}
this.gouxuan = val.length
},
handleSelectionChange2(val) { // 标准件和外购件多选
this.标准件和外购件流水号 = []
this.基本件流水号 = []
this.groupPartNumGroup = []
this.groupBasicPartNumGroup = []
this.materielNumGroup = []
this.idNumGroup = []
this.NumGroup = []
for (let i = 0; i < val.length; i++) {
this.标准件和外购件流水号.push(val[i].标准件和外购件流水号)
this.基本件流水号.push(val[i].基本件流水号)
this.groupPartNumGroup.push(val[i].组件零件流水号)
this.groupBasicPartNumGroup.push(val[i].组件零件基本件流水号)
this.materielNumGroup.push(val[i].物料流水号)
this.idNumGroup.push(val[i].id)
this.NumGroup.push(val[i].待采购数量)
}
this.gouxuan1 = val.length
},
selectable(row, index) { // 控制某行是否可选
return Number(row.采购状态编号) < 3 && Number(row.是否确认) === 1 // 未采购&&确认物料修改
},
// 查询外购件列表
searchTable11() {
this.totalnumber = 0
this.gouxuan = 0
let check1, check5, check7
this.loading1 = true
this.materialName ? check1 = 1 : check1 = 0
@@ -1638,6 +1666,7 @@ export default {
if (this.tabName === '标准件') { this.partType = 1 }
searchMaterial1(this.pageCurrent11, this.pageSize11, check1, this.materialName, this.id, check5, this.machineValue, check7, this.startTime[0], this.startTime[1]).then(response => {
this.tableData00 = response.data.rows
this.totalnumber = response.data.rows.length
this.total11 = response.data.total
const remark = []
const supplier = []
@@ -1710,11 +1739,14 @@ export default {
this.searchTable12()
},
searchTable22() {
this.totalnumber1 = 0
this.gouxuan1 = 0
let check1
this.materialName ? check1 = 1 : check1 = 0
this.loading2 = true
searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => {
this.tableData22 = response.data.result
this.totalnumber1 = this.tableData22.length
this.total22 = parseInt(response.data.output[0].ItemCount)
const supplier = []
this.remarkFilters = []

29
src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
View File

@@ -19,7 +19,7 @@
<el-divider content-position="right"/>
</div>
</el-card>
<el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="searchTable0();searchTable1();searchTable2();">
<el-tabs id="PurchasingCenter/PurchaseTaskAllocate" v-model="tabName" type="border-card" @tab-click="selecttabs">
<el-tab-pane label="标准件" name="标准件">
<el-row style="margin-bottom: 3px">
<!--<el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">-->
@@ -242,6 +242,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-row>
<div class="block">
<el-pagination
@@ -447,6 +448,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-row>
<div class="block">
<el-pagination
@@ -622,6 +624,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-row>
<div class="block">
<el-pagination
@@ -774,7 +777,9 @@ export default {
order: '',
checked: false,
checked2: false,
checked3: false
checked3: false,
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -814,6 +819,18 @@ export default {
clearInterval(this.timer2)
},
methods: {
selecttabs() {
if (this.tabName === '标准件') {
this.searchTable0()
this.gouxuan = 0
} else if (this.tabName === '外购件') {
this.searchTable1()
this.gouxuan = 0
} else if (this.tabName === '基本件') {
this.searchTable2()
this.gouxuan = 0
}
},
Jump() {
window.location.hash = '#PurchasingCenter/PurchaseTaskAllocate'
},
@@ -950,9 +967,11 @@ export default {
this.materialName ? this.check4 = 1 : this.check4 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.totalnumber = 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, parseInt(this.radio), check2, this.materialSpec, check3, this.materialModel, 1, 0, '', '').then(response => {
this.tableData0 = response.data.rows
this.totalnumber = response.data.rows.length
this.total0 = response.data.total
this.loading = false
})
@@ -969,8 +988,10 @@ export default {
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
this.checked2 ? this.radio1 = 2 : this.radio1 = 1
this.totalnumber = 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, parseInt(this.radio1), check2, this.materialSpec, check3, this.materialModel, 2, 0, '', '').then(response => {
this.tableData1 = response.data.rows
this.totalnumber = response.data.rows.length
this.total1 = response.data.total
this.loading = false
})
@@ -986,13 +1007,16 @@ export default {
this.machineValue ? check5 = 1 : check5 = 0
this.groupValue ? check6 = 1 : check6 = 0
this.checked3 ? this.radio2 = 2 : this.radio2 = 1
this.totalnumber = 0
searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, check5, this.machineValue, check6, this.groupValue, parseInt(this.radio2), check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
this.tableData2 = response.data.rows
this.totalnumber = response.data.rows.length
this.total2 = response.data.total
this.loading = false
})
},
handleSelectionChange1(val) { // 标准件和外购件多选
this.gouxuan = val.length
this.standardAndPurchase = []
this.groupAndPart = []
this.partNumber = []
@@ -1003,6 +1027,7 @@ export default {
}
},
handleSelectionChange2(val) { // 基本件多选
this.gouxuan = val.length
this.basic = []
this.groupAndPartBasic = []
this.partNumberBasic = []

9
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -129,10 +129,11 @@
</el-table-column>
<el-table-column label="备注" align="center" width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.备注" size="mini" style="width: 120px" @change="update(scope.row)"/>
<el-input v-show="contractNumType===0" v-model="scope.row.备注" size="mini" style="width: 120px" @change="update(scope.row)"/>
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<!-- <el-button-->
<!-- type="distribution"-->
<!-- size="small"-->
@@ -431,7 +432,9 @@ export default {
group9: [],
group10: '',
group11: '',
group12: ''
group12: '',
gouxuan: 0,
totalnumber: 0
}
},
computed: {
@@ -486,6 +489,7 @@ export default {
this.calculateContractSum()
},
handleSelectionChange(val) {
this.gouxuan = val.length
this.multipleSelection = val
for (let i = 0; i < this.multipleSelection.length; i++) {
this.Selection.push(Number(this.multipleSelection[i].请购单明细流水号))
@@ -566,6 +570,7 @@ export default {
searchData2(this.contractNumValue).then(response => {
this.tableData4 = []
console.log(response, 'tableData4')
this.totalnumber = response.data.length
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
this.tableData4.push({

5
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -65,6 +65,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
<div v-show="false" class="block">
<el-pagination
:current-page="pageCurrent1"
@@ -495,6 +496,8 @@ export default {
unit: [], // 单位组
Remarks: [], // 备注组
tableData4: [], // 合同模板
gouxuan: 0,
totalnumber: 0,
采购计划状态: '',
采购计划状态2: '',
paramRow: '' // 参数row
@@ -655,6 +658,7 @@ export default {
// this.pageCurrent1, this.pageSize1,
searchPurchasedMaterials(this.check1, this.partDrawingNumber, this.order, this.partName).then(response => {
this.tableData1 = response.data
this.totalnumber = response.data.length
this.total1 = response.data.total
this.loading1 = false
})
@@ -669,6 +673,7 @@ export default {
this.searchTable1()
},
handleSelectionChange(val) {
this.gouxuan = val.length
this.materielGroup = []
this.partNum = []
for (let i = 0; i < val.length; i++) {

9
src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
View File

@@ -21,7 +21,7 @@
<el-button type="distribution" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
</el-card>
<el-card>
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
<el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px;" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50px"/>
<el-table-column label="名称" sortable prop="物料名称" width="150px" align="center" show-overflow-tooltip >
<template slot-scope="scope">
@@ -49,6 +49,7 @@
</template>
</el-table-column>
</el-table>
<span style="font-size: 5px">共{{ totalnumber }}条信息，选择{{ gouxuan }}条</span>
</el-card>
</div>
</template>
@@ -67,7 +68,9 @@ export default {
inventoryName: [], // 仓库名称
locateNumber: '',
locateName: [],
table1: []
table1: [],
gouxuan: 0,
totalnumber: 0
}
},
created() {
@@ -152,10 +155,12 @@ export default {
if (!res.data[i].物料型号) { res.data[i].物料型号 = '' }
}
this.table1 = res.data
this.totalnumber = res.data.length
},
// 多选
handleSelectionChange(val) {
this.multipleSelection = val
this.gouxuan = val.length
},
// 明细可选
selectable(row) {