Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 1 year ago
parent
commit
261fecfd13
  1. 8
      yxt-as-ui/src/api/storage/allocation.js
  2. 7
      yxt-as-ui/src/api/storage/deliveryNotice.js
  3. 21
      yxt-as-ui/src/api/storage/receivingGoods.js
  4. 9
      yxt-as-ui/src/api/storage/stocktaking.js
  5. 43
      yxt-as-ui/src/api/storage/upShelf.js
  6. 9
      yxt-as-ui/src/router/index.js
  7. 8
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  8. 46
      yxt-as-ui/src/views/storage/receivingGoods/index.vue
  9. 20
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  10. 68
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
  11. 132
      yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
  12. 333
      yxt-as-ui/src/views/storage/upShelf/index.vue
  13. 412
      yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue
  14. 220
      yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue

8
yxt-as-ui/src/api/storage/allocation.js

@ -8,6 +8,7 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
@ -16,7 +17,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
@ -34,7 +36,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
method: 'post',
data: params
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
@ -53,6 +56,7 @@ export default {
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
data: data,
headers: { 'Content-Type': 'application/json' }
});
},

7
yxt-as-ui/src/api/storage/deliveryNotice.js

@ -8,6 +8,7 @@ export default {
url: '/wms/apiadmin/WmsAnsBill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
@ -35,7 +36,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
@ -44,7 +46,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},

21
yxt-as-ui/src/api/storage/receivingGoods.js

@ -8,6 +8,7 @@ export default {
url: '/wms/apiadmin/inventory/WmsReceiptBill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
@ -24,9 +25,10 @@ export default {
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit',
url: '/wms/apiadmin/inventory/WmsReceiptBill/saveOrUpdate',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
@ -35,7 +37,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/confirm',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
@ -44,7 +47,17 @@ export default {
return request({
url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
method: 'post',
data: params
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 选择供应商
choiceSupplier: function(params) {
return request({
url: '/wms/apiadmin/base/basesupplierinfo/choiceSupplierInfo',
method: 'post',
data: params,
})
},

9
yxt-as-ui/src/api/storage/stocktaking.js

@ -16,7 +16,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/wmsinventorycheckbill/save',
method: 'post',
data: data
data: data,
headers: { 'Content-Type': 'application/json' }
});
},
@ -33,7 +34,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage',
method: 'post',
data: params
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
@ -42,7 +44,8 @@ export default {
return request({
url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage',
method: 'post',
data: params
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
}

43
yxt-as-ui/src/api/storage/upShelf.js

@ -0,0 +1,43 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/WmsShelfBill/listPage',
method: 'post',
data: params,
})
},
// 初始化
init: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/details',
method: 'get',
data:data
});
},
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/saveOrUpdate',
method: 'post',
data: data
});
},
deleteBySids: function(data) {
return request({
url: '/wms/apiadmin/WmsShelfBill/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
}

9
yxt-as-ui/src/router/index.js

@ -116,6 +116,15 @@ export const constantRoutes = [
noCache: true
}
},
{
path: '/upShelf/index',
name: 'UpShelf',
component: () => import('@/views/storage/upShelf/index'),
meta: {
title: '上架单',
noCache: true
}
},
]
},

8
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@ -151,10 +151,10 @@
<el-input ref="focusAssumptionInput" v-model="scope.row.packageRemark" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="入库价" prop="taxPrice" align="center" width="100" />
<el-table-column label="税额" prop="taxPrice" align="center" width="100" />
<el-table-column label="含税单价" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库金额" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库价" prop="cost" align="center" width="100" />
<el-table-column label="税额" prop="taxAmount" align="center" width="100" />
<el-table-column label="含税单价" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>

46
yxt-as-ui/src/views/storage/receivingGoods/index.vue

@ -67,7 +67,8 @@
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" :disabled="scope.row.billState=='完成'"
@click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
@ -180,15 +181,15 @@
sid: "2"
}
],
billStateList: [{
name: "单据状态1",
sid: "1"
},
{
name: "单据状态2",
sid: "2"
}
],
billStateList: [{
name: "新建",
sid: "0"
},
{
name: "完成",
sid: "1"
}
],
}
},
mounted() {
@ -332,14 +333,23 @@
}
},
toAdd() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
if (this.selectionList[0].billState == '完成') {
this.$message({
type: 'warning',
message: "此记录已完成,不可操作。",
showClose: true
})
return
}
this.viewState = 5
this.$refs['divAddupShelfRecord'].showEdit(this.selectionList[0])

20
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@ -95,9 +95,8 @@
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button>
</div>
<el-table :key="tableKey" v-loading="listLoading" :data="formobj.list" :index="index" border
style="width: 100%;" ref="dataTable">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;" ref="dataTable">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column align="center" width="180">
<template slot="header" slot-scope="scope">
<i v-if="!isUpdata" class="add-btn-icon el-icon-plus" style="color: red;font-size:20px"
@ -150,7 +149,7 @@
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode">
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
@ -234,8 +233,8 @@
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="unit" align="center" width="150" />
<el-table-column label="库位" prop="unit" align="center" width="150" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
<el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="生产日期" align="center" width="180">
<template slot-scope="scope">
@ -267,6 +266,7 @@
components: {},
data() {
return {
title: '【新增】',
listLoading: false,
submitdisabled: false,
formobj: {
@ -765,13 +765,18 @@
},
showAdd() {
this.title = "【新增】"
this.isUpdata = false
console.log("showAdd", this.isUpdata);
this.getsupplierLust()
this.getWarehouseList()
},
showEdit(row) {
this.title = "【修改】"
this.isUpdata = true
this.getsupplierLust()
this.getWarehouseList()
console.log("showEdit", this.isUpdata);
var params = {
sid: row.sid
@ -848,7 +853,7 @@
row.warehouseSid = choose[0].sid
},
selectWarehouseAreaCode(val) {
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
@ -997,7 +1002,6 @@
}
}
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
},

68
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue

@ -14,10 +14,10 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row>
<el-col :span="12">
@ -33,14 +33,14 @@
<el-row>
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
@ -58,14 +58,14 @@
<el-row>
<el-col :span="12">
<div class="span-sty">到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
</el-row>
@ -78,12 +78,12 @@
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
@ -103,32 +103,32 @@
</el-table-column>
<el-table-column label="质检状态" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
<el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
<el-radio :label="0">合格</el-radio>
<el-radio :label="1">不合格</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
<el-table-column label="入库价" prop="taxPrice" align="center" width="100" />
<el-table-column label="税额" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库价" prop="cost" align="center" width="100" />
<el-table-column label="税额" prop="taxAmount" align="center" width="100" />
<el-table-column label="含税单价" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库金额" prop="taxPrice" align="center" width="100" />
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>
<div class="title titleOne">
<div class="title titleOne">
<div>商品-批次</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="商品列表序号" prop="xh" align="center" width="120" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="unit" align="center" width="150" />
<el-table-column label="库位" prop="unit" align="center" width="150" />
<el-table-column label="仓库" prop="warehouseName" align="center" width="150" />
<el-table-column label="库位" prop="warehouseRackName" align="center" width="150" />
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="生产日期" prop="manufactureDate" align="center" width="180" />
<el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
@ -199,6 +199,7 @@
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
@ -207,4 +208,3 @@
align-items: center;
}
</style>

132
yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue

@ -15,10 +15,10 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="title">
<div>基础信息</div>
</div>
<el-row>
<el-col :span="12">
@ -28,23 +28,23 @@
<el-col :span="12">
<div class="span-sty">制单人姓名</div>
<el-form-item><el-input v-model="formobj.createByName" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date"class="addinputInfo" value-format="yyyy-MM-dd"
placeholder="选择日期">
<el-col :span="12">
<div class="span-sty">外部单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单据日期</div>
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"
value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker></el-form-item>
</el-col>
</el-col>
</el-row>
@ -56,7 +56,8 @@
</el-col>
<el-col :span="12">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="1" clearable /></el-form-item>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="1" clearable /></el-form-item>
</el-col>
</el-row>
@ -77,18 +78,35 @@
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="unit" align="center" width="150" />
<el-table-column label="库位" prop="unit" align="center" width="150" />
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="上架数量" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="载具编号" align="center" width="120">
<el-table-column label="载具编号" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder="" />
<el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
@ -112,22 +130,16 @@
formobj: {
"sid": "",
"billNo": "",
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": "",
"createByName": "",
"createTime": "",
"busTypeKey": "",
"busTypeValue": "",
"supplierSid": "",
"supplierName": "",
"deliveryDate": "",
"sourceBillNo": "",
"sourceBillSid": "",
"billState": "新建",
"remarks": "",
"useOrgSid": "",
"createOrgSid": "",
"list": [],
"pcList": []
"list": [
],
"remarks": ""
},
hideUploadBtn: false,
busTypeList: [{
@ -145,36 +157,6 @@
}
},
created() {},
computed: {
//
totalQuantity() {
let quantity = 0
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) {
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
quantity += Number(e.count)
})
}
this.formobj.count = quantity
return quantity
},
//
materialCost() {
let material = 0
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length > 0) {
this.formobj.wmsInventoryAllocateBillDetailNewList.forEach((e) => {
material += Number((Number(e.count) * Number(e.taxPrice)))
})
}
this.formobj.amount = material.toFixed(2)
return material.toFixed(2)
},
},
methods: {
doGoodsDel(sid) {
console.log("doGoodsDel》》》》", sid)
@ -222,22 +204,16 @@
this.formobj = {
"sid": "",
"billNo": "",
"sourceBillSid": "",
"sourceBillNo": "",
"createBySid": "",
"createByName": "",
"createTime": "",
"busTypeKey": "",
"busTypeValue": "",
"supplierSid": "",
"supplierName": "",
"deliveryDate": "",
"billState": "",
"remarks": "",
"useOrgSid": "",
"createOrgSid": "",
"list": [],
"pcList": []
"sourceBillNo": "",
"sourceBillSid": "",
"billState": "新建",
"list": [
],
"remarks": ""
}
this.$emit('doback')
},
@ -444,7 +420,7 @@
row.actualInCount = row.orderCount
}
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
row.amount = (Number(row.actualInCount) * Number(row.taxPrice)).toFixed(2)
},
commodityComputeYHAndXSJE2(row, val) {
@ -488,6 +464,7 @@
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
@ -496,4 +473,3 @@
align-items: center;
}
</style>

333
yxt-as-ui/src/views/storage/upShelf/index.vue

@ -0,0 +1,333 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="上架单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
{{ searchxianshitit }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="来源单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择">
<el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">上架单列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="createTime" label="单据日期" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column prop="sourceBillNo" label="来源单号" align="center" />
<el-table-column prop="billState" label="单据状态" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
</div>
</template>
<script>
import req from '@/api/storage/upShelf.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './upShelfAdd.vue'
import divInfo from './upShelfInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toPrintLabel',
btnLabel: '打印标签'
},
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '上架'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
},
sids: [],
selectionList: [],
billStateList: [{
name: "新建",
sid: "0"
},
{
name: "完成",
sid: "1"
}
],
sids: []
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.loadList()
},
methods: {
toPrintLabel() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toPrintLabel':
this.toPrintLabel()
break
case 'doDel':
this.doDel()
break
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
doDel() {
if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteBySids(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// resp.code
}
}).catch(e => {
loading.close()
})
}).catch(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行删除操作'
})
}
},
loadList() {
this.tableLoading = true
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
}
this.loadList()
},
toAdd(row) {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
}
if (this.selectionList[0].billState == '完成') {
this.$message({
type: 'warning',
message: "此记录已完成,不可操作。",
showClose: true
})
return
}
this.viewState = 2
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
resetState() {
this.viewState = 1
},
}
}
</script>
<style scoped>
</style>

412
yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue

@ -0,0 +1,412 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{title}}上架单</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billNo}}</span>
<!-- <el-input v-model="formobj.name" placeholder="" class="addinputw" style="width:100%" clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">制单人姓名</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.createByName}}</span> -->
<el-input v-model="formobj.createByName" placeholder="" class="addinputw" style="width:100%" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">外部单号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.sourceBillNo}}</span>
<!-- <el-form-item class="trightb_item">
<el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="orderTypeSelect">
<el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.createTime}}</span> -->
<el-date-picker v-model="formobj.createTime" type="date" style="width:100%" value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据状态</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billState}}</span>
<!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span slot="label">{{formobj.supplierName}}</span> -->
<el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="1" clearable />
</el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="上架数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="载具编号" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/upShelf.js'
import req2 from '@/api/storage/allocation.js'
export default {
components: {},
data() {
return {
title: "【新增】",
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"billNo": "",
"createBySid": "",
"createByName": "",
"createTime": "",
"sourceBillNo": "",
"sourceBillSid": "",
"billState": "新建",
"list": [
],
"remarks": ""
},
hideUploadBtn: false,
supplierList: [],
warehouseList: [],
warehouseRackList: [],
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
current: 1,
size: 2,
total: 0,
params: {
name: '',
inOrg: "",
outOrg: ""
}
},
commodityData: [],
isUpdata: false
}
},
created() {},
methods: {
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
if (this.formobj.createByName == '') {
this.$message({
showClose: true,
type: 'error',
message: '制单人姓名不能为空'
})
return
}
if (this.formobj.createTime == '') {
this.$message({
showClose: true,
type: 'error',
message: '单据日期不能为空'
})
return
}
if (this.formobj.list.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
if (item.actualCount == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品上架数量不能为0'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
"sid": "",
"billNo": "",
"createBySid": "",
"createByName": "",
"createTime": "",
"sourceBillNo": "",
"sourceBillSid": "",
"billState": "新建",
"list": [
],
"remarks": ""
}
this.submitdisabled = false
this.$emit('doback')
},
showAdd() {
this.title = "【新增】"
this.getWarehouseList()
},
showEdit(row) {
this.getWarehouseList()
this.title = "【修改】"
var params = {
sid: row.sid
}
req.init(params)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
getWarehouseList() {
req2.getWarehouses().then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
}
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
req2.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
row.warehouseName = choose[0].warehouseName
row.warehouseSid = choose[0].sid
},
selectWarehouseAreaCode(val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseRackName = choose[0].areaCode
row.warehouseRackSid = choose[0].sid
},
}
}
</script>
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.span {
height: 30px;
line-height: 30px;
margin-left: 50px;
font-size: 15px;
font-weight: 400;
border: 1px #fff solid;
padding: 0px 10px;
border-radius: 5px;
}
::v-deep .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
}
</style>

220
yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue

@ -0,0 +1,220 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>上架单</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基础信息</div>
</div>
<el-row class="first_row">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billNo}}</span>
<!-- <el-input v-model="formobj.name" placeholder="" class="addinputw" style="width:100%" clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">制单人姓名</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createByName}}</span>
<!-- <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
clearable /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">来源单号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.sourceBillNo}}</span>
<!-- <el-form-item class="trightb_item">
<el-select v-model="GiftBagGood.goodSpuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="orderTypeSelect">
<el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.createTime}}</span>
<!-- <el-select v-model="GiftBagGood.goodSpuSid" filterable clearable placeholder="请选择" style="width:100%"
@change="businessTypeSelect">
<el-option v-for="item in businessTypeList" :key="item.sid" :label="item.name" :value="item.sid">
</el-option>
</el-select> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">单据状态</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.billState}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">{{formobj.remarks}}</span>
<!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
</el-form-item>
</el-col>
</el-row>
<div class="title"
style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="批次号" prop="batchNumber" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackCode" align="center" />
<el-table-column label="需上架数量" prop="count" align="center" />
<el-table-column label="已上架数量" prop="actualCount" align="center" />
<el-table-column label="载具编号" prop="packageNo" align="center" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/upShelf.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {},
}
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sid: row.sid
}
req.init(params)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style lang="scss" scoped>
//
::v-deep .hide {
.el-upload--picture-card {
display: none !important;
}
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.span {
height: 30px;
line-height: 30px;
margin-left: 50px;
font-size: 15px;
font-weight: 400;
border: 1px #fff solid;
padding: 0px 10px;
border-radius: 5px;
}
::v-deep .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
::v-deep .el-collapse-item__content {
padding-bottom: 0;
}
</style>
Loading…
Cancel
Save