|
@@ -266,22 +266,26 @@
|
|
|
<span v-if="createTemp.providerId == '' || parseFloat(createTemp.purchaseType) > 0">{{ scope.row.reportery }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="价格" prop="price" align="center" min-width="150">
|
|
|
+ <el-table-column v-if="createTemp.providerId == ''" label="价格" prop="price" align="center" min-width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <div v-if="createTemp.providerId == ''" v-for="item in scope.row.pricearr">
|
|
|
+ <div v-for="item in scope.row.pricearr">
|
|
|
<el-tooltip class="item" effect="dark" placement="top-start">
|
|
|
<div slot="content">{{item}}</div>
|
|
|
<div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item}}</div>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
- <el-form v-else :model="scope.row" :rules="rules">
|
|
|
- <el-form-item prop="price">
|
|
|
- <el-input v-model="scope.row.price" style="margin-top:15px" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column v-else label="价格" prop="price" align="center" min-width="150">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form :model="scope.row" :rules="rules">
|
|
|
+ <el-form-item prop="price">
|
|
|
+ <el-input v-model="scope.row.price" style="margin-top:15px" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="使用周期" min-width="120px" align="center">
|
|
|
+ <el-table-column v-if="createTemp.providerId == ''" label="使用周期" min-width="120px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<div v-for="item in scope.row.lifeCyclearr">
|
|
|
<el-tooltip class="item" effect="dark" placement="top-start">
|
|
@@ -291,7 +295,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="合同差异项" min-width="120px" align="center">
|
|
|
+ <el-table-column v-if="createTemp.providerId == ''" label="合同差异项" min-width="120px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<div v-for="item in scope.row.contractVarianceItemarr">
|
|
|
<el-tooltip class="item" effect="dark" placement="top-start">
|
|
@@ -1658,13 +1662,15 @@ export default {
|
|
|
}else if(this.dialogStatus==='special' && this.createTemp.purchaseType == '3'){
|
|
|
this.$set(item,'price','0')
|
|
|
this.$set(item,'amount','0')
|
|
|
+ }
|
|
|
+ if(this.dialogStatus !=='special'){
|
|
|
+ var pricearr = item.price.split(",")
|
|
|
+ this.$set(item,'pricearr',pricearr)
|
|
|
+ var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
+ this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
+ var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
+ this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
}
|
|
|
- var pricearr = item.price.split(",")
|
|
|
- this.$set(item,'pricearr',pricearr)
|
|
|
- var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
- this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
- var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
- this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
this.listAdd.unshift(item)
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
@@ -1691,12 +1697,14 @@ export default {
|
|
|
this.$set(item,'price','0')
|
|
|
this.$set(item,'amount','0')
|
|
|
}
|
|
|
- var pricearr = item.price.split(",")
|
|
|
- this.$set(item,'pricearr',pricearr)
|
|
|
- var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
- this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
- var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
- this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
+ if(this.dialogStatus !=='special'){
|
|
|
+ var pricearr = item.price.split(",")
|
|
|
+ this.$set(item,'pricearr',pricearr)
|
|
|
+ var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
+ this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
+ var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
+ this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
+ }
|
|
|
this.listAdd.unshift(item)
|
|
|
this.$forceUpdate()
|
|
|
})
|
|
@@ -1721,12 +1729,14 @@ export default {
|
|
|
this.$set(item,'price','0')
|
|
|
this.$set(item,'amount','0')
|
|
|
}
|
|
|
- var pricearr = item.price.split(",")
|
|
|
- this.$set(item,'pricearr',pricearr)
|
|
|
- var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
- this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
- var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
- this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
+ if(this.dialogStatus !=='special'){
|
|
|
+ var pricearr = item.price.split(",")
|
|
|
+ this.$set(item,'pricearr',pricearr)
|
|
|
+ var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
+ this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
+ var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
+ this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
+ }
|
|
|
this.listAdd.unshift(item)
|
|
|
}
|
|
|
} else {
|
|
@@ -1743,13 +1753,13 @@ export default {
|
|
|
this.$set(item,'price','0')
|
|
|
this.$set(item,'amount','0')
|
|
|
}
|
|
|
- if(this.dialogStatus==='special' && this.createTemp.purchaseType == '1'){
|
|
|
- var pricearr = item.price.split(",")
|
|
|
- this.$set(item,'pricearr',pricearr)
|
|
|
- var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
- this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
- var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
- this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
+ if(this.dialogStatus !=='special' && this.createTemp.providerId == ''){
|
|
|
+ var pricearr = item.price.split(",")
|
|
|
+ this.$set(item,'pricearr',pricearr)
|
|
|
+ var lifeCyclearr = item.lifeCycle.split(",")
|
|
|
+ this.$set(item,'lifeCyclearr',lifeCyclearr)
|
|
|
+ var contractVarianceItemarr = item.contractVarianceItem.split(",")
|
|
|
+ this.$set(item,'contractVarianceItemarr',contractVarianceItemarr)
|
|
|
}
|
|
|
this.listAdd.unshift(item)
|
|
|
this.$forceUpdate()
|
|
@@ -2790,8 +2800,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- handle_specialSubscription(){
|
|
|
- this.resetCreateTemp()
|
|
|
+ handle_specialSubscription(){
|
|
|
this.createTemp.purchaseType = '1'
|
|
|
this.edit = 1
|
|
|
this.getDepartParam.parammaps.pastureId = this.createTemp.pastureId
|
|
@@ -2824,6 +2833,9 @@ export default {
|
|
|
changeType(){
|
|
|
if(this.createTemp.purchaseType == 1){
|
|
|
this.getBigPartpurchase(parseInt(this.createTemp.purchaseType))
|
|
|
+ }else{
|
|
|
+ this.createTemp.orderNumber = ''
|
|
|
+ this.getCreateNumber()
|
|
|
}
|
|
|
this.listAdd = []
|
|
|
this.$set(this.createTemp,'providerId','')
|
|
@@ -2981,6 +2993,9 @@ export default {
|
|
|
let url = 'authdata/spare/parts/requisitions'
|
|
|
for(let i=0;i<this.listAdd.length;i++){
|
|
|
this.$set(this.listAdd[i],'contractId',String(this.listAdd[i].contractId))
|
|
|
+ this.$set(this.listAdd[i],'departmentId',this.createTemp.departmentId)
|
|
|
+ this.$set(this.listAdd[i],'date',this.createTemp.createTime)
|
|
|
+ this.$set(this.listAdd[i],'employeId',this.createTemp.employeId)
|
|
|
}
|
|
|
let data = {
|
|
|
"pastureId": parseInt(this.createTemp.pastureId),
|