yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
6f1328063e b7e130e871
commit
06f62ddbb5
16 changed files with 263 additions and 246 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  2. 18
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
  3. 23
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
  4. 7
      anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
  5. 31
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
  6. 46
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  7. 37
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
  8. 19
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
  9. 44
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
  10. 6
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
  11. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
  12. 48
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
  13. 73
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  14. 46
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
  15. 42
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
  16. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

18
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
View File

@ -69,6 +69,11 @@
<el-form-item label="规格型号">
<el-input v-model="listQuery.params.specifications" maxlength="125" placeholder="请输入规格型号" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="所属分公司">
<el-select v-model="listQuery.params.orgSid" class="addinputw" clearable filterable placeholder="">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -193,6 +198,7 @@ import chexinglook from './chexinglook'
import chexingpeizhi from './relation/chexingguanlianchangyong'
import chexinggonggaoxingao from './relation/chexinggonggaoxingao'
import upload from '../../../components/uploadFile/upload_chexing'
import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'chexing',
@ -268,6 +274,7 @@ export default {
tableKey: 0,
list: [],
srcList: [],
org_list: [],
carBrand_list: [], // 品牌
vehicleFunction_list: [], // 功能
productLine_list: [], // 系列
@ -295,7 +302,8 @@ export default {
emissionStandard: '',
engineType: '',
marketSegments: '',
specifications: ''
specifications: '',
orgSid: ''
},
current: 1,
size: 5,
@ -376,6 +384,11 @@ export default {
})
},
init() {
getListOrg().then((resp) => {
if (resp.success) {
this.org_list = resp.data
}
})
// 下拉框-功能
pullDown({
type: 'vehicleFunction'
@ -521,7 +534,8 @@ export default {
emissionStandard: '',
engineType: '',
marketSegments: '',
specifications: ''
specifications: '',
orgSid: ''
},
current: 1,
size: 5,

18
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
View File

@ -114,6 +114,11 @@
<el-form-item label="常用配置名称">
<el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="所属分公司">
<el-select v-model="listQuery.params.orgSid" class="addinputw" clearable placeholder="">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -264,6 +269,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import changyongpeizhiAdd from '../../chexingpeizhi/changyongpeizhiAdd'
import ChangyongpeizhiInfo from '@/views/cheliang/chexingpeizhi/changyongpeizhiInfo'
import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'changyongpeizhiguanlian',
@ -307,7 +313,8 @@ export default {
tireCoverKey: '',
tireSizeKey: '',
useOrgSid: '',
wheelbaseKey: ''
wheelbaseKey: '',
orgSid: ''
},
current: 1,
size: 10,
@ -320,6 +327,7 @@ export default {
configurationItemsSids: [],
sids: [],
chesid: '',
org_list: [],
carColor_list: [], // 车身颜色
slowMachine_list: [], // 缓速器
rearViewMirror_list: [], // 后视镜
@ -353,6 +361,11 @@ export default {
}
},
getType() {
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
}
})
// 下拉框-车身颜色
pullDown({
type: 'bodyColor'
@ -622,7 +635,8 @@ export default {
tireCoverKey: '',
tireSizeKey: '',
useOrgSid: '',
wheelbaseKey: ''
wheelbaseKey: '',
orgSid: ''
},
current: 1,
size: 10,

23
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
View File

@ -106,6 +106,11 @@
<el-form-item label="常用配置名称">
<el-input v-model="listQuery.params.configName" maxlength="125" placeholder="请输入常用配置名称" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="所属分公司">
<el-select v-model="listQuery.params.orgSid" class="addinputw" clearable placeholder="">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -269,6 +274,7 @@ import ButtonBar from '@/components/ButtonBar'
import changyongpeizhiAdd from './changyongpeizhiAdd'
import changyongpeizhiInfo from './changyongpeizhiInfo'
import changyongpeizhiRel from './ohter/changyongpeizhiRel'
import { getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'chexingpeizhi',
@ -388,22 +394,16 @@ export default {
suspensionKey: '',
tireCoverKey: '',
tireSizeKey: '',
wheelbaseKey: ''
wheelbaseKey: '',
orgSid: ''
},
current: 1,
total: 0,
size: 5
},
selectDate: undefined,
temp: {}, // 添加和修改
templook: {}, // 查看实体
textMap: {
update: '编辑',
create: '创建'
},
org_list: [],
sids: [],
names: '', // [ {{names}} ]
chesid: '',
dialogFormVisible: false, // 添加修改对话框状态
dialogFormShowVisible: false, // 查看对话框默认关闭状态
dialogStatus: '', // 对话框状态
@ -476,6 +476,11 @@ export default {
}
},
getType() {
getListOrg().then((resp) => {
if (resp.success) {
this.org_list = resp.data
}
})
// 下拉框-车身颜色
pullDown({
type: 'bodyColor'

7
anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue
View File

@ -378,7 +378,8 @@ export default {
certificateState: '004', // 合格证状态key
certificateStateValue: '正式', // 合格证状态value
noticeModel: '', // 公告型号
smRemarks: ''
smRemarks: '',
carModel: '',
}, // 添加和修改
templook: {}, // 查看实体
Situation: [],
@ -711,6 +712,10 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请检查车架号的长度应为8位或17位' })
return
}
if (this.temp.certificateSituationValue === '正式' && this.temp.carModel === '') {
this.$message({ showClose: true, type: 'error', message: '因合格证状态为正式,则车辆型号不能为空' })
return
}
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true

31
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
View File

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
@ -210,7 +210,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
this.$message({
showClose: true,
type: 'success',
@ -226,19 +225,20 @@ export default {
})
},
submitVehicleApply() {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
}
})
@ -258,6 +258,7 @@ export default {
createBySid: '',
baseModelModpriceModels: []
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},

46
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
View File

@ -5,7 +5,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -743,7 +743,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
@ -812,28 +811,42 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
this.handleReturn('true')
}
})
}).catch(() => {
hint = 0
})
} else {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
this.handleReturn('true')
}
})
}
@ -843,6 +856,7 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.$refs['form_obj'].resetFields()
this.imgList = []
this.submitdisabled = false
this.$emit('doback')
}
}

37
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
View File

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
@ -371,7 +371,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
@ -389,19 +388,26 @@ export default {
})
},
submitVehicleApply() {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
})
}
}).catch(() => {
this.submitdisabled = false
})
}
})
@ -432,6 +438,7 @@ export default {
callInBuyerOrgSid: '',
baseInternalPurchaseVehicles: []
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},

19
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
View File

@ -19,11 +19,11 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd"><!-- -->
<div class="title">调车开票申请</div> <!--:rules="rules"-->
<div class="titwu">调车开票申请</div> <!--:rules="rules"-->
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px" class="formadd">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
<el-col :span="8"> <!-- 默认为调入 -->
<el-col :span="8">
<el-form-item label="调车类型">
<span>调入</span>
</el-form-item>
@ -400,12 +400,9 @@ export default {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
save(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
}
_this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
@ -446,6 +443,7 @@ export default {
this.list = []
this.useOrg = []
this.useOrgName = ''
this.submitdisabled = false
this.$refs['dataForm'].resetFields()
this.$emit('doback')
},
@ -468,12 +466,9 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
submitSunInv(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
}
_this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false

44
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
View File

@ -17,7 +17,7 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd"><!-- -->
<div class="title">分公司间调账申请</div>
<div class="titwu">分公司间调账申请</div>
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px" class="formadd">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
@ -347,6 +347,7 @@ export default {
this.list = []
this.useOrg = ''
this.useOrgName = ''
this.submitdisabled = false
this.$refs['dataForm'].resetFields()
this.$emit('doback')
},
@ -355,15 +356,7 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
// this.temp.name = window.sessionStorage.getItem('name')
this.temp.createBySid = window.sessionStorage.getItem('userSid')
// req.detailsInfo(this.temp.sid).then(resp => {
// const data = resp.data
// this.temp.applicationCode = data.applicationCode
// this.temp.createTime = data.createTime
// }).catch(e => {
// this.submitdisabled = false
// })
this.dialogStatus = 'add'
this.viewTitle = '【新增】分公司间调账申请'
this.getPathSid()
@ -376,7 +369,7 @@ export default {
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】分公司间调账申请'
fetchDetailsBySid(row.sid).then(resp => {
fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
const data = resp.data
this.temp = data
@ -385,8 +378,6 @@ export default {
this.temp.accSids = []
console.log('编辑初始化', this.temp)
}
}).catch(e => {
this.submitdisabled = false
})
this.getPathSid()
this.getType()
@ -400,8 +391,7 @@ export default {
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
save(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
@ -423,26 +413,6 @@ export default {
}
})
},
// saveEdit() {
// const _this = this
// this.$refs['dataForm'].validate(valid => {
// if (valid) {
// this.submitdisabled = true
// req.save(this.temp).then(resp => {
// this.submitdisabled = false
// if (resp.success) {
// if (resp.success) {
// _this.handleReturn('true')
// }
// }
// }).catch(() => {
// this.submitdisabled = false
// })
// } else {
// return false
// }
// })
// },
handleSubmit() {
const _this = this
this.$refs['dataForm'].validate(valid => {
@ -458,8 +428,7 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
this.submitdisabled = false
submitAccAdjApply(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
_this.handleReturn('true')
@ -487,9 +456,6 @@ export default {
</script>
<style scoped>
.title {
padding: 28px 0;
}
.formadd /deep/ .el-row {
border: 0;

6
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
View File

@ -15,7 +15,7 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd"><!-- -->
<div class="title">分公司间调账申请</div>
<div class="titwu">分公司间调账申请</div>
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px" class="formadd">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
@ -169,10 +169,6 @@ export default {
</script>
<style scoped>
.title {
padding: 28px 0;
}
.formadd /deep/ .el-row {
border: 0;
}

4
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
View File

@ -171,7 +171,8 @@ export default {
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
userSid: '',
id: ''
},
rules: {}
}
@ -267,6 +268,7 @@ export default {
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
this.linkByParameter.id = this.nextNode.id
req.InitiatorToAnswer(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({

48
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
View File

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
</el-button>
</div>
</div>
@ -355,7 +355,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
@ -380,26 +379,33 @@ export default {
})
},
submitVehicleApply() {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
})
}
}, '*')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
}).catch(() => {
this.submitdisabled = false
})
}
})

73
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
View File

@ -5,7 +5,7 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交</el-button>
</div>
</div>
<div class="">
@ -757,7 +757,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
/* this.$message({
showClose: true,
type: 'success',
@ -838,42 +837,56 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}, '*')
}).catch(() => {
this.submitdisabled = false
})
}
})
}).catch(() => {
hint = 0
})
} else {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}, '*')
}).catch(() => {
this.submitdisabled = false
})
}
})
}

46
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
View File

@ -7,11 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button
type="primary"
size="small"
:disabled="submitdisabled"
@click="handleCreate()"
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()"
>保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交
@ -422,19 +418,16 @@ export default {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
save(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
// _this.handleReturn('true')
}
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
// _this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
@ -470,18 +463,15 @@ export default {
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
submitSunInv(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false

42
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
View File

@ -9,7 +9,7 @@
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交
</el-button>
</div>
</div>
@ -209,7 +209,6 @@ export default {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false
this.$message({
showClose: true,
type: 'success',
@ -232,26 +231,27 @@ export default {
})
},
submitVehicleApply() {
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submitVehicleApply(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '提交成功'
})
// 子页面向父级页面传递值(关闭弹框)
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}, '*')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
}).catch(() => {
this.submitdisabled = false
})
}
})

47
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
View File

@ -7,12 +7,7 @@
<div>【编辑】分公司间调账申请</div>
<!--start 添加修改按钮-->
<div>
<el-button
type="primary"
size="small"
:disabled="submitdisabled"
@click="handleCreate()"
>保存
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交
</el-button>
@ -366,23 +361,20 @@ export default {
handleCreate() {
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
if (this.list.length > 0) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
save(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false
@ -414,18 +406,15 @@ export default {
})
this.submitdisabled = true
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
this.submitdisabled = false
submitAccAdjApply(this.temp).then((resp) => {
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
window.parent.postMessage({
cmd: 'returnHeight',
params: {
// 操作成功，告诉父级页面关闭弹框
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false

Write Preview
Loading…
Cancel
Save