|
@@ -39,10 +39,10 @@
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="产品名称" prop="productName">{{ form.productName || '--' }}</a-form-model-item>
|
|
|
<a-form-model-item label="原厂编码" prop="productOrigCode">{{ form.productOrigCode || '--' }}</a-form-model-item>
|
|
|
- <a-form-model-item label="仓库仓位" prop="warehouse">
|
|
|
+ <a-form-model-item label="仓库仓位" prop="warehouseLocationSn">
|
|
|
<a-cascader
|
|
|
@change="changeWarehouseCascade"
|
|
|
- v-model="form.warehouse"
|
|
|
+ v-model="defaultWarehouseCascade"
|
|
|
expand-trigger="hover"
|
|
|
:allowClear="false"
|
|
|
:options="warehouseCascadeData"
|
|
@@ -128,7 +128,7 @@ export default {
|
|
|
productSn: [
|
|
|
{ required: true, message: '请选择产品编码', trigger: 'change' }
|
|
|
],
|
|
|
- warehouse: [
|
|
|
+ warehouseLocationSn: [
|
|
|
{ required: true, message: '请选择仓库仓位', trigger: 'change' }
|
|
|
],
|
|
|
productCost: [
|
|
@@ -265,24 +265,30 @@ export default {
|
|
|
const _this = this
|
|
|
warehouseCascadeList({}).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
- this.warehouseCascadeData = res.data.find(item => _this.defWarehouse && item.warehouseSn == _this.defWarehouse.warehouseSn)
|
|
|
- this.defaultWarehouseCascade[0] = this.defWarehouse.warehouseSn
|
|
|
- this.warehouseCascadeData.map(item => {
|
|
|
- item.sn = item.warehouseSn
|
|
|
- if (item.warehouseLocationList) {
|
|
|
- item.warehouseLocationList.map(subItem => {
|
|
|
- subItem.sn = subItem.warehouseLocationSn
|
|
|
- if(subItem.defaultFlag == 1){
|
|
|
- _this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
|
|
|
- _this.form.warehouse = _this.defaultWarehouseCascade
|
|
|
- _this.form.warehouseSn = _this.defaultWarehouseCascade[0] || undefined
|
|
|
- _this.form.warehouseLocationSn = _this.defaultWarehouseCascade[1] || undefined
|
|
|
- _this.warehouseSnBackups = _this.defaultWarehouseCascade[0] || undefined
|
|
|
- _this.warehouseLocationSnBackups = _this.defaultWarehouseCascade[1] || undefined
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
+ // 默认仓库
|
|
|
+ const defSn = this.isShowWarehouse ? this.nowData.warehouseSn : this.defWarehouse&&this.defWarehouse.warehouseSn
|
|
|
+ this.defaultWarehouseCascade[0] = defSn
|
|
|
+ const data = res.data.find(item => item.warehouseSn == defSn)
|
|
|
+ if(data){
|
|
|
+ data.sn = data.warehouseSn
|
|
|
+ if (data.warehouseLocationList) {
|
|
|
+ data.warehouseLocationList.map(subItem => {
|
|
|
+ subItem.sn = subItem.warehouseLocationSn
|
|
|
+ if(subItem.defaultFlag == 1){
|
|
|
+ _this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
|
|
|
+ _this.form.warehouse = _this.defaultWarehouseCascade
|
|
|
+ _this.form.warehouseSn = _this.defaultWarehouseCascade[0] || undefined
|
|
|
+ _this.form.warehouseLocationSn = _this.defaultWarehouseCascade[1] || undefined
|
|
|
+ _this.warehouseSnBackups = _this.defaultWarehouseCascade[0] || undefined
|
|
|
+ _this.warehouseLocationSnBackups = _this.defaultWarehouseCascade[1] || undefined
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.warehouseCascadeData = [data]
|
|
|
+ }else{
|
|
|
+ this.warehouseCascadeData = []
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
this.warehouseCascadeData = []
|
|
|
}
|
|
@@ -297,11 +303,12 @@ export default {
|
|
|
productCode: '',
|
|
|
productOrigCode: '',
|
|
|
warehouse: [],
|
|
|
- warehouseSn: '',
|
|
|
- warehouseLocationSn: '',
|
|
|
+ warehouseSn: this.warehouseSnBackups,
|
|
|
+ warehouseLocationSn: this.warehouseLocationSnBackups,
|
|
|
productCost: '',
|
|
|
productQty: ''
|
|
|
}
|
|
|
+ this.defaultWarehouseCascade = [this.warehouseSnBackups,this.warehouseLocationSnBackups]
|
|
|
this.productCost = ''
|
|
|
this.isGift = false
|
|
|
}
|