|
@@ -99,7 +99,6 @@ export default {
|
|
|
row.normAmount = ""
|
|
|
row.repairAmount = ""
|
|
|
row.settleNormId = ""
|
|
|
- row.settleNum = ""
|
|
|
if (val) {
|
|
|
var data = this.classifyList.find(item => item.categoryId == val)
|
|
|
row.parentCategoryName = data.name
|
|
@@ -132,7 +131,6 @@ export default {
|
|
|
row.normAmount = ""
|
|
|
row.repairAmount = ""
|
|
|
row.settleNormId = ""
|
|
|
- row.settleNum = ""
|
|
|
if (val) {
|
|
|
var data = this.classifyListLv2.find(item => item.categoryId == val)
|
|
|
row.categoryName = data.name
|
|
@@ -163,7 +161,6 @@ export default {
|
|
|
value={row[column.columnAttributes.prop]}
|
|
|
onInput={(val) => { row[column.columnAttributes.prop] = val }}
|
|
|
onChange={(val) => {
|
|
|
- row.settleNum = ""
|
|
|
if (val) {
|
|
|
var data = this.getflList(this.gonglv, row).find(item => item.label == val)
|
|
|
row.normAmount = data.normAmount
|
|
@@ -196,7 +193,7 @@ export default {
|
|
|
<el-form-item label="" label-width="0px" prop={`normList.${index}.${column.columnAttributes.prop}`} rules={required}>
|
|
|
<el-input
|
|
|
type="number"
|
|
|
- disabled={row.normAmount ? this.formData.settleStatus != 'YWG' : true}
|
|
|
+ disabled={this.formData.settleStatus != 'YWG'}
|
|
|
value={row[column.columnAttributes.prop]}
|
|
|
onInput={(val) => { row[column.columnAttributes.prop] = val }}
|
|
|
placeholder="请输入内容"
|
|
@@ -237,7 +234,6 @@ export default {
|
|
|
value={row[column.columnAttributes.prop]}
|
|
|
onInput={(val) => { row[column.columnAttributes.prop] = val }}
|
|
|
onChange={(val) => {
|
|
|
- row.settleNum = ""
|
|
|
if (val) {
|
|
|
var data = this.getflList(this.gonglr, row).find(item => item.label == val)
|
|
|
row.repairAmount = data.repairAmount
|
|
@@ -314,7 +310,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
columnAttributes: {
|
|
|
- label: '数量',
|
|
|
+ label: '结算数量',
|
|
|
prop: 'settleNum'
|
|
|
},
|
|
|
render: (h, { row, column, index }) => {
|
|
@@ -322,7 +318,7 @@ export default {
|
|
|
<el-form-item label="" label-width="0px" prop={`normList.${index}.${column.columnAttributes.prop}`} rules={required}>
|
|
|
<el-input
|
|
|
type="number"
|
|
|
- disabled={row.normAmount ? this.formData.settleStatus != 'YWG' : true}
|
|
|
+ disabled={this.formData.settleStatus != 'YWG'}
|
|
|
value={row[column.columnAttributes.prop]}
|
|
|
onInput={(val) => { row[column.columnAttributes.prop] = val }}
|
|
|
placeholder="请输入内容"
|
|
@@ -554,6 +550,9 @@ export default {
|
|
|
id: this.id
|
|
|
}).then(res => {
|
|
|
this.formData = res.data || {}
|
|
|
+ this.formData.normList.map(item=>{
|
|
|
+ item.settleNum = item.orderNum
|
|
|
+ })
|
|
|
if (this.formData.orderType == "INSTALL") {
|
|
|
// 安装单请求
|
|
|
listPageV2({ "pageNum": 1, "pageSize": -1, "params": [] }).then(res => {
|
|
@@ -570,31 +569,21 @@ export default {
|
|
|
type: this.formData.orderSmallType
|
|
|
}).then(res => {
|
|
|
var classifyList = {}
|
|
|
+ var classifyListLv2 = {}
|
|
|
this.classifyListLv2 = res.data.map(item => {
|
|
|
var { children, ...data } = item
|
|
|
classifyList[data.parentCategoryId] = data.parentCategoryName
|
|
|
- return {
|
|
|
+ classifyListLv2[data.categoryId] = {
|
|
|
name: data.categoryName,
|
|
|
...data
|
|
|
}
|
|
|
});
|
|
|
+ this.classifyListLv2 = Object.keys(classifyListLv2).map(key => classifyListLv2[key])
|
|
|
this.classifyList = Object.keys(classifyList).map(key => ({
|
|
|
name: classifyList[key],
|
|
|
categoryId: key
|
|
|
}))
|
|
|
})
|
|
|
- // // 获取产品大类小类
|
|
|
- // getClassifyList({ type: 2, status: true }).then(res => {
|
|
|
- // var classifyListLv2 = []
|
|
|
- // this.classifyList = res.data.map(item => {
|
|
|
- // var { children, ...data } = item
|
|
|
- // classifyListLv2.push(...(children || []))
|
|
|
- // return {
|
|
|
- // ...data
|
|
|
- // }
|
|
|
- // });
|
|
|
- // this.classifyListLv2 = classifyListLv2
|
|
|
- // })
|
|
|
settleNormOtherQuery().then(res => {
|
|
|
this.gongqt = res.data;
|
|
|
this.gongqtdl = Array.from(new Set(res.data.map(item => item.type))).map(type => ({
|