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

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 1 year ago
parent
163f185359 156e6e61dd
commit
235ecbc51e
12 changed files with 674 additions and 751 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/databases/yxt-as.sql
  2. 12
      yxt-as-ui/src/api/goods/goods.js
  3. 2
      yxt-as-ui/src/api/storage/receivingGoods.js
  4. 246
      yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
  5. 91
      yxt-as-ui/src/views/goods/goods/goodsInfo2.vue
  6. 112
      yxt-as-ui/src/views/goods/goods/index.vue
  7. 37
      yxt-as-ui/src/views/storage/deliveryNotice/index.vue
  8. 155
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  9. 12
      yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
  10. 2
      yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
  11. 4
      yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
  12. 2
      yxt-wms-biz/docs/databases/tables/wms.sql

2
doc/databases/yxt-as.sql
View File

@ -110,7 +110,7 @@ CREATE TABLE `as_busrepair_inventorybill_detail`
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='单据明细';
DEFAULT CHARSET = utf8 COMMENT ='维修出/退库单据明细';
DROP TABLE IF EXISTS `as_busclaim_bill`;
CREATE TABLE `as_busclaim_bill`

12
yxt-as-ui/src/api/goods/goods.js
View File

@ -5,7 +5,8 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/listPage',
// url: '/yxtbase/apiadmin/base/basegoodsspu/listPage',
url: '/yxtbase/apiadmin/base/basegoodsspu/goodsListPage',
method: 'post',
data: params,
headers: {
@ -24,7 +25,8 @@ export default {
// 新增、保存
saveGoods: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdate',
// url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdate',
url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdateGoods',
method: 'post',
data: data,
headers: {
@ -36,7 +38,8 @@ export default {
// 初始化
initGoods: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/initialization/' + data,
// url: '/yxtbase/apiadmin/base/basegoodsspu/initialization/' + data,
url: '/yxtbase/apiadmin/base/basegoodsspu//goodsDetails/' + data,
method: 'get'
});
},
@ -45,7 +48,8 @@ export default {
// 商品-- 删除
deleteBySids: function(data) {
return request({
url: '/yxtbase/apiadmin/base/basegoodsspu/delBySids',
// url: '/yxtbase/apiadmin/base/basegoodsspu/delBySids',
url: '/yxtbase/apiadmin/base/basegoodsspu/delGoodsBySids',
method: 'DELETE',
data: data,
headers: {

2
yxt-as-ui/src/api/storage/receivingGoods.js
View File

@ -17,7 +17,7 @@ export default {
// 初始化
init: function(data) {
return request({
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sourceSid=' + data,
url: '/wms/apiadmin/inventory/WmsReceiptBill/getDetailsInit?sid=' + data,
method: 'get'
});
},

246
yxt-as-ui/src/views/goods/goods/goodsAdd2.vue
View File

@ -67,7 +67,8 @@
<el-col :span="6">
<div class="span-sty">商品类别</div>
<el-form-item>
<el-select v-model="formobj.typeName" placeholder="请选择商品类别" class="addinputw" @change="selectCateChange">
<el-select v-model="formobj.goodsTypeName" placeholder="请选择商品类别" class="addinputw"
@change="selectCateChange">
<el-option v-for="item in cateList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
</el-select>
</el-form-item>
@ -77,7 +78,7 @@
<el-col :span="6">
<div class="span-sty">规格</div>
<el-form-item>
<el-input v-model="formobj.shelfLife" placeholder="规格" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.indexes" placeholder="规格" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
@ -117,7 +118,7 @@
<el-col :span="6">
<div class="span-sty">原厂标志</div>
<el-form-item>
<el-radio-group v-model="formobj.isListed" size="small" class="addinputw">
<el-radio-group v-model="formobj.isOriginalFactory" size="small" class="addinputw">
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio>
</el-radio-group>
@ -139,7 +140,7 @@
<el-col :span="18">
<div class="span-sty">商品备注</div>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
<el-input v-model="formobj.skuRemarks" placeholder="商品备注" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
@ -150,15 +151,15 @@
<el-col :span="16">
<div class="span-sty">库存上限</div>
<el-form-item>
<el-input v-model="formobj.externalCode" placeholder="库存上限" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input v-model="formobj.inventoryAlertUpperLimit" placeholder="库存上限" class="addinputw addinputInfo"
clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">库存下限</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="库存下限" class="addinputw addinputInfo"
<el-input v-model="formobj.inventoryAlertLowerLimit" placeholder="库存下限" class="addinputw addinputInfo"
clearable oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</el-form-item>
</el-col>
@ -170,7 +171,7 @@
<el-col :span="6">
<div class="span-sty">锁定销售定价</div>
<el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" class="addinputw">
<el-radio-group v-model="formobj.isLockingSalesPrice" size="small" class="addinputw">
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio>
</el-radio-group>
@ -180,8 +181,7 @@
<el-col :span="6">
<div class="span-sty">销售底价</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
clearable
<el-input v-model="formobj.minimumSalesPrice" placeholder="销售底价" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item>
</el-col>
@ -189,7 +189,8 @@
<el-col :span="6">
<div class="span-sty">三包价格</div>
<el-form-item>
<el-input v-model="formobj.externalCode" placeholder="外部编码" class="addinputw addinputInfo" clearable
<el-input v-model="formobj.standardPurchasePrice" placeholder="三包价格" class="addinputw addinputInfo"
clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item>
</el-col>
@ -197,8 +198,7 @@
<el-col :span="6">
<div class="span-sty">首保价格</div>
<el-form-item>
<el-input v-model="formobj.nationalStandardCode" placeholder="国标码" class="addinputw addinputInfo"
clearable
<el-input v-model="formobj.agencyPrice" placeholder="首保价格" class="addinputw addinputInfo" clearable
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item>
</el-col>
@ -242,35 +242,40 @@
imgList: [],
submitdisabled: false,
formobj: {
sid: '',
goodsName: "",
goodsCode: "",
brandSid: "",
brand: "",
goodsTypeSid: "",
typeName: "",
manufacturersid: "",
manufacturer: "",
externalCode: '',
factoryCode: '',
taxRate: '',
shelfLife: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
"sid": "",
"userSid": window.sessionStorage.getItem('userSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"goodsName": "",
"goodsCode": "",
"goodsPY": "",
"barCode": "",
"goodsUnitSid": "",
"goodsUnitName": "",
"goodsTypeSid": "",
"goodsTypeName": "",
"indexes": "",
"shelfLife": "",
"brandSid": "",
"brandName": "",
"manufacturerSid": "",
"manufacturerName": "",
"isOriginalFactory": "",
"isOriginalFactoryValue": "",
"sortNo": "",
"skuRemarks": "",
"inventoryAlertUpperLimit": "",
"inventoryAlertLowerLimit": "",
"isLockingSalesPrice": "",
"isLockingSalesPriceValue": "",
"minimumSalesPrice": "",
"standardPurchasePrice": "",
"agencyPrice": "",
"picPath": []
},
brandList: [],
cateList: [],
facturerList: [],
unitNameList: [],
hideUploadBtn: false,
dialogVisible: false,
dialogVisible2: false,
dialogVisible3: false,
itemInfo: {},
orderInfo: {}
}
},
created() {
@ -295,10 +300,8 @@
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
this.itemInfo.urls = this.imgList
this.formobj.picPath = this.imgList
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
},
saveOrUpdate() {
@ -320,36 +323,44 @@
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.hideUploadBtn = true
this.formobj = {
sid: '',
brand: "",
brandSid: "",
typeName: "",
goodsTypeSid: "",
manufacturer: "",
manufacturerSid: "",
goodsName: '',
goodsCode: '',
barcode: '',
producer: '',
unit: '',
specification: '',
remarks: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkus: []
"sid": "",
"userSid": window.sessionStorage.getItem('userSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"goodsName": "",
"goodsCode": "",
"goodsPY": "",
"barCode": "",
"goodsUnitSid": "",
"goodsUnitName": "",
"goodsTypeSid": "",
"goodsTypeName": "",
"indexes": "",
"shelfLife": "",
"brandSid": "",
"brandName": "",
"manufacturerSid": "",
"manufacturerName": "",
"isOriginalFactory": "",
"isOriginalFactoryValue": "",
"sortNo": "",
"skuRemarks": "",
"inventoryAlertUpperLimit": "",
"inventoryAlertLowerLimit": "",
"isLockingSalesPrice": "",
"isLockingSalesPriceValue": "",
"minimumSalesPrice": "",
"standardPurchasePrice": "",
"agencyPrice": "",
"picPath": []
}
this.$emit('doback')
},
showAdd() {
var sid = require('uuid').v1()
console.log('>>>>>>>>>showAdd', sid)
// var sid = require('uuid').v1()
// console.log('>>>>>>>>>showAdd', sid)
this.formobj.sid = sid
// this.formobj.sid = sid
},
indexMethod(index) {
return index + 1
@ -375,7 +386,7 @@
const choose = this.cateList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectCateChange', choose)
this.formobj.goodsTypeSid = choose[0].sid
this.formobj.typeName = choose[0].goodsTypeName
this.formobj.goodsTypeName = choose[0].goodsTypeName
},
selectfacturerChange(val) {
const choose = this.facturerList.filter((item) => item.sid == val)
@ -389,111 +400,6 @@
this.formobj.goodsUnitSid = choose[0].sid
this.formobj.goodsUnitName = choose[0].unitName
},
editGoodsSku(goodsSku) {
console.log('>>>>>>>>>editGoodsSku', goodsSku)
this.orderInfo = goodsSku
this.dialogVisible3 = true
},
showGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
this.dialogVisible = true
this.itemInfo = goodsSkuDto
},
editGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>editGoodsSkuDttail', goodsSkuDto)
this.dialogVisible2 = true
this.itemInfo = goodsSkuDto
this.imgList = goodsSkuDto.urls
},
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
handleClose3() {
this.dialogVisible3 = false
},
saveGoodsSku() {
console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
if (this.orderInfo.sid == '') {
this.orderInfo.sid = require('uuid').v1()
this.orderInfo.goodsSpuSid = this.formobj.sid
this.orderInfo.isEnable = '1'
var detail = {
sid: require('uuid').v1(),
isEnable: '1',
goodsSkuSid: this.orderInfo.sid,
finalPurchasePrice: "",
safetyStockDays: "",
isOriginalFactory: "",
isInventoryAlert: "",
inventoryAlertUpperLimit: "",
inventoryAlertLowerLimit: "",
costPrice: "",
tagPrice: "",
salesPrice: "",
standardPurchasePrice: "",
agencyPrice: "",
discount: "",
minimumSalesPrice: "",
isLockingSalesPrice: "",
isIntegralExchange: "",
integralAmount: "",
urls: [],
}
this.orderInfo.baseGoodsSkuExtend = detail
this.formobj.baseGoodsSkus.push(this.orderInfo)
} else {
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.sid == this.orderInfo.sid)
if (index > -1) {
this.formobj.baseGoodsSkus[index].goodsSkuCode = this.orderInfo.goodsSkuCode
this.formobj.baseGoodsSkus[index].title = this.orderInfo.title
this.formobj.baseGoodsSkus[index].externalCode = this.orderInfo.externalCode
}
}
this.dialogVisible3 = false
},
saveGoodsSkuDttail() {
this.itemInfo.urls = this.imgList
console.log('>>>>>>>>>saveGoodsSkuDttail', this.itemInfo)
var index = this.formobj.baseGoodsSkus.findIndex((item) => item.baseGoodsSkuExtend.sid == this.itemInfo.sid)
console.log('>>>>>>>>>saveGoodsSkuDttail', index)
this.formobj.baseGoodsSkus[index].baseGoodsSkuExtend = this.itemInfo
console.log('>>>>>>>>>saveGoodsSkuDttail', this.formobj.baseGoodsSkus[index].baseGoodsSkuExtend)
this.dialogVisible2 = false
},
addGoodsSku() {
this.dialogVisible3 = true
this.orderInfo = {
sid: ''
}
}
}
}

91
yxt-as-ui/src/views/goods/goods/goodsInfo2.vue
View File

@ -6,7 +6,6 @@ template>
<div>商品信息</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 添加修改按钮 -->
@ -62,14 +61,14 @@ template>
<el-col :span="6">
<div class="span-sty">商品类别</div>
<el-form-item>
<span class="addinputInfo">{{formobj.typeName}}</span>
<span class="addinputInfo">{{formobj.goodsTypeName}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">规格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.shelfLife}}</span>
<span class="addinputInfo">{{formobj.indexes}}</span>
</el-form-item>
</el-col>
@ -101,7 +100,7 @@ template>
<el-col :span="6">
<div class="span-sty">原厂标志</div>
<el-form-item>
<el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
<el-radio-group v-model="formobj.isOriginalFactory" :disabled="true" size="small" class="addinputw">
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio>
</el-radio-group>
@ -122,7 +121,7 @@ template>
<el-col :span="18">
<div class="span-sty">商品备注</div>
<el-form-item>
<span class="addinputInfo">{{formobj.remarks}}</span>
<span class="addinputInfo">{{formobj.skuRemarks}}</span>
</el-form-item>
</el-col>
@ -133,14 +132,14 @@ template>
<el-col :span="16">
<div class="span-sty">库存上限</div>
<el-form-item>
<span class="addinputInfo">{{formobj.externalCode}}</span>
<span class="addinputInfo">{{formobj.inventoryAlertUpperLimit}}</span>
</el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">库存下限</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.inventoryAlertLowerLimit}}</span>
</el-form-item>
</el-col>
@ -151,7 +150,7 @@ template>
<el-col :span="6">
<div class="span-sty">锁定销售定价</div>
<el-form-item>
<el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
<el-radio-group v-model="formobj.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
<el-radio :label="'1'">是</el-radio>
<el-radio :label="'2'">否</el-radio>
</el-radio-group>
@ -161,21 +160,21 @@ template>
<el-col :span="6">
<div class="span-sty">销售底价</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.minimumSalesPrice}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">三包价格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.externalCode}}</span>
<span class="addinputInfo">{{formobj.standardPurchasePrice}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">首保价格</div>
<el-form-item>
<span class="addinputInfo">{{formobj.nationalStandardCode}}</span>
<span class="addinputInfo">{{formobj.agencyPrice}}</span>
</el-form-item>
</el-col>
@ -187,7 +186,7 @@ template>
<div class="span-sty">规格图片</div>
<el-form-item>
<template slot-scope="scope">
<span v-for="(item,index) in itemInfo.urls" :key="index" class="addinputInfo">
<span v-for="(item,index) in formobj.picPath" :key="index" class="addinputInfo">
<el-popover placement="left" trigger="click" width="300">
<img :src="item.url" width="100%" />
<img slot="reference" :src="item.url" :alt="item.url"
@ -212,35 +211,7 @@ template>
export default {
data() {
return {
listLoading: false,
activeNames: ['1'],
imgList: [],
submitdisabled: false,
formobj: {
sid: '',
goodsName: "",
goodsCode: "",
brandSid: "",
brand: "",
goodsTypeSid: "",
typeName: "",
manufacturersid: "",
manufacturer: "",
externalCode: '',
factoryCode: '',
taxRate: '',
shelfLife: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSkuDtos: []
},
hideUploadBtn: false,
dialogVisible: false,
dialogVisible2: false,
itemInfo: {},
orderInfo: {}
formobj: {},
}
},
created() {},
@ -248,29 +219,7 @@ template>
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
this.hideUploadBtn = true
this.formobj = {
sid: '',
brand: "",
brandSid: "",
typeName: "",
goodsTypeSid: "",
manufacturer: "",
manufacturerSid: "",
goodsName: '',
goodsCode: '',
barcode: '',
producer: '',
unit: '',
specification: '',
remarks: '',
baseGoodsSpuDetail: {
goodsExplain: "",
goodsDescription: ""
},
baseGoodsSku: []
}
this.formobj = {}
this.$emit('doback')
},
showAdd() {},
@ -289,20 +238,6 @@ template>
})
},
showGoodsSkuDttail(goodsSkuDto) {
console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)
this.dialogVisible = true
this.itemInfo = goodsSkuDto
},
handleClose() {
this.dialogVisible = false
},
handleClose2() {
this.dialogVisible2 = false
},
}
}

112
yxt-as-ui/src/views/goods/goods/index.vue
View File

@ -10,32 +10,35 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.createOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="部门">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.useOrgName" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsName" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsCode" placeholder="" clearable />
</el-form-item>
<el-form-item label="拼音缩写">
<el-input v-model="queryParams.params.name" placeholder="" clearable />
<el-input v-model="queryParams.params.goodsPY" placeholder="" clearable />
</el-form-item>
<el-form-item label="商品类别">
<el-select v-model="queryParams.params.goodsTypeSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择" class="addinputw addinputInfo"
@change="selectCateChange">
<el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-form-item label="品牌">
<el-select v-model="queryParams.params.brandSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.brandName" placeholder="请选择" class="addinputw addinputInfo"
@change="selectBrandChange">
<el-option v-for="item in brandList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
<el-form-item label="厂家">
<el-select v-model="queryParams.params.facturerSid" placeholder="请选择" class="addinputw addinputInfo">
<el-select v-model="queryParams.params.manufacturerName" placeholder="请选择"
class="addinputw addinputInfo" @change="selectfacturerChange">
<el-option v-for="item in facturerList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</el-form-item>
@ -73,24 +76,24 @@
</el-table-column> -->
<el-table-column fixed prop="goodsName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsCode" label="商品编码" width="120" align="center" />
<el-table-column prop="goodsCode" label="拼音缩写" width="100" align="center" />
<el-table-column prop="goodsPY" label="拼音缩写" width="100" align="center" />
<el-table-column prop="barCode" label="商品条码" width="100" align="center" />
<el-table-column prop="barCode" label="计量单位" width="100" align="center" />
<el-table-column prop="typeName" label="商品类别" width="100" align="center" />
<el-table-column prop="typeName" label="规格" width="100" align="center" />
<el-table-column prop="typeName" label="保质期(天)" width="100" align="center" />
<el-table-column prop="goodsUnitName" label="品牌" width="100" align="center" />
<el-table-column prop="goodsUnitName" label="计量单位" width="100" align="center" />
<el-table-column prop="goodsTypeName" label="商品类别" width="100" align="center" />
<el-table-column prop="indexes" label="规格" width="100" align="center" />
<el-table-column prop="shelfLife" label="保质期(天)" width="100" align="center" />
<el-table-column prop="brandName" label="品牌" width="100" align="center" />
<el-table-column prop="manufacturerName" label="厂家" width="120" align="center" />
<el-table-column prop="nationalStandardCode" label="原厂标志" width="100" align="center" />
<el-table-column prop="taxRate" label="库存上限" width="100" align="center" />
<el-table-column prop="taxRate" label="库存下限" width="100" align="center" />
<el-table-column prop="taxRate" label="锁定销售价" width="100" align="center" />
<el-table-column prop="taxRate" label="销售底价" width="100" align="center" />
<el-table-column prop="taxRate" label="三包价格" width="100" align="center" />
<el-table-column prop="taxRate" label="首保价格" width="100" align="center" />
<el-table-column prop="isOriginalFactoryValue" label="原厂标志" width="100" align="center" />
<el-table-column prop="inventoryAlertUpperLimit" label="库存上限" width="100" align="center" />
<el-table-column prop="inventoryAlertLowerLimit" label="库存下限" width="100" align="center" />
<el-table-column prop="isLockingSalesPriceValue" label="锁定销售价" width="100" align="center" />
<el-table-column prop="minimumSalesPrice" label="销售底价" width="100" align="center" />
<el-table-column prop="standardPurchasePrice" label="三包价格" width="100" align="center" />
<el-table-column prop="agencyPrice" label="首保价格" width="100" align="center" />
<el-table-column label="商品图片" align="center" width="100">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.filePaths)">查看
<div style="color: #1890FF; text-decoration: underline ;" @click="showImage(scope.row.picPath)">查看
</div>
</template>
</el-table-column>
@ -111,6 +114,24 @@
<!-- 详情部分组件 -->
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="商品图片" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm1" class="formadd" style="margin-top: -30px;">
<el-row class="first_row">
<el-col :span="24" class="trightb">
<el-image style="width: 120px;height: 120px; margin: 10px; background: #f0f;"
v-for="(item,index) in fileList" :src="item.url" :preview-src-list="[item.url]">
</el-image>
</el-col>
</el-row>
</el-form>
</el-dialog>
</div>
</template>
@ -135,6 +156,7 @@
},
data() {
return {
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@ -175,14 +197,26 @@
size: 10,
total: 0,
params: {
name: ''
orgPath '',
useOrgName '',
createOrgName '',
goodsName '',
goodsCode '',
goodsPY '',
goodsTypeSid '',
goodsTypeName '',
brandSid '',
brandName '',
manufacturerSid '',
manufacturerName '',
}
},
sids: [],
selectionList: [],
brandList: [],
goodsTypeList: [],
facturerList: []
facturerList: [],
fileList: []
}
},
mounted() {
@ -213,6 +247,26 @@
}).catch(() => {})
},
selectBrandChange(val) {
const choose = this.brandList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectBrandChange', choose)
this.queryParams.params.brandSid = choose[0].sid
this.queryParams.params.brandName = choose[0].brandName
},
selectCateChange(val) {
const choose = this.goodsTypeList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectCateChange', choose)
this.queryParams.params.goodsTypeSid = choose[0].sid
this.queryParams.params.goodsTypeName = choose[0].goodsTypeName
},
selectfacturerChange(val) {
const choose = this.facturerList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectfacturerChange', choose)
this.queryParams.params.manufacturerSid = choose[0].sid
this.queryParams.params.manufacturerName = choose[0].manufacturerName
},
// 搜索条件效果
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -248,6 +302,9 @@
},
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) {
@ -369,6 +426,13 @@
console.log(e)
})
},
showImage(paths) {
this.fileList = paths
this.dialogVisible = true
},
handleClose() {
this.dialogVisible = false
},
}
}
</script>

37
yxt-as-ui/src/views/storage/deliveryNotice/index.vue
View File

@ -13,11 +13,11 @@
<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 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 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="外部单号">
@ -33,12 +33,12 @@
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
</el-form-item>
<el-form-item label="预计到货日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart"type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.deliveryDateStart" 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.deliveryDateEnd" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
<el-date-picker v-model="queryParams.params.deliveryDateEnd" 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="单据状态">
@ -131,8 +131,8 @@
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw"
style="width:100%" clearable />
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%"
clearable />
</el-form-item>
</el-col>
</el-row>
@ -208,8 +208,7 @@
},
sids: [],
selectionList: [],
busTypeList:[
{
busTypeList: [{
name: "业务类型1",
sid: "1"
},
@ -218,18 +217,16 @@
sid: "2"
}
],
billStateList:[
{
name :"单据状态1",
sid:"1"
billStateList: [{
name: "新建",
sid: "0"
},
{
name :"单据状态2",
sid:"2"
name: "完成",
sid: "1"
}
],
reviewStatusList:[
{
reviewStatusList: [{
name: "审核状态1",
sid: "1"
},

155
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
View File

@ -48,7 +48,8 @@
<div class="span-sty">供应商</div>
<el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
class="addinputInfo">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName" :value="item.sid">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
</el-option>
</el-select>
@ -84,13 +85,13 @@
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<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="操作" wid align="center" width="180">
<el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
<!-- <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> -->
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品名称" prop="goodsSpuName" 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" />
@ -219,7 +220,8 @@
busTypeKey: "",
busTypeValue: "",
createByName: window.sessionStorage.getItem('name'),
billState: 0,
billState: '新建',
billStateKey: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
@ -483,49 +485,64 @@
}
for (var i = 0; i < this.formobj.pcList.length; i++) {
var item = this.formobj.pcList[i]
// for (var i = 0; i < this.formobj.pcList.length; i++) {
// var item = this.formobj.pcList[i]
if (item.manufactureDate == '') {
this.$message({
showClose: true,
type: 'error',
message: '生产日期不能为空'
})
// if (item.manufactureDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: '生产日期不能为空'
// })
return
}
// return
// }
if (Number(item.batchCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能为0'
})
// if (Number(item.batchCount) == 0) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '商品批次数量不能为0'
// })
return
}
// return
// }
}
// }
for (var i = 0; i < this.formobj.list.length; i++) {
var index = i
var num = 0
const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
for (var j = 0; j < choose.length; j++) {
// for (var i = 0; i < this.formobj.list.length; i++) {
// var index = i
// var num = 0
// const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
// for (var j = 0; j < choose.length; j++) {
num += Number(choose[j].batchCount)
// num += Number(choose[j].batchCount)
}
// }
// console.log('>>>>>>>>>saveOrUpdate', num)
console.log('>>>>>>>>>saveOrUpdate', num)
// if (num > Number(this.formobj.list[i].actualInCount)) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '商品批次数量不能大于商品实收数量'
// })
// return
// }
// }
for (var i = 0; i < this.formobj.list.length; i++) {
if (num > Number(this.formobj.list[i].actualInCount)) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能大于商品实收数量'
message: '商品实收数量不能为空'
})
return
@ -559,56 +576,56 @@
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
for (var i = 0; i < this.formobj.pcList.length; i++) {
var item = this.formobj.pcList[i]
// for (var i = 0; i < this.formobj.pcList.length; i++) {
// var item = this.formobj.pcList[i]
if (item.manufactureDate == '') {
this.$message({
showClose: true,
type: 'error',
message: '生产日期不能为空'
})
// if (item.manufactureDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: '生产日期不能为空'
// })
return
}
// return
// }
if (Number(item.batchCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能为0'
})
// if (Number(item.batchCount) == 0) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '商品批次数量不能为0'
// })
return
}
// return
// }
}
// }
for (var i = 0; i < this.formobj.list.length; i++) {
var index = i
var num = 0
const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
for (var j = 0; j < choose.length; j++) {
// for (var i = 0; i < this.formobj.list.length; i++) {
// var index = i
// var num = 0
// const choose = this.formobj.pcList.filter((item) => Number(item.xh) == (index + 1))
// for (var j = 0; j < choose.length; j++) {
num += Number(choose[j].batchCount)
// num += Number(choose[j].batchCount)
}
// }
console.log('>>>>>>>>>saveOrUpdate', num)
// console.log('>>>>>>>>>saveOrUpdate', num)
if (num > Number(this.formobj.list[i].actualInCount)) {
this.$message({
showClose: true,
type: 'error',
message: '商品批次数量不能大于商品实收数量'
})
// if (num > Number(this.formobj.list[i].actualInCount)) {
// this.$message({
// showClose: true,
// type: 'error',
// message: '商品批次数量不能大于商品实收数量'
// })
return
}
// return
// }
}
// }
this.$refs['form_obj'].validate((valid) => {
if (valid) {

12
yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
View File

@ -59,7 +59,7 @@
</el-col>
<el-col :span="8">
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.billStateKey }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">审核状态</div>
@ -81,19 +81,19 @@
</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<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" width="150" />
<el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<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="warehouseName" align="center" width="120" />
<el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
<el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" width="120" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" width="100" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" />
<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-column label="采购金额" prop="amount" align="center" />
</el-table>
</el-form>

2
yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
View File

@ -779,7 +779,7 @@
this.getWarehouseList()
console.log("showEdit", this.isUpdata);
var params = {
sourcesid: row.sid
sid: row.sid
}
req.init( row.sid)

4
yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue
View File

@ -66,8 +66,8 @@
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border <el-table-column fixed width="60" label="序号"
type="index" :index="indexMethod" align="center" />
<el-table v-loading="listLoading" :data="formobj.pcList" 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="doGoodsDel(scope.row)">删除</el-button>

2
yxt-wms-biz/docs/databases/tables/wms.sql
View File

@ -441,7 +441,7 @@ CREATE TABLE `wms_inventory_record`
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='配货单明细';
DEFAULT CHARSET = utf8 COMMENT ='出入库记录';
DROP TABLE IF EXISTS `wms_old_register`;
CREATE TABLE `wms_old_register`

Write Preview
Loading…
Cancel
Save