浏览代码

订单生成字段调整

002390 1 年之前
父节点
当前提交
825745d5e6
共有 2 个文件被更改,包括 46 次插入38 次删除
  1. 44 36
      src/views/purchase/task/columns.js
  2. 2 2
      src/views/purchase/task/xie-yi-zhi-cai/column.js

+ 44 - 36
src/views/purchase/task/columns.js

@@ -1,11 +1,6 @@
 export default function useColumns() {
   const TableColumns = [
     {
-      item: { key: "customerName", title: "收货客户",width :100 },
-      attr: {},
-    },
-    
-    {
       item: { key: "status", title: "状态" ,width :100},
       attr: {
         is: "el-dict-tag",
@@ -13,27 +8,21 @@ export default function useColumns() {
 
       },
     },
-
     {
       item: { key: "existPrice", title: "是否有价格",width :100 },
       attr: { is: "el-dict-tag", dictName: "sys_true_false" },
     },
-    { item: { key: "demandCode", title: "需求单号",width :150 }, attr: {} },
-    { item: { key: "materialName", title: "物料",width :150 }, attr: {} },
     {
       item: { key: "materialCode", title: "物料编码",width :150 },
       attr: {},
     },
+    { item: { key: "materialName", title: "物料名称",width :150 }, attr: {} },
     { item: { key: "specification", title: "规格",width :100 }, attr: {} },
-    
-    // {
-    //   item: { key: "materialDesc", title: "物料描述",width :100 },
-    //   attr: {},
-    // },
     {
       item: { key: "manufacturerName", title: "生产厂家" ,width :100},
       attr: {},
     },
+    { item: { key: "unitName", title: "单位" ,width :100}, attr: {} },
     { item: { key: "puQty", title: "采购数量",width :100 }, 
       attr: {
         isSummary:true,
@@ -51,47 +40,66 @@ export default function useColumns() {
         isSummary:true,
       },
     },
-    {
-      item: { key: "priceType", title: "价格类型" ,width :100},
-      attr: { is: "el-dict-tag", dictName: "sys_price_type" },
-    },
-    { item: { key: "puUnitName", title: "采购单位",width :100 }, attr: {} },
-    
     { item: { key: "buyerName", title: "采购员",width :100 }, attr: {} },
     {
-      item: { key: "supplierName", title: "建议供应商",width :100 },
+      item: { key: "customerName", title: "收货客户",width :100 },
       attr: {},
     },
-    { item: { key: "puOrgName", title: "采购组织",width :100 }, attr: {} },
-    { item: { key: "currencyName", title: "币种",width :100 }, attr: {} },
-    { item: { key: "source", title: "需求单号" ,width :100}, attr: {} },
-   
+    { item: { key: "demandCode", title: "需求单号",width :150 }, attr: {} },
     {
       item: { key: "assignSupplierName", title: "指定供应商" ,width :100},
       attr: {},
     },
-    { item: { key: "demandDate", title: "需求时间",width :100 }, attr: {} },
-    { item: { key: "projectName", title: "项目名称",width :100 }, attr: {} },
-    {
-      item: { key: "demandPersonalName", title: "需求人",width :100 },
-      attr: {},
-    },
+    { item: { key: "code", title: "订单生成单号",width :160 }, attr: {} },
     {
       item: { key: "demandOrgName", title: "需求组织" ,width :100},
       attr: {},
     },
-    {
-      item: { key: "demandDeptName", title: "需求部门",width :100 },
-      attr: {},
-    },
+    { item: { key: "demandDate", title: "需求时间",width :100 }, attr: {} },
     {
       item: { key: "isBack", title: "是否退回",width :100 },
       attr: { is: "el-dict-tag", dictName: "sys_yes_no" ,width :100},
     },
     { item: { key: "baskCause", title: "退回原因" ,width :100}, attr: {} },
     { item: { key: "backDate", title: "退回日期",width :100 }, attr: {} },
-    { item: { key: "unitName", title: "单位" ,width :100}, attr: {} },
-    { item: { key: "code", title: "订单生成单号",width :160 }, attr: {} },
+    {
+      item: { key: "demandPersonalName", title: "需求人",width :100 },
+      attr: {},
+    },
+    
+    {
+      item: { key: "demandDeptName", title: "需求部门",width :100 },
+      attr: {},
+    },
+    // {
+    //   item: { key: "materialDesc", title: "物料描述",width :100 },
+    //   attr: {},
+    // },
+    
+    
+    // {
+    //   item: { key: "priceType", title: "价格类型" ,width :100},
+    //   attr: { is: "el-dict-tag", dictName: "sys_price_type" },
+    // },
+    
+    // { item: { key: "puUnitName", title: "采购单位",width :100 }, attr: {} },
+    
+    
+    // {
+    //   item: { key: "supplierName", title: "建议供应商",width :100 },
+    //   attr: {},
+    // },
+    // { item: { key: "puOrgName", title: "采购组织",width :100 }, attr: {} },
+    // { item: { key: "currencyName", title: "币种",width :100 }, attr: {} },
+    // { item: { key: "source", title: "需求单号" ,width :100}, attr: {} },
+   
+   
+    
+    // { item: { key: "projectName", title: "项目名称",width :100 }, attr: {} },
+    
+    
+    
+    
   ].map(({ item, attr }) => ({
     attr,
     item: {

+ 2 - 2
src/views/purchase/task/xie-yi-zhi-cai/column.js

@@ -26,7 +26,7 @@ export const TableColumns = [
       formatter: (prop) => {
         return (prop * 1);
       },
-      isSummary:true,
+      // isSummary:true,
     },
   },
   
@@ -62,7 +62,7 @@ export const TableColumns = [
       formatter: (prop) => {
         return (prop * 1);
       },
-      isSummary:true,
+      // isSummary:true,
     },
   },
   {