|
@@ -11,9 +11,8 @@
|
|
|
class="time-form"
|
|
class="time-form"
|
|
|
:selection.sync="selection"
|
|
:selection.sync="selection"
|
|
|
>
|
|
>
|
|
|
-
|
|
|
|
|
<template v-slot:files="scope">
|
|
<template v-slot:files="scope">
|
|
|
- <el-form-item >
|
|
|
|
|
|
|
+ <el-form-item>
|
|
|
<el-link
|
|
<el-link
|
|
|
v-for="link in scope.row.files"
|
|
v-for="link in scope.row.files"
|
|
|
:key="link.id"
|
|
:key="link.id"
|
|
@@ -25,16 +24,16 @@
|
|
|
</el-link>
|
|
</el-link>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
<template v-slot:supplierIds="scope">
|
|
<template v-slot:supplierIds="scope">
|
|
|
- <el-form-item >
|
|
|
|
|
|
|
+ <el-form-item>
|
|
|
<el-select
|
|
<el-select
|
|
|
v-model="scope.row['supplierIds']"
|
|
v-model="scope.row['supplierIds']"
|
|
|
clearable
|
|
clearable
|
|
|
filterable
|
|
filterable
|
|
|
multiple
|
|
multiple
|
|
|
collapse-tags
|
|
collapse-tags
|
|
|
- :disabled="status=='Detail'"
|
|
|
|
|
|
|
+ :disabled="status == 'Detail'"
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="i in scope.row.supplierList"
|
|
v-for="i in scope.row.supplierList"
|
|
@@ -45,15 +44,15 @@
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
-
|
|
|
|
|
- <template v-slot:add="scope" v-if="status!='Detail'">
|
|
|
|
|
|
|
+
|
|
|
|
|
+ <template v-slot:add="scope" v-if="status != 'Detail'">
|
|
|
<el-form-item style="margin-bottom: 20px">
|
|
<el-form-item style="margin-bottom: 20px">
|
|
|
<el-button type="primary" @click="openSupplier(scope.row)"
|
|
<el-button type="primary" @click="openSupplier(scope.row)"
|
|
|
>新增报价单</el-button
|
|
>新增报价单</el-button
|
|
|
>
|
|
>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
- <template v-slot:action="scope" v-if="status!='Detail'">
|
|
|
|
|
|
|
+ <template v-slot:action="scope" v-if="status != 'Detail'">
|
|
|
<el-popconfirm
|
|
<el-popconfirm
|
|
|
class="ele-action"
|
|
class="ele-action"
|
|
|
title="确定要删除吗?"
|
|
title="确定要删除吗?"
|
|
@@ -80,7 +79,8 @@
|
|
|
import { getInventoryTotalAPI } from '@/api/bpm/components/wms';
|
|
import { getInventoryTotalAPI } from '@/api/bpm/components/wms';
|
|
|
// import fileMain from '@/components/addDoc/index.vue';
|
|
// import fileMain from '@/components/addDoc/index.vue';
|
|
|
// import headList from '@/views/saleManage/businessOpportunity/components/headList.vue';
|
|
// import headList from '@/views/saleManage/businessOpportunity/components/headList.vue';
|
|
|
- import {lbjtList } from '@/enum/dict.js';
|
|
|
|
|
|
|
+ import { lbjtList } from '@/enum/dict.js';
|
|
|
|
|
+ // import { levelList } from '@/enum/dict.js';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
mixins: [dictMixins],
|
|
@@ -95,7 +95,7 @@
|
|
|
},
|
|
},
|
|
|
status: {
|
|
status: {
|
|
|
default: ''
|
|
default: ''
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
const defaultForm = {
|
|
const defaultForm = {
|
|
@@ -147,7 +147,7 @@
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
fixed: 'left',
|
|
fixed: 'left',
|
|
|
align: 'center',
|
|
align: 'center',
|
|
|
- show:this.status!='Detail'
|
|
|
|
|
|
|
+ show: this.status != 'Detail'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 100,
|
|
minWidth: 100,
|
|
@@ -210,6 +210,16 @@
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
align: 'center'
|
|
align: 'center'
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ minWidth: 120,
|
|
|
|
|
+ prop: 'goodsLevel',
|
|
|
|
|
+ label: '物品级别',
|
|
|
|
|
+ formatter: (_row, _column, cellValue) => {
|
|
|
|
|
+ return levelList.find((item) => item.value == _row.goodsLevel)
|
|
|
|
|
+ ?.label;
|
|
|
|
|
+ },
|
|
|
|
|
+ align: 'center'
|
|
|
|
|
+ },
|
|
|
{
|
|
{
|
|
|
minWidth: 80,
|
|
minWidth: 80,
|
|
|
prop: 'totalCount',
|
|
prop: 'totalCount',
|
|
@@ -278,10 +288,9 @@
|
|
|
minWidth: 200,
|
|
minWidth: 200,
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
formatter: (row, column) => {
|
|
formatter: (row, column) => {
|
|
|
-
|
|
|
|
|
return row.provenance && row.provenance.length
|
|
return row.provenance && row.provenance.length
|
|
|
? row.provenance
|
|
? row.provenance
|
|
|
- .map((item) => this.getDictValue('产地', item ))
|
|
|
|
|
|
|
+ .map((item) => this.getDictValue('产地', item))
|
|
|
.join(',')
|
|
.join(',')
|
|
|
: '';
|
|
: '';
|
|
|
}
|
|
}
|
|
@@ -301,12 +310,13 @@
|
|
|
label: '属性类型',
|
|
label: '属性类型',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
formatter: (row, column) => {
|
|
formatter: (row, column) => {
|
|
|
- if(row.produceType){
|
|
|
|
|
- return row.produceType.map(item=>{
|
|
|
|
|
- return lbjtList[item]
|
|
|
|
|
- }).toString()
|
|
|
|
|
|
|
+ if (row.produceType) {
|
|
|
|
|
+ return row.produceType
|
|
|
|
|
+ .map((item) => {
|
|
|
|
|
+ return lbjtList[item];
|
|
|
|
|
+ })
|
|
|
|
|
+ .toString();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// {
|
|
// {
|
|
@@ -407,7 +417,11 @@
|
|
|
//供应商列表
|
|
//供应商列表
|
|
|
item.resultList.forEach((val) => {
|
|
item.resultList.forEach((val) => {
|
|
|
//供应商产品
|
|
//供应商产品
|
|
|
- if (val.productCode == productItem.productCode&&val.batchNo == productItem.batchNo&&val.taskId == productItem.taskId) {
|
|
|
|
|
|
|
+ if (
|
|
|
|
|
+ val.productCode == productItem.productCode &&
|
|
|
|
|
+ val.batchNo == productItem.batchNo &&
|
|
|
|
|
+ val.taskId == productItem.taskId
|
|
|
|
|
+ ) {
|
|
|
totalCountS.push(
|
|
totalCountS.push(
|
|
|
Number(val.totalCount || 0) +
|
|
Number(val.totalCount || 0) +
|
|
|
Number(productItem.doneTotalCount || 0)
|
|
Number(productItem.doneTotalCount || 0)
|
|
@@ -429,7 +443,7 @@
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
filterMethod(value, row, column) {
|
|
filterMethod(value, row, column) {
|
|
|
- let ids = row.supplierIds
|
|
|
|
|
|
|
+ let ids = row.supplierIds;
|
|
|
if (ids.length > 0 && ids.includes(value)) {
|
|
if (ids.length > 0 && ids.includes(value)) {
|
|
|
return row;
|
|
return row;
|
|
|
}
|
|
}
|
|
@@ -458,8 +472,7 @@
|
|
|
'availableCountBase',
|
|
'availableCountBase',
|
|
|
find.availableCountBase
|
|
find.availableCountBase
|
|
|
);
|
|
);
|
|
|
- supplierList.push(...item.supplierList);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ supplierList.push(...item.supplierList);
|
|
|
});
|
|
});
|
|
|
supplierIds = Array.from(
|
|
supplierIds = Array.from(
|
|
|
new Set(supplierList.map((item) => item.id))
|
|
new Set(supplierList.map((item) => item.id))
|