Merge remote-tracking branch 'remotes/origin/intex_online20250410' into intex

6 days ago · 492d0e6af8
4 changed files with 100 additions and 95 deletions
--- a/src/components/Table/src/TableV2.vue
+++ b/src/components/Table/src/TableV2.vue
@ -1,6 +1,6 @@

 <template>
-  <div style="height: 400px" v-loading="loading">
+  <div style="height: 400px" v-loading="loading||timeLoading">
    <el-auto-resizer>
      <template #default="{ height, width }">
        <el-table-v2 
@ -149,8 +149,10 @@ const mColumns = ref(props.columns.map(item=>({
 })))

 const mData = ref([])
+const timeLoading = ref(false)
 watch(()=>props.data,()=>{
  console.log('selections',selections.value  )
+  timeLoading.value = true
  mData.value = props.data.map(item=>({
    ...item,
    checked: selections.value.find(item1=>item1.id==item.id)?true:false,
@ -158,6 +160,8 @@ watch(()=>props.data,()=>{
  }))
  console.log('mData',mData.value)

+  timeLoading.value = false
+
 })

 const rowEventHandlers = ({onClick})=>{
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@ -439,6 +439,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
        type: 'datetime',
        dateFormat: 'YYYY-MM-DD HH:mm:ss',
        valueFormat: 'x',
+        disabled:true
      }
    },
  },
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/index.vue
@ -767,91 +767,91 @@ const isShowMainButton = (row, val) => {
 const butttondata = (row, $index) => {
  return [
    // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
-    defaultButtons.mainListPlanSubBtn({
-      hide: isShowMainButton(row, ['1', '6']),
-      hasPermi: 'wms:supplierinvoice-request-main:sub'
-    }), // 提交审批
-    {
-      label: t('ts.查看明细'),
-      name: 'open_detail',
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: '',
-      link: true // 文本展现按钮
-    },
-    {
-      label: t('ts.采购通过'),
-      name: 'purchase_mainPlanSub',
-      hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: 'wms:supplierinvoice-request-main:app',
-      link: true // 文本展现按钮
-    },
-    {
-      label: t('ts.采购驳回'),
-      name: 'purchase_mainPlanTur',
-      hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
-      type: 'danger',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-request-main:rej'
-    },
-    {
-      label: t('ts.供应商确认'),
-      name: 'invoice_sent_out',
-      hide: isShowMainButton(row, ['3', '7']),
-      type: 'danger',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut'
-    },
-    {
-      label: t('ts.财务通过'),
-      name: 'finance_mainPlanSub',
-      hide: isShowMainButton(row, ['4']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: 'wms:supplierinvoice-request-main:financeApp',
-      link: true // 文本展现按钮
-    },
-    {
-      label: t('ts.财务驳回'),
-      name: 'finance_mainPlanTur',
-      hide: isShowMainButton(row, ['4']),
-      type: 'danger',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-request-main:financeRej'
-    },
-    defaultButtons.mainListEditBtn({
-      hasPermi: 'wms:supplierinvoice-request-main:update',
-      hide: isShowMainButton(row, ['1', '3', '6', '7'])
-    }), // 编辑
-    // defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6','7']) }), // 关闭
-    {
-      label: t('ts.作废'),
-      name: 'repeal',
-      hide: isShowMainButton(row, ['1', '3', '6', '7']),
-      type: 'danger',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: 'wms:supplierinvoice-request-main:repeal'
-    },
-    // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
+    // defaultButtons.mainListPlanSubBtn({
+    //   hide: isShowMainButton(row, ['1', '6']),
+    //   hasPermi: 'wms:supplierinvoice-request-main:sub'
+    // }), // 提交审批
+    // {
+    //   label: t('ts.查看明细'),
+    //   name: 'open_detail',
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: '',
+    //   link: true // 文本展现按钮
+    // },
+    // {
+    //   label: t('ts.采购通过'),
+    //   name: 'purchase_mainPlanSub',
+    //   hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: 'wms:supplierinvoice-request-main:app',
+    //   link: true // 文本展现按钮
+    // },
+    // {
+    //   label: t('ts.采购驳回'),
+    //   name: 'purchase_mainPlanTur',
+    //   hide: !(!isShowMainButton(row, ['2']) && row.currentIsProcurementCreator == true),
+    //   type: 'danger',
+    //   color: '',
+    //   link: true, // 文本展现按钮
+    //   hasPermi: 'wms:supplierinvoice-request-main:rej'
+    // },
+    // {
+    //   label: t('ts.供应商确认'),
+    //   name: 'invoice_sent_out',
+    //   hide: isShowMainButton(row, ['3', '7']),
+    //   type: 'danger',
+    //   color: '',
+    //   link: true, // 文本展现按钮
+    //   hasPermi: 'wms:supplierinvoice-request-main:invoiceSentOut'
+    // },
+    // {
+    //   label: t('ts.财务通过'),
+    //   name: 'finance_mainPlanSub',
+    //   hide: isShowMainButton(row, ['4']),
+    //   type: 'primary',
+    //   icon: '',
+    //   color: '',
+    //   hasPermi: 'wms:supplierinvoice-request-main:financeApp',
+    //   link: true // 文本展现按钮
+    // },
+    // {
+    //   label: t('ts.财务驳回'),
+    //   name: 'finance_mainPlanTur',
+    //   hide: isShowMainButton(row, ['4']),
+    //   type: 'danger',
+    //   color: '',
+    //   link: true, // 文本展现按钮
+    //   hasPermi: 'wms:supplierinvoice-request-main:financeRej'
+    // },
+    // defaultButtons.mainListEditBtn({
+    //   hasPermi: 'wms:supplierinvoice-request-main:update',
+    //   hide: isShowMainButton(row, ['1', '3', '6', '7'])
+    // }), // 编辑
+    // // defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6','7']) }), // 关闭
+    // {
+    //   label: t('ts.作废'),
+    //   name: 'repeal',
+    //   hide: isShowMainButton(row, ['1', '3', '6', '7']),
+    //   type: 'danger',
+    //   color: '',
+    //   link: true, // 文本展现按钮
+    //   hasPermi: 'wms:supplierinvoice-request-main:repeal'
+    // },
+    // // defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierinvoice-request-main:delete'}), // 删除
+    // {
+    //   label: t('打印对账单'),
+    //   name: 'mian_print',
+    //   hide: !(row.goldenTaxInvoiceNumber != null && row.goldenTaxInvoiceNumber != ''),
+    //   type: 'primary',
+    //   color: '',
+    //   link: true, // 文本展现按钮
+    //   hasPermi: ''
+    // },
    {
-      label: t('打印对账单'),
-      name: 'mian_print',
-      hide: !(row.goldenTaxInvoiceNumber != null && row.goldenTaxInvoiceNumber != ''),
-      type: 'primary',
-      color: '',
-      link: true, // 文本展现按钮
-      hasPermi: ''
-    }
-    ,{
      label: t('导出对账单明细'),
      name: 'export_statement_detail',
      hide: false,
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainQuery/supplierinvoiceRequestMain.data.ts
@ -1279,16 +1279,16 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
      }
    }
  },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false,
-  //   table: {
-  //     width: 300,
-  //     fixed: 'right'
-  //   },
-  // }
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+  }
 ]))
 export const accountantFormartDetail = ( cellValue) => {
  if(cellValue == 0){