Browse Source

销售订单B2B-调整

jingbb 1 month ago
parent
commit
7bb61af575

+ 4 - 4
src/views/saleCode/salesOrderB2B/SaleOrderB2BForm.data.ts

@@ -36,12 +36,12 @@ export const columns: BasicColumn[] = [
    {
     title: '优先级(priority)',
     align:"center",
-    dataIndex: 'priority_dictText'
+    dataIndex: 'priority'
    },
    {
     title: '产品分类(production class)',
     align:"center",
-    dataIndex: 'productionClass_dictText'
+    dataIndex: 'productionClass'
    },
    {
     title: '机型(model)',
@@ -66,12 +66,12 @@ export const columns: BasicColumn[] = [
    {
     title: '销售部门(sale department)',
     align:"center",
-    dataIndex: 'saleDepartment'
+    dataIndex: 'saleDepartmentName'
    },
    {
     title: '业务员(salesman)',
     align:"center",
-    dataIndex: 'salesman',
+    dataIndex: 'salesmanName',
    },
    {
     title: '合同来源(sourceCode)',

+ 5 - 9
src/views/saleCode/salesOrderB2B/SaleOrderB2BFormList.vue

@@ -181,9 +181,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'saleCode:sale_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
-          导出(export)</a-button
-        >
+        <a-button type="primary" v-auth="'b2bCode:sale_order_b2b: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" @click="close" v-auth="'saleCode:sale_order:close'"> 关闭(close)</a-button> -->
@@ -193,13 +191,13 @@
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete" v-auth="'saleCode:sale_order_form:deleteBatch'">
+              <a-menu-item key="1" @click="batchHandleDelete" v-auth="'b2bCode:sale_order_b2b:deleteBatch'">
                 <Icon icon="ant-design:delete-outlined" />
                 删除(delete)
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button v-auth="'saleCode:sale_order:delete'"
+          <a-button v-auth="'b2bCode:sale_order_b2b:deleteBatch'"
             >批量操作
             <Icon icon="mdi:chevron-down" />
           </a-button>
@@ -346,8 +344,7 @@
       {
         label: '编辑(edit)',
         onClick: handleEdit.bind(null, record),
-        auth: 'saleCode:sale_order:edit',
-        ifShow: record.submit == '0' || !record.submit,
+        auth: 'b2bCode:sale_order_b2b:edit',
       },
     ];
   }
@@ -367,8 +364,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'saleCode:sale_order:delete',
-        ifShow: record.submit == '0' || !record.submit,
+        auth: 'b2bCode:sale_order_b2b:delete',
       },
     ];
   }

+ 1 - 1
src/views/saleCode/salesOrderB2B/SaleOrderyB2BForm.api.ts

@@ -12,7 +12,7 @@ enum Api {
   exportXls = '/b2bCode/saleOrderB2b/exportXls',
   queryDataById = '/b2bCode/saleOrderB2b/queryById',
   saleOrderFormShipList = '/b2bCode/saleOrderB2b/querySaleOrderShipB2bByMainId',
-  saleOrderFormProductList = '/saleOrderB2b/querySaleOrderProductB2bByMainId',
+  saleOrderFormProductList = '/b2bCode/saleOrderB2b/querySaleOrderProductB2bByMainId',
   classList='baseCode/baseProductClass/list',
   customerList='/cuspCode/cuspCustomerProfile/list',
   projectList='/baseCode/baseProjectArchive/list',