|
|
@@ -167,6 +167,17 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
+ <!-- 审核状态 -->
|
|
|
+ <el-form-item label="审核状态" prop="auditStatus">
|
|
|
+ <el-select style="width:220px" v-model="queryParams.auditStatus" placeholder="请选择审核状态" clearable size="small" >
|
|
|
+ <el-option
|
|
|
+ v-for="item in auditStatusOptions"
|
|
|
+ :key="item.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
@@ -334,6 +345,12 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag prop="status" v-for="(item, index) in statusOptions" v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
|
|
|
</template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- 审核状态 -->
|
|
|
+ <el-table-column label="审核状态" align="center" prop="auditStatus" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-tag prop="status" v-for="(item, index) in auditStatusOptions" v-if="scope.row.auditStatus==item.dictValue">{{item.dictLabel}}</el-tag>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="运单号" align="center" prop="deliveryId" >
|
|
|
</el-table-column>
|
|
|
@@ -634,7 +651,23 @@ export default {
|
|
|
'deptId': 'currDeptChange'
|
|
|
},
|
|
|
data() {
|
|
|
- return {
|
|
|
+ return { auditStatusOptions : [
|
|
|
+ {
|
|
|
+ dictLabel: "待审批",
|
|
|
+ dictValue: 0,
|
|
|
+ type: ''
|
|
|
+ },
|
|
|
+ {
|
|
|
+ dictLabel: "审批拒绝",
|
|
|
+ dictValue: 1,
|
|
|
+ type: 'danger'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ dictLabel: "审核通过",
|
|
|
+ dictValue: 4,
|
|
|
+ type: 'success'
|
|
|
+ }
|
|
|
+ ],
|
|
|
itemlist : [],
|
|
|
importMsgOpen:false,
|
|
|
importMsg:"",
|
|
|
@@ -752,7 +785,7 @@ export default {
|
|
|
isSysDel: null,
|
|
|
deptId:null,
|
|
|
isUpload:null,
|
|
|
-
|
|
|
+ auditStatus:null, // 审批状态
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|