Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/router/routers.js

@@ -362,7 +362,7 @@ let menu = [
           {
             path: '/pur/purBySale/index',
             name: '以销定采',
-            component: () => import('@/view/pur/pur-by-sale/index.vue'),
+            component: () => import('@/view/pur/pur-order/add.vue'),
             meta: {
               title: '以销定采',
               notCache: false,

src/view/pur/pur-enter/index.vue

@@ -29,7 +29,7 @@
         <DkTable :id="'table-'+$options.name"
                  ref="table-select"
                  :data="tableData"
-                 :height="tableHeight/2-70"
+                 :height="this.tableHeight * split - 35"
                  primaryKey="entryId"
                  @current-change="currentChangeStandard"
                  @pageChange="pageSizeChange">
@@ -90,7 +90,7 @@
                    primaryKey="itemId"
                    :id="'table-'+$options.name"
                    name="table2" :data="goodsDetailData"
-                   :height="this.tableHeight/2-40"
+                   :height="this.tableHeight * (1-split)"
                    showFooter
                    :select-flag="false"
                    :pageFlag="false"
@@ -135,7 +135,7 @@
                    primaryKey="itemId"
                    :id="'table-'+$options.name"
                    name="table2" :data="goodsDetailData"
-                   :height="this.tableHeight/2-40"
+                   :height="this.tableHeight * (1-split)"
                    showFooter
                    :select-flag="false"
                    :pageFlag="false"
@@ -176,7 +176,7 @@
                    primaryKey="barcodeId"
                    :id="'table-'+$options.name"
                    name="table3" :data="barCodeData"
-                   :height="this.tableHeight/2-40"
+                   :height="this.tableHeight * (1-split)"
                    :select-flag="false"
                    :pageFlag="false"
                    :pageTotalFlag="false">>
@@ -200,7 +200,7 @@
                    primaryKey="reviewResumeId"
                    :id="'table-'+$options.name"
                    name="table4" :data="reviewResumeData"
-                   :height="this.tableHeight/2-40"
+                   :height="this.tableHeight * (1-split)"
                    @pageChange="itemPageChange"
                    :select-flag="false">
             <DkTableColumn type="seq" min-width="44"></DkTableColumn>

src/view/pur/pur-order/form.vue

@@ -1,6 +1,7 @@
+<!-- @desc:采购订单新建编辑  @auth:付斌  @time:2024/1/30 15:15 -->
 <template>
   <div class="main-div" style="position: relative;">
-    <DkButton type="primary" style="position:fixed;right: 100px;z-index: 1000;height: 30px"
+    <DkButton type="primary" style="position:fixed;right: 100px;z-index: 1000;height: 30px;margin-top: 10px"
               v-if="this.type == this.$config.formMode.add"
               @click="purchaseBasedOnSales(true)"> {{ $t('purchaseBasedOnSales') }}
     </DkButton>
@@ -201,12 +202,17 @@
       @modalCancel="clearPurchaseBasedOnSales"
     >
       <card :padding=0 style="margin-top: 1px;padding: 0">
+        <!--按钮区-->
+        <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
+          <template #left>
+            <BaseIndexButton ref="purchaseBasedOnSales" name="purchaseBasedOnSales"></BaseIndexButton>
+            <BaseIndexButton ref="clearPurchaseBasedOnSales" name="clearPurchaseBasedOnSales"></BaseIndexButton>
+          </template>
+        </BaseIndexButtonGroup>
         <!-- 查询条件-->
         <DkForm ref="purchaseBasedOnSalesFormData" v-model="purchaseBasedOnSalesFormData"
                 name="purchase-based-on-sales-form"
                 class="form-content-class" style="margin-top: 5px">
-          <DkButton @click="purchaseBasedOnSales(true)"> {{ $t('search') }}</DkButton>
-          <DkButton style="margin-left: 5px" @click="clearPurchaseBasedOnSales"> {{ $t('clear') }}</DkButton>
           <!--订单单号-->
           <DkFormItem prop="orderNo" :label="$t('orderNo')">
             <InputPop ref="orderNo" v-model="purchaseBasedOnSalesFormData.orderNo"/>

src/view/pur/pur-order/index.vue

@@ -38,7 +38,7 @@
                  :export-url="$libaray.checkButtonHasRight('sale-export')?'/order-server/sale/order/export/':''"
                  :export-condition="exportCondition"
                  :tree-flag="true" sum-total-type="total"
-                 @pageChange="pageSizeChange" ref="table-select" :data="tableData" :height="tableHeight/2-70">
+                 @pageChange="pageSizeChange" ref="table-select" :data="tableData" :height="this.tableHeight * split - 35">
           <DkTableColumn class-name="fixed-left" type="radio" fixed="left" width="45"></DkTableColumn>
           <DkTableColumn type="seq" width="60" sortable></DkTableColumn>
           <!--所属公司-->
@@ -125,7 +125,7 @@
                    :expand-flag="true"
                    :id="'table-'+$options.name" :show-footer="true"
                    :export-url="$libaray.checkButtonHasRight('sale-export')?'/order-server/sale/order_item/export/'+orderId:''"
-                   name="table" ref="detail-select" :data="tableDataDetail_goodsDetail" :height="this.tableHeight/2-40">
+                   name="table" ref="detail-select" :data="tableDataDetail_goodsDetail" :height="this.tableHeight * (1-split)">
             <DkTableColumn type="seq" width="60" sortable></DkTableColumn>
             <DkTableColumn
               v-for="(item, index) in tableDataTitle_goodsDetail"
@@ -147,7 +147,7 @@
         <!--附件-->
         <div v-show="reviewResumeFlag">
           <DkTable :pageFlag="false" :pageTotalFlag="false" :id="'table-'+$options.name"
-                   name="table" ref="file-select" :data="tableDataDetail_files" :height="this.tableHeight/2-40">
+                   name="table" ref="file-select" :data="tableDataDetail_files" :height="this.tableHeight * (1-split)">
             <DkTableColumn type="seq" width="60" sortable></DkTableColumn>
             <DkTableColumn field="docType" min-width="150" width="150"></DkTableColumn>
             <DkTableColumn field="name" :title="$t('fileName')" min-width="300" width="300"></DkTableColumn>