Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!381

src/views/purchase/apply/add/columns.js

@@ -78,7 +78,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "effectiveDate", title: "生效日期" },
+      item: { key: "approveTime", title: "单据申请日期" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
@@ -269,7 +269,7 @@ export default function useColumns() {
             valueFormat: "yyyy-MM-dd",
           },
         },
-        
+
         {
           item: { key: "isApprovalFirst", title: "首次报批" },
           attr: {

src/views/purchase/apply/columns.js

@@ -2,7 +2,7 @@ import CONFIG from "@/config";
 
 export default function useColumns() {
   const TableColumns = [
-    { item: { key: "priceCode", title: "价格编码", width: 150 }, attr: {} },
+    { item: { key: "priceCode", title: "价格编码1", width: 150 }, attr: {} },
     {
       item: { key: "status", title: "状态", width: 100 },
       attr: { is: "el-dict-tag", dictName: "sys_status", width: 100 },
@@ -25,7 +25,7 @@ export default function useColumns() {
       attr: { is: "el-dict-tag", dictName: "is_effective", width: 100 },
     },
     {
-      item: { key: "effectiveDate", title: "生效日期", width: 100 },
+      item: { key: "approveTime", title: "单据申请日期", width: 100 },
       attr: {},
     },
     {

src/views/purchase/apply/copy/columns.js

@@ -78,7 +78,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "effectiveDate", title: "生效日期" },
+      item: { key: "approveTime", title: "单据申请日期" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {

src/views/purchase/apply/edit/columns.js

@@ -78,7 +78,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "effectiveDate", title: "生效日期" },
+      item: { key: "approveTime", title: "单据申请日期" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
@@ -269,7 +269,7 @@ export default function useColumns() {
             valueFormat: "yyyy-MM-dd",
           },
         },
-        
+
         {
           item: { key: "isApprovalFirst", title: "首次报批" },
           attr: {

src/views/purchase/apply/see/columns.js

@@ -42,7 +42,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { width: 100, key: "effectiveDate", title: "生效日期" },
+      item: { width: 100, key: "approveTime", title: "单据申请日期" },
       attr: {},
     },
     {