采购订单B2B-接口测试修改

src/views/purchase/purchaseOrderB2B/PurchaseOrderFormB2B.data.ts

@@ -34,12 +34,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)',
@@ -64,12 +64,12 @@ export const columns: BasicColumn[] = [
    {
     title: '采购部门(purchase department)',
     align:"center",
-    dataIndex: 'purchaseDepartmentName'
+    dataIndex: 'purchaseDepartment'
    },
    {
     title: '采购员(purchaseman)',
     align:"center",
-    dataIndex: 'purchasemanName',
+    dataIndex: 'purchaseman',
     width:'250'
    },
    {

src/views/purchase/purchaseOrderB2B/PurchaseOrderFormB2BList.vue

@@ -138,19 +138,19 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'purCode:pur_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
+        <a-button type="primary" v-auth="'b2bCode:pur_order_b2b:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
           导出(export)</a-button
         >
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <template #overlay>
             <a-menu>
-              <a-menu-item key="1" @click="batchHandleDelete" v-auth="'purCode:pur_order:deleteBatch'">
+              <a-menu-item key="1" @click="batchHandleDelete" v-auth="'b2bCode:pur_order_b2b:deleteBatch'">
                 <Icon icon="ant-design:delete-outlined" />
                 删除(delete)
               </a-menu-item>
             </a-menu>
           </template>
-          <a-button v-auth="'purCode:pur_order:deleteBatch'"
+          <a-button v-auth="'b2bCode:pur_order_b2b:deleteBatch'"
             >批量操作
             <Icon icon="mdi:chevron-down" />
           </a-button>
@@ -168,11 +168,8 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <PurchaseOrderFormModal @register="registerModal" @success="handleSuccess" />
+    <PurchaseOrderFormB2BModal @register="registerModal" @success="handleSuccess" />
     <ViewFileListModal ref="ViewFileListModalRef" />
-    <SelectPurOrderModal ref="SelectPurOrderModalRef" @copy-product="handleCopyProduct" />
-    <ViewHistoryVersionModal ref="ViewHistoryVersionModallRef" />
-    <SetCloseReasonModal ref="SetCloseReasonModalRef"  @success="successfullyClosed"></SetCloseReasonModal>
   </div>
 </template>
 
@@ -181,7 +178,7 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage';
   import { useModal } from '/@/components/Modal';
-  import PurchaseOrderFormModal from './components/PurchaseOrderFormModal.vue';
+  import PurchaseOrderFormB2BModal from './components/PurchaseOrderFormB2BModal.vue';
   import { columns, superQuerySchema } from './PurchaseOrderFormB2B.data';
   import {
     list,
@@ -189,40 +186,25 @@
     batchDelete,
     getImportUrl,
     getExportUrl,
-    batchSubmit,
-    cancelBatchSubmit,
-    bacthClose,
-    cancelBatchClose,
-    bacthConfirm,
-    cancelBatchConfirm,
     supplierOption,
-    getExportUrlRow,
     ProjectOption
-  } from './PurchaseOrderFormB2B.api';
+  } from './PurchaseOrderyFormB2B.api';
   import { cloneDeep } from 'lodash-es';
   import { JDictSelectTag, ApiSelect, JInput,JSelect } from '/@/components/Form';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
   import ViewFileListModal from './components/ViewFileListModal.vue';
-  import SelectPurOrderModal from './components/SelectPurOrderModal.vue';
-  import ViewHistoryVersionModal from './components/ViewHistoryVersionModal.vue';
-  import SetCloseReasonModal from '../../publicComponents/SetCloseReasonModal.vue'
   import { message } from 'ant-design-vue';
-  import { useMethods } from '/@/hooks/system/useMethods';
-  const { handleExportXlsx, } = useMethods();
   const formRef = ref();
   const ViewFileListModalRef = ref();
-  const SelectPurOrderModalRef = ref();
-  const ViewHistoryVersionModallRef = ref();
   const queryParam = reactive<any>({});
-  var SetCloseReasonModalRef = ref();
   var showField = ref('currency_dictText+name');
   //注册model
   const [registerModal, { openModal }] = useModal();
   //注册table数据
   const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
     tableProps: {
-      title: '采购订单',
+      title: '采购订单B2B',
       api: list,
       columns,
       canResize: false,
@@ -241,7 +223,7 @@
       },
     },
     exportConfig: {
-      name: '采购订单',
+      name: '采购订单B2B',
       url: getExportUrl,
       params: queryParam,
     },
@@ -298,6 +280,9 @@
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
+  function viewFileDetail(props) {
+    ViewFileListModalRef.value.getTable(props.column.dataIndex, props.record);
+  }
   /**
    * 成功回调
    */
@@ -312,7 +297,7 @@
       {
         label: '编辑(edit)',
         onClick: handleEdit.bind(null, record),
-        auth: 'purCode:pur_order:edit',
+        auth: 'b2bCode:pur_order_b2b:edit',
         ifShow: record.submit == '0' || !record.submit,
       },
     ];
@@ -333,19 +318,11 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'purCode:pur_order:delete',
+        auth: 'b2bCode:pur_order_b2b:delete',
         ifShow: record.submit == '0' || !record.submit,
       },
     ];
   }
-  function submit() {
-    if (selectedRowKeys.value.length == 0) {
-      message.warning('请选择数据');
-    } else {
-      var ids = selectedRowKeys.value.join(',');
-      batchSubmit({ ids: ids }, handleSuccess);
-    }
-  }
 
   /* ----------------------以下为原生查询需要添加的-------------------------- */
   const toggleSearchStatus = ref<boolean>(false);

src/views/purchase/purchaseOrderB2B/PurchaseOrderyFormB2B.api.ts

@@ -6,7 +6,7 @@ const { createConfirm } = useMessage();
 enum Api {
   list = '/b2bCode/purOrderB2b/list',
   edit='/b2bCode/purOrderB2b/edit',
-  deleteOne = '/b2bCode/purOrderB2b/edit',
+  deleteOne = '/b2bCode/purOrderB2b/delete',
   deleteBatch = '/b2bCode/purOrderB2b/deleteBatch',
   importExcel = '/b2bCode/purOrderB2b/importExcel',
   exportXls = '/b2bCode/purOrderB2b/exportXls',

src/views/purchase/purchaseOrderB2B/components/PurchaseOrderFormB2BForm.vue

@@ -2,10 +2,10 @@
   <a-spin :spinning="loading">
     <JFormContainer :disabled="disabled">
       <template #detail>
-        <a-form v-bind="formItemLayout" name="SaleOrderForm" ref="formRef">
+        <a-form v-bind="formItemLayout" name="PurchaseOrderFormB2BForm" ref="formRef">
           <a-row>
             <a-col :span="12">
-              <a-form-item label="组织(organize)" v-bind="validateInfos.organize" id="SaleOrderForm-organize" name="organize">
+              <a-form-item label="组织(organize)" v-bind="validateInfos.organize" id="PurchaseOrderFormB2BForm-organize" name="organize">
                 <a-select v-model:value="formData.organize" :disabled="formData.id!==''&&formData.submit == '1'">
                   <a-select-option value="上海">上海</a-select-option>
                   <a-select-option value="香港">香港</a-select-option>
@@ -13,12 +13,12 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="SaleOrderForm-billCode" name="billCode">
+              <a-form-item label="订单编号(bill code)" v-bind="validateInfos.billCode" id="PurchaseOrderFormB2BForm-billCode" name="billCode">
                 <a-input v-model:value="formData.billCode" placeholder="自动生成" disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" id="SaleOrderForm-billDate" name="billDate">
+              <a-form-item label="单据日期(bill date)" v-bind="validateInfos.billDate" id="PurchaseOrderFormB2BForm-billDate" name="billDate">
                 <a-date-picker
                   placeholder="请选择单据日期(bill date)"
                   v-model:value="formData.billDate"
@@ -30,7 +30,7 @@
             </a-col>
 
             <a-col :span="12">
-              <a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName">
+              <a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="PurchaseOrderFormB2BForm-projectName" name="projectName">
                 <a-input-search
                   v-model:value="formData.projectName"
                   placeholder="请输入项目(project)"
@@ -44,7 +44,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="SaleOrderForm-supplier" name="supplier">
+              <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="PurchaseOrderFormB2BForm-supplier" name="supplier">
                 <ApiSelect
                   :api="supplierOption"
                   showSearch
@@ -59,7 +59,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="SaleOrderForm-priority" name="priority">
+              <a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="PurchaseOrderFormB2BForm-priority" name="priority">
                 <JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority" disabled />
               </a-form-item>
             </a-col>
@@ -67,7 +67,7 @@
               <a-form-item
                 label="产品分类(production class)"
                 v-bind="validateInfos.productionClass"
-                id="SaleOrderForm-productionClass"
+                id="PurchaseOrderFormB2BForm-productionClass"
                 name="productionClass"
               >
                 <ApiSelect
@@ -84,23 +84,23 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="机型(model)" v-bind="validateInfos.model" id="SaleOrderForm-model" name="model">
+              <a-form-item label="机型(model)" v-bind="validateInfos.model" id="PurchaseOrderFormB2BForm-model" name="model">
                 <JDictSelectTag v-model:value="formData.model" placeholder="请选择" dictCode="model_typer" disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="SaleOrderForm-maker" name="maker">
+              <a-form-item label="厂家(maker)" v-bind="validateInfos.maker" id="PurchaseOrderFormB2BForm-maker" name="maker">
                 <a-input v-model:value="formData.maker" placeholder="请输入厂家(maker)" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="贸易条款(trade term)" v-bind="validateInfos.tradeTerms" id="SaleOrderForm-tradeTerms" name="tradeTerms">
+              <a-form-item label="贸易条款(trade term)" v-bind="validateInfos.tradeTerms" id="PurchaseOrderFormB2BForm-tradeTerms" name="tradeTerms">
                 <JDictSelectTag v-model:value="formData.tradeTerms" placeholder="请选择" dictCode="delivery_terms" />
               </a-form-item>
             </a-col>
 
             <a-col :span="12">
-              <a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="SaleOrderForm-isExport" name="isExport">
+              <a-form-item label="是否出口(export)" v-bind="validateInfos.isExport" id="PurchaseOrderFormB2BForm-isExport" name="isExport">
                 <JDictSelectTag v-model:value="formData.isExport" placeholder="请选择" dictCode="yes_or_no" />
               </a-form-item>
             </a-col>
@@ -108,7 +108,7 @@
               <a-form-item
                 label="包装要求(package requirement)"
                 v-bind="validateInfos.packagebRequirement"
-                id="SaleOrderForm-packagebRequirement"
+                id="PurchaseOrderFormB2BForm-packagebRequirement"
                 name="packagebRequirement"
               >
                 <a-input
@@ -120,12 +120,12 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="收件人(recipient)" v-bind="validateInfos.recipient" id="SaleOrderForm-recipient" name="recipient">
+              <a-form-item label="收件人(recipient)" v-bind="validateInfos.recipient" id="PurchaseOrderFormB2BForm-recipient" name="recipient">
                 <a-input v-model:value="formData.recipient" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="运输方式(transport)" v-bind="validateInfos.transport" id="SaleOrderForm-transport" name="transport">
+              <a-form-item label="运输方式(transport)" v-bind="validateInfos.transport" id="PurchaseOrderFormB2BForm-transport" name="transport">
                 <JDictSelectTag v-model:value="formData.transport" placeholder="请选择" dictCode="delivery_methods" />
               </a-form-item>
             </a-col>
@@ -133,25 +133,25 @@
               <a-form-item
                 label="收件人地址(recipient address)"
                 v-bind="validateInfos.recipientAddress"
-                id="SaleOrderForm-recipientAddress"
+                id="PurchaseOrderFormB2BForm-recipientAddress"
                 name="recipientAddress"
               >
                 <a-input v-model:value="formData.recipientAddress" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms">
+              <a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="PurchaseOrderFormB2BForm-paymentTerms" name="paymentTerms">
                 <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="收件人电话(recipient tel)" v-bind="validateInfos.recipientTel" id="SaleOrderForm-recipientTel" name="recipientTel">
+              <a-form-item label="收件人电话(recipient tel)" v-bind="validateInfos.recipientTel" id="PurchaseOrderFormB2BForm-recipientTel" name="recipientTel">
                 <a-input v-model:value="formData.recipientTel" placeholder="请输入" AutoComplete="off" />
               </a-form-item>
             </a-col>
 
             <a-col :span="12">
-              <a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="SaleOrderForm-delivery" name="delivery">
+              <a-form-item label="发货方式(delivery)" v-bind="validateInfos.delivery" id="PurchaseOrderFormB2BForm-delivery" name="delivery">
                 <JDictSelectTag v-model:value="formData.delivery" placeholder="请选择" dictCode="delivery_sale_order" />
               </a-form-item>
             </a-col>
@@ -159,7 +159,7 @@
               <a-form-item
                 label="质保期(warranty period)"
                 v-bind="validateInfos.warrantyPeriod"
-                id="SaleOrderForm-warrantyPeriod"
+                id="PurchaseOrderFormB2BForm-warrantyPeriod"
                 name="warrantyPeriod"
               >
                 <a-input
@@ -174,19 +174,19 @@
               <a-form-item
                 label="质保条款(warranty terms)"
                 v-bind="validateInfos.warrantyTerms"
-                id="SaleOrderForm-warrantyTerms"
+                id="PurchaseOrderFormB2BForm-warrantyTerms"
                 name="warrantyTerms"
               >
                 <a-input v-model:value="formData.warrantyTerms" placeholder="请输入质保条款(warranty terms)" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="汇率(exchange rate)" v-bind="validateInfos.exchangeRate" id="SaleOrderForm-exchangeRate" name="exchangeRate">
+              <a-form-item label="汇率(exchange rate)" v-bind="validateInfos.exchangeRate" id="PurchaseOrderFormB2BForm-exchangeRate" name="exchangeRate">
                 <a-input v-model:value="formData.exchangeRate" placeholder="请输入" allow-clear AutoComplete="off" disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="SaleOrderForm-currency" name="currency">
+              <a-form-item label="币种(currency)" v-bind="validateInfos.currency" id="PurchaseOrderFormB2BForm-currency" name="currency">
                 <JDictSelectTag v-model:value="formData.currency" placeholder="请选择" dictCode="currency" disabled />
               </a-form-item>
             </a-col>
@@ -194,19 +194,19 @@
               <a-form-item
                 label="采购部门(purchase department)"
                 v-bind="validateInfos.purchaseDepartment"
-                id="SaleOrderForm-purchaseDepartment"
+                id="PurchaseOrderFormB2BForm-purchaseDepartment"
                 name="purchaseDepartment"
               >
                 <a-input v-model:value="formData.purchaseDepartmentName" placeholder="请输入" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="SaleOrderForm-purchaseman" name="purchaseman">
+              <a-form-item label="采购员(purchasesman)" v-bind="validateInfos.purchaseman" id="PurchaseOrderFormB2BForm-purchaseman" name="purchaseman">
                 <a-input v-model:value="formData.purchasemanName" placeholder="请输入采购员(salesman)" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="折扣(discountHead)" v-bind="validateInfos.discountHead" id="SaleOrderForm-discountHead" name="discountHead">
+              <a-form-item label="折扣(discountHead)" v-bind="validateInfos.discountHead" id="PurchaseOrderFormB2BForm-discountHead" name="discountHead">
                 <a-input-number
                   v-model:value="formData.discountHead"
                   placeholder="请输入折扣(discountHead)"
@@ -220,14 +220,14 @@
               <a-form-item
                 label="折后金额(discounted amount)"
                 v-bind="validateInfos.discountAmount"
-                id="SaleOrderForm-discountAmount"
+                id="PurchaseOrderFormB2BForm-discountAmount"
                 name="discountAmount"
               >
                 <a-input v-model:value="formData.discountAmount" allow-clear disabled />
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="SaleOrderForm-notes" name="notes">
+              <a-form-item label="备注(notes)" v-bind="validateInfos.notes" id="PurchaseOrderFormB2BForm-notes" name="notes">
                 <a-input v-model:value="formData.notes" AutoComplete="off" />
               </a-form-item>
             </a-col>
@@ -235,7 +235,7 @@
               <a-form-item
                 label="协议条款(agreement terms)"
                 v-bind="validateInfos.agreementTerms"
-                id="SaleOrderForm-agreementTerms"
+                id="PurchaseOrderFormB2BForm-agreementTerms"
                 name="agreementTerms"
               >
                 <JSelectMultiple
@@ -248,7 +248,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="SaleOrderForm-attachs" name="attachs">
+              <a-form-item label="附件(attachs)" v-bind="validateInfos.attachs" id="PurchaseOrderFormB2BForm-attachs" name="attachs">
                 <JUpload v-model:value="formData.attachs" />
               </a-form-item>
             </a-col>
@@ -331,7 +331,7 @@
   import moment from 'moment';
   const useForm = Form.useForm;
   export default defineComponent({
-    name: 'SaleOrderForm',
+    name: 'PurchaseOrderFormB2BForm',
     components: {
       JVxeTable,
       JFormContainer,

src/views/purchase/purchaseOrderB2B/components/PurchaseOrderFormB2BModal.vue

@@ -12,7 +12,7 @@
   import PurchaseOrderFormB2BForm from './PurchaseOrderFormB2BForm.vue';
 
   export default {
-    name: "SaleOrderFormModal",
+    name: "PurchaseOrderFormB2BModal",
     components:{
       BasicModal,
       PurchaseOrderFormB2BForm