shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-09-20 15:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

beyond 8.1

Browse source 
beyond 8.1
This commit is contained in:
beyond 2019-08-01 11:01:55 +08:00
parent bfd37fd6ac
commit cc9175ebff
144 changed files with 1485 additions and 357 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/views/AccessMaterials/AccessMaterialsList.vue
View file

@ -313,6 +313,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -322,10 +323,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateaccess2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -487,10 +495,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/AccessMaterials/RetreatMaterialsList.vue
View file

@ -303,6 +303,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -312,10 +313,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateretreatMaterials2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -480,10 +488,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/AccessMaterials/components/DetailList.vue
View file

@ -255,6 +255,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.accessMaterialsDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/AccessMaterials/components/DetailList2.vue
View file

@ -242,6 +242,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.retreatMaterialsDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/AccessTools/AccessToolsList.vue
View file

@ -441,10 +441,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/AccessTools/components/DetailList.vue
View file

@ -309,6 +309,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.accessToolsDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/AdjustPrice/AdjustPriceList.vue
View file

@ -269,6 +269,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -278,10 +279,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatrepoadjustprice2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -457,10 +465,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/AdjustPrice/components/DetailList.vue
View file

@ -252,6 +252,11 @@ export default {
this.adjustRepositoryId = this.personalForm.adjustRepositoryId
this.list2 = this.personalForm.repoAdjustPriceDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

5
src/views/AdvancePay/components/DetailList.vue
View file

@ -206,6 +206,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.stockArrivalDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/Advancemanage/AdvanceOrderList.vue
View file

@ -294,6 +294,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -303,10 +304,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateadvanceorder2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -469,10 +477,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/Advancemanage/PrepReturnList.vue
View file

@ -298,6 +298,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -307,10 +308,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateadvancereturn2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -511,10 +519,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Advancemanage/components/DetailList.vue
View file

@ -166,6 +166,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = new Array(this.personalForm)
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/Advancemanage/components/DetailList2.vue
View file

@ -198,6 +198,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.advanceOrderDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/Advancemanage/components/DetailList3.vue
View file

@ -274,6 +274,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.advanceReturnDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/AgentCollect/components/DetailList.vue
View file

@ -499,6 +499,11 @@ export default {
this.personalForm = this.detaildata
this.productForm = this.detaildata.installmentApplyDetailVos[0]
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/AgentCollect/index.vue
View file

@ -410,10 +410,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

16
src/views/BasicSettings/ApprovalProcess.vue
View file

@ -13,14 +13,14 @@
<!-- 搜索按钮 -->
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" @click="handleFilter">{{ $t('public.search') }}</el-button>
<!-- 批量操作 -->
<el-dropdown @command="handleCommand">
<el-button v-waves class="filter-item" type="primary">
{{ $t('public.batchoperation') }} <i class="el-icon-arrow-down el-icon--right"/>
</el-button>
<el-dropdown-menu slot="dropdown" style="width: 140px">
<el-dropdown-item v-permission="['1-39-45-2']" style="text-align: left" command="delete"><svg-icon icon-class="shanchu" style="width: 40px"/>{{ $t('public.delete') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <el-dropdown @command="handleCommand">-->
<!-- <el-button v-waves class="filter-item" type="primary">-->
<!-- {{ $t('public.batchoperation') }} <i class="el-icon-arrow-down el-icon&#45;&#45;right"/>-->
<!-- </el-button>-->
<!-- <el-dropdown-menu slot="dropdown" style="width: 140px">-->
<!-- <el-dropdown-item v-permission="['1-39-45-2']" style="text-align: left" command="delete"><svg-icon icon-class="shanchu" style="width: 40px"/>{{ $t('public.delete') }}</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- 表格导出操作 -->
<el-button v-permission="['1-39-45-6']" v-waves :loading="downloadLoading" class="filter-item" style="width: 86px" @click="handleExport"> <svg-icon icon-class="daochu"/>{{ $t('public.export') }}</el-button>
<!-- 打印操作 -->

67
src/views/BasicSettings/NewApprovalProcess.vue
View file

@ -5,6 +5,9 @@
<h2 ref="geren" class="form-name">基本信息</h2>
<div class="container">
<el-form ref="personalForm" :model="personalForm" :rules="personalrules" :inline="true" status-icon class="demo-ruleForm" label-position="top" label-width="300px" style="margin-left: 30px;">
<!-- <el-form-item :label="$t('LogisticsCar.drivers')" prop="drivers" style="width: 40%;margin-top:1%">-->
<!-- <el-input v-model="drivers" placeholder="请输入驾驶员" @focus="handlechoose2"/>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('BasicSettings.process_name')" prop="process_name" style="width: 40%;margin-top:1%">
<el-input v-model="personalForm.process_name" placeholder="请输入流程名称" clearable/>
</el-form-item>
@ -81,16 +84,9 @@
<el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" prop="handlerName" align="center" label="步骤处理人" min-width="500px">
<template slot="edit" slot-scope="scope">
<el-input v-model="scope.row.handlerName" @focus="handlechoose(scope)" @input="$refs.editable.updateStatus(scope)" @change="$refs.editable.updateStatus(scope)"/>
<my-emp :control.sync="empcontrol" @chuli="chuli(scope, $event)"/>
<my-emp2 :control.sync="empcontrol2" @personName="personName(scope, $event)" @personIds="personIds(scope, $event)"/>
</template>
</el-editable-column>
<!--<el-editable-column align="center" label="操作" min-width="300px">-->
<!--<template slot-scope="scope">-->
<!--&lt;!&ndash;<el-input v-model="scope.row.handlerName" style="float: left;width: 100px" @input="$refs.editable.updateStatus(scope)"/>&ndash;&gt;-->
<!--<el-button icon="el-icon-more-outline" style="float: right" @click="handlechoose(scope)"/>-->
<!--<my-emp :control.sync="empcontrol" @personName="personName" @chuli="chuli(scope)"/>-->
<!--</template>-->
<!--</el-editable-column>-->
</el-editable>
</div>
<!--操作-->
@ -109,10 +105,11 @@ import permission from '@/directive/permission/index.js' // 权限判断指令
import permission2 from '@/directive/permission2/index.js' // 权限判断指令
import checkPermission from '@/utils/permission' // 权限判断函数
import MyEmp from './components/MyEmp'
import MyEmp2 from './components/MyEmp2'
export default {
name: 'NewApprovalProcess',
directives: { permission, permission2 },
components: { MyEmp },
components: { MyEmp, MyEmp2 },
data() {
return {
// 控制scope
@ -125,6 +122,7 @@ export default {
handlerName: '',
// 采购员弹窗控制
empcontrol: false,
empcontrol2: false,
// 单据类型数据
categorys: [],
// 审批流程列表规则
@ -173,6 +171,39 @@ export default {
this.getnationlist()
},
methods: {
chuli(scope, val) {
console.log(val)
console.log(scope)
this.kongscope.row.handlerName = val.personName
this.kongscope.row.stepHandler = val.id
// scope.row.handlerName = val.personName
// scope.row.stepHandler = val.id
console.log(scope.row.step)
if (this.kongscope.row.step === null) {
this.kongscope.row.step = scope.$index + 1
}
return
},
handlechoose2() {
this.empcontrol2 = true
},
// 驾驶员列表返回数据
personName(scope, val) {
// this.drivers = val
// this.personalForm.driverNames = val
this.kongscope.row.handlerName = val
this.kongscope.row.stepHandlerName = val
console.log(' this.kongscope.row.handlerName', this.kongscope.row.handlerName)
},
personIds(scope, val) {
// this.personalForm.drivers = val
this.kongscope.row.stepHandler = ',' + val + ','
console.log('this.kongscope.row.stepHandler', this.kongscope.row.stepHandler)
// if (this.kongscope.row.step === null) {
// this.kongscope.row.step = scope.$index + 1
// }
return
},
checkPermission,
getnationlist() {
// 区域列表数据
@ -234,7 +265,7 @@ export default {
handlesave() {
console.log(this.personalForm)
const rest = JSON.stringify(this.$refs.editable.getRecords())
console.log(rest)
console.log('rest', rest)
this.$refs.personalForm.validate((valid) => {
if (valid) {
createapproval(this.personalForm, rest).then(res => {
@ -271,27 +302,15 @@ export default {
// 审核人选择
// 员工输入框focus事件触发
handlechoose(scope) {
this.empcontrol = true
this.empcontrol2 = true
console.log(scope)
this.kongscope = scope
this.kongscope.row.step = scope.$index + 1
},
// 处理人change事件
fuzhi(scope) {
scope.row.handlerName = this.handlerName
},
chuli(scope, val) {
console.log(val)
console.log(scope)
this.kongscope.row.handlerName = val.personName
this.kongscope.row.stepHandler = val.id
// scope.row.handlerName = val.personName
// scope.row.stepHandler = val.id
console.log(scope.row.step)
if (scope.row.step === null) {
scope.row.step = scope.$index + 1
}
return
},
handleStep(row) {
console.log(row)
},

30
src/views/BasicSettings/components/MyDialog.vue
View file

@ -60,6 +60,7 @@
<template slot="edit" slot-scope="scope">
<el-input v-model="scope.row.handlerName" @focus="handlechoose(scope)" @input="$refs.editable.updateStatus(scope)"/>
<my-emp :control.sync="empcontrol" @chuli="chuli(scope, $event)"/>
<my-emp2 :control.sync="empcontrol2" @personName="personName(scope, $event)" @personIds="personIds(scope, $event)"/>
</template>
</el-editable-column>
<!--<el-editable-column align="center" label="操作" min-width="300px">-->
@ -82,8 +83,9 @@
import { regionlist, searchRepository } from '@/api/public'
import { searchcategory, searchDetail, updateeapproval } from '@/api/BasicSettings'
import MyEmp from './MyEmp'
import MyEmp2 from './MyEmp2'
export default {
components: { MyEmp },
components: { MyEmp, MyEmp2 },
props: {
control: {
type: Boolean,
@ -110,6 +112,7 @@ export default {
handlerName: '',
// 采购员弹窗控制
empcontrol: false,
empcontrol2: false,
// 单据类型数据
categorys: [],
// 审批流程列表规则
@ -167,6 +170,23 @@ export default {
this.getnationlist()
},
methods: {
// 驾驶员列表返回数据
personName(scope, val) {
// this.drivers = val
// this.personalForm.driverNames = val
this.kongscope.row.handlerName = val
this.kongscope.row.stepHandlerName = val
console.log(' this.kongscope.row.handlerName', this.kongscope.row.handlerName)
},
personIds(scope, val) {
// this.personalForm.drivers = val
this.kongscope.row.stepHandler = ',' + val + ','
console.log('this.kongscope.row.stepHandler', this.kongscope.row.stepHandler)
if (scope.row.step === null) {
scope.row.step = scope.$index + 1
}
return
},
// 国籍列表
getnationlist() {
// 区域列表数据
@ -215,18 +235,14 @@ export default {
// 审核人选择
// 员工输入框focus事件触发
handlechoose(scope) {
this.empcontrol = true
this.empcontrol2 = true
this.kongscope = scope
this.kongscope.row.step = scope.$index + 1
},
// 处理人change事件
fuzhi(scope) {
scope.row.handlerName = this.handlerName
},
// 员工列表返回数据
personName(val) {
this.handlerName = val.personName
this.stepHandler = val.id
},
chuli(scope, val) {
this.kongscope.row.handlerName = val.personName
this.kongscope.row.stepHandler = val.id

333
src/views/BasicSettings/components/MyEmp2.vue Normal file
View file

@ -0,0 +1,333 @@
<template>
<el-dialog :visible.sync="employeeVisible" :control="control" :close-on-press-escape="false" top="10px" title="选择员工" append-to-body @close="$emit('update:control', false)">
<div class="filter-container">
<el-input v-model="getemplist.employeename" :placeholder="$t('NewEmployeeInformation.employeename')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-input v-model="getemplist.jobnumber" :placeholder="$t('NewEmployeeInformation.jobnumber2')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
<el-date-picker
v-model="getemplist.time"
type="date"
class="filter-item"
placeholder="选择日期"
value-format="yyyy-MM-dd"/>
<el-popover
placement="bottom"
width="500"
trigger="click">
<el-cascader
:options="regions2"
:props="props2"
v-model="getemplistregions"
:show-all-levels="false"
placeholder="请选择区域"
change-on-select
filterable
clearable
style="width: 40%;float: left;margin-left: 20px"
@change="handlechange4"
/>
<el-select v-model="getemplist.repositoryid" placeholder="请选择门店" clearable filterable style="width: 40%;float: right;margin-right: 20px">
<el-option
v-for="(item, index) in repositories"
:key="index"
:label="item.repositoryName"
:value="item.id"/>
</el-select>
<el-select v-model="getemplist.postid" :value="getemplist.postid" :placeholder="$t('NewEmployeeInformation.postid2')" class="filter-item" clearable style="width: 40%;float: left;margin-top: 10px;margin-left: 20px">
<el-option label="xxx" value="1"/>
<el-option label="xxx" value="2"/>
</el-select>
<el-select v-model="getemplist.deptid" :placeholder="$t('NewEmployeeInformation.deptid2')" class="filter-item" clearable style="width: 40%;float: right;margin-top: 10px;margin-right: 20px">
<el-option
v-for="(item, index) in depts"
:key="index"
:label="item.deptName"
:value="item.id"/>
</el-select>
<div class="seachbutton" style="width: 100%;float: right;margin-top: 20px">
<el-button v-waves class="filter-item" type="primary" style="float: right" @click="handleFilter">{{ $t('public.search') }}</el-button>
</div>
<el-button v-waves slot="reference" type="primary" class="filter-item" style="width: 130px">{{ $t('public.filter') }}<svg-icon icon-class="shaixuan" style="margin-left: 4px"/></el-button>
</el-popover>
<el-button v-waves class="filter-item" type="primary" icon="el-icon-search" style="width: 86px" @click="handleFilter">{{ $t('public.search') }}</el-button>
<el-button v-waves class="filter-item" icon="el-icon-plus" type="success" style="width: 86px;" @click="handleAdd">{{ $t('public.add') }}</el-button>
</div>
<el-table
v-loading="listLoading"
:data="list"
:key="tableKey"
border
fit
highlight-current-row
style="width: 100%"
@selection-change="handleCurrentChange">
<el-table-column
type="selection"
width="55"
align="center"/>
<el-table-column
:label="$t('NewEmployeeInformation.id')"
:resizable="false"
property="id"
align="center"
width="50"/>
<el-table-column
:label="$t('NewEmployeeInformation.jobNumber')"
:resizable="false"
property="jobNumber"
align="center"
width="100"/>
<el-table-column
:label="$t('NewEmployeeInformation.account')"
:resizable="false"
property="account"
width="150"
align="center"/>
<el-table-column :label="$t('NewEmployeeInformation.name')" :resizable="false" align="center" width="109">
<template slot-scope="scope">
<span>{{ scope.row.firstName }} {{ scope.row.middleName }} {{ scope.row.lastName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('NewEmployeeInformation.gender')" :resizable="false" prop="gender" align="center" width="80">
<template slot-scope="scope">
<span>{{ scope.row.gender | genderFilter }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('NewEmployeeInformation.deptName')" :resizable="false" prop="deptName" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.deptName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('NewEmployeeInformation.regionName')" :resizable="false" prop="regionName" align="center" width="230">
<template slot-scope="scope">
<span>{{ scope.row.regionName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('NewEmployeeInformation.repositoryName')" :resizable="false" prop="repositoryName" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.repositoryName }}</span>
</template>
</el-table-column>
</el-table>
<el-button v-waves class="filter-item" type="success" style="width: 86px;margin-top: 20px" @click="handleAddTo">{{ $t('public.addTo') }}</el-button>
<pagination v-show="total>0" :total="total" :page.sync="getemplist.pagenum" :limit.sync="getemplist.pagesize" @pagination="gitemplist" />
</el-dialog>
</template>
<script>
import { regionlist, searchRepository } from '@/api/public'
import { getemplist, getdeptlist } from '@/api/EmployeeInformation'
import waves from '@/directive/waves' // Waves directive
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
export default {
directives: { waves },
components: { Pagination },
filters: {
genderFilter(status) {
const statusMap = {
1: '男',
2: '女'
}
return statusMap[status]
}
},
props: {
control: {
type: Boolean,
default: false
}
},
data() {
return {
// 批量操作
moreaction: '',
// 仓库管理员回显数据
managerPeople: '',
// 小区经理回显数据
regionManagerId: '',
// / 弹窗选择
// 单选表格样式
currentRow: null,
// 员工表格数据
list: [],
// 员工表格数据条数
total: 0,
// 员工表格识别
tableKey: 0,
// 加载员工表格
listLoading: true,
// 员工查询列表数据
getemplist: {
repositoryid: '',
regionid: '',
postid: '',
deptid: '',
employeename: '',
pagenum: 1,
pagesize: 10,
stat: 1, loginRepositoryId: this.$store.getters.repositoryId, regionIds: this.$store.getters.regionId,
time: '',
jobnumber: ''
},
// 部门列表
depts: [],
// 区域级联数据转化
props2: {
value: 'id',
label: 'regionName',
children: 'regionListVos'
},
// 区域数据
regions2: [],
getemplistregions: [],
// 门店数据
repositories: [],
// 员工选择框控制
employeeVisible: this.control,
// 小区经理选择框控制
regionManagerVisible: false
}
},
watch: {
control() {
this.employeeVisible = this.control
console.log(this.control)
this.gitemplist()
}
},
created() {
this.gitemplist()
},
methods: {
// 仓库管理员选择开始
gitemplist() {
// 员工列表数据
this.listLoading = true
console.log(this.getemplist)
getemplist(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
} else {
this.$notify.error({
title: '错误',
message: '出错了',
offset: 100
})
}
setTimeout(() => {
this.listLoading = false
}, 0.5 * 100)
})
// 部门列表数据
getdeptlist().then(res => {
if (res.data.ret === 200) {
this.depts = res.data.data.content
} else {
this.$notify.error({
title: '错误',
message: '出错了',
offset: 100
})
}
})
// 区域数据
regionlist().then(res => {
if (res.data.ret === 200) {
this.regions2 = this.tranKTree(res.data.data.content)
}
})
},
// 转化数据方法
tranKTree(arr) {
if (!arr || !arr.length) return
return arr.map(item => ({
id: item.id,
regionName: item.regionName,
regionListVos: this.tranKTree(item.regionListVos)
}))
},
// 查询
handleFilter() {
this.getemplist.regionid = this.getemplistregions[this.getemplistregions.length - 1]
getemplist(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list
this.total = res.data.data.content.totalCount
} else {
this.$notify.error({
title: '错误',
message: '出错了',
offset: 100
})
}
})
},
// 新增数据
handleAdd() {
this.employeeVisible = false
this.$router.push('/EmployeeInformation/NewEmployeeInformation')
},
// 根据区域选择门店
handlechange4(val) {
console.log(val)
const finalid = val[val.length - 1]
searchRepository(finalid).then(res => {
if (res.data.ret === 200) {
console.log(res)
this.repositories = res.data.data.content.list
} else {
this.$message.error('出错了')
}
})
},
// 清空历史搜索数据
restemplist() {
this.getemplist = {
repositoryid: '',
regionid: '',
postid: '',
deptid: '',
employeename: '',
pagenum: 1,
pagesize: 10,
stat: 1,
time: '',
jobnumber: ''
}
this.getemplistregions = []
},
// 多项选择员工数据时的操作
handleCurrentChange(val) {
this.moreaction = val
},
// 员工id和name选择
handleAddTo() {
this.employeeVisible = false
const ids = this.moreaction.map(item => item.id).join()
const names = this.moreaction.map(item => item.personName).join()
this.$emit('personName', names)
this.$emit('personIds', ids)
}
}
}
</script>
<style scoped>
.ERP-container {
margin: 50px 30px;
}
.filter-item{
width: 140px;
margin-left: 20px;
}
.form-name{
font-size: 18px;
color: #373e4f;
margin-bottom: -20px;
margin-top: 30px;
}
.container{
margin-top: 2%;
border: 1px solid #eceff6;
}
</style>

21
src/views/BuildUp/BuildUpList.vue
View file

@ -259,6 +259,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -268,10 +269,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatebuildup2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -435,7 +443,10 @@ export default {
isReview(row) {
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/BuildUp/components/DetailList.vue
View file

@ -261,6 +261,11 @@ export default {
this.list2 = this.personalForm.buildBeforeDetailVos
this.list3 = this.personalForm.buildAfterDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

6
src/views/ChangeCount/ChangeCountList.vue
View file

@ -422,10 +422,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/ChangeCount/components/DetailList.vue
View file

@ -241,6 +241,11 @@ export default {
detaildata() {
this.personalForm = this.detaildata
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.list2 = this.personalForm.changeCountDetailvos
}
},

6
src/views/CheckFail/CheckFailList.vue
View file

@ -376,10 +376,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/CheckFail/components/DetailList.vue
View file

@ -251,6 +251,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.checkFailHandleDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/CheckReport/CheckReportList.vue
View file

@ -399,10 +399,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/CheckReport/components/DetailList.vue
View file

@ -354,6 +354,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.checkReportDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/CheckReport/components/DetailList2.vue
View file

@ -354,6 +354,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.checkReportDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/CollectList/components/DetailList.vue
View file

@ -499,6 +499,11 @@ export default {
this.personalForm = this.detaildata
this.productForm = this.detaildata.installmentApplyDetailVos[0]
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/CollectList/index.vue
View file

@ -482,10 +482,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/Collection/CollectionList.vue
View file

@ -460,10 +460,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/Collection/RecoverVehicleList.vue
View file

@ -413,10 +413,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Collection/components/DetailList.vue
View file

@ -244,6 +244,11 @@ export default {
detaildata() {
this.personalForm = this.detaildata
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.list2 = this.personalForm.recoverVehicleDetailVos
this.list3 = this.personalForm.recoverVehicleLostVos
}

5
src/views/Coupon/components/DetailList.vue
View file

@ -211,6 +211,11 @@ export default {
this.list2 = this.personalForm.productVos
this.list3 = this.personalForm.saleOrderCostDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/CustomerMarketing/CustomerChatList.vue
View file

@ -379,10 +379,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/CustomerMarketing/CustomerVisitList.vue
View file

@ -374,10 +374,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/CustomerSurveyReport/CustomerSurveyReportList.vue
View file

@ -381,10 +381,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/CustomerSurveyReport/components/DetailList.vue
View file

@ -267,6 +267,11 @@ export default {
console.log('this.personalForm', this.personalForm)
this.list2 = this.personalForm.saleContractDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
let pro = ''
if (this.personalForm.personalProperty.indexOf('1') !== -1) {
pro = pro + '电视'

22
src/views/DailyAdjust/DailyAdjustList.vue
View file

@ -264,6 +264,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -273,10 +274,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatedailyAdjust2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -439,10 +447,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/DailyAdjust/components/DeailList.vue
View file

@ -227,6 +227,11 @@ export default {
this.repositoryId = this.personalForm.repositoryName
this.list2 = this.personalForm.dailyAdjustDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

6
src/views/DeliverGoods/DeliverGoodsList.vue
View file

@ -406,10 +406,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/DeliverGoods/components/DetailList.vue
View file

@ -264,6 +264,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.deliverGoodsDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/Expenses/ExpensesList.vue
View file

@ -314,6 +314,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -323,10 +324,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateexpenses2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -475,10 +483,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Expenses/components/DetailList.vue
View file

@ -228,6 +228,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.expensesDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

2
src/views/Getauthority/index.vue
View file

@ -70,7 +70,7 @@
<el-col :span="8">
<div class="container3" style="margin-top: 20px">
<div style="width: 100%;border: 1px solid #ebeef5;border-bottom:none;height: 30px;padding-top: 5px;padding-left: 28px;color: #606266;">操作权限</div>
<el-card class="box-card" shadow="never" style="height: 730px">
<el-card class="box-card" shadow="never" style="height: 730px;overflow-y: auto">
<div slot="header" class="clearfix">
<span>名称</span>
<el-checkbox v-model="checkAll" style="float: right;margin-bottom: -5px" @change="handleCheckAllChange">全选</el-checkbox>

6
src/views/InstallmentApply/InstallmentApplyList.vue
View file

@ -563,10 +563,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/InstallmentApply/components/DetailList.vue
View file

@ -605,6 +605,11 @@ export default {
this.personalForm.motorCode = this.detaildata.installmentApplyDetailVos[0].motorCode
this.personalForm.batteryCode = this.detaildata.installmentApplyDetailVos[0].batteryCode
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
console.log('this.personalForm', this.personalForm)
const lis = {}
lis.consultancyName = this.personalForm.consultancyNameOne

5
src/views/InstallmentList/components/DetailList.vue
View file

@ -499,6 +499,11 @@ export default {
this.personalForm = this.detaildata
this.productForm = this.detaildata.installmentApplyDetailVos[0]
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/InstallmentList/index.vue
View file

@ -410,10 +410,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/InventoryCount/InventoryCountList.vue
View file

@ -241,6 +241,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -250,10 +251,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatecount2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -421,10 +429,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/InventoryCount/components/DetailList.vue
View file

@ -238,6 +238,11 @@ export default {
this.countRepositoryId = this.personalForm.countRepositoryName
this.list2 = this.personalForm.inventoryCountDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

22
src/views/InventoryOverflow/OverflowList.vue
View file

@ -272,6 +272,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -281,10 +282,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateoverflow2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -449,10 +457,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/InventoryOverflow/components/DetailList.vue
View file

@ -229,6 +229,11 @@ export default {
this.overflowRepositoryId = this.personalForm.overflowRepositoryName
this.list2 = this.personalForm.inventoryOverflowDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

22
src/views/Inventorydamaged/InventorydamagedList.vue
View file

@ -238,6 +238,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -247,10 +248,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatedamaged2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -403,10 +411,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Inventorydamaged/components/DetailList.vue
View file

@ -240,6 +240,11 @@ export default {
this.damagedRepositoryId = this.personalForm.damagedRepositoryName
this.list2 = this.personalForm.inventoryDamagedDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.getlocation()
}
},

6
src/views/Invoice/InvoiceList.vue
View file

@ -371,10 +371,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Invoice/components/DetailList.vue
View file

@ -216,6 +216,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.stockContractDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/MaterialsList/MaterialsListli.vue
View file

@ -205,6 +205,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -214,10 +215,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatematerials2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -291,10 +299,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/MaterialsList/components/DetailList.vue
View file

@ -194,6 +194,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.materialsListDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/OutFactory/OutFactoryList.vue
View file

@ -247,10 +247,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/OutSourcing/OutSourcingList.vue
View file

@ -331,10 +331,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/OutSourcing/components/DetailList.vue
View file

@ -207,6 +207,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.outsourcingDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/OverdueList/index.vue
View file

@ -430,10 +430,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/Package/PackageList.vue
View file

@ -375,10 +375,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/PrepReceipt/PrepReceiptList.vue
View file

@ -313,6 +313,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -322,10 +323,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateprepReceipt2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -473,10 +481,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/PrepReceipt/components/DetailList.vue
View file

@ -226,6 +226,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.incomeDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/ProducePlan/ProducePlanList.vue
View file

@ -249,6 +249,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -258,10 +259,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateproduceplan2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -408,10 +416,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/ProduceRequire/components/DetailList.vue
View file

@ -258,6 +258,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.stockOrderDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/ProduceRequire/index.vue
View file

@ -413,10 +413,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/ProduceTask/ProduceReportList.vue
View file

@ -230,6 +230,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -239,10 +240,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateproducereport2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -393,10 +401,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

22
src/views/ProduceTask/ProduceTaskList.vue
View file

@ -281,6 +281,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -290,10 +291,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateproducetask2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -448,10 +456,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/ProduceTask/components/DetailList.vue
View file

@ -199,6 +199,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.produceTaskDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/ProduceTask/components/DetailList2.vue
View file

@ -355,6 +355,11 @@ export default {
this.personalForm = this.detaildata
this.workCenterId = this.personalForm.workCenter
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.list = this.personalForm.produceReportDetails
this.list2 = this.personalForm.produceReportPeopleDetailVos
this.list3 = this.personalForm.produceReportEquipmentDetails

2
src/views/Product/components/MyDialog.vue
View file

@ -548,6 +548,8 @@ export default {
this.personalForm.caigoumeasurement = this.personalForm.caigouMeasurement
this.personalForm.salemeasurement = this.personalForm.saleMeasurement
this.personalForm.stockmeasurement = this.personalForm.stockMeasurement
console.log('111', this.personalForm.stockmeasurement)
console.log('222', this.personalForm.unitGroupId)
if (this.personalForm.unitGroupId === null) {
this.con = true
} else {

22
src/views/ProductCost/ProductCostList.vue
View file

@ -287,6 +287,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -296,10 +297,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateproduceCost(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -466,10 +474,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/ProductCost/components/DetailList.vue
View file

@ -360,6 +360,11 @@ export default {
this.personalForm = this.detaildata
// this.list2 = this.personalForm.checkReportDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.list2[0].material = this.personalForm.productCostDetails[0].beginMaterialsMoney
this.list2[0].man = this.personalForm.productCostDetails[0].beginSalaryMoney
this.list2[0].produce = this.personalForm.productCostDetails[0].beginProduceMoney

6
src/views/QualityCheck/QualityCheckList.vue
View file

@ -374,10 +374,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/QualityCheck/components/DetailList.vue
View file

@ -250,6 +250,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.qualityCheckDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/Receipt/ReceiptList.vue
View file

@ -433,10 +433,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Receipt/components/DetailList.vue
View file

@ -241,6 +241,11 @@ export default {
detaildata() {
this.personalForm = this.detaildata
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.list2 = this.personalForm.changeCountDetailvos
}
},

22
src/views/Recycling/RecyclingList.vue
View file

@ -312,6 +312,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -321,10 +322,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updaterecycling2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -472,10 +480,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/Recycling/components/DetailList.vue
View file

@ -267,6 +267,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.incomeDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/RequirePlan/RequirePlanList.vue
View file

@ -255,6 +255,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -264,10 +265,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updateproduceplan2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -424,10 +432,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/RequirePlan/components/DetailList.vue
View file

@ -187,6 +187,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.materialsRequirePlanDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/ReturnExchange/ReturnExchangeList.vue
View file

@ -384,10 +384,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/ReturnExchange/components/DetailList.vue
View file

@ -316,6 +316,11 @@ export default {
this.list2 = this.personalForm.returnExchangeOutVos
this.list3 = this.personalForm.returnExchangeRetreatVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/SaleContract/SaleContractList.vue
View file

@ -419,10 +419,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/SaleContract/components/DetailList.vue
View file

@ -365,6 +365,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.saleContractDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/SaleOpportunity/SaleOpportunityList.vue
View file

@ -516,10 +516,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

6
src/views/SaleOrder/SaleOrderList.vue
View file

@ -529,10 +529,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/SaleOrder/components/DetailList.vue
View file

@ -512,6 +512,11 @@ export default {
this.list2 = this.personalForm.saleOrderDetailVos
this.list3 = this.personalForm.saleOrderCostDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
this.prepReceiptData.sourceNumber = this.personalForm.number
this.getprepReceipt()
this.saleOutparms.sourceNumber = this.personalForm.number

6
src/views/SaleOut/SaleOutList.vue
View file

@ -464,10 +464,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/SaleOut/components/DetailList.vue
View file

@ -498,6 +498,11 @@ export default {
this.list2 = this.personalForm.saleOrderDetailVos
this.list3 = this.personalForm.saleOrderCostDetails
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/SalePlan/SalePlanList.vue
View file

@ -415,10 +415,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/SalePlan/components/DetailList.vue
View file

@ -260,6 +260,11 @@ export default {
this.personalForm = this.detaildata
this.data2 = this.personalForm.salePlanDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

22
src/views/SaleReturn/SaleReturnList.vue
View file

@ -310,6 +310,7 @@ export default {
// 反结单操作
handleReview4(row) {
this.reviewParms.id = row.id
this.reviewParms.judgePersonId = this.$store.getters.userId
this.$confirm('请反审批', '反审批', {
distinguishCancelAndClose: true,
confirmButtonText: '反审批',
@ -319,10 +320,17 @@ export default {
const parms = JSON.stringify(this.reviewParms)
updatesaleReturn2(parms).then(res => {
if (res.data.ret === 200) {
this.$message({
type: 'success',
message: '反审批成功!'
})
if (res.data.data.result === false) {
this.$message({
type: 'error',
message: '反审批失败!'
})
} else {
this.$message({
type: 'success',
message: '反审批成功!'
})
}
this.getlist()
}
})
@ -520,10 +528,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

5
src/views/SaleReturn/components/DetailList.vue
View file

@ -374,6 +374,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.saleReturnDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

5
src/views/ShouldPayList/components/DetailList.vue
View file

@ -320,6 +320,11 @@ export default {
this.personalForm = this.detaildata
this.list2 = this.personalForm.stockArrivalDetailVos
this.reviewList = this.personalForm.approvalUseVos
for (let i = 0; i < this.reviewList.length; i++) {
if (this.reviewList[i].actualStepHandler === null) {
this.reviewList.splice(i, 1)
}
}
}
},
methods: {

6
src/views/ShouldPayList/index.vue
View file

@ -339,10 +339,12 @@ export default {
},
// 判断审核按钮
isReview(row) {
console.log(row)
if (row.approvalUseVos !== '' && row.approvalUseVos !== null && row.approvalUseVos !== undefined && row.approvalUseVos.length !== 0) {
const approvalUse = row.approvalUseVos
if (this.$store.getters.userId === approvalUse[approvalUse.length - 1].stepHandler && (row.judgeStat === 1 || row.judgeStat === 0)) {
const index = approvalUse[approvalUse.length - 1].stepHandler.indexOf(',' + this.$store.getters.userId + ',')
console.log(approvalUse[approvalUse.length - 1].stepHandler)
console.log(index)
if (index > -1 && (row.judgeStat === 1 || row.judgeStat === 0)) {
return true
}
}

Some files were not shown because too many files have changed in this diff Show more