|
@@ -462,7 +462,11 @@
|
|
|
v-model="scope.row.singleWeight"
|
|
v-model="scope.row.singleWeight"
|
|
|
@input="changeCount(scope.row, scope.$index)"
|
|
@input="changeCount(scope.row, scope.$index)"
|
|
|
placeholder="请输入"
|
|
placeholder="请输入"
|
|
|
- ></el-input>
|
|
|
|
|
|
|
+ >
|
|
|
|
|
+ <template slot="append">
|
|
|
|
|
+ {{ scope.row.weightUnit }}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:technologyRouteName="scope">
|
|
<template v-slot:technologyRouteName="scope">
|
|
@@ -625,10 +629,25 @@
|
|
|
:disabled="quoteType === 2"
|
|
:disabled="quoteType === 2"
|
|
|
@input="handleCountChange(scope.row, scope.$index)"
|
|
@input="handleCountChange(scope.row, scope.$index)"
|
|
|
>
|
|
>
|
|
|
|
|
+ <template slot="append">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="scope.row[countObj.unitIdKey]"
|
|
|
|
|
+ style="width: 80px"
|
|
|
|
|
+ @change="changeCount(scope.row, scope.$index)"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ :label="item.conversionUnit"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ @click.native="packingChange(item, scope.$index)"
|
|
|
|
|
+ v-for="(item, index) in scope.row.packageDispositionList"
|
|
|
|
|
+ :key="index"
|
|
|
|
|
+ ></el-option>
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </template>
|
|
|
</el-input>
|
|
</el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
- <template v-slot:saleUnit="scope">
|
|
|
|
|
|
|
+ <!-- <template v-slot:saleUnit="scope">
|
|
|
<el-form-item
|
|
<el-form-item
|
|
|
:prop="'datasource.' + scope.$index + '.' + countObj.unitIdKey"
|
|
:prop="'datasource.' + scope.$index + '.' + countObj.unitIdKey"
|
|
|
>
|
|
>
|
|
@@ -646,7 +665,7 @@
|
|
|
></el-option>
|
|
></el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- </template>
|
|
|
|
|
|
|
+ </template> -->
|
|
|
<template v-slot:modelKey="scope">
|
|
<template v-slot:modelKey="scope">
|
|
|
<el-form-item :prop="'datasource.' + scope.$index + '.' + 'modelKey'">
|
|
<el-form-item :prop="'datasource.' + scope.$index + '.' + 'modelKey'">
|
|
|
<DictSelection
|
|
<DictSelection
|
|
@@ -1122,20 +1141,20 @@ export default {
|
|
|
width: 1
|
|
width: 1
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- width: 150,
|
|
|
|
|
|
|
+ width: 250,
|
|
|
prop: 'saleCount',
|
|
prop: 'saleCount',
|
|
|
label: '数量',
|
|
label: '数量',
|
|
|
slot: 'saleCount',
|
|
slot: 'saleCount',
|
|
|
headerSlot: this.isTotalCount ? 'headerTotalCount' : '',
|
|
headerSlot: this.isTotalCount ? 'headerTotalCount' : '',
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- width: 150,
|
|
|
|
|
- prop: 'saleUnit',
|
|
|
|
|
- label: '单位',
|
|
|
|
|
- slot: 'saleUnit',
|
|
|
|
|
- align: 'center'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // width: 150,
|
|
|
|
|
+ // prop: 'saleUnit',
|
|
|
|
|
+ // label: '单位',
|
|
|
|
|
+ // slot: 'saleUnit',
|
|
|
|
|
+ // align: 'center'
|
|
|
|
|
+ // }
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
// 当quoteType为2时添加生产加工相关列
|
|
// 当quoteType为2时添加生产加工相关列
|
|
@@ -1213,7 +1232,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- width: 120,
|
|
|
|
|
|
|
+ width: 180,
|
|
|
prop: 'singleWeight',
|
|
prop: 'singleWeight',
|
|
|
label: '单重',
|
|
label: '单重',
|
|
|
slot: 'singleWeight',
|
|
slot: 'singleWeight',
|
|
@@ -1222,15 +1241,15 @@ export default {
|
|
|
|
|
|
|
|
show: this.quoteType !== 2
|
|
show: this.quoteType !== 2
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- width: 120,
|
|
|
|
|
- prop: 'weightUnit',
|
|
|
|
|
- label: '重量单位',
|
|
|
|
|
- slot: 'weightUnit',
|
|
|
|
|
- align: 'center',
|
|
|
|
|
-
|
|
|
|
|
- show: this.quoteType !== 2
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // width: 120,
|
|
|
|
|
+ // prop: 'weightUnit',
|
|
|
|
|
+ // label: '重量单位',
|
|
|
|
|
+ // slot: 'weightUnit',
|
|
|
|
|
+ // align: 'center',
|
|
|
|
|
+
|
|
|
|
|
+ // show: this.quoteType !== 2
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
minWidth: 120,
|
|
minWidth: 120,
|
|
|
prop: 'goodsLevel',
|
|
prop: 'goodsLevel',
|
|
@@ -1241,12 +1260,16 @@ export default {
|
|
|
show: this.quoteType !== 2
|
|
show: this.quoteType !== 2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- width: 150,
|
|
|
|
|
|
|
+ width: 200,
|
|
|
prop: 'totalCount',
|
|
prop: 'totalCount',
|
|
|
label: '计量数量',
|
|
label: '计量数量',
|
|
|
headerSlot: 'headerTotalCount',
|
|
headerSlot: 'headerTotalCount',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
-
|
|
|
|
|
|
|
+ formatter: (_row, _column, cellValue) => {
|
|
|
|
|
+ if (_row.totalCount) {
|
|
|
|
|
+ return _row.totalCount + ' ' + _row.measuringUnit;
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
show: this.quoteType !== 2
|
|
show: this.quoteType !== 2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
@@ -1385,13 +1408,13 @@ export default {
|
|
|
|
|
|
|
|
show: this.quoteType !== 2
|
|
show: this.quoteType !== 2
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- width: 120,
|
|
|
|
|
- prop: 'measuringUnit',
|
|
|
|
|
- label: '计量单位',
|
|
|
|
|
- slot: 'measuringUnit',
|
|
|
|
|
- align: 'center'
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // width: 120,
|
|
|
|
|
+ // prop: 'measuringUnit',
|
|
|
|
|
+ // label: '计量单位',
|
|
|
|
|
+ // slot: 'measuringUnit',
|
|
|
|
|
+ // align: 'center'
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
prop: 'provenance',
|
|
prop: 'provenance',
|
|
|
label: '产地',
|
|
label: '产地',
|
|
@@ -1404,10 +1427,15 @@ export default {
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
- width: 120,
|
|
|
|
|
|
|
+ width: 180,
|
|
|
prop: 'totalWeight',
|
|
prop: 'totalWeight',
|
|
|
label: '总重',
|
|
label: '总重',
|
|
|
slot: 'totalWeight',
|
|
slot: 'totalWeight',
|
|
|
|
|
+ formatter: (_row, _column, cellValue) => {
|
|
|
|
|
+ if (_row.totalWeight) {
|
|
|
|
|
+ return _row.totalWeight + ' ' + _row.weightUnit;
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|