|
@@ -7,10 +7,13 @@
|
|
|
<template #left_btn>
|
|
|
<el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
|
|
|
<el-radio-button label="">全部</el-radio-button>
|
|
|
- <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
|
|
|
- item.label
|
|
|
- }}
|
|
|
- </el-radio-button>
|
|
|
+ <template v-for="(item, index) in statusList" >
|
|
|
+ <el-radio-button v-if="index !== 3" :key="index" :label="item.value">{{
|
|
|
+ item.label
|
|
|
+ }}
|
|
|
+ </el-radio-button>
|
|
|
+ </template>
|
|
|
+
|
|
|
</el-radio-group>
|
|
|
</template>
|
|
|
<template #right_btn>
|
|
@@ -412,10 +415,10 @@
|
|
|
v-if="
|
|
|
$checkBtnRole('apply', $route.meta.roles) &&
|
|
|
((!isCustomer &&!scope.row.automaticStatus &&
|
|
|
- scope.row.examineStatus === 'SAVE')||(isCustomer && !scope.row.automaticStatus &&
|
|
|
- scope.row.examineStatus === 'SAVE' && scope.row.type!=2) || (
|
|
|
+ (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL'))||(isCustomer && !scope.row.automaticStatus &&
|
|
|
+ (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') && scope.row.type!=2) || (
|
|
|
!isCustomer && scope.row.automaticStatus &&
|
|
|
- scope.row.examineStatus === 'SAVE' &&
|
|
|
+ (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') &&
|
|
|
scope.row.type===2
|
|
|
) )
|
|
|
"
|
|
@@ -455,7 +458,7 @@
|
|
|
</el-popconfirm>
|
|
|
<el-button
|
|
|
v-if="
|
|
|
- !scope.row.automaticStatus &&
|
|
|
+ !scope.row.automaticStatus &&
|
|
|
$checkBtnRole('edit', $route.meta.roles) &&
|
|
|
(scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
|
|
|
scope.row.type === 1
|
|
@@ -471,7 +474,7 @@
|
|
|
(( !isCustomer &&!scope.row.automaticStatus &&
|
|
|
(scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
|
|
|
scope.row.type === 2 )||(isCustomer && !scope.row.automaticStatus &&
|
|
|
- (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2) ||
|
|
|
+ (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2 && scope.type!==1) ||
|
|
|
(!isCustomer &&scope.row.automaticStatus &&
|
|
|
(scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
|
|
|
scope.row.type===2))
|
|
@@ -596,7 +599,7 @@ export default {
|
|
|
{ label: '已保存', value: 'SAVE' },
|
|
|
{ label: '待审核', value: 'WAIT' },
|
|
|
{ label: '审核通过', value: 'OK' },
|
|
|
- // // { label: '审核驳回', value: 'FAIL' },,
|
|
|
+ { label: '审核驳回', value: 'FAIL' },
|
|
|
{ label: '已关闭', value: 'CLOSE' }
|
|
|
],
|
|
|
orderTypeList: [
|