21、22行

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:amv-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:amv-purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isDetail: false,
+    isDetail: false,
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 400,
+      width: 400,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   },
+    },
-  // },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:bs-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:bs-purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isDetail: false,
+    isDetail: false,
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 400,
+      width: 400,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   },
+    },
-  // },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -1114,18 +1114,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
+    // {
-      label: '操作',
+    //   label: '操作',
-      hiddenInMain: true,
+    //   hiddenInMain: true,
-      field: 'action',
+    //   field: 'action',
-      isDetail: false,
+    //   isDetail: false,
-      isForm: false,
+    //   isForm: false,
-      table: {
+    //   table: {
-        width: 180,
+    //     width: 180,
-        fixed: 'right'
+    //     fixed: 'right'
-      },
+    //   },
-      isTableForm: true
+    //   isTableForm: true
-    }
+    // }
   ])
 )
 

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:develop-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isDetail: false,
+    isDetail: false,
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 400,
+      width: 400,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   },
+    },
-  // },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:false,
+  //   isTableForm:false,
-  }
+  // }
 ]))
 
 //表单校验

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:jis-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:jis-purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isDetail: false,
+    isDetail: false,
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 400,
+      width: 400,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   },
+    },
-  // },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:false,
+  //   isTableForm:false,
-  }
+  // }
 ]))
 
 //表单校验

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -1114,18 +1114,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
+    // {
-      label: '操作',
+    //   label: '操作',
-      hiddenInMain: true,
+    //   hiddenInMain: true,
-      field: 'action',
+    //   field: 'action',
-      isDetail: false,
+    //   isDetail: false,
-      isForm: false,
+    //   isForm: false,
-      table: {
+    //   table: {
-        width: 180,
+    //     width: 180,
-        fixed: 'right'
+    //     fixed: 'right'
-      },
+    //   },
-      isTableForm: true
+    //   isTableForm: true
-    }
+    // }
   ])
 )
 

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue

@@ -249,7 +249,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@@ -318,7 +318,7 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn(null), // 新增
+  // defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultImportBtn(null), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:false,
+  //   isTableForm:false,
-  }
+  // }
 ]))
 
 //表单校验

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -1114,18 +1114,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       hiddenInMain: false,
       sortTableDefault: 1012
     },
-    {
+    // {
-      label: '操作',
+    //   label: '操作',
-      hiddenInMain: true,
+    //   hiddenInMain: true,
-      field: 'action',
+    //   field: 'action',
-      isDetail: false,
+    //   isDetail: false,
-      isForm: false,
+    //   isForm: false,
-      table: {
+    //   table: {
-        width: 180,
+    //     width: 180,
-        fixed: 'right'
+    //     fixed: 'right'
-      },
+    //   },
-      isTableForm: true
+    //   isTableForm: true
-    }
+    // }
   ])
 )
 

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue

@@ -240,7 +240,7 @@ const butttondata = (row, $index) => {
     }), // 生成到货检验申请
     defaultButtons.mainPutawayRequestBtn({
       hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest',
-      hide: row.putawayRequestFlag == 'FALSE'
+      hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE'
     }), // 生成采购上架申请
     defaultButtons.mainPurchasereturnRecordBtn({
       hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  // {
+  {
-  //   label: '操作',
+    label: '操作',
-  //   field: 'action',
+    field: 'action',
-  //   isDetail: false,
+    isDetail: false,
-  //   isForm: false,
+    isForm: false,
-  //   table: {
+    table: {
-  //     width: 400,
+      width: 400,
-  //     fixed: 'right'
+      fixed: 'right'
-  //   },
+    },
-  // },
+  },
   {
     label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
     field: 'fromBatch',
@@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:2000,
   },
 
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:true,
+  //   isTableForm:true,
-  }
+  // }
 ]))
 
 // 表单校验

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
+  // {
-    label: '操作',
+  //   label: '操作',
-    hiddenInMain:true,
+  //   hiddenInMain:true,
-    field: 'action',
+  //   field: 'action',
-    isDetail: false,
+  //   isDetail: false,
-    isForm: false ,
+  //   isForm: false ,
-    table: {
+  //   table: {
-      width: 150,
+  //     width: 150,
-      fixed: 'right'
+  //     fixed: 'right'
-    },
+  //   },
-    isTableForm:false,
+  //   isTableForm:false,
-  }
+  // }
 ]))
 
 //表单校验