yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 week ago
parent
b4fa3ec7c0 bee9eef203
commit
781e705cb3
14 changed files with 1741 additions and 1889 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
  2. 66
      yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
  3. 10
      yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
  4. 60
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue
  5. 63
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue
  6. 10
      yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue
  7. 29
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
  8. 62
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
  9. 25
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
  10. 10
      yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
  11. 35
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue
  12. 60
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue
  13. 24
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue
  14. 10
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue

62
yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
View File

@ -140,7 +140,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseAreaName" label="库区" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="taxPrice" label="单价" width="100" align="center" /> -->
@ -447,36 +448,37 @@
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"billSid": this.formobj.sid,
"inventorySid": e.inventorySid,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"taxPrice": e.taxPrice,
"stockCount": e.count,
"inWarehouseSid": '',
"inWarehouseName": '',
"inWarehouseRackSid": '',
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"requAmount": e.taxPrice,
"markUpRatio": 0,
"unit": e.unit,
"goodsID": e.goodsID,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
billSid: this.formobj.sid,
inventorySid: e.inventorySid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseZoneSid: e.warehouseZoneSid,
warehouseZoneName: e.warehouseZoneName,
warehouseAreaSid: e.warehouseAreaSid,
warehouseArea: e.warehouseArea,
warehouseRackSid: e.warehouseRackSid,
warehouseRackCode: e.warehouseRackCode,
taxPrice: e.taxPrice,
stockCount: e.count,
inWarehouseSid: '',
inWarehouseName: '',
inWarehouseRackSid: '',
inWarehouseRackCode: '',
count: 0,
amount: 0,
requAmount: e.taxPrice,
markUpRatio: 0,
unit: e.unit,
goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
})
})
}

66
yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
View File

@ -7,11 +7,8 @@
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,21 +39,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -66,7 +54,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -81,11 +70,12 @@
<script>
import req from '@/api/storage/allocation.js'
export default {
data() {
return {
index: 0,
formobj: {},
formobj: {}
}
},
@ -127,8 +117,6 @@
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -139,12 +127,8 @@
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
handleReturn() {
this.formobj = {}
this.$emit('doback')
}
}
@ -152,47 +136,13 @@
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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>

10
yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
View File

@ -35,8 +35,7 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
@ -45,6 +44,7 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="unit" 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="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center"/>
@ -53,8 +53,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -64,6 +63,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle',
components: {
@ -85,7 +85,7 @@
deptSid: '',
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: '',
goodsSkuCode: ''
},
total: 0
}

60
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue
View File

@ -140,6 +140,7 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseZoneName" label="区域" width="150" 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" />
@ -449,36 +450,37 @@
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"billSid": this.formobj.sid,
"inventorySid": e.inventorySid,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"taxPrice": e.taxPrice,
"stockCount": e.count,
"inWarehouseSid": '',
"inWarehouseName": '',
"inWarehouseRackSid": '',
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"requAmount": e.taxPrice,
"markUpRatio": 0,
"unit": e.unit,
"goodsID": e.goodsID,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
billSid: this.formobj.sid,
inventorySid: e.inventorySid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseZoneSid: e.warehouseZoneSid,
warehouseZoneName: e.warehouseZoneName,
warehouseAreaSid: e.warehouseAreaSid,
warehouseArea: e.warehouseArea,
warehouseRackSid: e.warehouseRackSid,
warehouseRackCode: e.warehouseRackCode,
taxPrice: e.taxPrice,
stockCount: e.count,
inWarehouseSid: '',
inWarehouseName: '',
inWarehouseRackSid: '',
inWarehouseRackCode: '',
count: 0,
amount: 0,
requAmount: e.taxPrice,
markUpRatio: 0,
unit: e.unit,
goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
})
})
}

63
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue
View File

@ -7,11 +7,8 @@
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,21 +39,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -66,7 +54,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -81,11 +70,12 @@
<script>
import req from '@/api/storage/allocation.js'
export default {
data() {
return {
index: 0,
formobj: {},
formobj: {}
}
},
@ -127,8 +117,6 @@
})
return sums
},
showAdd(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -139,12 +127,9 @@
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.formobj = {}
this.$emit('doback')
}
}
@ -152,47 +137,13 @@
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.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>

10
yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue
View File

@ -35,8 +35,7 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
@ -45,6 +44,7 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="unit" 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="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center"/>
@ -53,8 +53,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -64,6 +63,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle',
components: {
@ -85,7 +85,7 @@
deptSid: '',
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: '',
goodsSkuCode: ''
},
total: 0
}

29
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
View File

@ -10,11 +10,8 @@
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -47,21 +42,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title ">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -69,7 +57,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -79,8 +68,6 @@
</el-table>
</el-form>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd">
@ -110,8 +97,9 @@
<span>意见:</span>
</el-col>
<el-col :span="20">
<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-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-row>
<div style="text-align:center;margin-top: 20px;">
@ -129,6 +117,7 @@
import {
selectStaffListss
} from '@/api/Common/dictcommons'
export default {
data() {
return {
@ -238,8 +227,6 @@
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()

62
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
View File

@ -83,7 +83,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseAreaName" label="库区" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="markUpRatio" label="加价比例(%)" width="120" align="center">
@ -365,36 +366,37 @@
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"billSid": this.formobj.sid,
"inventorySid": e.inventorySid,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"taxPrice": e.taxPrice,
"stockCount": e.count,
"inWarehouseSid": '',
"inWarehouseName": '',
"inWarehouseRackSid": '',
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"requAmount": e.taxPrice,
"markUpRatio": 0,
"unit": e.unit,
"goodsID": e.goodsID,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
billSid: this.formobj.sid,
inventorySid: e.inventorySid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseZoneSid: e.warehouseZoneSid,
warehouseZoneName: e.warehouseZoneName,
warehouseAreaSid: e.warehouseAreaSid,
warehouseArea: e.warehouseArea,
warehouseRackSid: e.warehouseRackSid,
warehouseRackCode: e.warehouseRackCode,
taxPrice: e.taxPrice,
stockCount: e.count,
inWarehouseSid: '',
inWarehouseName: '',
inWarehouseRackSid: '',
inWarehouseRackCode: '',
count: 0,
amount: 0,
requAmount: e.taxPrice,
markUpRatio: 0,
unit: e.unit,
goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
})
})
}

25
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
View File

@ -7,11 +7,8 @@
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,21 +39,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -66,7 +54,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -81,6 +70,7 @@
<script>
import req from '@/api/storage/allocation.js'
export default {
data() {
return {
@ -95,7 +85,7 @@
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
}
}
},
created() {
@ -161,8 +151,6 @@
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -173,7 +161,6 @@
}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {

10
yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
View File

@ -35,8 +35,7 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
@ -45,6 +44,7 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="unit" 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="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center"/>
@ -53,8 +53,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -64,6 +63,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle',
components: {
@ -85,7 +85,7 @@
deptSid: '',
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: '',
goodsSkuCode: ''
},
total: 0
}

35
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue
View File

@ -10,11 +10,8 @@
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -47,21 +42,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -69,7 +57,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -79,7 +68,6 @@
</el-table>
</el-form>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd">
@ -109,8 +97,9 @@
<span>意见:</span>
</el-col>
<el-col :span="20">
<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-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-row>
<div style="text-align:center;margin-top: 20px;">
@ -119,7 +108,6 @@
</div>
</el-form>
</el-dialog>
</div>
</template>
@ -128,6 +116,7 @@
import {
selectStaffListss
} from '@/api/Common/dictcommons'
export default {
data() {
return {
@ -237,8 +226,6 @@
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
@ -248,15 +235,12 @@
this.formobj = res.data
}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
// 加签
openCountersign(val) {
this.operation = val
@ -462,12 +446,9 @@
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass {
border-top: 1px solid #E0E3EB;
}

60
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue
View File

@ -93,6 +93,7 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseZoneName" label="区域" width="150" 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" />
@ -377,36 +378,37 @@
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.wmsInventoryAllocateBillDetailNewList.push({
"goodsSpuSid": e.goodsSpuSid,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
"goodsSkuOwnSpec": e.goodsSkuOwnSpec,
"goodsSkuSid": e.goodsSkuSid,
"goodsSkuTitle": e.goodsSkuTitle,
"billSid": this.formobj.sid,
"inventorySid": e.inventorySid,
"warehouseSid": e.warehouseSid,
"warehouseName": e.warehouseName,
"warehouseAreaSid": e.warehouseAreaSid,
"warehouseArea": e.warehouseArea,
"warehouseRackSid": e.warehouseRackSid,
"warehouseRackCode": e.warehouseRackCode,
"taxPrice": e.taxPrice,
"stockCount": e.count,
"inWarehouseSid": '',
"inWarehouseName": '',
"inWarehouseRackSid": '',
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"requAmount": e.taxPrice,
"markUpRatio": 0,
"unit": e.unit,
"goodsID": e.goodsID,
"manufacturerSid": e.manufacturerSid,
"manufacturerName": e.manufacturerName,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
billSid: this.formobj.sid,
inventorySid: e.inventorySid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseZoneSid: e.warehouseZoneSid,
warehouseZoneName: e.warehouseZoneName,
warehouseAreaSid: e.warehouseAreaSid,
warehouseArea: e.warehouseArea,
warehouseRackSid: e.warehouseRackSid,
warehouseRackCode: e.warehouseRackCode,
taxPrice: e.taxPrice,
stockCount: e.count,
inWarehouseSid: '',
inWarehouseName: '',
inWarehouseRackSid: '',
inWarehouseRackCode: '',
count: 0,
amount: 0,
requAmount: e.taxPrice,
markUpRatio: 0,
unit: e.unit,
goodsID: e.goodsID,
manufacturerSid: e.manufacturerSid,
manufacturerName: e.manufacturerName
})
})
}

24
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue
View File

@ -7,11 +7,8 @@
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请人</div>
<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-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@ -44,21 +39,14 @@
<el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>调拨商品列表</div>
</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<div class="title titleOne">调拨商品列表</div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
@ -66,7 +54,8 @@
<el-table-column prop="goodsSkuOwnSpec" 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="warehouseArea" label="仓库" width="150" align="center" />
<el-table-column prop="warehouseZoneName" label="区域" width="150" 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="库存数量" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例" align="center"/>
@ -81,6 +70,7 @@
<script>
import req from '@/api/storage/allocation.js'
export default {
data() {
return {
@ -95,7 +85,7 @@
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
}
}
},
@ -163,8 +153,6 @@
})
return sums
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()

10
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue
View File

@ -35,8 +35,7 @@
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center"/>
@ -45,6 +44,7 @@
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
<el-table-column prop="unit" 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="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="count" label="库存数量" align="center"/>
@ -53,8 +53,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -64,6 +63,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/storage/allocation.js'
export default {
name: 'SelectVehicle',
components: {
@ -85,7 +85,7 @@
deptSid: '',
goodsID: '',
goodsSkuTitle: '',
goodsSkuCode: '',
goodsSkuCode: ''
},
total: 0
}

Write Preview
Loading…
Cancel
Save