|
|
@@ -334,7 +334,7 @@
|
|
|
align="center"
|
|
|
prop="singleWeight"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- width="240"
|
|
|
+ width="120"
|
|
|
>
|
|
|
<template slot-scope="{ row, $index }">
|
|
|
<template v-if="row.isSave">
|
|
|
@@ -348,6 +348,8 @@
|
|
|
:min="0"
|
|
|
controls-position="right"
|
|
|
@input="inputsingleWeight(row, $index)"
|
|
|
+ :controls="false"
|
|
|
+ style="width: 100%"
|
|
|
></el-input-number>
|
|
|
<template slot="append">
|
|
|
{{ row.measureUnit }}
|
|
|
@@ -1216,6 +1218,11 @@
|
|
|
const supplierList = await storageApi.contactQueryByCategoryIdsAPI({
|
|
|
categoryIds: res.map((item) => item.id)
|
|
|
});
|
|
|
+ console.log(
|
|
|
+ 'supplierList---------------------------------',
|
|
|
+ supplierList
|
|
|
+ );
|
|
|
+ // console.log(supplierList[item.id])
|
|
|
// 获取包装规格
|
|
|
let packingSpecification =
|
|
|
await storageApi.getCategoryPackageDisposition({
|
|
|
@@ -1245,6 +1252,10 @@
|
|
|
let measureQuantity = filtersItem.totalCount || 0;
|
|
|
let packingQuantity = filtersItem.totalCount || 0;
|
|
|
let packingUnit = filtersItem.measuringUnit || '';
|
|
|
+ console.log(
|
|
|
+ filtersItem.measuringUnit,
|
|
|
+ '77777777777777777777777777777777777777777777'
|
|
|
+ );
|
|
|
let price = filtersItem.singlePrice || 0;
|
|
|
let singleWeight = filtersItem.singleWeight || 0; // 单重重量
|
|
|
let weight = filtersItem.sendTotalWeight || 0;
|
|
|
@@ -1652,7 +1663,6 @@
|
|
|
getNowDate() {
|
|
|
let date = new Date(),
|
|
|
obj = {
|
|
|
- year: date.getFullYear(), //获取完整的年份(4位)
|
|
|
month: date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
|
|
|
strDate: date.getDate(), // 获取当前日(1-31)
|
|
|
hour: date.getHours(), //获取当前小时(0 ~ 23)
|
|
|
@@ -1666,7 +1676,7 @@
|
|
|
},
|
|
|
// 赋值入库时间
|
|
|
getNowFormatDate() {
|
|
|
- if (this.bizType == 2) {
|
|
|
+ if (this.bizType == '2') {
|
|
|
let time = '00:00:00';
|
|
|
this.formData.storageTime = this.form.receiveDate + ' ' + time;
|
|
|
} else {
|
yijing