Преглед на файлове

1.注释部分不需要展示的字段;
2.修订字段未禁用字段问题

002390 преди 2 години
родител
ревизия
656d651749

+ 7 - 2
src/views/purchase/purchase-order/add/column.js

@@ -21,7 +21,12 @@ export const Columns = [
     isShow:true,
     require: true,
   },
-  { key: "oaDemandNo", title: "OA需求单号", inputType: "Input",  isShow:true,},
+  { 
+    key: "oaDemandNo", 
+    title: "OA需求单号", 
+    inputType: "Input",  
+    isShow:true,
+  },
   {
     key: "code",
     title: "订单编号",
@@ -377,7 +382,7 @@ export const Columns = [
   { key: "isArrival", title: "到货超期", inputType: "Checkbox",  isShow:true,},
   { key: "createByName", title: "创建人名称", inputType: "Input", isShow:false, },
   { key: "updateByName", title: "更新人名称", inputType: "Input", isShow:false, },
-  { key: "flowId", title: "OA流程ID", inputType: "Input", isShow:false, },
+  // { key: "flowId", title: "OA流程ID", inputType: "Input", isShow:false, },
   { key: "approver", title: "审批人", inputType: "Input", isShow:false, },
   {
     key: "approverFinishTime",

+ 7 - 10
src/views/purchase/purchase-order/column.js

@@ -111,12 +111,9 @@ export const TableColumns = [
   // { key: "supplierPersonal", title: "供应商业务员" },
   { key: "supplierPersonalName", title: "供应商业务员" },
   { key: "marketingCode", title: "销售订单号" },
-  // { key: "tenantId", title: "租户号" },
-  // { key: "revision", title: "乐观锁" },
   { key: "createByName", title: "创建人" },
   { key: "updateByName", title: "更新人" },
-  // { key: "delFlag", title: "删除标记" },
-  { key: "flowId", title: "OA流程ID" },
+  // { key: "flowId", title: "OA流程ID" },
   { key: "approver", title: "审批人" },
   { key: "approverFinishTime", title: "审批时间" },
   { key: "approveTime", title: "提交时间" },
@@ -140,7 +137,7 @@ export const TableColumns = [
   { key: "projectNowName", title: "在建工程项目" },
   { key: "operatingItemsName", title: "经营性项目" },
   { key: "isArrivalReson", title: "到货超期原因" },
-  { key: "midOrderNo", title: "中台采购订单号" },
+  // { key: "midOrderNo", title: "中台采购订单号" },
 ];
 
 export const TabColumns = [
@@ -148,9 +145,9 @@ export const TabColumns = [
     title: '物料信息',
     key: 'puOrderItemList',
     tableColumns: [
-      { key: "rowNo", title: "行号" },
+      { key: "rowNo", title: "行号",width:80, },
       // { key: "orderId", title: "采购订单ID" },
-      { key: "material", title: "物料" },
+      { key: "material", title: "物料ID" },
       { key: "materialName", title: "物料名称", width: 180 },
       { key: "materialCode", title: "物料编码", width: 180 },
       { key: "materialClassify", title: "物料分类", width: 180 },
@@ -173,7 +170,7 @@ export const TabColumns = [
       { key: "unitName", title: "单位", width: 180 },
       { key: "qty", title: "数量" },
       // { key: "currency", title: "币种" },
-      // { key: "currencyName", title: "币种" },
+      { key: "currencyName", title: "币种" },
       { key: "taxPrice", title: "含税单价" },
       { key: "money", title: "价税合计" },
       { key: "tax", title: "税率" },
@@ -291,8 +288,8 @@ export const TabColumns = [
     tableColumns: [
       // { key: "id", title: "主键" },
       // { key: "orderId", title: "采购订单ID", width: 180 },
-      { key: "rowno", title: "行号" },
-      { key: "material", title: "物料", width: 180 },
+      { key: "rowno", title: "行号",width:80, },
+      { key: "material", title: "物料ID", width: 180 },
       { key: "materialName", title: "物料名称", width: 180 },
       { key: "specification", title: "规格" },
       { key: "qty", title: "数量" },

+ 2 - 2
src/views/purchase/purchase-order/edit/index.vue

@@ -75,9 +75,9 @@ export default {
       })
     },
     // 判断属性是否禁用
-    handleIsForbidden(status) {
+   async handleIsForbidden(status) {
       console.log(status);
-      let {  updateColumns,updateTabColumns } = forbidden(status != '2');
+      let { updateColumns, updateTabColumns } = await forbidden(status != '2');
       this.columns = updateColumns;
       this.tabColumns = updateTabColumns;
     },

+ 2 - 2
src/views/purchase/purchase-order/edit/initColumn.js

@@ -36,7 +36,7 @@ export const forbidden = (isEdit) => {
 
       if (item.key == 'buyerName' || item.key == 'puDeptName' || item.key == 'deductionMoney' ||
         item.key == 'supplierContactsName' || item.key == 'agentName' || item.key == 'isInvoice' ||
-        item.key == 'rebateMoney' || t.key == 'remark') {
+        item.key == 'rebateMoney' || item.key == 'remark') {
         item.disabled = false;
         item.readonly = false;
       } else {
@@ -46,7 +46,6 @@ export const forbidden = (isEdit) => {
     })
 
     updateTabColumns.forEach(item => {
-
       item.tableColumns.forEach(t => {
 
         if (t.key == 'unit' || t.key == 'qty' ||
@@ -68,4 +67,5 @@ export const forbidden = (isEdit) => {
 
   return { updateColumns, updateTabColumns }
 
+
 }

+ 0 - 4
src/views/purchase/purchase-order/index.vue

@@ -76,9 +76,6 @@ export default {
     },
     handleSearchChange() {
       this.isSimpleSearch = !this.isSimpleSearch;
-      // this.$notify.info({
-      //   title: this.isSimpleSearch ? "Simple Search" : "All Search",
-      // });
     },
 
     // 刷新操作
@@ -87,7 +84,6 @@ export default {
     },
     // 查询操作
     handleQueryList() {
-      console.log(this.params,'this.params---------------------');
       let {date} = this.params;
         this.params.startDate = date ? date[0] :'';
         this.params.endDate = date ? date[1] : '';