所有节点-子表顺序调换

src/views/inventiry/purchaseIn/components/purchaseInForm.vue

@@ -86,24 +86,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购入库 - 船明细(ship details)" key="purInShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="purInShipTableRef"
-          :loading="purInShipTable.loading"
-          :columns="purInShipTable.columns"
-          :dataSource="purInShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="采购入库 - 入库明细(stock in details)" key="stockIn" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectArrivalList"> 选择到货单(select arrival)</a-button>
         <j-vxe-table
@@ -128,6 +110,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="采购入库 - 船明细(ship details)" key="purInShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="purInShipTableRef"
+          :loading="purInShipTable.loading"
+          :columns="purInShipTable.columns"
+          :dataSource="purInShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+     
     </a-tabs>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesModalRef"></BaseShipArchiveAccessoriesModal>
     <selectArrivalList ref="SelectArrivalListRef" @selectArrrivalOrder="addStockInList"></selectArrivalList>
@@ -190,7 +191,7 @@
         columns: stockInColumns,
         dataSource: []
       });
-      const activeKey = ref('purInShip');
+      const activeKey = ref('stockIn');
       const formData = reactive<Record<string, any>>({
         id: '',
         status: undefined,
@@ -243,7 +244,7 @@
         resetFields();
         purInShipTable.dataSource = [];
         stockInTable.dataSource = [];
-        activeKey.value = 'purInShip'
+        activeKey.value = 'stockIn'
       }
       async function edit(row) {
         //主表数据

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -120,24 +120,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="到货单 - 船明细(ship details)" key="ArriveGoodsFormShipFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="ArriveGoodsFormShipTableRef"
-          :loading="ArriveGoodsFormShipFormShipTable.loading"
-          :columns="ArriveGoodsFormShipFormShipTable.columns"
-          :dataSource="ArriveGoodsFormShipFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="到货单 - 到货明细(arrive details)" key="arriveDetailsFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectPurchaseOrderList"> 选择采购单(select purchase order)</a-button>
         <j-vxe-table
@@ -160,6 +142,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="到货单 - 船明细(ship details)" key="ArriveGoodsFormShipFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="ArriveGoodsFormShipTableRef"
+          :loading="ArriveGoodsFormShipFormShipTable.loading"
+          :columns="ArriveGoodsFormShipFormShipTable.columns"
+          :dataSource="ArriveGoodsFormShipFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      
     </a-tabs>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesModalRef"></BaseShipArchiveAccessoriesModal>
@@ -227,7 +228,7 @@
         columns: ArriveGoodsDetailColumns,
         dataSource: []
       });
-      const activeKey = ref('ArriveGoodsFormShipFormShip');
+      const activeKey = ref('arriveDetailsFormProduct');
       var notAllowEdit = ref(false);
       const formData = reactive<Record<string, any>>({
         id: '',
@@ -288,7 +289,7 @@
         resetFields();
         ArriveGoodsFormShipFormShipTable.dataSource = [];
         arriveDetailsFormProductTable.dataSource = [];
-        activeKey.value = 'ArriveGoodsFormShipFormShip'
+        activeKey.value = 'arriveDetailsFormProduct'
         formData.purchaseman=userStore.getUserInfo.username;
         formData.purchaseDepartment = userStore.getUserInfo.orgCode
         getSupplierOption()

src/views/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -36,47 +36,48 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="运费采购订单 - 发货通知单(delivery notice)" key="DeliveryDotice" :forceRender="true">
+      <a-tab-pane tab="运费采购订单 - 运费产品明细(freight product details)" key="FreightProductDetails" :forceRender="true">
+        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="SelectProduct"> 选择产品(select product)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable
-          ref="DeliveryDoticeTableableRef"
-          :loading="DeliveryDoticeTable.loading"
-          :columns="DeliveryDoticeTable.columns"
-          :dataSource="DeliveryDoticeTable.dataSource"
+          ref="FreightProductDetailsTableRef"
+          :loading="FreightProductDetailsTable.loading"
+          :columns="FreightProductDetailsTable.columns"
+          :dataSource="FreightProductDetailsTable.dataSource"
           :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
           >
-            <template #action="props" >
-              <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
+            <template #action="props">
+              <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
                 <a>删除(delete)</a>
               </a-popconfirm>
             </template>
           </j-vxe-table>
       </a-tab-pane>
-      <a-tab-pane tab="运费采购订单 - 运费产品明细(freight product details)" key="FreightProductDetails" :forceRender="true">
-        <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="SelectProduct"> 选择产品(select product)</a-button>
+      <a-tab-pane tab="运费采购订单 - 发货通知单(delivery notice)" key="DeliveryDotice" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
           resizable
-          ref="FreightProductDetailsTableRef"
-          :loading="FreightProductDetailsTable.loading"
-          :columns="FreightProductDetailsTable.columns"
-          :dataSource="FreightProductDetailsTable.dataSource"
+          ref="DeliveryDoticeTableableRef"
+          :loading="DeliveryDoticeTable.loading"
+          :columns="DeliveryDoticeTable.columns"
+          :dataSource="DeliveryDoticeTable.dataSource"
           :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
           >
-            <template #action="props">
-              <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+            <template #action="props" >
+              <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
                 <a>删除(delete)</a>
               </a-popconfirm>
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      
     </a-tabs>
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
   </a-spin>
@@ -130,7 +131,7 @@
         columns: FreightProDetailsColumns,
         dataSource: []
       });
-      const activeKey = ref('DeliveryDotice');
+      const activeKey = ref('FreightProductDetails');
       const formData = reactive<Record<string, any>>({
         id: '',
         status: undefined,
@@ -173,7 +174,7 @@
         resetFields();
         DeliveryDoticeTable.dataSource = [];
         FreightProductDetailsTable.dataSource = [];
-        activeKey.value = 'DeliveryDotice'
+        activeKey.value = 'FreightProductDetails'
         getSupplierOption()
       }
       async function edit(row) {

src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue

@@ -99,24 +99,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购询价单 - 船明细(ship details)" key="PuechaseInquiryFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="PuechaseInquiryFormShipTableRef"
-          :loading="PuechaseInquiryFormShipTable.loading"
-          :columns="PuechaseInquiryFormShipTable.columns"
-          :dataSource="PuechaseInquiryFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="采购询价单 - 产品明细(product details)" key="PuechaseInquiryFormProduct" :forceRender="true">
         <a-button type="primary" @click="SelectCustomerInquiry" style="margin-right: 1%;margin-bottom: 1%;"> 选择客户询价单(select customer inquiry form)</a-button>
         <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
@@ -140,6 +122,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="采购询价单 - 船明细(ship details)" key="PuechaseInquiryFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="PuechaseInquiryFormShipTableRef"
+          :loading="PuechaseInquiryFormShipTable.loading"
+          :columns="PuechaseInquiryFormShipTable.columns"
+          :dataSource="PuechaseInquiryFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      
     </a-tabs>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
@@ -209,7 +210,7 @@
         dataSource: []
       });
       var BaseShipArchiveAccessoriesListRef = ref();
-      const activeKey = ref('PuechaseInquiryFormShip');
+      const activeKey = ref('PuechaseInquiryFormProduct');
       var notAllowEdit = ref(false);
       var supplierOption = ref([]);
       const formData = reactive<Record<string, any>>({
@@ -276,7 +277,7 @@
         resetFields();
         PuechaseInquiryFormShipTable.dataSource = [];
         PuechaseInquiryFormProductTable.dataSource = [];
-        activeKey.value = 'PuechaseInquiryFormShip'
+        activeKey.value = 'PuechaseInquiryFormProduct'
         getSupplierOption()
         getOptiom()
         inquiryPeriod.value = []

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -141,24 +141,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购订单 - 船明细(ship details)" key="PurOrderFormShipFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="PurOrderFormShipFormShipTableRef"
-          :loading="PurOrderFormShipFormShipTable.loading"
-          :columns="PurOrderFormShipFormShipTable.columns"
-          :dataSource="PurOrderFormShipFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="采购订单 - 产品明细(product details)" key="purOrderFormShipFormProduct" :forceRender="true">
         <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;" @click="selectSaleOrderList"> 选择销售订单(select saleorder)</a-button>
         <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;" @click="SelectSupplierQuotationList"> 选择报价单(select quotation)</a-button>
@@ -183,6 +165,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="采购订单 - 船明细(ship details)" key="PurOrderFormShipFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="PurOrderFormShipFormShipTableRef"
+          :loading="PurOrderFormShipFormShipTable.loading"
+          :columns="PurOrderFormShipFormShipTable.columns"
+          :dataSource="PurOrderFormShipFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+     
     </a-tabs>
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct ='addProduct'></SelectPrpductModal>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
@@ -258,7 +259,7 @@
         columns: purchaseOrderProductColumns,
         dataSource: []
       });
-      const activeKey = ref('PurOrderFormShipFormShip');
+      const activeKey = ref('purOrderFormShipFormProduct');
       var notAllowEdit = ref(false);
       const formData = reactive<Record<string, any>>({
         id: '',
@@ -325,7 +326,7 @@
         resetFields();
         PurOrderFormShipFormShipTable.dataSource = [];
         purOrderFormShipFormProductTable.dataSource = [];
-        activeKey.value = 'PurOrderFormShipFormShip'
+        activeKey.value = 'purOrderFormShipFormProduct'
         formData.purchaseman=userStore.getUserInfo.username;
         formData.purchaseDepartment = userStore.getUserInfo.orgCode
       }

src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -114,24 +114,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购报价单 - 船明细(ship details)" key="PuechaseQuotationFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="PuechaseQuotationFormShipTableRef"
-          :loading="PuechaseQuotationFormShipTable.loading"
-          :columns="PuechaseQuotationFormShipTable.columns"
-          :dataSource="PuechaseQuotationFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="采购报价单 - 产品明细(product details)" key="PuechaseQuotationFormProduct" :forceRender="true">
         <a-button type="primary" @click="SelectSupplierInquiry" style="margin-right: 1%;margin-bottom: 1%;"> 选择供应商询价单(select supplier inquiry form)</a-button>
         <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
@@ -155,6 +137,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="采购报价单 - 船明细(ship details)" key="PuechaseQuotationFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="PuechaseQuotationFormShipTableRef"
+          :loading="PuechaseQuotationFormShipTable.loading"
+          :columns="PuechaseQuotationFormShipTable.columns"
+          :dataSource="PuechaseQuotationFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+     
     </a-tabs>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
@@ -224,7 +225,7 @@
         dataSource: []
       });
       var BaseShipArchiveAccessoriesListRef = ref();
-      const activeKey = ref('PuechaseQuotationFormShip');
+      const activeKey = ref('PuechaseQuotationFormProduct');
       var notAllowEdit = ref(false);
       var supplierOption = ref([]);
       const formData = reactive<Record<string, any>>({
@@ -287,7 +288,7 @@
         resetFields();
         PuechaseQuotationFormShipTable.dataSource = [];
         PuechaseQuotationFormProductTable.dataSource = [];
-        activeKey.value = 'PuechaseQuotationFormShip'
+        activeKey.value = 'PuechaseQuotationFormProduct'
         getSupplierOption()
         notAllowEdit.value=false
       }

src/views/purchase/selectionQuotationForm/components/SelectQuotationFormForm.vue

@@ -57,24 +57,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购报价单选定 - 船明细(ship details)" key="SelectQuotationFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="SelectQuotationFormShipTableRef"
-          :loading="SelectQuotationFormShipTable.loading"
-          :columns="SelectQuotationFormShipTable.columns"
-          :dataSource="SelectQuotationFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="采购报价单选定 - 产品明细(product details)" key="SelectQuotationFormProduct" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
@@ -101,6 +83,24 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="采购报价单选定 - 船明细(ship details)" key="SelectQuotationFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="SelectQuotationFormShipTableRef"
+          :loading="SelectQuotationFormShipTable.loading"
+          :columns="SelectQuotationFormShipTable.columns"
+          :dataSource="SelectQuotationFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
       <a-tab-pane tab="采购报价单选定 - 供应商报价明细(supplier quotation details)" key="SupplierQuotationDetails" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
@@ -207,7 +207,7 @@ import { log } from 'console';
       });
       var BaseShipArchiveAccessoriesListRef = ref();
       var supplierList = ref([]);
-      const activeKey = ref('SelectQuotationFormShip');
+      const activeKey = ref('SelectQuotationFormProduct');
       const formData = reactive<Record<string, any>>({
         id: '',
         status: undefined,
@@ -252,7 +252,7 @@ import { log } from 'console';
         SelectQuotationFormProductTable.dataSource = [];
         SupplierQuotationDetailsTable.dataSource = []
         SupplierSummaryAmountTable.dataSource = []
-        activeKey.value = 'SelectQuotationFormShip'
+        activeKey.value = 'SelectQuotationFormProduct'
       }
 
       async function edit(row) {

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -117,29 +117,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="销售报价单 - 船明细(ship details)" key="saleQuotationFormShip" :forceRender="true">
-        <a-button type="primary" @click="selectShip"> 选择船(select ship)</a-button>
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="saleQuotationFormShipTableRef"
-          :loading="saleQuotationFormShipTable.loading"
-          :columns="saleQuotationFormShipTable.columns"
-          :dataSource="saleQuotationFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-              <a-divider type="vertical"/>
-                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
-                  <a>删除(delete)</a>
-                </a-popconfirm>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="销售报价单 - 产品明细(product details)" key="saleQuotationFormProduct" :forceRender="true">
         <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
         <a-button type="primary" @click="chooseSupplier"> 选择供应商报价(selete supplier quotation)</a-button>
@@ -167,6 +144,30 @@
               </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="销售报价单 - 船明细(ship details)" key="saleQuotationFormShip" :forceRender="true">
+        <a-button type="primary" @click="selectShip"> 选择船(select ship)</a-button>
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="saleQuotationFormShipTableRef"
+          :loading="saleQuotationFormShipTable.loading"
+          :columns="saleQuotationFormShipTable.columns"
+          :dataSource="saleQuotationFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+              <a-divider type="vertical"/>
+                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+                  <a>删除(delete)</a>
+                </a-popconfirm>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      
     </a-tabs>
     <SelectShipSModal ref="SelectShipSModalRef" @select="addShip"></SelectShipSModal>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
@@ -249,7 +250,7 @@
       });
       var SelectShipSModalRef = ref();
       var BaseShipArchiveAccessoriesListRef = ref();
-      const activeKey = ref('saleQuotationFormShip');
+      const activeKey = ref('saleQuotationFormProduct');
       var notAllowEdit = ref(false);
       var classOption = ref([]);
       var customerOption =ref([]);
@@ -316,7 +317,7 @@
         resetFields();
         saleQuotationFormShipTable.dataSource = [];
         saleQuotationFormProductTable.dataSource = [];
-        activeKey.value = 'saleQuotationFormShip'
+        activeKey.value = 'saleQuotationFormProduct'
         getOptiom()
         getCustomerOptions()
         quotationPeriod.value = []

src/views/saleCode/saleContract/components/SaleContractModal.vue

@@ -7,28 +7,6 @@
     </BasicForm>
     <!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated @change="handleChangeTabs" style="padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="销售合同-船明细" key="saleContractShip" :forceRender="true">
-        <JVxeTable
-          keep-source
-          resizable
-          ref="saleContractShip"
-          :loading="saleContractShipTable.loading"
-          :columns="saleContractShipTable.columns"
-          :dataSource="saleContractShipTable.dataSource"
-          :height="340"
-          :rowNumber="true"
-          :rowSelection="true"
-          :disabled="formDisabled"
-          >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-              <a-divider type="vertical"/>
-                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
-                  <a>删除(delete)</a>
-                </a-popconfirm>
-            </template>
-        </JVxeTable>
-      </a-tab-pane>
       <a-tab-pane tab="销售合同-产品明细" key="saleContractProduct" :forceRender="true">
         <a-button type="primary" @click="seleteQuotation" style="margin-top: 10px;margin-bottom: 5px;margin-right: 1%;"> 选择报价单(selete quotation)</a-button>
         <a-button type="primary" @click="selectProducts" style="margin-top: 10px;margin-bottom: 5px"> 选择产品(select product)</a-button>
@@ -53,6 +31,29 @@
             </template>
         </JVxeTable>
       </a-tab-pane>
+      <a-tab-pane tab="销售合同-船明细" key="saleContractShip" :forceRender="true">
+        <JVxeTable
+          keep-source
+          resizable
+          ref="saleContractShip"
+          :loading="saleContractShipTable.loading"
+          :columns="saleContractShipTable.columns"
+          :dataSource="saleContractShipTable.dataSource"
+          :height="340"
+          :rowNumber="true"
+          :rowSelection="true"
+          :disabled="formDisabled"
+          >
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+              <a-divider type="vertical"/>
+                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+                  <a>删除(delete)</a>
+                </a-popconfirm>
+            </template>
+        </JVxeTable>
+      </a-tab-pane>
+      
     </a-tabs>
     <SelectProjectModal ref="SelectProjectModalRef"  @selectProject="addProject"></SelectProjectModal>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
@@ -86,7 +87,7 @@
     const formDisabled = ref(false);
     const refKeys = ref(['saleContractShip', 'saleContractProduct', ]);
     var notAllowEdit = ref(false);
-    const activeKey = ref('saleContractShip');
+    const activeKey = ref('saleContractProduct');
     const saleContractShip = ref();
     const saleContractProduct = ref();
     const SelectQuotationModalRef = ref()
@@ -151,7 +152,7 @@
 
     async function reset(){
       await resetFields();
-      activeKey.value = 'saleContractShip';
+      activeKey.value = 'saleContractProduct';
       saleContractShipTable.dataSource = [];
       saleContractProductTable.dataSource = [];
     }

src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -103,53 +103,54 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="销售询价单 - 船明细(ship details)" key="saleInquiryFormShip" :forceRender="true">
-        <a-button type="primary" @click="selectShip"> 选择船(select ship)</a-button>
+      <a-tab-pane tab="销售询价单 - 产品明细(product details)" key="saleInquiryFormProduct" :forceRender="true">
+        <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
+        <a-button type="primary" @click="setNeed" style="margin-right: 1%;"> 设置需要船检证书(set need ship inspection certificate)</a-button>
+        <a-button type="primary" @click="setNotNeed"> 设置不需要船检证书(set need not ship inspection certificate)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable
-          ref="saleInquiryFormShipTableRef"
-          :loading="saleInquiryFormShipTable.loading"
-          :columns="saleInquiryFormShipTable.columns"
-          :dataSource="saleInquiryFormShipTable.dataSource"
+          ref="saleInquiryFormProductTableRef"
+          :loading="saleInquiryFormProductTable.loading"
+          :columns="saleInquiryFormProductTable.columns"
+          :dataSource="saleInquiryFormProductTable.dataSource"
           :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
+          asyncRemove
           >
-            <template #action="props" >
-              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
-              <a-divider type="vertical"/>
-                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
+          <template #action="props">
+                <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
                   <a>删除(delete)</a>
                 </a-popconfirm>
             </template>
           </j-vxe-table>
       </a-tab-pane>
-      <a-tab-pane tab="销售询价单 - 产品明细(product details)" key="saleInquiryFormProduct" :forceRender="true">
-        <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
-        <a-button type="primary" @click="setNeed" style="margin-right: 1%;"> 设置需要船检证书(set need ship inspection certificate)</a-button>
-        <a-button type="primary" @click="setNotNeed"> 设置不需要船检证书(set need not ship inspection certificate)</a-button>
+      <a-tab-pane tab="销售询价单 - 船明细(ship details)" key="saleInquiryFormShip" :forceRender="true">
+        <a-button type="primary" @click="selectShip"> 选择船(select ship)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable
-          ref="saleInquiryFormProductTableRef"
-          :loading="saleInquiryFormProductTable.loading"
-          :columns="saleInquiryFormProductTable.columns"
-          :dataSource="saleInquiryFormProductTable.dataSource"
+          ref="saleInquiryFormShipTableRef"
+          :loading="saleInquiryFormShipTable.loading"
+          :columns="saleInquiryFormShipTable.columns"
+          :dataSource="saleInquiryFormShipTable.dataSource"
           :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
-          asyncRemove
           >
-          <template #action="props">
-                <a-popconfirm title="确定删除吗？" @confirm="handleDelete1(props)">
+            <template #action="props" >
+              <a @click="viewAccessory(props)" >查看配件信息(view accessory information)</a>
+              <a-divider type="vertical"/>
+                <a-popconfirm title="确定删除吗？" @confirm="handleDelete(props)">
                   <a>删除(delete)</a>
                 </a-popconfirm>
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      
     </a-tabs>
     <SelectShipSModal ref="SelectShipSModalRef" @select="addShip"></SelectShipSModal>
     <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
@@ -222,7 +223,7 @@
       });
       var SelectShipSModalRef = ref();
       var BaseShipArchiveAccessoriesListRef = ref();
-      const activeKey = ref('saleInquiryFormShip');
+      const activeKey = ref('saleInquiryFormProduct');
       var classOption = ref([]);
       var customerOption =ref([]);
       const formData = reactive<Record<string, any>>({
@@ -281,7 +282,7 @@
         resetFields();
         saleInquiryFormShipTable.dataSource = [];
         saleInquiryFormProductTable.dataSource = [];
-        activeKey.value = 'saleInquiryFormShip'
+        activeKey.value = 'saleInquiryFormProduct'
         getOptiom()
         getCustomerOptions()
         inquiryPeriod.value = []

src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -169,24 +169,6 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="销售订单 - 船明细(ship details)" key="SaleOrderFormShipFormShip" :forceRender="true">
-        <j-vxe-table
-          :keep-source="true"
-          resizable
-          ref="SaleOrderFormShipFormShipTableRef"
-          :loading="SaleOrderFormShipFormShipTable.loading"
-          :columns="SaleOrderFormShipFormShipTable.columns"
-          :dataSource="SaleOrderFormShipFormShipTable.dataSource"
-          :height="340"
-          :disabled="disabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          >
-            <template #action="props" >
-              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
-            </template>
-          </j-vxe-table>
-      </a-tab-pane>
       <a-tab-pane tab="销售订单 - 产品明细(product details)" key="SaleOrderFormShipFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;" @click="selectProductList"> 选择产品(select product)</a-button>
         <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;" @click ="selectContractList"> 选择合同(select contract)</a-button>
@@ -211,6 +193,25 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
+      <a-tab-pane tab="销售订单 - 船明细(ship details)" key="SaleOrderFormShipFormShip" :forceRender="true">
+        <j-vxe-table
+          :keep-source="true"
+          resizable
+          ref="SaleOrderFormShipFormShipTableRef"
+          :loading="SaleOrderFormShipFormShipTable.loading"
+          :columns="SaleOrderFormShipFormShipTable.columns"
+          :dataSource="SaleOrderFormShipFormShipTable.dataSource"
+          :height="340"
+          :disabled="disabled"
+          :rowNumber="true"
+          :rowSelection="true"
+          >
+            <template #action="props" >
+              <a  @click="viewAccessory(props)">查看配件信息(view accessory information)</a>
+            </template>
+          </j-vxe-table>
+      </a-tab-pane>
+      
     </a-tabs>
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct ='addProduct'></SelectPrpductModal>
     <SelectContractModal ref="SelectContractModalRef" @selectContract="addContract"></SelectContractModal>
@@ -286,7 +287,7 @@
         columns: saleOrderProductColumns,
         dataSource: []
       });
-      const activeKey = ref('SaleOrderFormShipFormShip');
+      const activeKey = ref('SaleOrderFormShipFormProduct');
       var notAllowEdit = ref(false);
       const formData = reactive<Record<string, any>>({
         id: '',
@@ -359,7 +360,7 @@
         resetFields();
         SaleOrderFormShipFormShipTable.dataSource = [];
         SaleOrderFormShipFormProductTable.dataSource = [];
-        activeKey.value = 'SaleOrderFormShipFormShip'
+        activeKey.value = 'SaleOrderFormShipFormProduct'
         formData.salesman=userStore.getUserInfo.username;
         formData.saleDepartment = userStore.getUserInfo.orgCode
       }