|
|
|
|
@ -147,9 +147,8 @@
|
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
|
|
|
|
|
<el-col :span="24"> |
|
|
|
|
<!-- <el-col :span="24"> |
|
|
|
|
<el-form-item label="服务类型" prop="serviceType"> |
|
|
|
|
<!-- <el-input v-model="form.serviceType" placeholder="请输入服务类型"/>--> |
|
|
|
|
<el-radio-group |
|
|
|
|
v-model="form.serviceType" |
|
|
|
|
class="ml-4" |
|
|
|
|
@ -160,7 +159,7 @@
|
|
|
|
|
}}</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
</el-col> --> |
|
|
|
|
</el-form> |
|
|
|
|
</el-row> |
|
|
|
|
<el-row> |
|
|
|
|
@ -322,7 +321,7 @@
|
|
|
|
|
v-model="box" |
|
|
|
|
width="50%" |
|
|
|
|
:before-close="beforeClose" |
|
|
|
|
:show-close='false' |
|
|
|
|
:show-close="false" |
|
|
|
|
append-to-body |
|
|
|
|
> |
|
|
|
|
<el-form |
|
|
|
|
@ -459,7 +458,7 @@ import { getListMaterial } from '@/api/basic/basicMaterial';
|
|
|
|
|
import { getDetailWarehouse, getListCopy } from '@/api/basicdata/basicdataWarehouse'; |
|
|
|
|
import { getListIdsName } from '@/api/basicdata/basicdataStoreBrand'; |
|
|
|
|
import { getListName } from '@/api/basicdata/basicdataStoreBusiness'; |
|
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus' |
|
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'; |
|
|
|
|
export default { |
|
|
|
|
name: 'warehouseWarehouseingAddReceipt', |
|
|
|
|
data() { |
|
|
|
|
@ -497,7 +496,7 @@ export default {
|
|
|
|
|
}, |
|
|
|
|
// 表单数据 |
|
|
|
|
form: { |
|
|
|
|
serviceType: null, |
|
|
|
|
// serviceType: null, |
|
|
|
|
}, |
|
|
|
|
formDetail: {}, |
|
|
|
|
// 选择行 |
|
|
|
|
@ -543,7 +542,7 @@ export default {
|
|
|
|
|
licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }], |
|
|
|
|
warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }], |
|
|
|
|
orderNumber: [{ required: true, message: '请输入订单自编号', trigger: 'blur' }], |
|
|
|
|
serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }], |
|
|
|
|
// serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }], |
|
|
|
|
customerCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }], |
|
|
|
|
}, |
|
|
|
|
buttonLoadingList: { |
|
|
|
|
@ -816,7 +815,7 @@ export default {
|
|
|
|
|
]; |
|
|
|
|
this.form.clientId = obj.value; |
|
|
|
|
} |
|
|
|
|
this.form.serviceType = null; |
|
|
|
|
// this.form.serviceType = null; |
|
|
|
|
let aa = ''; |
|
|
|
|
this.options.some(i => { |
|
|
|
|
// console.log(">><><><<>",i); |
|
|
|
|
@ -832,9 +831,9 @@ export default {
|
|
|
|
|
typeService: '3', |
|
|
|
|
}); |
|
|
|
|
// console.log("bububu",bu.data.data.records); |
|
|
|
|
if (bu.data.data?.records.length > 0) { |
|
|
|
|
this.form.serviceType = bu.data.data.records[0].mold; |
|
|
|
|
} |
|
|
|
|
// if (bu.data.data?.records.length > 0) { |
|
|
|
|
// this.form.serviceType = bu.data.data.records[0].mold; |
|
|
|
|
// } |
|
|
|
|
let cl = await getListClient(this.page.currentPage, this.page.pageSize, { pid: row }); |
|
|
|
|
// console.log(">>>>",cl.data.data.records); |
|
|
|
|
this.shop = []; |
|
|
|
|
@ -941,67 +940,61 @@ export default {
|
|
|
|
|
handleDetail() { |
|
|
|
|
this.$refs.formDetail.validate(valid => { |
|
|
|
|
if (valid) { |
|
|
|
|
ElMessageBox.confirm( |
|
|
|
|
`是否确认入库${this.formDetail.createInventory}件`, |
|
|
|
|
'提示', |
|
|
|
|
{ |
|
|
|
|
confirmButtonText: '确认', |
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
type: 'warning', |
|
|
|
|
} |
|
|
|
|
) |
|
|
|
|
.then(() => { |
|
|
|
|
console.log(this.formDetail); |
|
|
|
|
this.stuff.some(i => { |
|
|
|
|
console.log(i); |
|
|
|
|
if (i.id == this.formDetail.productName) { |
|
|
|
|
this.formDetail.productName = i.name; |
|
|
|
|
} |
|
|
|
|
if (i.id == this.formDetail.productCode) { |
|
|
|
|
this.formDetail.productCode = i.productCode; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.distributionUnit.some(p => { |
|
|
|
|
if (p.dictKey == this.formDetail.productUnit) { |
|
|
|
|
this.formDetail.productUnit = p.dictValue; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (this.data.length > 0) { |
|
|
|
|
console.log( |
|
|
|
|
'当前在这里=-================================================================' |
|
|
|
|
); |
|
|
|
|
if (!!this.formDetail.createInventory) { |
|
|
|
|
let s = false; |
|
|
|
|
this.data.some(i => { |
|
|
|
|
if (i.productCode === this.formDetail.productCode) { |
|
|
|
|
s = true; |
|
|
|
|
if (this.title != '编辑') { |
|
|
|
|
i.createInventory = |
|
|
|
|
parseInt(i.createInventory) + parseInt(this.formDetail.createInventory); |
|
|
|
|
i.actualReceipt = 0; |
|
|
|
|
} |
|
|
|
|
ElMessageBox.confirm(`是否确认入库${this.formDetail.createInventory}件`, '提示', { |
|
|
|
|
confirmButtonText: '确认', |
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
.then(() => { |
|
|
|
|
console.log(this.formDetail); |
|
|
|
|
this.stuff.some(i => { |
|
|
|
|
console.log(i); |
|
|
|
|
if (i.id == this.formDetail.productName) { |
|
|
|
|
this.formDetail.productName = i.name; |
|
|
|
|
} |
|
|
|
|
if (i.id == this.formDetail.productCode) { |
|
|
|
|
this.formDetail.productCode = i.productCode; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.distributionUnit.some(p => { |
|
|
|
|
if (p.dictKey == this.formDetail.productUnit) { |
|
|
|
|
this.formDetail.productUnit = p.dictValue; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (!s) { |
|
|
|
|
if (this.data.length > 0) { |
|
|
|
|
console.log( |
|
|
|
|
'当前在这里=-================================================================' |
|
|
|
|
); |
|
|
|
|
if (!!this.formDetail.createInventory) { |
|
|
|
|
let s = false; |
|
|
|
|
this.data.some(i => { |
|
|
|
|
if (i.productCode === this.formDetail.productCode) { |
|
|
|
|
s = true; |
|
|
|
|
if (this.title != '编辑') { |
|
|
|
|
i.createInventory = |
|
|
|
|
parseInt(i.createInventory) + parseInt(this.formDetail.createInventory); |
|
|
|
|
i.actualReceipt = 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
if (!s) { |
|
|
|
|
this.formDetail.actualReceipt = 0; |
|
|
|
|
this.data.push(this.formDetail); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning('请填写入库数量'); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.formDetail.actualReceipt = 0; |
|
|
|
|
this.data.push(this.formDetail); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.$message.warning('请填写入库数量'); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
this.formDetail.actualReceipt = 0; |
|
|
|
|
this.data.push(this.formDetail); |
|
|
|
|
} |
|
|
|
|
this.box = false; |
|
|
|
|
this.formDetail = {}; |
|
|
|
|
}) |
|
|
|
|
.catch(() => { |
|
|
|
|
this.formDetail.createInventory=0 |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.box = false; |
|
|
|
|
this.formDetail = {}; |
|
|
|
|
}) |
|
|
|
|
.catch(() => { |
|
|
|
|
this.formDetail.createInventory = 0; |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
