wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
qiezi 10 months ago
parent
ce7dc033b2 ba01a2ea65
commit
e588c2959e
2 changed files with 34 additions and 8 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. 41
      src/views/modules/changeManagement/changeRecord.vue
  2. 1
      src/views/modules/changeManagement/changeRequest.vue

41
src/views/modules/changeManagement/changeRecord.vue
View File

@ -287,8 +287,14 @@
<el-footer style="height:25px;text-align:center">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
<el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane>
@ -386,8 +392,14 @@
<el-footer style="height:25px;text-align:center">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
<el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane>
@ -536,8 +548,14 @@
<el-footer style="height:25px;text-align:center">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
<el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane>
@ -590,8 +608,14 @@
<el-footer style="height:25px;text-align:center">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button v-if="authSubmit && modalData.changeStatus === '审批中' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
<el-button v-if="authReject && modalData.changeStatus === '审批中' && modalData.isReject === 'Y' && modalData.createBy2 === createBy2" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="authSubmit">
<el-button v-if="modalData.changeStatus === '审批中'" type="primary" :loading="submitLoading" @click="agreeSubmit">同意</el-button>
</template>
<template v-if="authReject">
<el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" :loading="submitLoading" @click="submitDataModal">驳回</el-button>
</template>
</template>
</el-footer>
</el-tab-pane>
</el-tabs>
@ -4193,6 +4217,7 @@
} else if (type === 7) {
strVal = this.tempExecutorRow.executor
}
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 133) {
strVal = this.tempPartRow.newPartNo

1
src/views/modules/changeManagement/changeRequest.vue
View File

@ -3149,6 +3149,7 @@
} else if (type === 7) {
strVal = this.tempExecutorRow.executor
}
conSql = " and b.site = '" + this.$store.state.user.site + "'"
}
if (val === 133) {
strVal = this.tempPartRow.newPartNo

Write Preview
Loading…
Cancel
Save