yuansh 1 week ago
parent
commit
20324e2b80

+ 5 - 0
src/views/platformBusiness/commissionOrder/commissionOrderForm.data.ts

@@ -36,6 +36,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'saleDepartmenName'
    },
+   {
+    title: '佣金(commission)',
+    align:"center",
+    dataIndex: 'commission'
+   },
    {
     title: '业务员(salesman)',
     align:"center",

+ 2 - 31
src/views/saleCode/saleInterfaceSync/SaleInterfaceSync.data.ts

@@ -75,7 +75,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'content'
    },
    {
-    title: '同步状态(0-未同步,1-同步成功,2-同步失败)',
+    title: '同步状态',
     align:"center",
     dataIndex: 'sync'
    },
@@ -287,35 +287,6 @@ export const formSchema: FormSchema[] = [
     field: 'content',
     component: 'InputTextArea',
   },
-  {
-    label: '同步状态(0-未同步,1-同步成功,2-同步失败)',
-    field: 'sync',
-    component: 'InputNumber',
-  },
-  {
-    label: '同步信息',
-    field: 'syncInfo',
-    component: 'Input',
-  },
-  {
-    label: '同步人',
-    field: 'syncBy',
-    component: 'Input',
-  },
-  {
-    label: '同步时间',
-    field: 'syncTime',
-    component: 'DatePicker',
-    componentProps: {
-       showTime:true,
-       valueFormat: 'YYYY-MM-DD HH:mm:ss'
-     },
-  },
-  {
-    label: '同步单号',
-    field: 'syncCode',
-    component: 'Input',
-  },
   {
     label: 'subject',
     field: 'subject',
@@ -599,4 +570,4 @@ export const superQuerySchema = {
 export function getBpmFormSchema(_formData): FormSchema[]{
 // 默认和原始表单保持一致 如果流程中配置了权限数据,这里需要单独处理formSchema
   return formSchema;
-}
+}

+ 2 - 2
src/views/saleCode/saleInterfaceSync/components/SaleInterfaceSyncModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="896" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title"  width="95%"  @ok="handleSubmit">
     <BasicForm @register="registerForm" ref="formRef" name="SaleInterfaceSyncForm"/>
     <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs">
@@ -110,4 +110,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>

+ 4 - 4
src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -104,8 +104,8 @@
           <!-- <a-button type="primary" v-auth="'saleCode:sale_invoice:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> -->
           导出(export)</a-button
         >
-        <a-button type="primary" @click="submit"> 提交(submit)</a-button>
-        <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
+        <a-button type="primary" v-auth="'saleCode:sale_invoice:submit'" @click="submit"> 提交(submit)</a-button>
+        <a-button type="primary" v-auth="'saleCode:sale_invoice:cancelSubmit'" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
         <a-button type="primary" v-auth="'saleCode:sale_invoice:nullify'" @click="handleNullify"> 作废(nullify)</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
@@ -130,9 +130,9 @@
       <template #bodyCell="{ column, record, index, text }"> </template>
 
       <template #jumpToAndExport="props">
-        <a @click="handleView(props)">查看(view)</a>
+        <a @click="handleView(props)" v-auth="'saleCode:sale_invoice:viewOrder'">查看(view)</a>
         <a-divider type="vertical" />
-        <a @click="handleRowExport(props)">导出(export)</a>
+        <a @click="handleRowExport(props)" v-auth="'saleCode:sale_invoice:viewOrder'">导出(export)</a>
       </template>
 
       <template #jumpTo="props">