yusheng 10 hónapja
szülő
commit
fca6af4ea5

+ 5 - 0
src/BIZComponents/inventoryTableDetails.vue

@@ -8,6 +8,8 @@
       class="time-form"
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
+      :max-height="maxHeight"
+
     >
       <template v-slot:technicalDrawings="scope">
         <el-form-item
@@ -155,6 +157,9 @@
         type: Boolean,
         default: false
       },
+      maxHeight:{
+        default:350
+      },
       countObj: {
         type: Object,
         default: () => {

+ 10 - 6
src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue

@@ -50,10 +50,7 @@
             <el-form-item label="附件:" prop="receiveFiles">
               <fileMain v-model="form.receiveFiles" type="view"></fileMain>
             </el-form-item>
-            <!-- <el-form-item label="质检回执:" prop="qualityReportFiles">
-              <fileMain v-model="form.qualityReportFiles" type="view"></fileMain>
-
-            </el-form-item> -->
+          
           </el-col>
 
           <el-col :span="8">
@@ -83,17 +80,24 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-
-
           </el-col>
 
           <el-col :span="8">
+            <el-form-item label="质检总数:" prop="qmsTotalNum">
+              <el-input v-model="form.qmsTotalNum" disabled></el-input>
+            </el-form-item>
+
             <el-form-item label="合格数:" prop="qmsPassNum">
               <el-input v-model="form.qmsPassNum" disabled></el-input>
             </el-form-item>
             <el-form-item label="不合格数:" prop="qmsNopassNum">
               <el-input v-model="form.qmsNopassNum" disabled></el-input>
             </el-form-item>
+            <el-form-item label="质检合格率:" prop="qmsPassRate">
+              <el-input v-model="form.qmsPassRate" disabled>
+              <template #append>%</template>
+              </el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>

+ 6 - 4
src/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue

@@ -113,6 +113,7 @@
         :cache-key="cacheKeyUrl"
         :datasource="detailData.productList"
         row-key="id"
+        max-height="350px"
       >
         <template v-slot:technicalDrawings="{ row }">
           <fileMain v-model="row.technicalDrawings" type="view"></fileMain>
@@ -147,7 +148,7 @@
   import { levelList } from '@/enum/dict.js';
 
   export default {
-    mixins: [dictMixins,tabMixins],
+    mixins: [dictMixins, tabMixins],
     components: {
       // fileMain,
       fileUpload,
@@ -160,7 +161,7 @@
 
     data() {
       return {
-        cacheKeyUrl:'eos-purchaseOrder-outSourceSend-inventoryTableDetail',
+        cacheKeyUrl: 'eos-purchaseOrder-outSourceSend-inventoryTableDetail',
         activeComp: 'main',
         tabOptions: [
           { key: 'main', name: '发货单详情' },
@@ -252,7 +253,7 @@
               }
             }
           },
- 
+
           {
             width: 200,
             prop: 'supplierMark',
@@ -358,7 +359,8 @@
             prop: 'goodsLevel',
             label: '物品级别',
             formatter: (_row, _column, cellValue) => {
-              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
             },
             align: 'center'
           },

+ 2 - 0
src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -8,6 +8,8 @@
       :cache-key="cacheKeyUrl"
       :datasource="form.datasource"
       class="time-form"
+      max-height="350px"
+
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

+ 2 - 0
src/views/purchasingManage/purchaseOrder/returnGoods/components/detailDialog.vue

@@ -148,6 +148,8 @@
       :cache-key="cacheKeyUrl"
         :datasource="detailData.productList"
         row-key="id"
+        max-height="350px"
+
       >
         <!-- <template v-slot:toolbar>
           <div class="headbox">

+ 2 - 0
src/views/purchasingManage/purchaseOrder/returnGoods/components/inventoryTable.vue

@@ -8,6 +8,8 @@
       :cache-key="cacheKeyUrl"
       :datasource="form.datasource"
       class="time-form"
+      max-height="350px"
+
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

+ 1 - 0
src/views/saleManage/saleOrder/components/darwerComponents/saleOrderInfo.vue

@@ -177,6 +177,7 @@
       :isDiscountTotalPrice="true"
       :isArrivalWay="true"
       pageName="send"
+      :maxHeight="300"
       :isWms="true"
     ></inventoryTabledetail>
     <headerTitle title="类型清单" v-if="form.needProduce == 4"></headerTitle>

+ 1 - 0
src/views/saleManage/saleOrder/entrustedReceive/components/detailDialog.vue

@@ -91,6 +91,7 @@
         :cache-key="cacheKeyUrl"
         :datasource="detailData.productList"
         row-key="id"
+        :maxHeight="350"
       >
         <template v-slot:technicalDrawings="{ row }">
           <fileMain v-model="row.files" type="view"></fileMain>

+ 2 - 0
src/views/saleManage/saleOrder/entrustedReceive/components/inventoryTable.vue

@@ -9,6 +9,8 @@
       :datasource="form.datasource"
       :selection.sync="selection"
       class="time-form"
+      :maxHeight="350"
+
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

+ 2 - 0
src/views/saleManage/saleOrder/exceptionManagement/components/addOrEditDialog.vue

@@ -102,6 +102,8 @@
         :toolkit="[]"
         :datasource="form.detailList"
         row-key="id"
+        :maxHeight="400"
+
       >
         <template v-slot:headerExceptionDispose="{ column }">
           <span class="is-required">{{ column.label }}</span>

+ 2 - 0
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -8,6 +8,8 @@
       class="time-form"
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
+      :maxHeight="350"
+
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>

+ 2 - 0
src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue

@@ -7,6 +7,8 @@
     row-key="id"
     @columns-change="handleColumnChange"
     :cache-key="cacheKeyUrl"
+    :maxHeight="350"
+
   >
     <template v-slot:technicalDrawings="{ row }">
       <fileMain v-model="row.technicalDrawings" type="view"></fileMain>

+ 2 - 0
src/views/saleManage/saleOrder/invoiceConfirm/components/addInvoiceDialog.vue

@@ -123,6 +123,7 @@
           :columns="columns"
           @columns-change="handleColumnChange"
           :cache-key="cacheKeyUrl"
+          :maxHeight="350"
           :datasource="form.productList"
           row-key="id"
         >
@@ -169,6 +170,7 @@
           ref="table"
           :needPage="false"
           :columns="trayListColumns"
+          :maxHeight="350"
           :toolkit="[]"
           :datasource="trayListData"
           row-key="id"

+ 9 - 8
src/views/saleManage/saleOrder/invoiceConfirm/components/detailDialog.vue

@@ -98,6 +98,7 @@
             row-key="id"
             @columns-change="handleColumnChange"
             :cache-key="cacheKeyUrl"
+            :maxHeight="350"
           >
           </ele-pro-table>
         </el-tab-pane>
@@ -108,6 +109,7 @@
             :columns="trayListColumns"
             :datasource="trayListData"
             row-key="id"
+            :maxHeight="350"
           >
           </ele-pro-table>
         </el-tab-pane>
@@ -145,14 +147,12 @@
   import getDynamicsColumns from '@/mixins/getDynamicsColumns';
   // import fileMain from '@/components/addDoc/index.vue';
   import PalletTable from '@/views/saleManage/saleOrder/invoice/components/palletTable.vue';
-  import {
-    getSendSaleOrderConfirmDetail,
-  } from '@/api/saleManage/invoiceConfirm';
+  import { getSendSaleOrderConfirmDetail } from '@/api/saleManage/invoiceConfirm';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import { levelList } from '@/enum/dict.js';
 
   export default {
-    mixins: [dictMixins, getDynamicsColumns,tabMixins],
+    mixins: [dictMixins, getDynamicsColumns, tabMixins],
     components: {
       PalletTable,
       // fileMain,
@@ -163,7 +163,7 @@
     },
     data() {
       return {
-        cacheKeyUrl:'eos-saleManage-invoiceConfirm-inventoryTableDetails',
+        cacheKeyUrl: 'eos-saleManage-invoiceConfirm-inventoryTableDetails',
         activeComp: 'main',
         tabOptions: [
           { key: 'main', name: '发货确认单详情' },
@@ -381,7 +381,7 @@
             minWidth: 100,
             prop: 'totalCount',
             label: '确认数量',
-            slot:'totalCount',
+            slot: 'totalCount',
             showOverflowTooltip: true,
             align: 'center'
           },
@@ -434,7 +434,7 @@
             prop: 'taxRate',
             label: '税率',
             formatter: (row, column) => {
-              return row.taxRate?row.taxRate+'%':''
+              return row.taxRate ? row.taxRate + '%' : '';
             },
             align: 'center'
           },
@@ -480,7 +480,8 @@
             prop: 'goodsLevel',
             label: '物品级别',
             formatter: (_row, _column, cellValue) => {
-              return levelList.find(item=>item.value==_row.goodsLevel)?.label
+              return levelList.find((item) => item.value == _row.goodsLevel)
+                ?.label;
             },
             align: 'center'
           },

+ 2 - 1
src/views/saleManage/saleOrder/returnGoods/components/detailDialog.vue

@@ -132,9 +132,10 @@
       <ele-pro-table
         ref="table"
         @columns-change="handleColumnChange"
-      :cache-key="cacheKeyUrl"
+         :cache-key="cacheKeyUrl"
         :needPage="false"
         :columns="columns"
+        :maxHeight="250"
         v-show="!['40', '50'].includes(form.type) || form.returnSourceType != 1"
         :datasource="detailData.productList"
         row-key="id"

+ 2 - 0
src/views/saleManage/saleOrder/returnGoods/components/inventoryTable.vue

@@ -8,6 +8,8 @@
       @columns-change="handleColumnChange"
       :cache-key="cacheKeyUrl"
       class="time-form"
+      :maxHeight="250"
+
     >
       <!-- 表头工具栏 -->
       <template v-slot:toolbar>