|
@@ -40,16 +40,18 @@
|
|
|
<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="warehouseLocationSn">
|
|
|
- <a-cascader
|
|
|
- @change="changeWarehouseCascade"
|
|
|
- v-model="defaultWarehouseCascade"
|
|
|
- expand-trigger="hover"
|
|
|
- :allowClear="false"
|
|
|
- :options="warehouseCascadeData"
|
|
|
- :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
|
|
|
+ {{ (nowData&&nowData.warehouseName) || '--' }} >
|
|
|
+ <a-select
|
|
|
id="bulkWarehousingOrder-product-warehouse"
|
|
|
- placeholder="请选择仓库仓位"
|
|
|
- style="width: 100%;" />
|
|
|
+ @change="changeWarehouseCascade"
|
|
|
+ placeholder="请选择仓位"
|
|
|
+ :allowClear="false"
|
|
|
+ style="width: 50%;"
|
|
|
+ v-model="form.warehouseLocationSn">
|
|
|
+ <a-select-option v-for="item in warehouseCascadeData" :value="item.sn">
|
|
|
+ {{ item.name }}
|
|
|
+ </a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="成本价">
|
|
|
<span style="margin-right:20px;">{{ form.productCost ? toThousands(form.productCost) : '--' }}</span>
|
|
@@ -117,9 +119,8 @@ export default {
|
|
|
productName: '',
|
|
|
productCode: '',
|
|
|
productOrigCode: '',
|
|
|
- warehouse: [],
|
|
|
warehouseSn: '',
|
|
|
- warehouseLocationSn: '',
|
|
|
+ warehouseLocationSn: undefined,
|
|
|
productCost: '',
|
|
|
productQty: ''
|
|
|
},
|
|
@@ -143,7 +144,6 @@ export default {
|
|
|
warehouseCascadeData: [], // 仓库仓位 下拉数据
|
|
|
warehouseSnBackups: '', // 仓库备份数据
|
|
|
warehouseLocationSnBackups: '', // 仓位备份数据
|
|
|
- defaultWarehouseCascade: [], // 默认仓库仓位
|
|
|
isGift: false
|
|
|
}
|
|
|
},
|
|
@@ -191,7 +191,6 @@ export default {
|
|
|
const data = res.data
|
|
|
this.form = Object.assign(this.form, data)
|
|
|
// this.fetchUser(this.form.productCode)
|
|
|
- this.form.warehouse = [this.form.warehouseSn, this.form.warehouseLocationSn]
|
|
|
this.warehouseSnBackups = this.form.warehouseSn || undefined
|
|
|
this.warehouseLocationSnBackups = this.form.warehouseLocationSn || undefined
|
|
|
this.isGift = this.form.giftFlag == 1
|
|
@@ -243,22 +242,8 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
changeWarehouseCascade (val) {
|
|
|
- if (val.length < 2) {
|
|
|
- this.$message.warning('当前仓库无仓位,请选择其他仓库')
|
|
|
- this.form.warehouseSn = this.warehouseSnBackups
|
|
|
- this.form.warehouseLocationSn = this.warehouseLocationSnBackups
|
|
|
- if (this.warehouseSnBackups || this.warehouseLocationSnBackups) {
|
|
|
- this.form.warehouse = [this.warehouseSnBackups, this.warehouseLocationSnBackups]
|
|
|
- } else {
|
|
|
- this.form.warehouse = []
|
|
|
- }
|
|
|
- } else {
|
|
|
- this.form.warehouseSn = val[0] ? val[0] : ''
|
|
|
- this.form.warehouseLocationSn = val[1] ? val[1] : ''
|
|
|
- this.warehouseSnBackups = this.form.warehouseSn
|
|
|
- this.warehouseLocationSnBackups = this.form.warehouseLocationSn
|
|
|
- }
|
|
|
this.$refs.productQty.focus()
|
|
|
+ this.$refs.ruleForm.validate()
|
|
|
},
|
|
|
// 仓库仓位 级联 列表
|
|
|
getWarehouseCascade () {
|
|
@@ -267,28 +252,22 @@ export default {
|
|
|
if (res.status == 200) {
|
|
|
// 默认仓库
|
|
|
const defSn = this.isShowWarehouse ? this.nowData.warehouseSn : this.defWarehouse&&this.defWarehouse.warehouseSn
|
|
|
- this.defaultWarehouseCascade[0] = defSn
|
|
|
+ _this.form.warehouseSn = defSn
|
|
|
+ _this.warehouseSnBackups = 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
|
|
|
- }
|
|
|
- })
|
|
|
+ console.log(data.warehouseLocationList)
|
|
|
+ if(data&&data.warehouseLocationList){
|
|
|
+ data.warehouseLocationList.map(subItem => {
|
|
|
+ subItem.sn = subItem.warehouseLocationSn
|
|
|
+ if(subItem.defaultFlag == 1){
|
|
|
+ _this.form.warehouseLocationSn = subItem.warehouseLocationSn
|
|
|
+ _this.warehouseLocationSnBackups = subItem.warehouseLocationSn
|
|
|
}
|
|
|
- this.warehouseCascadeData = [data]
|
|
|
+ })
|
|
|
+ this.warehouseCascadeData = data.warehouseLocationList
|
|
|
}else{
|
|
|
this.warehouseCascadeData = []
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
this.warehouseCascadeData = []
|
|
|
}
|
|
@@ -302,13 +281,11 @@ export default {
|
|
|
productName: '',
|
|
|
productCode: '',
|
|
|
productOrigCode: '',
|
|
|
- warehouse: [],
|
|
|
warehouseSn: this.warehouseSnBackups,
|
|
|
warehouseLocationSn: this.warehouseLocationSnBackups,
|
|
|
productCost: '',
|
|
|
productQty: ''
|
|
|
}
|
|
|
- this.defaultWarehouseCascade = [this.warehouseSnBackups,this.warehouseLocationSnBackups]
|
|
|
this.productCost = ''
|
|
|
this.isGift = false
|
|
|
}
|
|
@@ -326,9 +303,6 @@ export default {
|
|
|
this.warehouseSnBackups = ''
|
|
|
this.warehouseLocationSnBackups = ''
|
|
|
} else {
|
|
|
- this.$nextTick(() => {
|
|
|
- this.resetData()
|
|
|
- })
|
|
|
this.getWarehouseCascade()
|
|
|
}
|
|
|
},
|