|
|
@@ -312,7 +312,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column label="部门" min-width="110px" align="center" prop="purpose" valign="middle" /> -->
|
|
|
- <el-table-column label="驳回说明" min-width="110px" align="center" prop="explain1" valign="middle" />
|
|
|
+ <el-table-column label="驳回说明" min-width="110px" align="center" prop="explain1" valign="middle" v-if="textMap.create == '新增'" />
|
|
|
<el-table-column label="备注" min-width="110px" align="center" valign="middle">
|
|
|
<template slot-scope="scope">
|
|
|
<el-input v-model="scope.row.purpose" />
|
|
|
@@ -334,7 +334,7 @@
|
|
|
<div slot="footer" class="dialog-footer" style="bottom:10px">
|
|
|
<el-button type="primary" :disabled="isokDisable" v-if="dialogStatus==='create'" @click="add_dialog_save()">保存并关闭</el-button>
|
|
|
<el-button type="primary" :disabled="isokDisable" v-else-if="dialogStatus==='update'" @click="edit_dialog_save()">保存并关闭</el-button>
|
|
|
- <el-button @click="dialogFormVisible = false;get_table_data()">取消并关闭</el-button>
|
|
|
+ <el-button @click="dialogFormVisible = false;get_table_data();createTemp.partCode=''">取消并关闭</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -559,7 +559,7 @@
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer" style="bottom:10px">
|
|
|
<el-button type="primary" :disabled="isokDisable" v-if="dialogStatus==='special'" @click="special_dialog_save()">保存并关闭</el-button>
|
|
|
- <el-button @click="dialogFormVisible2 = false;get_table_data()">取消并关闭</el-button>
|
|
|
+ <el-button @click="dialogFormVisible2 = false;get_table_data();createTemp.partCode=''">取消并关闭</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -1526,7 +1526,8 @@ export default {
|
|
|
this.createTemp.createTime = parseTime(new Date(), '{y}-{m}-{d}')
|
|
|
this.createTemp.orderNumber = ''
|
|
|
this.createTemp.providerId = ''
|
|
|
- this.createTemp.funderId = ''
|
|
|
+ this.createTemp.funderId = ''
|
|
|
+ this.createTemp.partCode = ''
|
|
|
this.createTemp.purchaseType = '1'
|
|
|
this.listAdd = []
|
|
|
},
|
|
|
@@ -2283,7 +2284,7 @@ export default {
|
|
|
console.log(this.dialogStatus,'======')
|
|
|
if(this.dialogStatus == 'create'){
|
|
|
console.log(this.dialogStatus,'======')
|
|
|
- this.getdataListSee.parammaps.reject = ''
|
|
|
+ this.getdataListSee.parammaps.reject = 1
|
|
|
}else{
|
|
|
this.getdataListSee.parammaps.reject = 0
|
|
|
}
|
|
|
@@ -2372,7 +2373,8 @@ export default {
|
|
|
row.providerId = ''
|
|
|
row.providerName = ''
|
|
|
}
|
|
|
- this.createTemp = Object.assign({}, row) // copy obj
|
|
|
+ this.createTemp = Object.assign({}, row) // copy obj
|
|
|
+ this.createTemp.createTime = row.inputTime
|
|
|
this.dialogStatus = 'update'
|
|
|
this.dialogFormVisible = true
|
|
|
this.$nextTick(() => {
|
|
|
@@ -2462,12 +2464,14 @@ export default {
|
|
|
contractId: '@insertSpotList.contractId',
|
|
|
lifeCycle: '@insertSpotList.lifeCycle',
|
|
|
reject: '@insertSpotList.reject',
|
|
|
- departmentId: this.createTemp.departmentId,
|
|
|
+ departmentId: this.createTemp.departmentId,
|
|
|
+ date: this.createTemp.inputTime,
|
|
|
+ employeId:this.createTemp.employeId,
|
|
|
contractVarianceItem: '@insertSpotList.contractVarianceItem',
|
|
|
// partpurchase:''
|
|
|
}}
|
|
|
ExecDataByConfig(this.postDataPramas).then(response => {
|
|
|
- console.log('新增保存发送参数', this.postDataPramas)
|
|
|
+ console.log('编辑保存发送参数', this.postDataPramas)
|
|
|
if (response.msg === 'fail') {
|
|
|
this.$notify({
|
|
|
title: '保存失败',
|
