Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 8 months ago
parent
commit
6a37749279
  1. 12
      yxt-as-ui/src/api/storage/allocation.js
  2. 10
      yxt-as-ui/src/api/storage/oldPartsRecovery.js
  3. 58
      yxt-as-ui/src/api/storage/oldpPartStocktaking.js
  4. 96
      yxt-as-ui/src/api/storage/oldpPartStocktakingLoss.js
  5. 94
      yxt-as-ui/src/api/storage/oldpPartStocktakingSurplus.js
  6. 18
      yxt-as-ui/src/router/index.js
  7. 106
      yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
  8. 54
      yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue
  9. 118
      yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue
  10. 65
      yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue
  11. 330
      yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue
  12. 383
      yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue
  13. 163
      yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossInfo.vue
  14. 327
      yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue
  15. 437
      yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue
  16. 162
      yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusInfo.vue
  17. 14
      yxt-as-ui/src/views/storage/stocktaking/index.vue

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

@ -5,7 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post',
data: params,
@ -17,7 +17,7 @@ export default {
deleteBySids: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
method: 'DELETE',
data: data,
@ -30,7 +30,7 @@ export default {
// 保存物流信息
saveLogisticsInfo: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
method: 'post',
data: data,
@ -42,7 +42,7 @@ export default {
// 新增、保存
save: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post',
data: data,
@ -55,7 +55,7 @@ export default {
// 初始化
init: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
method: 'get'
});
@ -64,7 +64,7 @@ export default {
// 调拨
allocation: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
method: 'post',
data: data,

10
yxt-as-ui/src/api/storage/oldPartsRecovery.js

@ -5,7 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/as/v1/AsBusrepairBill/pageBillList',
method: 'post',
data: params,
@ -18,7 +18,7 @@ export default {
// 获取维修工单详情
getOneByBillNo: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/as/v1/AsBusrepairBill/getOneByBillNo?sid=' + data,
method: 'get',
});
@ -27,7 +27,7 @@ export default {
// 保存旧件回收登记
saveorUpdateOldRegister: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldRegister/saveorUpdateOldRegister',
method: 'post',
data: data,
@ -40,7 +40,7 @@ export default {
// 获取旧件入库详情
init: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldInventory/getInit?sid=' + data,
method: 'get',
});
@ -49,7 +49,7 @@ export default {
// 保存旧件入库
saveInventory: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/WmsOldInventory/saveInventory',
method: 'post',
data: data,

58
yxt-as-ui/src/api/storage/oldpPartStocktaking.js

@ -5,8 +5,8 @@ export default {
// 生成盘点点
createBill: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/save',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/save',
method: 'post',
data: data,
headers: {
@ -18,8 +18,8 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/listPage',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/listPage',
method: 'post',
data: params,
headers: {
@ -31,8 +31,8 @@ export default {
// 生成盘点报告
billCreateReport: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/createReport',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/createReport',
method: 'post',
params: data,
headers: {
@ -44,8 +44,8 @@ export default {
// 盘点单详情
billDetail: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/detailGoodPageList',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/detailGoodPageList',
method: 'post',
data: params,
headers: {
@ -57,8 +57,8 @@ export default {
// 盘库列表
billStocktak: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/detailRackPageList',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/detailRackPageList',
method: 'post',
data: params,
headers: {
@ -70,8 +70,8 @@ export default {
// 库位盘点明细列表
billRackCodeDetail: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/detailRackGoodPageList',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/detailRackGoodPageList',
method: 'post',
data: params,
headers: {
@ -83,30 +83,35 @@ export default {
// 初始化盘库报告
init: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/fetchDetailsBySid/' + data,
method: 'get'
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/viewReport',
method: 'post',
params: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 保存盘点报告
saveReport: function(data) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/saveReport',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/saveReport',
method: 'post',
data: data,
params: data,
headers: {
'Content-Type': 'application/json'
}
});
},
downloadExcel: function() {
downloadExcel: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/downloadExcel',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/downloadExcel',
method: 'post',
params: params,
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: {
'Content-Type': 'application/json'
@ -114,15 +119,16 @@ export default {
})
},
downloadPDF: function() {
downloadPDF: function(params) {
return request({
baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/oldpPartStocktaking/downloadPdf',
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorycheckbill/createPdf',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
params: params,
headers: {
'Content-Type': 'application/json'
}
},
})
},

96
yxt-as-ui/src/api/storage/oldpPartStocktakingLoss.js

@ -0,0 +1,96 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
deleteBySids: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 盘点单详情
fetchDetailsBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/fetchDetailsBySid/' + params,
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 根据部门sid 获取所有盘点单号
getSourceBillNoBySid: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/getSourceBillNoBySid',
method: 'post',
params: data
})
},
// 根据盘点单sid 获取商品
sourceBillBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/sourceBillBySid/' + params,
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 保存盘盈入库
save: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 提交盘盈入库
submit: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryloss/submit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
}

94
yxt-as-ui/src/api/storage/oldpPartStocktakingSurplus.js

@ -0,0 +1,94 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
deleteBySids: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/delBySids',
method: 'DELETE',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},
// 盘点单详情
fetchDetailsBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/fetchDetailsBySid/' + params,
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 根据部门sid 获取所有盘点单号
getSourceBillNoBySid: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/getSourceBillNoBySid',
method: 'post',
params: data
})
},
// 根据盘点单sid 获取商品
sourceBillBySid: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/sourceBillBySid/' + params,
method: 'get',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 保存盘盈入库
save: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/save',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 提交盘盈入库
submit: function(data) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventorysurplus/submit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
});
},
}

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

@ -576,6 +576,24 @@ export const constantRoutes = [{
noCache: true
}
},
{
path: '/oldpPartStocktakingSurplus/index',
component: () => import('@/views/storage/oldpPartStocktakingSurplus/index'),
name: 'OldpPartStocktakingSurplus',
meta: {
title: '旧件盘盈入库',
noCache: true
}
},
{
path: '/oldpPartStocktakingLoss/index',
component: () => import('@/views/storage/oldpPartStocktakingLoss/index'),
name: 'OldpPartStocktakingLoss',
meta: {
title: '旧件盘亏出库',
noCache: true
}
},
{
path: '/storageage/storageage',
component: () => import('@/views/storage/storageage/storageage'),

106
yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@ -50,30 +50,32 @@
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty">调入站</div>
<el-form-item> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg"
class="addinputInfo addinputw">
<div class="span-sty2"><span class="must">*</span> 调入分公司</div>
<el-form-item prop="inOrgName"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司"
@change="selectInOrg" class="addinputInfo2 addinputw2">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item> <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
style="width:100%">
<el-col :span="5">
<div class="span-sty2"><span class="must">*</span> 调入站点</div>
<el-form-item prop="inPlatName">
<el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
class="addinputInfo addinputw">
<el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">经办人</div>
<el-form-item> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
<div class="span-sty"><span class="must">*</span> 经办人</div>
<el-form-item prop="confirmName"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
@change="selectOperatorName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
</el-option>
@ -236,7 +238,23 @@
"remarks": "",
"wmsInventoryAllocateBillDetailNewList": []
},
rules: {},
rules: {
inOrgName: [{
required: true,
message: '调入分公司不能为空',
trigger: 'change'
}],
inPlatName: [{
required: true,
message: '调入站点不能为空',
trigger: 'change'
}],
confirmName: [{
required: true,
message: '经办人不能为空',
trigger: 'change'
}],
},
orgList: [],
deptList: [],
operatorNameList: [],
@ -437,7 +455,7 @@
"inWarehouseRackCode": '',
"count": 0,
"amount": 0,
"transferPrice": 0,
"transferPrice": e.taxPrice,
"markupRatio": 0,
"goodsSpuName": e.goodsSpuName,
"goodsSkuCode": e.goodsSkuCode,
@ -503,6 +521,30 @@
console.log("saveOrUpdate", this.formobj);
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
this.$message({
type: "warning",
showClose: true,
message: '调拨商品不能为空'
})
return
}
for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
if (Number(item.count) == 0) {
this.$message({
type: "warning",
showClose: true,
message: '调拨数量不能为空或0'
})
return
}
}
this.submitdisabled = true
req.allocation(this.formobj).then((res) => {
if (res.success) {
@ -561,7 +603,7 @@
</script>
<style scoped>
/deep/ .el-form-item__error {
.formaddcopy02 .el-row .el-col /deep/ .el-form-item__error {
margin-left: 120px !important;
}
@ -570,19 +612,45 @@
}
.span-sty {
width: 100px !important;
width: 130px !important;
}
.span-sty2 {
position: absolute;
top: 0;
bottom: 0;
left: 0;
line-height: 42px;
text-align: right;
font-size: 14px;
color: #606266;
font-weight: 600;
width: 70px;
padding-right: 5px;
border-right: 1px solid #e0e3eb;
width: 110px !important;
}
.addinputInfo2 {
margin-left: 110px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw2 {
margin-left: 110px !important;
width: calc(100% - 105px);
}
.addinputInfo {
margin-left: 90px !important;
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 90px !important;
width: calc(100% - 80px);
margin-left: 120px !important;
width: calc(100% - 115px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
@ -595,10 +663,6 @@
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;

54
yxt-as-ui/src/views/storage/oldpPartStocktaking/index.vue

@ -323,7 +323,8 @@
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": ""
"superviseName": "",
"warehouseTypeKey": "02"
}
},
sids: [],
@ -360,7 +361,9 @@
superviseName: '',
superviseSid: '',
remarks: "",
dataList: []
dataList: [],
"warehouseTypeKey": "02",
"warehouseTypeValue": "旧件库"
},
financeList: [],
rules: {
@ -386,6 +389,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "02"
}
},
warehouseList: [],
@ -496,6 +500,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "02"
}
}
this.seleRack()
@ -548,6 +553,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "02"
}
}
this.dialogVisible2 = false
@ -564,6 +570,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "02"
}
}
this.dialogVisible2 = false
@ -719,7 +726,8 @@
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": ""
"superviseName": "",
"warehouseTypeKey": "02"
}
}
this.loadList()
@ -783,26 +791,38 @@
})
return
}
var params = {
sid: this.selectionList[0].sid
}
this.$confirm("请确认是否盘点完毕,生成盘点报告后将不能再盘点!", "提示", {
// iconClass: "el-icon-question", //
confirmButtonText: "确认", //
cancelButtonText: "取消", //
showClose: true, //
type: "warning", // success/info/warning/error
}).then(() => {
//
var params = {
sid: this.selectionList[0].sid
}
req.billCreateReport(params).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '操作成功',
showClose: true
})
req.billCreateReport(params).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '操作成功',
showClose: true
})
this.loadList()
}
}).catch(() => {})
}).catch(() => {
//
});
this.loadList()
}
}).catch(() => {})
},
toEdit(row) {
this.viewState = 3
this.$refs['divedit'].showEdit(row.sid)
this.$refs['divedit'].showEdit(row)
},
toReport(row) {

118
yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingEditReport.vue

@ -57,51 +57,62 @@
<span> {{formobj.ypNum}}</span>
</div>
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 应盘金额:</span>
<span> {{formobj.ypMoney}}</span>
</div>
</div> -->
<div style="flex: 1;">
<span> 实盘数量:</span>
<span> {{formobj.spNum}}</span>
</div>
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 实盘金额:</span>
<span> {{formobj.spMoney}}</span>
</div>
</div> -->
<div style="flex: 1;">
<span> 盘盈数量:</span>
<span> {{formobj.pyNum}}</span>
</div>
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 盘盈金额:</span>
<span> {{formobj.pyMoney}}</span>
</div>
</div> -->
<div style="flex: 1;">
<span> 盘亏数量:</span>
<span> {{formobj.pkNum}}</span>
</div>
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 盘亏金额:</span>
<span> {{formobj.pkMoney}}</span>
</div>
</div> -->
<div style="flex: 1;">
<span> 盘损数量:</span>
<span> {{formobj.psNum}}</span>
</div>
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 盘损金额:</span>
<span> {{formobj.psMoney}}</span>
</div> -->
<div style="flex: 1;">
<span> 虚拟件数量:</span>
<span> {{formobj.virtualNum}}</span>
</div>
<div style="flex: 1;">
<span> 未入库数量:</span>
<span> {{formobj.unInStorageNum}}</span>
</div>
</div>
<div class="title titleOne">
@ -111,15 +122,19 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseName" label="仓库" width="200" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" align="center" />
<!-- <el-table-column prop="ypMoney" label="应盘金额" align="center" /> -->
<el-table-column prop="spNum" label="实盘" align="center" />
<el-table-column prop="spMoney" label="实盘金额" align="center" />
<!-- <el-table-column prop="spMoney" label="实盘金额" align="center" /> -->
<el-table-column prop="pyNum" label="盘盈" align="center" />
<el-table-column prop="pyMoney" label="盘盈金额" align="center" />
<!-- <el-table-column prop="pyMoney" label="盘盈金额" align="center" /> -->
<el-table-column prop="pkNum" label="盘亏" align="center" />
<el-table-column prop="pkMoney" label="盘亏金额" align="center" />
<!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" /> -->
<el-table-column prop="psNum" label="盘损" align="center" />
<el-table-column prop="psMoney" label="盘损金额" align="center" />
<!-- <el-table-column prop="psMoney" label="盘损金额" align="center" /> -->
<el-table-column prop="virtualNum" label="虚拟件" align="center" />
<!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
<el-table-column prop="unInStorageNum" label="未入库" align="center" />
<!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
</el-table>
<div class="title titleOne">
@ -127,17 +142,21 @@
</div>
<el-table :data="formobj.arehouseAreaeStocktakList" :index="index" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" width="200" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" width="300" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" align="center" />
<!-- <el-table-column prop="ypMoney" label="应盘金额" align="center" /> -->
<el-table-column prop="spNum" label="实盘" align="center" />
<el-table-column prop="spMoney" label="实盘金额" align="center" />
<!-- <el-table-column prop="spMoney" label="实盘金额" align="center" /> -->
<el-table-column prop="pyNum" label="盘盈" align="center" />
<el-table-column prop="pyMoney" label="盘盈金额" align="center" />
<!-- <el-table-column prop="pyMoney" label="盘盈金额" align="center" /> -->
<el-table-column prop="pkNum" label="盘亏" align="center" />
<el-table-column prop="pkMoney" label="盘亏金额" align="center" />
<!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" /> -->
<el-table-column prop="psNum" label="盘损" align="center" />
<el-table-column prop="psMoney" label="盘损金额" align="center" />
<!-- <el-table-column prop="psMoney" label="盘损金额" align="center" /> -->
<el-table-column prop="virtualNum" label="虚拟件" align="center" />
<!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
<el-table-column prop="unInStorageNum" label="未入库" align="center" />
<!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
</el-table>
</el-form>
@ -209,7 +228,9 @@
showEdit(row) {
req.init(row.sid).then((res) => {
req.init({
sid: row.sid
}).then((res) => {
if (res.success) {
this.formobj = res.data
@ -227,7 +248,13 @@
saveOrUpdate() {
this.submitdisabled = true
req.saveReport(this.formobj).then((res) => {
var info = {
sid: this.formobj.sid,
remarks: this.formobj.remarks
}
req.saveReport(info).then((res) => {
if (res.success) {
this.$message({
showClose: true,
@ -274,24 +301,37 @@
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadPDF().then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '盘库报告' + '.pdf'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
req.downloadPDF({
sid: this.formobj.sid
}).then((res) => {
if (res.success) {
loading.close()
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data +
'&outFileName=' + '盘点报告', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '盘点报告.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
}).catch(() => {
loading.close()
})
},
downLoadDetail() {
@ -301,7 +341,9 @@
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.downloadExcel().then((resp) => {
req.downloadExcel({
sid: this.formobj.sid
}).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'

65
yxt-as-ui/src/views/storage/oldpPartStocktaking/oldpPartStocktakingReportDetail.vue

@ -54,7 +54,7 @@
<span> {{formobj.ypNum}}</span>
</div>
<!-- <div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 应盘金额:</span>
<span> {{formobj.ypMoney}}</span>
</div> -->
@ -63,8 +63,8 @@
<span> 实盘数量:</span>
<span> {{formobj.spNum}}</span>
</div>
<!--
<div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 实盘金额:</span>
<span> {{formobj.spMoney}}</span>
</div> -->
@ -84,7 +84,7 @@
<span> {{formobj.pkNum}}</span>
</div>
<!-- <div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 盘亏金额:</span>
<span> {{formobj.pkMoney}}</span>
</div> -->
@ -94,7 +94,7 @@
<span> {{formobj.psNum}}</span>
</div>
<!-- <div style="flex: 1;">
<!-- <div style="flex: 1;">
<span> 盘损金额:</span>
<span> {{formobj.psMoney}}</span>
</div> -->
@ -118,19 +118,19 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseName" label="仓库" min-width="120" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" width="120" align="center" />
<el-table-column prop="spNum" label="实盘" width="120" align="center" />
<el-table-column prop="spMoney" label="实盘金额" align="center" width="120" />
<!-- <el-table-column prop="ypMoney" label="应盘金额" width="120" align="center" /> -->
<el-table-column prop="spNum" label="实盘" align="center" />
<!-- <el-table-column prop="spMoney" label="实盘金额" align="center" width="120" /> -->
<el-table-column prop="pyNum" label="盘盈" align="center" />
<el-table-column prop="pyMoney" label="盘盈金额" align="center" width="120" />
<el-table-column prop="pkNum" label="盘亏" align="center" width="100" />
<el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" />
<el-table-column prop="psNum" label="盘损" align="center" width="100" />
<el-table-column prop="psMoney" label="盘损金额" align="center" width="100" />
<el-table-column prop="virtualNum" label="虚拟件" align="center" width="100" />
<el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" />
<el-table-column prop="unInStorageNum" label="未入库" align="center" width="100" />
<el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" />
<!-- <el-table-column prop="pyMoney" label="盘盈金额" align="center" width="120" /> -->
<el-table-column prop="pkNum" label="盘亏" align="center" />
<!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" /> -->
<el-table-column prop="psNum" label="盘损" align="center" />
<!-- <el-table-column prop="psMoney" label="盘损金额" align="center" width="100" /> -->
<el-table-column prop="virtualNum" label="虚拟件" align="center" />
<!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
<el-table-column prop="unInStorageNum" label="未入库" align="center" />
<!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
</el-table>
<div class="title titleOne">
@ -140,19 +140,19 @@
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="warehouseAreaeName" label="仓库-库区" min-width="120" align="center" />
<el-table-column prop="ypNum" label="应盘" align="center" />
<el-table-column prop="ypMoney" label="应盘金额" width="120" align="center" />
<el-table-column prop="spNum" label="实盘" width="120" align="center" />
<el-table-column prop="spMoney" label="实盘金额" width="120" align="center" />
<!-- <el-table-column prop="ypMoney" label="应盘金额" width="120" align="center" /> -->
<el-table-column prop="spNum" label="实盘" align="center" />
<!-- <el-table-column prop="spMoney" label="实盘金额" width="120" align="center" /> -->
<el-table-column prop="pyNum" label="盘盈" align="center" />
<el-table-column prop="pyMoney" label="盘盈金额" width="120" align="center" />
<el-table-column prop="pkNum" label="盘亏" align="center" width="100" />
<el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" />
<el-table-column prop="psNum" label="盘损" align="center" width="100" />
<el-table-column prop="psMoney" label="盘损金额" align="center" width="120" />
<el-table-column prop="virtualNum" label="虚拟件" align="center" width="100" />
<el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" />
<el-table-column prop="unInStorageNum" label="未入库" align="center" width="100" />
<el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" />
<!-- <el-table-column prop="pyMoney" label="盘盈金额" width="120" align="center" /> -->
<el-table-column prop="pkNum" label="盘亏" align="center" />
<!-- <el-table-column prop="pkMoney" label="盘亏金额" align="center" width="120" /> -->
<el-table-column prop="psNum" label="盘损" align="center" />
<!-- <el-table-column prop="psMoney" label="盘损金额" align="center" width="120" /> -->
<el-table-column prop="virtualNum" label="虚拟件" align="center" />
<!-- <el-table-column prop="virtualMoney" label="虚拟件金额" align="center" width="120" /> -->
<el-table-column prop="unInStorageNum" label="未入库" align="center" />
<!-- <el-table-column prop="unInStorageMoney" label="未入库金额" align="center" width="120" /> -->
</el-table>
</el-form>
@ -163,6 +163,9 @@
<script>
import req from '@/api/storage/oldpPartStocktaking.js'
import {
getStorage
} from '@/utils/auth'
export default {
data() {
return {
@ -179,7 +182,9 @@
},
methods: {
showDetail(sid) {
req.init(sid).then((res) => {
req.init({
sid: sid
}).then((res) => {
if (res.success) {
this.formobj = res.data

330
yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/index.vue

@ -0,0 +1,330 @@
<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.deptNmae" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
</el-form-item>
<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.createStartTime" 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.createEndTime" 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-date-picker v-model="queryParams.params.finishStartTime" 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.finishEndTime" 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>
<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="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="nodeState" label="流程状态" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="finishTime" label="办结日期" align="center" />
<el-table-column prop="sourceBillNo" label="盘点单号" align="center" />
<el-table-column prop="businessType" 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/oldpPartStocktakingLoss.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './oldpPartStocktakingLossAdd.vue'
import divInfo from './oldpPartStocktakingLossInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"deptNmae": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"sourceBillNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
},
sids: [],
selectionList: [],
}
},
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
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
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: '',
billNo: "",
sourceBillNo: "",
createTimestart: '',
createTimeEnd: '',
billstate: '',
menuUrl: '',
orgPath: '',
usersid: ""
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit(row) {
this.viewState = 2
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
},
}
}
</script>
<style scoped>
</style>

383
yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossAdd.vue

@ -0,0 +1,383 @@
<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="primary" size="small" :disabled="submitdisabled" @click="submit">提交</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" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 申请日期</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 盘点单号</div>
<el-form-item prop="sourceBillNo">
<el-select v-model="formobj.sourceBillNo" filterable clearable placeholder="请选择"
class="addinputw addinputInfo" @change="selectSourceBillNo">
<el-option v-for="item in sourceBillNoList" :key="item.billSid" :label="item.billNo"
:value="item.billSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.goodsList" border>
<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="doDelGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品ID" prop="goodsID" align="center" />
<el-table-column label="商品名称" prop="goodsName" align="center" />
<el-table-column label="商品编码" prop="goodsCode" align="center" />
<el-table-column label="规格" prop="goodsSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackName" align="center" />
<el-table-column label="入库单价" prop="inStoragePrice" align="center" />
<el-table-column label="盘亏数量" prop="pkNum" align="center" />
<el-table-column label="出库数量" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.outStorageNum"
@input="commodityComputeYHAndXSJE3(scope.row)" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/oldpPartStocktakingLoss.js'
import {
getCurrentDate
} from '@/utils/index.js'
import {
getOrgSidByPath,
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
title: "【新增】",
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "14",
"businessValue": "盘亏出库",
"remarks": "",
"goodsList": []
},
hideUploadBtn: false,
sourceBillNoList: [],
rules: {
sourceBillNo: [{
required: true,
message: '请选择盘点单号',
trigger: 'change'
}],
}
}
},
created() {
},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
}
},
},
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
req.getSourceBillNoBySid({
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
this.sourceBillNoList = resp.data
}
})
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// 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
})
// }
// })
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.goodsList.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.goodsList.length; i++) {
var item = this.formobj.goodsList[i]
if (Number(item.outStorageNum) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品出库数量不能为空'
})
return
}
}
this.submitdisabled = true
req.submit(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": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "14",
"businessValue": "盘亏出库",
"remarks": "",
"goodsList": []
}
this.submitdisabled = false
this.$emit('doback')
},
showAdd() {
this.title = "【新增】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【修改】"
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
})
.catch(e => {
this.formobj = {}
})
},
selectSourceBillNo(val) {
console.log("selectSourceBillNo", val);
const choose = this.sourceBillNoList.filter((item) => item.billSid == val)
console.log('>>>>>>>>>selectSourceBillNo', choose)
this.formobj.sourceBillNo = choose[0].billNo
this.formobj.sourceBillSid = choose[0].billSid
this.getSourceBillGoods(this.formobj.sourceBillSid)
},
getSourceBillGoods(sid) {
req.sourceBillBySid(sid).then((resp) => {
if (resp.success) {
this.formobj.goodsList = resp.data
}
})
},
doDelGoods(row) {
console.log("doDelGoods", row);
const index = this.formobj.goodsList.findIndex((item) => item == row)
this.formobj.goodsList.splice(index, 1)
},
commodityComputeYHAndXSJE3(row) {
console.log("commodityComputeYHAndXSJE3", row);
if (Number(row.outStorageNum) > Number(row.pkNum)) {
row.outStorageNum = Number(row.pkNum)
}
row.money = (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
}
}
}
</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;
}
</style>

163
yxt-as-ui/src/views/storage/oldpPartStocktakingLoss/oldpPartStocktakingLossInfo.vue

@ -0,0 +1,163 @@
<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="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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputw 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="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.goodsList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsName" align="center" />
<el-table-column label="商品编码" prop="goodsCode" align="center" />
<el-table-column label="规格" prop="goodsSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="仓库" prop="warehouseName" align="center" />
<el-table-column label="库位" prop="warehouseRackName" align="center" />
<el-table-column label="入库单价" prop="inStoragePrice" align="center" />
<el-table-column label="盘亏数量" prop="pkNum" align="center" />
<el-table-column label="出库数量" prop="outStorageNum" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/oldpPartStocktakingLoss.js'
export default {
components: {},
data() {
return {
listLoading: false,
formobj: {},
}
},
created() {},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.outStorageNum)).toFixed(2)
}
},
},
methods: {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.$emit('doback')
},
showAdd(row) {
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
//
indexMethod(index) {
return index + 1
},
}
}
</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;
}
</style>

327
yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/index.vue

@ -0,0 +1,327 @@
<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.deptName" placeholder="" clearable />
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="queryParams.params.createByName" placeholder="" clearable />
</el-form-item>
<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.createStartTime" 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.createEndTime" 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-date-picker v-model="queryParams.params.finishStartTime" 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.finishEndTime" 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>
<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="150">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="nodeState" label="流程状态" align="center" />
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="deptName" label="申请部门" align="center" />
<el-table-column prop="createByName" label="申请人" align="center" />
<el-table-column prop="createTime" label="申请日期" align="center" />
<el-table-column prop="finishTime" label="办结日期" align="center" />
<el-table-column prop="sourceBillNo" label="盘点单号" align="center" />
<el-table-column prop="businessType" 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/oldpPartStocktakingSurplus.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './oldpPartStocktakingSurplusAdd.vue'
import divInfo from './oldpPartStocktakingSurplusInfo.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
}, {
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"sourceBillNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
},
sids: [],
selectionList: [],
}
},
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 '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
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
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: {
"deptName": "",
"createByName": "",
"billNo": "",
"createStartTime": "",
"createEndTime": "",
"finishStartTime": "",
"finishEndTime": "",
"sourceBillNo": "",
"userSid": "",
"orgPath": "",
"menuUrl": ""
}
}
this.loadList()
},
toAdd() {
this.viewState = 2
this.$refs['divadd'].showAdd()
},
toEdit(row) {
this.viewState = 2
this.$refs['divadd'].showEdit(row)
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showAdd(row)
},
resetState() {
this.viewState = 1
},
}
}
</script>
<style scoped>
</style>

437
yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusAdd.vue

@ -0,0 +1,437 @@
<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="primary" size="small" :disabled="submitdisabled" @click="submit">提交</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" :rules="rules" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 申请日期</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 盘点单号</div>
<el-form-item prop="sourceBillNo">
<el-select v-model="formobj.sourceBillNo" filterable clearable placeholder="请选择"
class="addinputw addinputInfo" @change="selectSourceBillNo">
<el-option v-for="item in sourceBillNoList" :key="item.billSid" :label="item.billNo"
:value="item.billSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
clearable /></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.goodsList" border>
<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="doDelGoods(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsName" align="center" />
<el-table-column label="商品编码" prop="goodsCode" align="center" />
<el-table-column label="规格" prop="goodsSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="盘盈数量" prop="pyNum" align="center" />
<el-table-column label="供应商" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.supplierName" clearable placeholder="请选择"
@change="selectSupplierName(scope.row,$event)">
<el-option v-for="(item,i) in supplierList" :key="i" :label="item.supplierName" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="入库单价" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE3(scope.row)"
v-model="scope.row.inStoragePrice" clearable placeholder=""
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
<el-table-column label="入库数量" align="center">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.inStorageNum"
@input="commodityComputeYHAndXSJE3(scope.row)" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/oldpPartStocktakingSurplus.js'
import {
getCurrentDate
} from '@/utils/index.js'
import {
getOrgSidByPath,
choiceSupplierInfo
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
title: "【新增】",
listLoading: false,
submitdisabled: false,
formobj: {
"sid": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "04",
"businessValue": "盘盈入库",
"remarks": "",
"goodsList": []
},
hideUploadBtn: false,
supplierList: [],
sourceBillNoList: [],
rules: {
sourceBillNo: [{
required: true,
message: '请选择盘点单号',
trigger: 'change'
}],
}
}
},
created() {
},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
}
},
},
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
choiceSupplierInfo({
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
}
})
req.getSourceBillNoBySid({
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
'defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
this.sourceBillNoList = resp.data
}
})
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// 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
})
// }
// })
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.goodsList.length == 0) {
this.$message({
showClose: true,
type: 'error',
message: '请添加商品'
})
return
}
for (var i = 0; i < this.formobj.goodsList.length; i++) {
var item = this.formobj.goodsList[i]
if (item.supplierName == '' || item.supplierSid == '') {
this.$message({
showClose: true,
type: 'error',
message: '供应商不能为空'
})
return
}
if (Number(item.inStoragePrice) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品入库单价不能为空'
})
return
}
if (Number(item.inStorageNum) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品入库数量不能为空'
})
return
}
}
this.submitdisabled = true
req.submit(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": "",
"createBySid": window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"createTime": getCurrentDate(),
"sourceBillNo": "",
"sourceBillSid": "",
"businessKey": "04",
"businessValue": "盘盈入库",
"remarks": "",
"goodsList": []
}
this.submitdisabled = false
this.$emit('doback')
},
showAdd() {
this.title = "【新增】"
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.title = "【修改】"
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
})
.catch(e => {
this.formobj = {}
})
},
selectSourceBillNo(val) {
console.log("selectSourceBillNo", val);
const choose = this.sourceBillNoList.filter((item) => item.billSid == val)
console.log('>>>>>>>>>selectSourceBillNo', choose)
this.formobj.sourceBillNo = choose[0].billNo
this.formobj.sourceBillSid = choose[0].billSid
this.getSourceBillGoods(this.formobj.sourceBillSid)
},
getSourceBillGoods(sid) {
req.sourceBillBySid(sid).then((resp) => {
if (resp.success) {
this.formobj.goodsList = resp.data
}
})
},
doDelGoods(row) {
console.log("doDelGoods", row);
const index = this.formobj.goodsList.findIndex((item) => item == row)
this.formobj.goodsList.splice(index, 1)
},
selectSupplierName(row, val) {
console.log("selectSupplierName", row);
console.log("selectSupplierName", val);
const choose = this.supplierList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.supplierName = choose[0].supplierName
row.supplierSid = choose[0].sid
},
commodityComputeYHAndXSJE3(row) {
console.log("commodityComputeYHAndXSJE3", row);
if (Number(row.inStorageNum) > Number(row.pyNum)) {
row.inStorageNum = Number(row.pyNum)
}
row.money = (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
}
}
}
</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;
}
</style>

162
yxt-as-ui/src/views/storage/oldpPartStocktakingSurplus/oldpPartStocktakingSurplusInfo.vue

@ -0,0 +1,162 @@
<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="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="addinputw addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputw 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="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">业务类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.businessValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputw addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>旧件列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.goodsList" border>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="goodsName" align="center" />
<el-table-column label="商品编码" prop="goodsCode" align="center" />
<el-table-column label="规格" prop="goodsSpec" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="盘盈数量" prop="pyNum" align="center" />
<el-table-column label="供应商" prop="supplierName" align="center" />
<el-table-column label="入库单价" prop="inStoragePrice" align="center" />
<el-table-column label="入库数量" prop="inStorageNum" align="center" />
<el-table-column label="金额" align="center">
<template #default="scope">
{{ totalQuantity(scope.row) }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/oldpPartStocktakingSurplus.js'
export default {
components: {},
data() {
return {
listLoading: false,
formobj: {},
}
},
created() {},
computed: {
//
totalQuantity() {
return function(row) {
row.money = (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
return (Number(row.inStoragePrice) * Number(row.inStorageNum)).toFixed(2)
}
},
},
methods: {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
}
this.$emit('doback')
},
showAdd(row) {
req.fetchDetailsBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
},
//
indexMethod(index) {
return index + 1
},
}
}
</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;
}
</style>

14
yxt-as-ui/src/views/storage/stocktaking/index.vue

@ -323,7 +323,8 @@
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": ""
"superviseName": "",
"warehouseTypeKey": "01"
}
},
sids: [],
@ -360,7 +361,9 @@
superviseName: '',
superviseSid: '',
remarks: "",
dataList: []
dataList: [],
"warehouseTypeKey": "01",
"warehouseTypeValue": "配件库"
},
financeList: [],
rules: {
@ -386,6 +389,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
}
},
warehouseList: [],
@ -490,6 +494,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
}
}
this.seleRack()
@ -542,6 +547,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
}
}
this.dialogVisible2 = false
@ -558,6 +564,7 @@
"warehouseAreaName": "",
"warehouseRackSid": "",
"warehouseRackCode": "",
"warehouseTypeKey": "01",
}
}
this.dialogVisible2 = false
@ -713,7 +720,8 @@
"createEndTime": "",
"checkState": "",
"createByName": "",
"superviseName": ""
"superviseName": "",
"warehouseTypeKey": "01",
}
}
this.loadList()

Loading…
Cancel
Save