Browse Source

完善采购订单

master
guoxing 10 months ago
parent
commit
320aca3a47
  1. 98
      src/views/purchase/purchaseOrder/relation/chooseproducts.vue
  2. 19
      src/views/purchase/purchaseReview/index.vue
  3. 3
      src/views/system/userManage/userManageList.vue

98
src/views/purchase/purchaseOrder/relation/chooseproducts.vue

@ -32,8 +32,8 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="randomKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@select="select" @select-all="selectAll">
<el-table-column width="50px" type="selection" align="center" />
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="center" />
@ -96,7 +96,10 @@
goodsSkuCode: '',
},
total: 0
}
},
tableData: [],
selectedItems: [],
randomKey: Math.random(),
}
},
methods: {
@ -122,6 +125,7 @@
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
this.selectedPreExisting(this.selectedItems)
}
})
},
@ -139,9 +143,9 @@
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
// handleSelectionChange(row) {
// this.sids = row
// },
showAdd(createOrgSid) {
// const aa = []
// if (value.length > 0) {
@ -160,7 +164,13 @@
},
//
AddUpdateReturn() {
this.sids = []
this.selectedItems.forEach(row => {
this.sids.push(row)
})
if (this.sids.length > 0) {
this.selectedItems = []
this.$emit('backData', this.sids)
} else {
this.$notify({
@ -174,6 +184,82 @@
//
handleReturn() {
this.$emit('doback')
this.selectedItems = []
},
// //
// setTabelData() {
// let {
// current,
// size
// } = this.pages
// this.tableData = this.list.slice((current - 1) * size, (current - 1) * size + size)
// //randomKeytabletable
// this.randomKey = Math.random()
// this.selectedPreExisting(this.selectedItems)
// },
// //
// handleCurrentChange(index) {
// this.listQuery.current = index
// this.setTabelData()
// },
//table
selectedPreExisting(rows) {
if (rows.length > 0) {
//使this.$nextTick
this.$nextTick(() => {
rows.forEach(row => {
//rowtableData
let selectedItem = this.list.find(item => item.sid == row.sid)
this.$refs.multipleTable.toggleRowSelection(selectedItem);
});
})
} else {
this.$refs.multipleTable.clearSelection();
}
},
//
select(selection, row) {
console.log("selection", selection)
//selectionundefined,
//selectionrow
if (selection && selection.find(item => item && (item.sid == row.sid))) {
console.log("this.selectedItems+++++", this.selectedItems)
this.addRows([row])
} else {
console.log("this.selectedItems------", this.selectedItems)
this.deleteRows([row])
}
},
//
selectAll(selection) {
//
if (selection.length > 0) {
this.addRows(this.list)
} else {
this.deleteRows(this.list)
}
},
//
addRows(rows) {
rows.forEach(row => {
//selectedItems
if (this.selectedItems.find(item => item.sid == row.sid)) {
return
}
this.selectedItems.push(row)
});
},
//
deleteRows(rows) {
//selectedItems
if (this.selectedItems.length == 0) {
return
}
rows.forEach(row => {
var index = this.selectedItems.findIndex(item => item.sid == row.sid)
this.selectedItems.splice(index, 1)
})
}
}
}

19
src/views/purchase/purchaseReview/index.vue

@ -279,7 +279,10 @@
purchaseAppendixList: [],
purchaseBillDetailList: {}
},
orderInfo: {},
orderInfo: {
state: 1,
remarks: ""
},
btnList: [{
type: 'primary',
size: 'small',
@ -732,8 +735,19 @@
},
handleSave() {
console.log("handleSave》》》》", this.orderInfo)
this.orderInfo.sid = this.sids[0]
if (this.orderInfo.state == 1) {
this.$message({
type: 'warning',
message: '请选择审核意见',
showClose: true
})
return
}
if (this.orderInfo.state == 3) {
if (this.orderInfo.remarks == '') {
this.$message({
@ -741,8 +755,9 @@
message: '请填写备注',
showClose: true
})
return
}
return
}
req.examine(this.orderInfo).then((resp) => {

3
src/views/system/userManage/userManageList.vue

@ -55,6 +55,7 @@
</el-table-column>
<el-table-column prop="name" label="姓名" align="center"></el-table-column>
<el-table-column prop="roleName" label="角色" align="center"></el-table-column>
<el-table-column prop="departmentName" label="部门" align="center"></el-table-column>
<!-- <el-table-column label="角色名称" :formatter='sysRoleVosName'></el-table-column> -->
<!-- <el-table-column label="角色名称" align="center">
<template slot-scope="scope">
@ -560,7 +561,7 @@
},
//
userinfoChange(row) {
row.defaultDeptSid = row.departmentSid
row.defaultDeptSid = row.orgSid
initUserInfo(row).then(res => {
if (res.code == '200') {
this.editDialog = true

Loading…
Cancel
Save