Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 week ago
parent
commit
781e705cb3
  1. 66
      yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
  2. 222
      yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
  3. 234
      yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
  4. 66
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue
  5. 223
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue
  6. 234
      yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue
  7. 685
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
  8. 66
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
  9. 305
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
  10. 234
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
  11. 687
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue
  12. 66
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue
  13. 308
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue
  14. 234
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue

66
yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue

@ -139,9 +139,10 @@
<el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="stockCount" label="库存数量" width="100" align="center" /> <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
<!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> --> <!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> -->
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
@ -447,36 +448,37 @@
this.viewState = 1 this.viewState = 1
if (value.length > 0) { if (value.length > 0) {
value.forEach((e) => { value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({ this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid, goodsSpuSid: e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName, goodsSpuName: e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode, goodsSkuCode: e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec, goodsSkuOwnSpec: e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid, goodsSkuSid: e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle, goodsSkuTitle: e.goodsSkuTitle,
"billSid": this.formobj.sid, billSid: this.formobj.sid,
"inventorySid": e.inventorySid, inventorySid: e.inventorySid,
"warehouseSid": e.warehouseSid, warehouseSid: e.warehouseSid,
"warehouseName": e.warehouseName, warehouseName: e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid, warehouseZoneSid: e.warehouseZoneSid,
"warehouseArea": e.warehouseArea, warehouseZoneName: e.warehouseZoneName,
"warehouseRackSid": e.warehouseRackSid, warehouseAreaSid: e.warehouseAreaSid,
"warehouseRackCode": e.warehouseRackCode, warehouseArea: e.warehouseArea,
"taxPrice": e.taxPrice, warehouseRackSid: e.warehouseRackSid,
"stockCount": e.count, warehouseRackCode: e.warehouseRackCode,
"inWarehouseSid": '', taxPrice: e.taxPrice,
"inWarehouseName": '', stockCount: e.count,
"inWarehouseRackSid": '', inWarehouseSid: '',
"inWarehouseRackCode": '', inWarehouseName: '',
"count": 0, inWarehouseRackSid: '',
"amount": 0, inWarehouseRackCode: '',
"requAmount": e.taxPrice, count: 0,
"markUpRatio": 0, amount: 0,
"unit": e.unit, requAmount: e.taxPrice,
"goodsID": e.goodsID, markUpRatio: 0,
"manufacturerSid": e.manufacturerSid, unit: e.unit,
"manufacturerName": e.manufacturerName, goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
}) })
}) })
} }

222
yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue

@ -7,11 +7,8 @@
</div> </div>
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -25,9 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,35 +39,29 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
@ -80,119 +69,80 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
data() {
return {
index: 0,
formobj: {},
}
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
export default {
data() {
return {
index: 0,
formobj: {}
}
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
} }
this.$emit('doback') const values = data.map(item => Number(item[column.property]))
} if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn() {
this.formobj = {}
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { .span-sty {
margin-left: 120px !important; width: 130px !important;
} }
.addinputInfo {
.must { margin-left: 120px !important;
color: #f00; }
} .first_row {
border-top: 1px solid #E0E3EB;
.span-sty { }
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

234
yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue

@ -14,13 +14,13 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品ID" class="searchlist"> <el-form-item label="商品ID" class="searchlist">
<el-input v-model="listQuery.params.goodsID" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品编码" class="searchlist"> <el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" class="searchlist"> <el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -35,26 +35,25 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>--> <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="50px" type="selection" align="center" /> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
<el-table-column prop="warehouseArea" label="库区" align="center" /> <el-table-column prop="warehouseArea" label="库区" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center" /> <el-table-column prop="count" label="库存数量" align="center"/>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div> </div>
@ -62,111 +61,112 @@
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle', export default {
components: { name: 'SelectVehicle',
Pagination components: {
}, Pagination
data() { },
return { data() {
isSearchShow: false, return {
searchxianshitit: '隐藏查询条件', isSearchShow: false,
tableKey: 0, searchxianshitit: '隐藏查询条件',
sids: [], tableKey: 0,
list: [], sids: [],
number: '', list: [],
listLoading: false, number: '',
listQuery: { listLoading: false,
current: 1, listQuery: {
size: 10, current: 1,
params: { size: 10,
deptSid: '', params: {
goodsID: '', deptSid: '',
goodsSkuTitle: '', goodsID: '',
goodsSkuCode: '', goodsSkuTitle: '',
}, goodsSkuCode: ''
total: 0 },
} total: 0
} }
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
}, },
methods: { //
// getList() {
clicksearchShow() { this.listLoading = true
this.isSearchShow = !this.isSearchShow req.getGoods(this.listQuery).then((response) => {
if (this.isSearchShow) { this.listLoading = false
this.searchxianshitit = '隐藏查询条件' if (response.success) {
} else { this.listQuery.total = response.data.total
this.searchxianshitit = '显示查询条件' this.list = response.data.records
} }
}, })
indexMethod(index) { },
var pagestart = (this.listQuery.current - 1) * this.listQuery.size //
var pageindex = index + 1 + pagestart handleFilter() {
return pageindex this.listQuery.current = 1
}, this.getList()
// },
getList() { //
this.listLoading = true handleReset() {
req.getGoods(this.listQuery).then((response) => { this.listQuery.current = 1
this.listLoading = false this.listQuery.size = 10
if (response.success) { this.listQuery.total = 0
this.listQuery.total = response.data.total this.listQuery.params.goodsID = ''
this.list = response.data.records this.listQuery.params.goodsSkuTitle = ''
} this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
}) })
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsID = ''
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
} }
},
//
handleReturn() {
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

66
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue

@ -139,9 +139,10 @@
<el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="150" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="stockCount" label="库存数量" width="100" align="center" /> <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
<!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> --> <!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> -->
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
@ -449,36 +450,37 @@
this.viewState = 1 this.viewState = 1
if (value.length > 0) { if (value.length > 0) {
value.forEach((e) => { value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({ this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid, goodsSpuSid: e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName, goodsSpuName: e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode, goodsSkuCode: e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec, goodsSkuOwnSpec: e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid, goodsSkuSid: e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle, goodsSkuTitle: e.goodsSkuTitle,
"billSid": this.formobj.sid, billSid: this.formobj.sid,
"inventorySid": e.inventorySid, inventorySid: e.inventorySid,
"warehouseSid": e.warehouseSid, warehouseSid: e.warehouseSid,
"warehouseName": e.warehouseName, warehouseName: e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid, warehouseZoneSid: e.warehouseZoneSid,
"warehouseArea": e.warehouseArea, warehouseZoneName: e.warehouseZoneName,
"warehouseRackSid": e.warehouseRackSid, warehouseAreaSid: e.warehouseAreaSid,
"warehouseRackCode": e.warehouseRackCode, warehouseArea: e.warehouseArea,
"taxPrice": e.taxPrice, warehouseRackSid: e.warehouseRackSid,
"stockCount": e.count, warehouseRackCode: e.warehouseRackCode,
"inWarehouseSid": '', taxPrice: e.taxPrice,
"inWarehouseName": '', stockCount: e.count,
"inWarehouseRackSid": '', inWarehouseSid: '',
"inWarehouseRackCode": '', inWarehouseName: '',
"count": 0, inWarehouseRackSid: '',
"amount": 0, inWarehouseRackCode: '',
"requAmount": e.taxPrice, count: 0,
"markUpRatio": 0, amount: 0,
"unit": e.unit, requAmount: e.taxPrice,
"goodsID": e.goodsID, markUpRatio: 0,
"manufacturerSid": e.manufacturerSid, unit: e.unit,
"manufacturerName": e.manufacturerName, goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
}) })
}) })
} }

223
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue

@ -7,11 +7,8 @@
</div> </div>
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -25,9 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,35 +39,29 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
@ -80,119 +69,81 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
data() {
return {
index: 0,
formobj: {},
}
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
export default {
data() {
return {
index: 0,
formobj: {}
}
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
} }
this.$emit('doback') const values = data.map(item => Number(item[column.property]))
} if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {}
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
/deep/ .el-form-item__error { .span-sty {
margin-left: 120px !important; width: 130px !important;
} }
.addinputInfo {
.must { margin-left: 120px !important;
color: #f00; }
} .first_row {
border-top: 1px solid #E0E3EB;
.span-sty { }
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

234
yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue

@ -14,13 +14,13 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品ID" class="searchlist"> <el-form-item label="商品ID" class="searchlist">
<el-input v-model="listQuery.params.goodsID" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品编码" class="searchlist"> <el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" class="searchlist"> <el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -35,26 +35,25 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>--> <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="50px" type="selection" align="center" /> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
<el-table-column prop="warehouseArea" label="库区" align="center" /> <el-table-column prop="warehouseArea" label="库区" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center" /> <el-table-column prop="count" label="库存数量" align="center"/>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div> </div>
@ -62,111 +61,112 @@
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle', export default {
components: { name: 'SelectVehicle',
Pagination components: {
}, Pagination
data() { },
return { data() {
isSearchShow: false, return {
searchxianshitit: '隐藏查询条件', isSearchShow: false,
tableKey: 0, searchxianshitit: '隐藏查询条件',
sids: [], tableKey: 0,
list: [], sids: [],
number: '', list: [],
listLoading: false, number: '',
listQuery: { listLoading: false,
current: 1, listQuery: {
size: 10, current: 1,
params: { size: 10,
deptSid: '', params: {
goodsID: '', deptSid: '',
goodsSkuTitle: '', goodsID: '',
goodsSkuCode: '', goodsSkuTitle: '',
}, goodsSkuCode: ''
total: 0 },
} total: 0
} }
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
}, },
methods: { //
// getList() {
clicksearchShow() { this.listLoading = true
this.isSearchShow = !this.isSearchShow req.getGoods(this.listQuery).then((response) => {
if (this.isSearchShow) { this.listLoading = false
this.searchxianshitit = '隐藏查询条件' if (response.success) {
} else { this.listQuery.total = response.data.total
this.searchxianshitit = '显示查询条件' this.list = response.data.records
} }
}, })
indexMethod(index) { },
var pagestart = (this.listQuery.current - 1) * this.listQuery.size //
var pageindex = index + 1 + pagestart handleFilter() {
return pageindex this.listQuery.current = 1
}, this.getList()
// },
getList() { //
this.listLoading = true handleReset() {
req.getGoods(this.listQuery).then((response) => { this.listQuery.current = 1
this.listLoading = false this.listQuery.size = 10
if (response.success) { this.listQuery.total = 0
this.listQuery.total = response.data.total this.listQuery.params.goodsID = ''
this.list = response.data.records this.listQuery.params.goodsSkuTitle = ''
} this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
}) })
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsID = ''
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
} }
},
//
handleReturn() {
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

685
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue

@ -10,11 +10,8 @@
</div> </div>
</div> </div>
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -28,9 +25,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -47,40 +42,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title ">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
<!-- 选择待办人 的弹出框--> <!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%"> <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd"> <el-form class="formadd">
@ -110,8 +97,9 @@
<span>意见:</span> <span>意见:</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" <el-form-item>
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item> <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div style="text-align:center;margin-top: 20px;"> <div style="text-align:center;margin-top: 20px;">
@ -125,349 +113,348 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
import { import {
selectStaffListss selectStaffListss
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
export default {
data() { export default {
return { data() {
index: 0, return {
formobj: {}, index: 0,
options: [], formobj: {},
operation: '', // options: [],
dialogList: { operation: '', //
comment: '' dialogList: {
}, comment: ''
startTask: true, },
current: { startTask: true,
taskDefKey: '', current: {
taskName: '' // taskDefKey: '',
}, taskName: '' //
nextNode: {}, // },
nodeDialogVisible: false, nextNode: {}, //
currentLink: true, nodeDialogVisible: false,
countersignLink: false, currentLink: true,
// countersignLink: false,
linkByParameter: { //
businessSid: '', linkByParameter: {
comment: '', businessSid: '',
instanceId: '', comment: '',
taskId: '', instanceId: '',
orgSidPath: '', taskId: '',
taskDefKey: '', orgSidPath: '',
userSid: '' taskDefKey: '',
}, userSid: ''
// },
countersign: { //
taskId: '', countersign: {
assignee: '', taskId: '',
userSid: '', assignee: '',
instanceId: '', userSid: '',
views: '' instanceId: '',
} views: ''
} }
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
}, },
created() { showInfo(sid) {
console.log('url:' + window.location.href) this.$nextTick(() => {
var one = window.location.href.indexOf('&data') + 6 this.$refs['form_obj'].clearValidate()
const data = window.location.href.substr(one) // urlunescape()web,使 })
const obj = JSON.parse(decodeURIComponent(data)) req.init(sid).then((res) => {
console.log('iframe页面获取的obj:', obj) if (res.success) {
// this.formobj = res.data
this.linkByParameter.businessSid = obj.businessSid }
this.linkByParameter.instanceId = obj.instanceId })
this.linkByParameter.taskId = obj.taskId selectStaffListss().then((res) => {
this.linkByParameter.taskDefKey = obj.taskDefKey if (res.success) {
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath') this.options = res.data
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
} }
}, '*') })
}, },
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showInfo(sid) { //
this.$nextTick(() => { openCountersign(val) {
this.$refs['form_obj'].clearValidate() this.operation = val
}) this.currentLink = true
req.init(sid).then((res) => { this.countersignLink = true
if (res.success) { this.dialogList.comment = ''
this.formobj = res.data req.getNextNodesForSubmit({
} taskDefKey: this.current.taskDefKey,
}) businessSid: this.linkByParameter.businessSid
selectStaffListss().then((res) => { }).then((resp) => {
if (res.success) { if (resp.success) {
this.options = res.data var arr = resp.data
} this.nextNode = arr[0]
}) this.nodeDialogVisible = true
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
} }
}, this.submitdisabled = false
/** 加签 */ })
handleCountersign() { },
if (this.countersign.assignee === '') { //
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请选择加签人员' message: '请填写审批意见'
}) })
return } else {
this.handleReject()
} }
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') { if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请填写审批意见' message: '请填写审批意见'
}) })
return } else {
this.handleStop()
} }
this.countersign.views = this.dialogList.comment } else if (this.operation === '加签') {
req.delegate(this.countersign).then((response) => { this.handleCountersign()
if (response.success) { }
this.$notify({ },
title: '提示', /** 加签 */
message: '执行成功', handleCountersign() {
type: 'success', if (this.countersign.assignee === '') {
duration: 2000 this.$message({
}) showClose: true,
this.nodeDialogVisible = false type: 'error',
// message: '请选择加签人员'
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
}, return
/** 终止任务 */ }
handleStop() { if (this.dialogList.comment === '') {
this.linkByParameter.comment = this.dialogList.comment this.$message({
req.breakProcess(this.linkByParameter).then((response) => { showClose: true,
if (response.success) { type: 'error',
this.$notify({ message: '请填写审批意见'
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
return
} }
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
.rowClass { .rowClass {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
</style> </style>

66
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue

@ -82,9 +82,10 @@
<el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="stockCount" label="库存数量" width="100" align="center" /> <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -365,36 +366,37 @@
this.viewState = 1 this.viewState = 1
if (value.length > 0) { if (value.length > 0) {
value.forEach((e) => { value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({ this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid, goodsSpuSid: e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName, goodsSpuName: e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode, goodsSkuCode: e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec, goodsSkuOwnSpec: e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid, goodsSkuSid: e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle, goodsSkuTitle: e.goodsSkuTitle,
"billSid": this.formobj.sid, billSid: this.formobj.sid,
"inventorySid": e.inventorySid, inventorySid: e.inventorySid,
"warehouseSid": e.warehouseSid, warehouseSid: e.warehouseSid,
"warehouseName": e.warehouseName, warehouseName: e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid, warehouseZoneSid: e.warehouseZoneSid,
"warehouseArea": e.warehouseArea, warehouseZoneName: e.warehouseZoneName,
"warehouseRackSid": e.warehouseRackSid, warehouseAreaSid: e.warehouseAreaSid,
"warehouseRackCode": e.warehouseRackCode, warehouseArea: e.warehouseArea,
"taxPrice": e.taxPrice, warehouseRackSid: e.warehouseRackSid,
"stockCount": e.count, warehouseRackCode: e.warehouseRackCode,
"inWarehouseSid": '', taxPrice: e.taxPrice,
"inWarehouseName": '', stockCount: e.count,
"inWarehouseRackSid": '', inWarehouseSid: '',
"inWarehouseRackCode": '', inWarehouseName: '',
"count": 0, inWarehouseRackSid: '',
"amount": 0, inWarehouseRackCode: '',
"requAmount": e.taxPrice, count: 0,
"markUpRatio": 0, amount: 0,
"unit": e.unit, requAmount: e.taxPrice,
"goodsID": e.goodsID, markUpRatio: 0,
"manufacturerSid": e.manufacturerSid, unit: e.unit,
"manufacturerName": e.manufacturerName, goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
}) })
}) })
} }

305
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue

@ -7,11 +7,8 @@
</div> </div>
</div> </div>
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -25,9 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,35 +39,29 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
@ -80,147 +69,145 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
data() { export default {
return { data() {
index: 0, return {
formobj: {}, index: 0,
// formobj: {},
linkByParameter: { //
businessSid: '', linkByParameter: {
comment: '', businessSid: '',
instanceId: '', comment: '',
taskId: '', instanceId: '',
orgSidPath: '', taskId: '',
taskDefKey: '', orgSidPath: '',
userSid: '' taskDefKey: '',
}, userSid: ''
} }
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
}, },
created() { showInfo(sid) {
console.log('url:' + window.location.href) this.$nextTick(() => {
var one = window.location.href.indexOf('&data') + 6 this.$refs['form_obj'].clearValidate()
const data = window.location.href.substr(one) // urlunescape()web,使 })
const obj = JSON.parse(decodeURIComponent(data)) req.init(sid).then((res) => {
console.log('iframe页面获取的obj:', obj) if (res.success) {
// this.formobj = res.data
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
} }
}, '*') })
}, },
methods: { /** 确认撤回任务 */
// openRevoke() {
getSummaries(param) { this.$confirm('是否确认执行撤回操作', '提示', {
const { confirmButtonText: '确定',
columns, cancelButtonText: '取消',
data type: 'warning'
} = param }).then(() => {
const sums = [] this.handleRevoke()
columns.forEach((column, index) => { }).catch(() => {
if (index === 0) { this.$message({
sums[index] = '合计' type: 'info',
return message: '已取消撤回'
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
}) })
req.init(sid).then((res) => { })
if (res.success) { },
this.formobj = res.data /** 撤回任务 */
} handleRevoke() {
}) req.revokeProcess(this.linkByParameter).then((response) => {
}, if (response.success) {
this.$notify({
/** 确认撤回任务 */ title: '提示',
openRevoke() { message: '执行成功',
this.$confirm('是否确认执行撤回操作', '提示', { type: 'success',
confirmButtonText: '确定', duration: 2000
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
}) })
}) this.nodeDialogVisible = false
}, //
/** 撤回任务 */ window.parent.postMessage({
handleRevoke() { cmd: 'returnHeight',
req.revokeProcess(this.linkByParameter).then((response) => { params: {
if (response.success) { //
this.$notify({ code: 1
title: '提示', }
message: '执行成功', }, '*')
type: 'success', }
duration: 2000 })
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
</style> </style>

234
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue

@ -14,13 +14,13 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品ID" class="searchlist"> <el-form-item label="商品ID" class="searchlist">
<el-input v-model="listQuery.params.goodsID" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品编码" class="searchlist"> <el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" class="searchlist"> <el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -35,26 +35,25 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>--> <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="50px" type="selection" align="center" /> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
<el-table-column prop="warehouseArea" label="库区" align="center" /> <el-table-column prop="warehouseArea" label="库区" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center" /> <el-table-column prop="count" label="库存数量" align="center"/>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div> </div>
@ -62,111 +61,112 @@
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle', export default {
components: { name: 'SelectVehicle',
Pagination components: {
}, Pagination
data() { },
return { data() {
isSearchShow: false, return {
searchxianshitit: '隐藏查询条件', isSearchShow: false,
tableKey: 0, searchxianshitit: '隐藏查询条件',
sids: [], tableKey: 0,
list: [], sids: [],
number: '', list: [],
listLoading: false, number: '',
listQuery: { listLoading: false,
current: 1, listQuery: {
size: 10, current: 1,
params: { size: 10,
deptSid: '', params: {
goodsID: '', deptSid: '',
goodsSkuTitle: '', goodsID: '',
goodsSkuCode: '', goodsSkuTitle: '',
}, goodsSkuCode: ''
total: 0 },
} total: 0
} }
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
}, },
methods: { //
// getList() {
clicksearchShow() { this.listLoading = true
this.isSearchShow = !this.isSearchShow req.getGoods(this.listQuery).then((response) => {
if (this.isSearchShow) { this.listLoading = false
this.searchxianshitit = '隐藏查询条件' if (response.success) {
} else { this.listQuery.total = response.data.total
this.searchxianshitit = '显示查询条件' this.list = response.data.records
} }
}, })
indexMethod(index) { },
var pagestart = (this.listQuery.current - 1) * this.listQuery.size //
var pageindex = index + 1 + pagestart handleFilter() {
return pageindex this.listQuery.current = 1
}, this.getList()
// },
getList() { //
this.listLoading = true handleReset() {
req.getGoods(this.listQuery).then((response) => { this.listQuery.current = 1
this.listLoading = false this.listQuery.size = 10
if (response.success) { this.listQuery.total = 0
this.listQuery.total = response.data.total this.listQuery.params.goodsID = ''
this.list = response.data.records this.listQuery.params.goodsSkuTitle = ''
} this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
}) })
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsID = ''
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
} }
},
//
handleReturn() {
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

687
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue

@ -10,11 +10,8 @@
</div> </div>
</div> </div>
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -28,9 +25,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -47,39 +42,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
<!-- 选择待办人 的弹出框--> <!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%"> <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd"> <el-form class="formadd">
@ -109,8 +97,9 @@
<span>意见:</span> <span>意见:</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" <el-form-item>
type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item> <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div style="text-align:center;margin-top: 20px;"> <div style="text-align:center;margin-top: 20px;">
@ -119,356 +108,348 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
import { import {
selectStaffListss selectStaffListss
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
export default {
data() { export default {
return { data() {
index: 0, return {
formobj: {}, index: 0,
options: [], formobj: {},
operation: '', // options: [],
dialogList: { operation: '', //
comment: '' dialogList: {
}, comment: ''
startTask: true, },
current: { startTask: true,
taskDefKey: '', current: {
taskName: '' // taskDefKey: '',
}, taskName: '' //
nextNode: {}, // },
nodeDialogVisible: false, nextNode: {}, //
currentLink: true, nodeDialogVisible: false,
countersignLink: false, currentLink: true,
// countersignLink: false,
linkByParameter: { //
businessSid: '', linkByParameter: {
comment: '', businessSid: '',
instanceId: '', comment: '',
taskId: '', instanceId: '',
orgSidPath: '', taskId: '',
taskDefKey: '', orgSidPath: '',
userSid: '' taskDefKey: '',
}, userSid: ''
// },
countersign: { //
taskId: '', countersign: {
assignee: '', taskId: '',
userSid: '', assignee: '',
instanceId: '', userSid: '',
views: '' instanceId: '',
} views: ''
} }
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
}, },
created() { showInfo(sid) {
console.log('url:' + window.location.href) this.$nextTick(() => {
var one = window.location.href.indexOf('&data') + 6 this.$refs['form_obj'].clearValidate()
const data = window.location.href.substr(one) // urlunescape()web,使 })
const obj = JSON.parse(decodeURIComponent(data)) req.init(sid).then((res) => {
console.log('iframe页面获取的obj:', obj) if (res.success) {
// this.formobj = res.data
this.linkByParameter.businessSid = obj.businessSid }
this.linkByParameter.instanceId = obj.instanceId })
this.linkByParameter.taskId = obj.taskId selectStaffListss().then((res) => {
this.linkByParameter.taskDefKey = obj.taskDefKey if (res.success) {
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath') this.options = res.data
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid') }
this.current.taskDefKey = obj.taskDefKey })
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
}, },
mounted() { //
window.parent.postMessage({ openCountersign(val) {
cmd: 'returnHeight', this.operation = val
params: { this.currentLink = true
// this.countersignLink = true
code: 2, this.dialogList.comment = ''
data: 400 + 'px' req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
} }
}, '*') this.submitdisabled = false
})
}, },
methods: { //
// openAgree(val) {
getSummaries(param) { this.operation = val
const { this.currentLink = true
columns, this.countersignLink = false
data this.dialogList.comment = '同意'
} = param req.getNextNodesForSubmit({
const sums = [] taskDefKey: this.current.taskDefKey,
columns.forEach((column, index) => { businessSid: this.linkByParameter.businessSid
if (index === 0) { }).then((resp) => {
sums[index] = '合计' if (resp.success) {
return var arr = resp.data
} this.nextNode = arr[0]
const values = data.map(item => Number(item[column.property])) this.nodeDialogVisible = true
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.init(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({
showClose: true,
type: 'error',
message: '请填写审批意见'
})
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
} }
}, this.submitdisabled = false
/** 加签 */ })
handleCountersign() { },
if (this.countersign.assignee === '') { //
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请选择加签人员' message: '请填写审批意见'
}) })
return } else {
this.handleReject()
} }
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') { if (this.dialogList.comment === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'error', type: 'error',
message: '请填写审批意见' message: '请填写审批意见'
}) })
return } else {
this.handleStop()
} }
this.countersign.views = this.dialogList.comment } else if (this.operation === '加签') {
req.delegate(this.countersign).then((response) => { this.handleCountersign()
if (response.success) { }
this.$notify({ },
title: '提示', /** 加签 */
message: '执行成功', handleCountersign() {
type: 'success', if (this.countersign.assignee === '') {
duration: 2000 this.$message({
}) showClose: true,
this.nodeDialogVisible = false type: 'error',
// message: '请选择加签人员'
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
}, return
/** 终止任务 */ }
handleStop() { if (this.dialogList.comment === '') {
this.linkByParameter.comment = this.dialogList.comment this.$message({
req.breakProcess(this.linkByParameter).then((response) => { showClose: true,
if (response.success) { type: 'error',
this.$notify({ message: '请填写审批意见'
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}) })
return
} }
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo {
margin-left: 120px !important;
.addinputInfo { }
margin-left: 120px !important; .rowClass {
} border-top: 1px solid #E0E3EB;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}
</style> </style>

66
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue

@ -92,9 +92,10 @@
<el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="warehouseArea" label="库区" width="150" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="stockCount" label="库存数量" width="100" align="center" /> <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -377,36 +378,37 @@
this.viewState = 1 this.viewState = 1
if (value.length > 0) { if (value.length > 0) {
value.forEach((e) => { value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({ this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid, goodsSpuSid: e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName, goodsSpuName: e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode, goodsSkuCode: e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec, goodsSkuOwnSpec: e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid, goodsSkuSid: e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle, goodsSkuTitle: e.goodsSkuTitle,
"billSid": this.formobj.sid, billSid: this.formobj.sid,
"inventorySid": e.inventorySid, inventorySid: e.inventorySid,
"warehouseSid": e.warehouseSid, warehouseSid: e.warehouseSid,
"warehouseName": e.warehouseName, warehouseName: e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid, warehouseZoneSid: e.warehouseZoneSid,
"warehouseArea": e.warehouseArea, warehouseZoneName: e.warehouseZoneName,
"warehouseRackSid": e.warehouseRackSid, warehouseAreaSid: e.warehouseAreaSid,
"warehouseRackCode": e.warehouseRackCode, warehouseArea: e.warehouseArea,
"taxPrice": e.taxPrice, warehouseRackSid: e.warehouseRackSid,
"stockCount": e.count, warehouseRackCode: e.warehouseRackCode,
"inWarehouseSid": '', taxPrice: e.taxPrice,
"inWarehouseName": '', stockCount: e.count,
"inWarehouseRackSid": '', inWarehouseSid: '',
"inWarehouseRackCode": '', inWarehouseName: '',
"count": 0, inWarehouseRackSid: '',
"amount": 0, inWarehouseRackCode: '',
"requAmount": e.taxPrice, count: 0,
"markUpRatio": 0, amount: 0,
"unit": e.unit, requAmount: e.taxPrice,
"goodsID": e.goodsID, markUpRatio: 0,
"manufacturerSid": e.manufacturerSid, unit: e.unit,
"manufacturerName": e.manufacturerName, goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
}) })
}) })
} }

308
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue

@ -7,11 +7,8 @@
</div> </div>
</div> </div>
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -25,9 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,35 +39,29 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<div class="title titleOne"> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<div>调拨商品列表</div> <el-table-column prop="goodsID" label="商品ID" align="center"/>
</div> <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
show-summary :summary-method="getSummaries"> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" /> <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" /> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" /> <el-table-column prop="stockCount" label="库存数量" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
<el-table-column prop="warehouseName" label="仓库" width="150" align="center" /> <el-table-column prop="requAmount" label="调拨单价" align="center"/>
<el-table-column prop="warehouseArea" label="仓库" width="150" align="center" /> <el-table-column prop="count" label="调拨数量" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
<el-table-column prop="stockCount" label="库存数量" align="center" />
<el-table-column prop="markUpRatio" label="加价比例" align="center" />
<el-table-column prop="requAmount" label="调拨单价" align="center" />
<el-table-column prop="count" label="调拨数量" align="center" />
<el-table-column prop="amount" label="调拨金额" align="center" width="100" />
</el-table> </el-table>
</el-form> </el-form>
</div> </div>
@ -80,148 +69,147 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
data() { export default {
return { data() {
index: 0, return {
formobj: {}, index: 0,
// formobj: {},
linkByParameter: { //
businessSid: '', linkByParameter: {
comment: '', businessSid: '',
instanceId: '', comment: '',
taskId: '', instanceId: '',
orgSidPath: '', taskId: '',
taskDefKey: '', orgSidPath: '',
userSid: '' taskDefKey: '',
}, userSid: ''
} }
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
//
getSummaries(param) {
const {
columns,
data
} = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
})
return sums
}, },
showInfo(sid) {
created() { this.$nextTick(() => {
console.log('url:' + window.location.href) this.$refs['form_obj'].clearValidate()
var one = window.location.href.indexOf('&data') + 6 })
const data = window.location.href.substr(one) // urlunescape()web,使 req.init(sid).then((res) => {
const obj = JSON.parse(decodeURIComponent(data)) if (res.success) {
console.log('iframe页面获取的obj:', obj) this.formobj = res.data
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
} }
}, '*') })
}, },
/** 确认撤回任务 */
methods: { openRevoke() {
// this.$confirm('是否确认执行撤回操作', '提示', {
getSummaries(param) { confirmButtonText: '确定',
const { cancelButtonText: '取消',
columns, type: 'warning'
data }).then(() => {
} = param this.handleRevoke()
const sums = [] }).catch(() => {
columns.forEach((column, index) => { this.$message({
if (index === 0) { type: 'info',
sums[index] = '合计' message: '已取消撤回'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'count') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
} else if (column.property === 'amount') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0)
sums[index] += ''
}
}) })
return sums })
}, },
/** 撤回任务 */
handleRevoke() {
showInfo(sid) { req.revokeProcess(this.linkByParameter).then((response) => {
this.$nextTick(() => { if (response.success) {
this.$refs['form_obj'].clearValidate() this.$notify({
}) title: '提示',
req.init(sid).then((res) => { message: '执行成功',
if (res.success) { type: 'success',
this.formobj = res.data duration: 2000
}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
}) })
}) this.nodeDialogVisible = false
}, //
/** 撤回任务 */ window.parent.postMessage({
handleRevoke() { cmd: 'returnHeight',
req.revokeProcess(this.linkByParameter).then((response) => { params: {
if (response.success) { //
this.$notify({ code: 1
title: '提示', }
message: '执行成功', }, '*')
type: 'success', }
duration: 2000 })
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
} }
} }
}
</script> </script>
<style scoped> <style scoped>
.span-sty { .span-sty {
width: 130px !important; width: 130px !important;
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
</style> </style>

234
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue

@ -14,13 +14,13 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品ID" class="searchlist"> <el-form-item label="商品ID" class="searchlist">
<el-input v-model="listQuery.params.goodsID" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品编码" class="searchlist"> <el-form-item label="商品编码" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="商品名称" class="searchlist"> <el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable /> <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -35,26 +35,25 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>--> <!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"> <el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="50px" type="selection" align="center" /> <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" /> <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
<el-table-column prop="goodsSkuTitle" label="商品名称" align="center" /> <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" /> <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" /> <el-table-column prop="unit" label="单位" align="center"/>
<el-table-column prop="unit" label="单位" align="center" /> <el-table-column prop="warehouseName" label="仓库" align="center"/>
<el-table-column prop="warehouseName" label="仓库" align="center" /> <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
<el-table-column prop="warehouseArea" label="库区" align="center" /> <el-table-column prop="warehouseArea" label="库区" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center" /> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center" /> <el-table-column prop="count" label="库存数量" align="center"/>
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> </div>
</div> </div>
@ -62,111 +61,112 @@
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle', export default {
components: { name: 'SelectVehicle',
Pagination components: {
}, Pagination
data() { },
return { data() {
isSearchShow: false, return {
searchxianshitit: '隐藏查询条件', isSearchShow: false,
tableKey: 0, searchxianshitit: '隐藏查询条件',
sids: [], tableKey: 0,
list: [], sids: [],
number: '', list: [],
listLoading: false, number: '',
listQuery: { listLoading: false,
current: 1, listQuery: {
size: 10, current: 1,
params: { size: 10,
deptSid: '', params: {
goodsID: '', deptSid: '',
goodsSkuTitle: '', goodsID: '',
goodsSkuCode: '', goodsSkuTitle: '',
}, goodsSkuCode: ''
total: 0 },
} total: 0
} }
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
}, },
methods: { //
// getList() {
clicksearchShow() { this.listLoading = true
this.isSearchShow = !this.isSearchShow req.getGoods(this.listQuery).then((response) => {
if (this.isSearchShow) { this.listLoading = false
this.searchxianshitit = '隐藏查询条件' if (response.success) {
} else { this.listQuery.total = response.data.total
this.searchxianshitit = '显示查询条件' this.list = response.data.records
} }
}, })
indexMethod(index) { },
var pagestart = (this.listQuery.current - 1) * this.listQuery.size //
var pageindex = index + 1 + pagestart handleFilter() {
return pageindex this.listQuery.current = 1
}, this.getList()
// },
getList() { //
this.listLoading = true handleReset() {
req.getGoods(this.listQuery).then((response) => { this.listQuery.current = 1
this.listLoading = false this.listQuery.size = 10
if (response.success) { this.listQuery.total = 0
this.listQuery.total = response.data.total this.listQuery.params.goodsID = ''
this.list = response.data.records this.listQuery.params.goodsSkuTitle = ''
} this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
}) })
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 10
this.listQuery.total = 0
this.listQuery.params.goodsID = ''
this.listQuery.params.goodsSkuTitle = ''
this.listQuery.params.goodsSkuCode = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, deptSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.deptSid = deptSid
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请至少选择一条记录进行操作',
type: 'error',
duration: 2000
})
}
},
//
handleReturn() {
this.$emit('doback')
} }
},
//
handleReturn() {
this.$emit('doback')
} }
} }
}
</script> </script>
<style scoped> <style scoped>
</style> </style>

Loading…
Cancel
Save