|
@@ -41,38 +41,42 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- normColumns() {
|
|
|
- return [
|
|
|
- {
|
|
|
- columnAttributes: {
|
|
|
- label: '产品品牌',
|
|
|
- prop: 'brand'
|
|
|
- },
|
|
|
+ qianmianzuijia() {
|
|
|
+ return [{
|
|
|
+ columnAttributes: {
|
|
|
+ label: '产品品牌',
|
|
|
+ prop: 'brand'
|
|
|
},
|
|
|
- {
|
|
|
- columnAttributes: {
|
|
|
- label: '产品大类',
|
|
|
- prop: 'mainName'
|
|
|
- },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ columnAttributes: {
|
|
|
+ label: '产品大类',
|
|
|
+ prop: 'mainName'
|
|
|
},
|
|
|
- {
|
|
|
- columnAttributes: {
|
|
|
- label: '产品小类',
|
|
|
- prop: 'smallName'
|
|
|
- },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ columnAttributes: {
|
|
|
+ label: '产品小类',
|
|
|
+ prop: 'smallName'
|
|
|
},
|
|
|
- {
|
|
|
- columnAttributes: {
|
|
|
- label: '产品机型',
|
|
|
- prop: 'goodsName'
|
|
|
- },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ columnAttributes: {
|
|
|
+ label: '产品机型',
|
|
|
+ prop: 'goodsName'
|
|
|
},
|
|
|
- {
|
|
|
- columnAttributes: {
|
|
|
- label: '数量',
|
|
|
- prop: 'orderNum'
|
|
|
- },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ columnAttributes: {
|
|
|
+ label: '数量',
|
|
|
+ prop: 'orderNum'
|
|
|
},
|
|
|
+ }]
|
|
|
+ },
|
|
|
+
|
|
|
+ normColumns() {
|
|
|
+ return [
|
|
|
+ ...this.qianmianzuijia,
|
|
|
{
|
|
|
columnAttributes: {
|
|
|
label: '工单类型',
|
|
@@ -364,6 +368,7 @@ export default {
|
|
|
},
|
|
|
otherColumns() {
|
|
|
return [
|
|
|
+ ...this.qianmianzuijia,
|
|
|
{
|
|
|
columnAttributes: {
|
|
|
label: '费用类型',
|
|
@@ -548,7 +553,7 @@ export default {
|
|
|
id: this.id
|
|
|
}).then(res => {
|
|
|
this.formData = res.data || {}
|
|
|
- this.formData.normList.map(item=>{
|
|
|
+ this.formData.normList.map(item => {
|
|
|
item.settleNum = item.orderNum
|
|
|
})
|
|
|
if (this.formData.orderType == "INSTALL") {
|