|
@@ -18,9 +18,9 @@
|
|
|
<el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
|
|
|
<el-collapse-item title="采购单信息" name="1">
|
|
|
<show-data-table
|
|
|
+ :sitem="sitem"
|
|
|
:newTime="newTime"
|
|
|
v-if="newTime !== ''"
|
|
|
- :sitem="sitem"
|
|
|
:columns="ShowDataTableColumns"
|
|
|
>
|
|
|
<template slot="supplier_name">
|
|
@@ -115,6 +115,11 @@
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
|
|
|
+
|
|
|
+ <template slot="pay_type">
|
|
|
+ {{(payWayOptions.find(({value})=> value === sitem.pay_type) || {}).label || "--"}}
|
|
|
+ </template>
|
|
|
+
|
|
|
<template slot="wsm">
|
|
|
<span><template v-if="sitem.wsm_supplier">{{ sitem.wsm_supplier }}/</template>{{ sitem.wsm_name }}</span>
|
|
|
<el-popover placement="top" width="300" trigger="hover">
|
|
@@ -243,7 +248,7 @@ import orderInTable from "./components/order-in-table";
|
|
|
import workDiffTable from "./components/work-diff-table";
|
|
|
import ShowDataTableColumns from "./components/ShowDataTableColumns";
|
|
|
import { statusOptions } from "./columns";
|
|
|
-import { cg_order_type_options } from "@/assets/js/statusList";
|
|
|
+import { cg_order_type_options, payWayOptions } from "@/assets/js/statusList";
|
|
|
import tolerance from "./components/tolerance";
|
|
|
import urlConfig from "@/apis/url-config";
|
|
|
import editPrice from "./components/editPrice";
|
|
@@ -282,6 +287,7 @@ export default {
|
|
|
hasdiff: false,
|
|
|
isCgd:true,
|
|
|
activeTabs: "1",
|
|
|
+ payWayOptions,
|
|
|
ShowDataTableColumns: ShowDataTableColumns,
|
|
|
isMetal: false,
|
|
|
finishStatus: "finish",
|