Browse Source

feat:添加字段

snow 1 year ago
parent
commit
09a814fbab

+ 8 - 0
src/assets/js/statusList.js

@@ -2,6 +2,14 @@ const statusList = [
   { name: "启用", code: 1 },
   { name: "禁用", code: 0 },
 ];
+
+export const payWayOptions = [
+  { value: '0', label: '现结' },
+  { value: '1', label: '月清' },
+  { value: '2', label: '双月清' }
+]
+
+
 const cg_order_type_options = [
   { id: "1", label: "库存商品" },
   { id: "2", label: "非库存商品" },

+ 7 - 2
src/views/purchaseIn/purchaseOrder/components/ShowDataTableColumns.js

@@ -21,7 +21,6 @@ export default [
     label: "要求入库时间",
     span: 6
   },
- 
   {
     prop: "supplier_name",
     label: "销售方公司",
@@ -75,7 +74,13 @@ export default [
     prop: "gold_price",
     label: "当前实时金价",
     _slot_: "gold_price",
-    span: 12
+    span: 6
+  },
+  { 
+    prop:"pay_type",
+    label:"供应商支付方式",
+    span:6,
+    _slot_:"pay_type"
   },
   {
     prop: "customer",

+ 6 - 1
src/views/purchaseIn/purchaseOrder/detail.vue

@@ -129,6 +129,10 @@
                   </el-popover>
                 </template>
 
+                <template slot="pay_type">
+                  {{(payWayOptions.find(({value})=> value === sitem.pay_type) || {}).label || "--"}}
+                </template>
+
                 <template slot="gold_price">
                   <div
                     v-if="
@@ -242,7 +246,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";
@@ -288,6 +292,7 @@ export default {
       ShowDataTableColumns: ShowDataTableColumns,
       isMetal: false,
       finishStatus: "finish",
+      payWayOptions,
       activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
       statusOptions: statusOptions,

+ 7 - 5
src/views/supplierPurchaseIn/supplierPurchaseOrder/components/ShowDataTableColumns.js

@@ -32,15 +32,11 @@ export default [
     label: "购买方公司",
     _slot_: "company",
   },
-
   {
     prop: "wsm",
     label: "仓库信息",
     _slot_: "wsm",
   },
- 
- 
- 
   {
     prop: "total_fee",
     label: "采购总成本",
@@ -75,8 +71,14 @@ export default [
     prop: "gold_price",
     label: "当前实时金价",
     _slot_: "gold_price",
-    span: 12
+    span: 6
   },
+    { 
+      prop:"pay_way",
+      label:"供应商支付方式",
+      span:6,
+      _slot_:"pay_type"
+    },
   {
     prop: "customer",
     label: "订单客户名称",

+ 8 - 2
src/views/supplierPurchaseIn/supplierPurchaseOrder/detail.vue

@@ -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",