|
@@ -276,6 +276,7 @@
|
|
|
:data="selectAuditList"
|
|
|
:header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
|
|
|
>
|
|
|
+ <el-table-column type="index" label="#"></el-table-column>
|
|
|
<el-table-column
|
|
|
v-for="(item, index) in getRowList"
|
|
|
:key="index"
|
|
@@ -291,6 +292,9 @@
|
|
|
<span v-if="item.label == 'refno3'">{{
|
|
|
scope.row.refno3 ? scope.row.refno3 : scope.row.billNo
|
|
|
}}</span>
|
|
|
+ <span v-else-if="item.label == 'sendUserId'">
|
|
|
+ {{ scope.row.sendUserId | userFormat(userOptions) }}
|
|
|
+ </span>
|
|
|
<span v-else-if="item.label == 'auditOpTime'">{{ scope.row.auditOpTime?(scope.row.auditOpTime).slice(0, 10): '' }}</span>
|
|
|
<span v-else>{{ scope.row[item.label] }}</span>
|
|
|
</template>
|
|
@@ -359,7 +363,7 @@
|
|
|
:show-overflow-tooltip="true"
|
|
|
label="提交日期"
|
|
|
></el-table-column> -->
|
|
|
- <el-table-column label="操作" width="80">
|
|
|
+ <el-table-column label="操作" width="80" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
<span style="cursor: pointer" @click="approval(scope.row)"
|
|
|
>查看详情</span
|
|
@@ -401,6 +405,7 @@ import { listCorps } from "@/api/basicdata/corps";
|
|
|
import { addSet, select, resetModule } from "@/api/system/set";
|
|
|
import Cookies from "js-cookie";
|
|
|
import draggable from "vuedraggable";
|
|
|
+import { listUser, queryUserVal } from "@/api/system/user";
|
|
|
|
|
|
export default {
|
|
|
name: "index",
|
|
@@ -438,49 +443,49 @@ export default {
|
|
|
label: "refno1",
|
|
|
name: "委托方",
|
|
|
checked: 0,
|
|
|
- width: 100,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "2",
|
|
|
label: Cookies.get("sysType") == 3 ? "sendTime" : "billTime",
|
|
|
name: "日期",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "3",
|
|
|
label: "refno3",
|
|
|
name: "提单号",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "4",
|
|
|
label: "refno2",
|
|
|
name: "业务类型",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
- },
|
|
|
- {
|
|
|
- surface: "5",
|
|
|
- label: "fAmount",
|
|
|
- name: "出入库费",
|
|
|
- checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
+ // {
|
|
|
+ // surface: "5",
|
|
|
+ // label: "fAmount",
|
|
|
+ // name: "出入库费",
|
|
|
+ // checked: 0,
|
|
|
+ // width: 150,
|
|
|
+ // },
|
|
|
{
|
|
|
surface: "6",
|
|
|
label: "billNo",
|
|
|
name: "系统编号",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "7",
|
|
|
label: "audit",
|
|
|
name: "审核状态",
|
|
|
checked: 0,
|
|
|
- width: 120,
|
|
|
+ width: 150,
|
|
|
},
|
|
|
{
|
|
|
surface: "8",
|
|
@@ -498,10 +503,10 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "10",
|
|
|
- label: "isAccountPeriod",
|
|
|
+ label: "sendUserId",
|
|
|
name: "提交人",
|
|
|
checked: 0,
|
|
|
- width: 150,
|
|
|
+ width: 120,
|
|
|
},
|
|
|
{
|
|
|
surface: "11",
|
|
@@ -512,6 +517,7 @@ export default {
|
|
|
},
|
|
|
],
|
|
|
allCheck: false,
|
|
|
+ userOptions: [],
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
@@ -520,10 +526,24 @@ export default {
|
|
|
listCorps().then((response) => {
|
|
|
this.factIdOptions = response.rows;
|
|
|
});
|
|
|
+ listUser().then((response) => {
|
|
|
+ this.userOptions = response.rows;
|
|
|
+ });
|
|
|
this.getList();
|
|
|
this.getRow();
|
|
|
console.log(Cookies.get("sysType"))
|
|
|
},
|
|
|
+ filters: {
|
|
|
+ userFormat(row, userOptions) {
|
|
|
+ let name;
|
|
|
+ userOptions.map((e) => {
|
|
|
+ if (row == e.userId) {
|
|
|
+ name = e.nickName;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return name;
|
|
|
+ },
|
|
|
+ },
|
|
|
methods: {
|
|
|
//列设置全选
|
|
|
allChecked() {
|