From 032ddb30a8d9d884cc176a4a506580b4a1272586 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 17:14:07 +0800
Subject: [PATCH] 模态框ui调整
---
src/views/common/order-stock.vue | 2
src/views/product/workbench/handymantype.vue | 2
src/views/common/productstructure.vue | 2
src/views/common/ztt-table.vue | 12 +
src/views/common/step.vue | 2
src/views/quality/teststandard/index.vue | 1
src/views/common/stock.vue | 2
src/views/common/completeproductstructure.vue | 2
src/views/common/productout.vue | 2
src/views/common/user.vue | 2
src/views/product/workbench/productoutput-dialog.vue | 2
src/views/plan/customerorder/synchronize-part.vue | 2
src/views/common/workstation.vue | 2
src/views/product/artificialinformationjoin/handymantype_form.vue | 2
src/views/common/partfamily.vue | 2
src/views/common/routing.vue | 2
src/views/plan/manufacturingorder/DelMatUnIssue.vue | 2
src/views/basic/crew/index.vue | 2
src/views/warehouse/return/return-detail-index.vue | 2
src/views/common/location.vue | 2
src/views/quality/finishedProductInspection/finishedProduct-form.vue | 22 ++--
src/views/technology/routing/routing-part.vue | 2
src/views/common/staff.vue | 2
src/views/quality/Packaging_ledger/pack-from.vue | 2
src/views/common/document.vue | 2
src/views/common/joinstockorder.vue | 2
src/views/common/stock-multi.vue | 2
src/views/quality/newReport/TestMan.vue | 2
src/views/plan/operationtaskreserved/stock.vue | 2
src/views/warehouse/check/part-choose.vue | 2
src/views/common/part.vue | 4
src/views/quality/task/templatePart.vue | 2
src/views/common/workstationMulti.vue | 2
src/views/plan/manufacturingorder/routing.vue | 2
src/views/warehouse/returnstock/stock-part.vue | 2
src/views/aps/tree/resource.vue | 2
src/views/product/workbench/split-stock.vue | 2
src/views/common/rawMaterial-part.vue | 6
src/views/common/customerorder.vue | 2
src/views/basic/shift/shift-form.vue | 14 +-
src/views/technology/document/spotCheckRule.vue | 2
src/views/aps/joinresgroup/resource.vue | 2
src/views/plan/manufacturingorder/orderSpotCheckRule.vue | 2
src/views/common/operation.vue | 2
src/views/quality/Packaging_ledger/pack-fromadd.vue | 2
src/views/common/routingOperationTemplate.vue | 2
src/views/common/workstaff.vue | 2
src/views/common/resource.vue | 2
src/views/common/param.vue | 2
src/views/common/manufacturingorder.vue | 2
src/views/quality/packageinspect/packageInspect-form.vue | 20 ++--
src/views/warehouse/preparedetail/stock.vue | 2
src/views/plan/schedule/manufacturingorder.vue | 2
src/views/product/workbench/product-record-form-list.vue | 2
src/views/plan/customerorder/customerorder-config-history.vue | 2
src/views/quality/processInspect/processInspect-form.vue | 24 ++--
src/views/quality/rawMaterial/rawMaterial-form.vue | 29 +++--
src/views/warehouse/receiving/receiving-detail-index.vue | 2
src/views/product/dutyrecord/dutyrecord-table.vue | 2
src/views/product/artificialinformationjoin/handymantype.vue | 2
src/views/common/operationParamTemplate.vue | 2
src/views/quality/parts/template.vue | 2
src/views/aps/resource/workstation.vue | 2
src/views/product/dutyrecord/handymantype.vue | 2
src/views/product/workbench/productoutput-list.vue | 2
src/views/warehouse/receiving/delivery-detail-index.vue | 2
66 files changed, 126 insertions(+), 120 deletions(-)
diff --git a/src/views/aps/joinresgroup/resource.vue b/src/views/aps/joinresgroup/resource.vue
index 5f1139c..d6649c2 100644
--- a/src/views/aps/joinresgroup/resource.vue
+++ b/src/views/aps/joinresgroup/resource.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramArr="resourceIdArr"
ref="joinResGroupResourceTable"
diff --git a/src/views/aps/resource/workstation.vue b/src/views/aps/resource/workstation.vue
index 6ca88b4..6335f42 100644
--- a/src/views/aps/resource/workstation.vue
+++ b/src/views/aps/resource/workstation.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="resourceWorkstationTable"
>
diff --git a/src/views/aps/tree/resource.vue b/src/views/aps/tree/resource.vue
index bf5be9a..b81cbec 100644
--- a/src/views/aps/tree/resource.vue
+++ b/src/views/aps/tree/resource.vue
@@ -6,7 +6,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="400"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="treeResourceTable"
>
diff --git a/src/views/basic/crew/index.vue b/src/views/basic/crew/index.vue
index 8b281d4..8835110 100644
--- a/src/views/basic/crew/index.vue
+++ b/src/views/basic/crew/index.vue
@@ -30,7 +30,7 @@
>
<template #toolbar>
<el-button type="primary" @click="addHandle"
- v-if="permissions.basic_crew_person_add"></el-button>
+ v-if="permissions.basic_crew_person_add">娣诲姞</el-button>
</template>
</ttable>
</el-col>
diff --git a/src/views/basic/shift/shift-form.vue b/src/views/basic/shift/shift-form.vue
index 5f14b80..17d18a9 100644
--- a/src/views/basic/shift/shift-form.vue
+++ b/src/views/basic/shift/shift-form.vue
@@ -42,7 +42,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="mondayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.mondayWorkHours"
@@ -73,7 +73,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="tuesdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.tuesdayWorkHours"
@@ -104,7 +104,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="wensdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.wensdayWorkHours"
@@ -135,7 +135,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="thursdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.thursdayWorkHours"
@@ -166,7 +166,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="fridayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.fridayWorkHours"
@@ -197,7 +197,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="saturdayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.saturdayWorkHours"
@@ -228,7 +228,7 @@
>
</el-time-picker>
</el-col>
- <el-col :span="5" :offset="1">
+ <el-col :span="9" :offset="3">
<el-form-item prop="sundayWorkHours" style="margin-bottom:0px">
<el-input
v-model="dataForm.sundayWorkHours"
diff --git a/src/views/common/completeproductstructure.vue b/src/views/common/completeproductstructure.vue
index 04ef31d..0d4ff1a 100644
--- a/src/views/common/completeproductstructure.vue
+++ b/src/views/common/completeproductstructure.vue
@@ -17,7 +17,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="queryParam"
ref="commonCompleteproductstructureTable"
diff --git a/src/views/common/customerorder.vue b/src/views/common/customerorder.vue
index 6cf7722..e8ff6fc 100644
--- a/src/views/common/customerorder.vue
+++ b/src/views/common/customerorder.vue
@@ -15,7 +15,7 @@
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
- :bottomOffset="350"
+ :bottomOffset="150"
:paramArr="type"
ref="customerOrderTable"
>
diff --git a/src/views/common/document.vue b/src/views/common/document.vue
index fe74309..25c7a1c 100644
--- a/src/views/common/document.vue
+++ b/src/views/common/document.vue
@@ -50,7 +50,7 @@
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
- :bottomOffset="350"
+ :bottomOffset="150"
:fixedHeight="tableFixHeight"
ref="documentTable"
:paramObj="queryParam"
diff --git a/src/views/common/joinstockorder.vue b/src/views/common/joinstockorder.vue
index 7266900..98b900b 100644
--- a/src/views/common/joinstockorder.vue
+++ b/src/views/common/joinstockorder.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="joinStockOrderTable"
diff --git a/src/views/common/location.vue b/src/views/common/location.vue
index ad9fad7..1a6c6da 100644
--- a/src/views/common/location.vue
+++ b/src/views/common/location.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonLocationTable"
>
diff --git a/src/views/common/manufacturingorder.vue b/src/views/common/manufacturingorder.vue
index 20a6831..cfb225e 100644
--- a/src/views/common/manufacturingorder.vue
+++ b/src/views/common/manufacturingorder.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonManufacturingOrderTable"
>
diff --git a/src/views/common/operation.vue b/src/views/common/operation.vue
index 6c75fdd..74b9240 100644
--- a/src/views/common/operation.vue
+++ b/src/views/common/operation.vue
@@ -17,7 +17,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonOperationTable"
>
diff --git a/src/views/common/operationParamTemplate.vue b/src/views/common/operationParamTemplate.vue
index 0b5960c..9f62a37 100644
--- a/src/views/common/operationParamTemplate.vue
+++ b/src/views/common/operationParamTemplate.vue
@@ -21,7 +21,7 @@
:paramObj="paramTemplateObj"
:selColValArr="paramTemplateSelArr"
:selCol="paramTemplateSelCol"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="operationParamTemplateTable"
>
<template #toolbar></template>
diff --git a/src/views/common/order-stock.vue b/src/views/common/order-stock.vue
index 5938b18..8cc96e1 100644
--- a/src/views/common/order-stock.vue
+++ b/src/views/common/order-stock.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:selColValArr="paramSelArr"
diff --git a/src/views/common/param.vue b/src/views/common/param.vue
index 9d6f3df..66c3976 100644
--- a/src/views/common/param.vue
+++ b/src/views/common/param.vue
@@ -19,7 +19,7 @@
:ajaxFun="ajaxFun"
:selColValArr="paramSelArr"
:selCol="paramSelCol"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="paramTable"
>
<template #toolbar></template>
diff --git a/src/views/common/part.vue b/src/views/common/part.vue
index 9374cce..dd03a4d 100644
--- a/src/views/common/part.vue
+++ b/src/views/common/part.vue
@@ -1,7 +1,7 @@
<template>
<el-dialog
v-diadrag
- width="60%"
+ width="70%"
title="闆朵欢"
top="5vh"
:visible.sync="innerVisible"
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonPartTable"
diff --git a/src/views/common/partfamily.vue b/src/views/common/partfamily.vue
index a9f8133..375de34 100644
--- a/src/views/common/partfamily.vue
+++ b/src/views/common/partfamily.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonPartFamilyTable"
>
diff --git a/src/views/common/productout.vue b/src/views/common/productout.vue
index 25a7fd7..f6b3371 100644
--- a/src/views/common/productout.vue
+++ b/src/views/common/productout.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonProductoutTable"
diff --git a/src/views/common/productstructure.vue b/src/views/common/productstructure.vue
index 4ac5c5b..8ea2948 100644
--- a/src/views/common/productstructure.vue
+++ b/src/views/common/productstructure.vue
@@ -17,7 +17,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="queryParam"
ref="commonProductstructureTable"
diff --git a/src/views/common/rawMaterial-part.vue b/src/views/common/rawMaterial-part.vue
index 13d5b07..27a3d34 100644
--- a/src/views/common/rawMaterial-part.vue
+++ b/src/views/common/rawMaterial-part.vue
@@ -19,7 +19,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:isShowPagination="false"
@@ -248,10 +248,10 @@
margin-top: 0px;
margin-bottom: 5px;
}
- @media screen and (max-width: 800px) {
+ /* @media screen and (max-width: 800px) {
.el-dialog {
height: 600px !important;
}
-}
+ } */
</style>
\ No newline at end of file
diff --git a/src/views/common/resource.vue b/src/views/common/resource.vue
index 2630765..44cf9f9 100644
--- a/src/views/common/resource.vue
+++ b/src/views/common/resource.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonResourceTable"
>
diff --git a/src/views/common/routing.vue b/src/views/common/routing.vue
index ba3fa01..bf9050e 100644
--- a/src/views/common/routing.vue
+++ b/src/views/common/routing.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="queryParam"
ref="commonRoutingTable"
diff --git a/src/views/common/routingOperationTemplate.vue b/src/views/common/routingOperationTemplate.vue
index f46d8d8..d5567be 100644
--- a/src/views/common/routingOperationTemplate.vue
+++ b/src/views/common/routingOperationTemplate.vue
@@ -20,7 +20,7 @@
:paramObj="paramTemplateObj"
:selColValArr="paramTemplateSelArr"
:selCol="paramTemplateSelCol"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="operationParamTemplateTable"
>
<template #toolbar></template>
diff --git a/src/views/common/staff.vue b/src/views/common/staff.vue
index 24661bb..200621e 100644
--- a/src/views/common/staff.vue
+++ b/src/views/common/staff.vue
@@ -18,7 +18,7 @@
:options="options"
:selColValArr="paramSelArr"
:selCol="paramSelCol"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonStaffTable"
>
diff --git a/src/views/common/step.vue b/src/views/common/step.vue
index d8e3f0e..788c0d5 100644
--- a/src/views/common/step.vue
+++ b/src/views/common/step.vue
@@ -17,7 +17,7 @@
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="commonStepTable"
>
<template #toolbar></template>
diff --git a/src/views/common/stock-multi.vue b/src/views/common/stock-multi.vue
index a8d5422..e543ae5 100644
--- a/src/views/common/stock-multi.vue
+++ b/src/views/common/stock-multi.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:selColValArr="paramSelArr"
diff --git a/src/views/common/stock.vue b/src/views/common/stock.vue
index 8cb3e74..53943d0 100644
--- a/src/views/common/stock.vue
+++ b/src/views/common/stock.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:selColValArr="paramSelArr"
diff --git a/src/views/common/user.vue b/src/views/common/user.vue
index 9d71e05..f22bbbb 100644
--- a/src/views/common/user.vue
+++ b/src/views/common/user.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonUserTable"
diff --git a/src/views/common/workstaff.vue b/src/views/common/workstaff.vue
index 9e9014a..c25b4e0 100644
--- a/src/views/common/workstaff.vue
+++ b/src/views/common/workstaff.vue
@@ -11,7 +11,7 @@
:options="options"
:selColValArr="selColValArr"
:selCol="selCol"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonStaffTable"
>
diff --git a/src/views/common/workstation.vue b/src/views/common/workstation.vue
index 9413793..34a1a7e 100644
--- a/src/views/common/workstation.vue
+++ b/src/views/common/workstation.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonWorkstationTable"
>
diff --git a/src/views/common/workstationMulti.vue b/src/views/common/workstationMulti.vue
index f8621bd..2581dad 100644
--- a/src/views/common/workstationMulti.vue
+++ b/src/views/common/workstationMulti.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="commonWorkstationMultiTable"
>
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 70b8191..04f5297 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -164,7 +164,7 @@
:span-method="objectSpanMethod"
:header-cell-style="tableHeaderStyle"
v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }"
- height="100px"
+ height="300px"
:class="[
'commonTable',
isGeneralSearch && !isEdit
@@ -568,6 +568,10 @@
return 'id'
}
},
+ toolbarMaxLength: {
+ type: Number,
+ default: 5,
+ },
// 琛ㄦ牸鍨嬪彿锛歮ini,medium,small
tableSize: { type: String, default: 'small' },
// 鏁版嵁璇锋眰鏂规硶
@@ -755,11 +759,11 @@
return colList
},
getToolBarBtn() {
- return this.table.toolbar ? this.table.toolbar.slice(0, 5) : []
+ return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : []
},
getToolbarDown() {
- return this.getToolBarBtn.length === 5
- ? this.table.toolbar.slice(5, this.table.toolbar.length)
+ return this.getToolBarBtn.length == this.toolbarMaxLength
+ ? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length)
: []
},
isRefreshBtn() {
diff --git a/src/views/plan/customerorder/customerorder-config-history.vue b/src/views/plan/customerorder/customerorder-config-history.vue
index f6cce3b..67c35eb 100644
--- a/src/views/plan/customerorder/customerorder-config-history.vue
+++ b/src/views/plan/customerorder/customerorder-config-history.vue
@@ -27,7 +27,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonPartTable"
diff --git a/src/views/plan/customerorder/synchronize-part.vue b/src/views/plan/customerorder/synchronize-part.vue
index ad2de4e..85d2e20 100644
--- a/src/views/plan/customerorder/synchronize-part.vue
+++ b/src/views/plan/customerorder/synchronize-part.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:paramArr="type"
diff --git a/src/views/plan/manufacturingorder/DelMatUnIssue.vue b/src/views/plan/manufacturingorder/DelMatUnIssue.vue
index 8e80ee4..3a6e096 100644
--- a/src/views/plan/manufacturingorder/DelMatUnIssue.vue
+++ b/src/views/plan/manufacturingorder/DelMatUnIssue.vue
@@ -16,7 +16,7 @@
"
:options="options"
:ajaxFun="ajaxFun"
- :bottomOffset="250"
+ :bottomOffset="150"
ref="delMatUnIssueTable"
>
<template #toolbar></template>
diff --git a/src/views/plan/manufacturingorder/orderSpotCheckRule.vue b/src/views/plan/manufacturingorder/orderSpotCheckRule.vue
index 09012a9..568f1a3 100644
--- a/src/views/plan/manufacturingorder/orderSpotCheckRule.vue
+++ b/src/views/plan/manufacturingorder/orderSpotCheckRule.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="orderSpotCheckRuleTable"
diff --git a/src/views/plan/manufacturingorder/routing.vue b/src/views/plan/manufacturingorder/routing.vue
index 4726c8e..51d1794 100644
--- a/src/views/plan/manufacturingorder/routing.vue
+++ b/src/views/plan/manufacturingorder/routing.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="routingTable"
:paramObj="queryParam"
diff --git a/src/views/plan/operationtaskreserved/stock.vue b/src/views/plan/operationtaskreserved/stock.vue
index bc584d6..1b73c6c 100644
--- a/src/views/plan/operationtaskreserved/stock.vue
+++ b/src/views/plan/operationtaskreserved/stock.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:paramArr="paramArr"
diff --git a/src/views/plan/schedule/manufacturingorder.vue b/src/views/plan/schedule/manufacturingorder.vue
index bc15eac..e346401 100644
--- a/src/views/plan/schedule/manufacturingorder.vue
+++ b/src/views/plan/schedule/manufacturingorder.vue
@@ -13,7 +13,7 @@
:options="options"
:ajaxFun="ajaxFun"
ref="manufacturingOrderTable"
- :bottomOffset="255"
+ :bottomOffset="150"
>
<template #toolbar></template>
</ttable>
diff --git a/src/views/product/artificialinformationjoin/handymantype.vue b/src/views/product/artificialinformationjoin/handymantype.vue
index 93bc2ec..875cf86 100644
--- a/src/views/product/artificialinformationjoin/handymantype.vue
+++ b/src/views/product/artificialinformationjoin/handymantype.vue
@@ -7,7 +7,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramArr="handyTypeId"
ref="commonHandymanTypeTable"
diff --git a/src/views/product/artificialinformationjoin/handymantype_form.vue b/src/views/product/artificialinformationjoin/handymantype_form.vue
index 0d94d50..ce7518b 100644
--- a/src/views/product/artificialinformationjoin/handymantype_form.vue
+++ b/src/views/product/artificialinformationjoin/handymantype_form.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:paramArr="handyId"
:ajaxFun="ajaxFun"
ref="commonHandymanTypeTable"
diff --git a/src/views/product/dutyrecord/dutyrecord-table.vue b/src/views/product/dutyrecord/dutyrecord-table.vue
index 681c482..cca8205 100644
--- a/src/views/product/dutyrecord/dutyrecord-table.vue
+++ b/src/views/product/dutyrecord/dutyrecord-table.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="dutyRecordTable"
>
diff --git a/src/views/product/dutyrecord/handymantype.vue b/src/views/product/dutyrecord/handymantype.vue
index 3ae4513..41a1472 100644
--- a/src/views/product/dutyrecord/handymantype.vue
+++ b/src/views/product/dutyrecord/handymantype.vue
@@ -66,7 +66,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonHandymanTypeTable"
diff --git a/src/views/product/workbench/handymantype.vue b/src/views/product/workbench/handymantype.vue
index 237095f..033dd81 100644
--- a/src/views/product/workbench/handymantype.vue
+++ b/src/views/product/workbench/handymantype.vue
@@ -45,7 +45,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonHandymanTypeTable"
diff --git a/src/views/product/workbench/product-record-form-list.vue b/src/views/product/workbench/product-record-form-list.vue
index 6464829..d8d1d13 100644
--- a/src/views/product/workbench/product-record-form-list.vue
+++ b/src/views/product/workbench/product-record-form-list.vue
@@ -15,7 +15,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonProductoutputTable"
diff --git a/src/views/product/workbench/productoutput-dialog.vue b/src/views/product/workbench/productoutput-dialog.vue
index 83d4b88..9ccd2cd 100644
--- a/src/views/product/workbench/productoutput-dialog.vue
+++ b/src/views/product/workbench/productoutput-dialog.vue
@@ -15,7 +15,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonProductoutputTable"
diff --git a/src/views/product/workbench/productoutput-list.vue b/src/views/product/workbench/productoutput-list.vue
index f4b8989..c1ae248 100644
--- a/src/views/product/workbench/productoutput-list.vue
+++ b/src/views/product/workbench/productoutput-list.vue
@@ -4,7 +4,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
@ttRowClick="saveSelectRow"
diff --git a/src/views/product/workbench/split-stock.vue b/src/views/product/workbench/split-stock.vue
index caf5310..e55c18e 100644
--- a/src/views/product/workbench/split-stock.vue
+++ b/src/views/product/workbench/split-stock.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="stockPartTable"
diff --git a/src/views/quality/Packaging_ledger/pack-from.vue b/src/views/quality/Packaging_ledger/pack-from.vue
index 0c6937c..1587f27 100644
--- a/src/views/quality/Packaging_ledger/pack-from.vue
+++ b/src/views/quality/Packaging_ledger/pack-from.vue
@@ -15,7 +15,7 @@
:prelang="prelang"
:options="options"
:ajaxFun="ajaxFun"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="paramTable"
>
<template #toolbar></template>
diff --git a/src/views/quality/Packaging_ledger/pack-fromadd.vue b/src/views/quality/Packaging_ledger/pack-fromadd.vue
index b280ee7..6d16c84 100644
--- a/src/views/quality/Packaging_ledger/pack-fromadd.vue
+++ b/src/views/quality/Packaging_ledger/pack-fromadd.vue
@@ -16,7 +16,7 @@
:options="options"
:ajaxFun="ajaxFun"
:paramObj="packageBoxIddata"
- :bottomOffset="350"
+ :bottomOffset="150"
ref="paramTable"
>
<template #toolbar></template>
diff --git a/src/views/quality/finishedProductInspection/finishedProduct-form.vue b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
index dccb95c..0ffa692 100644
--- a/src/views/quality/finishedProductInspection/finishedProduct-form.vue
+++ b/src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -118,12 +118,12 @@
:cell-style="{textAlign:'center'}" row-key="iid" default-expand-all
style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column label="椤圭洰" prop="father" width="240" ></el-table-column>
- <el-table-column prop="iname" label="鎸囨爣" width="240" ></el-table-column>
- <el-table-column prop="iunit" label="鍗曚綅" width="240" ></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="240" ></el-table-column>
+ <el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140" ></el-table-column>
+ <el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140" ></el-table-column>
+ <el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140" ></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="140" show-overflow-tooltip ></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="妫�娴嬪��"
- width="240" style="text-align: center;">
+ width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
@@ -148,11 +148,11 @@
</el-col>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:80%" v-model="scope.row.eId"
+ <el-select style="width:60%" v-model="scope.row.eId"
v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -167,7 +167,7 @@
</template>
</el-table-column>
<el-table-column prop="inspectionValue"
- label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ label="妫�楠屾弿杩�" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
@@ -214,9 +214,9 @@
<el-col :span="24">
<el-table border height="90" :data="inspectionResultForm"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
- :cell-style="{textAlign:'center'}">
- <el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
+ :cell-style="{textAlign: 'center'}">
+ <el-table-column prop="materialCode" width="200" label="鐗╂枡缂栧彿" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="material" width="200" label="鐗╂枡鍚嶇О" show-overflow-tooltip></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
diff --git a/src/views/quality/newReport/TestMan.vue b/src/views/quality/newReport/TestMan.vue
index fb8a654..a964842 100644
--- a/src/views/quality/newReport/TestMan.vue
+++ b/src/views/quality/newReport/TestMan.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="testManTable"
>
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 4f825f5..4dc8c5c 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -64,11 +64,11 @@
</div>
<div class="packageInspect-detail">
<el-row :gutter="10" style="width:100%;z-index: 10;height:50px;">
- <el-col :span="20">妫�楠岄」鐩�</el-col>
- <el-col :span="2">
- <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
+ <el-col :sm="18" :lg="20">妫�楠岄」鐩�</el-col>
+ <el-col :sm="3" :lg="2" >
+ <el-button v-if="resultVal=='' || resultVal==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
</el-col>
- <el-col :span="2">
+ <el-col :sm="3" :lg="2">
<el-button v-if="resultVal=='' || resultVal==null" style="width:100%" type="primary" size="small"
@click="savePackIns()">淇濆瓨</el-button>
</el-col>
@@ -88,13 +88,13 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="260">
+ <el-table-column prop="name" label="椤圭洰" width="160">
<template slot-scope="scope">
- <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:90%;" v-model="scope.row.name"
+ <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name"
placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="required" label="瑕佹眰" width="260">
+ <el-table-column prop="required" label="瑕佹眰" width="160" show-overflow-tooltip>
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :readonly="resultVal!=null" v-model="scope.row.required"
@@ -102,7 +102,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" show-overflow-tooltip>
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
@@ -140,8 +140,8 @@
<el-table class="l-mes" border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
- <el-table-column prop="packageNo" label="鍖呰缂栧彿"></el-table-column>
- <el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
+ <el-table-column prop="packageNo" label="鍖呰缂栧彿" width="200" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="userName" label="妫�楠屽憳" width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
<el-select :disabled="resultVal!=null" style="width:100%" v-model="scope.row.result">
diff --git a/src/views/quality/parts/template.vue b/src/views/quality/parts/template.vue
index 4e372ce..5121371 100644
--- a/src/views/quality/parts/template.vue
+++ b/src/views/quality/parts/template.vue
@@ -9,7 +9,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="templateTable"
>
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 42cef67..01a072a 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -104,13 +104,13 @@
default-expand-all style="width: 100%"
ref="table"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
- <el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
- <el-table-column prop="iunit" label="鍗曚綅" width="240"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="240"></el-table-column>
+ <el-table-column type="index" label="搴忓彿" show-overflow-tooltip width="60"></el-table-column>
+ <el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="140"></el-table-column>
<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
- label="妫�娴嬪��" width="240" style="text-align: center;">
+ label="妫�娴嬪��" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col v-if="scope.row.itype === '1'">
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
@@ -136,12 +136,12 @@
</el-col>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<span v-if="resultVal != null && scope.row.iname != null"
v-text="scope.row.ename"></span>
<div v-else>
- <el-select style="width:80%" v-model="scope.row.eId" v-if="scope.row.iname != null"
+ <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
filterable @change="updateDevice(scope.row, scope.$index)">
<el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
:label="item.code + '-' + item.name"></el-option>
@@ -155,8 +155,8 @@
</div>
</template>
</el-table-column>
- <el-table-column
- label="妫�楠屾弿杩�" width="240" style="text-align: center;">
+ <el-table-column show-overflow-tooltip
+ label="妫�楠屾弿杩�" width="140" style="text-align: center;">
<template slot-scope="scope">
<el-col>
<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
@@ -192,8 +192,8 @@
<el-table border height="90" :data="inspectionResultForm"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
:cell-style="{ textAlign: 'center' }">
- <el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="materialCode" width="200" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="material" width="200" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 5a05f43..fd7022f 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -115,14 +115,14 @@
<el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
<el-tab-pane label="妫�楠岄」鐩�">
<el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :sm="12" :lg="18"></el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="15" :lg="18"></el-col>
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
</el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
</el-col>
- <el-col :sm="4" :lg="2" style="text-align: right;">
+ <el-col :sm="3" :lg="2" style="text-align: right;">
<el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
</el-col>
</el-row>
@@ -141,12 +141,12 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column type="index" label="搴忓彿" width="60">
</el-table-column>
- <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
<template slot-scope="scope">
<el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="260">
+ <el-table-column prop="name" label="椤圭洰" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
@@ -154,7 +154,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="260">
+ <el-table-column prop="unit" label="鍗曚綅" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
@@ -162,7 +162,7 @@
</template>
</el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="260">
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="160">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
@@ -170,7 +170,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
@@ -186,10 +186,10 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
<template slot-scope="scope">
<div v-if="!scope.row.children">
- <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%"
+ <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
<el-option v-for="(item,index) in deviceList"
:key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -203,7 +203,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
<template slot-scope="scope">
<div v-if="!scope.row.children">
<el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
@@ -264,6 +264,7 @@
<el-table-column
prop="rawInsNo"
align="center"
+ width="120"
label="鍘熸潗鏂欐楠岀紪鍙�"
show-overflow-tooltip
></el-table-column>
@@ -319,8 +320,8 @@
<el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
- <el-table-column prop="code" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="code" width="150" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" width="150" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
diff --git a/src/views/quality/task/templatePart.vue b/src/views/quality/task/templatePart.vue
index 70a57f8..91bfd0e 100644
--- a/src/views/quality/task/templatePart.vue
+++ b/src/views/quality/task/templatePart.vue
@@ -10,7 +10,7 @@
:isShowHide="true"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="templatePartTable"
>
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 120c1c0..4be8c9b 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -8,6 +8,7 @@
@handleSelectionChange="handleCurrentChange"
:uploadInfo="uploadInfo"
:prelang="prelang"
+ :toolbarMaxLength="3"
:options="options"
:ajaxFun="ajaxFun"
@dbClickRow="handleDbClickRow"
diff --git a/src/views/technology/document/spotCheckRule.vue b/src/views/technology/document/spotCheckRule.vue
index 709d955..4372d66 100644
--- a/src/views/technology/document/spotCheckRule.vue
+++ b/src/views/technology/document/spotCheckRule.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="spotCheckRuleTable"
diff --git a/src/views/technology/routing/routing-part.vue b/src/views/technology/routing/routing-part.vue
index 93c3413..15787dc 100644
--- a/src/views/technology/routing/routing-part.vue
+++ b/src/views/technology/routing/routing-part.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
ref="commonPartTable"
diff --git a/src/views/warehouse/check/part-choose.vue b/src/views/warehouse/check/part-choose.vue
index 1217662..eab0041 100644
--- a/src/views/warehouse/check/part-choose.vue
+++ b/src/views/warehouse/check/part-choose.vue
@@ -16,7 +16,7 @@
:isShowHide="true"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="partTable"
>
diff --git a/src/views/warehouse/preparedetail/stock.vue b/src/views/warehouse/preparedetail/stock.vue
index a1d0886..e412fe4 100644
--- a/src/views/warehouse/preparedetail/stock.vue
+++ b/src/views/warehouse/preparedetail/stock.vue
@@ -16,7 +16,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="stockTable"
:paramArr="paramArr"
diff --git a/src/views/warehouse/receiving/delivery-detail-index.vue b/src/views/warehouse/receiving/delivery-detail-index.vue
index 4f6a48b..57d3506 100644
--- a/src/views/warehouse/receiving/delivery-detail-index.vue
+++ b/src/views/warehouse/receiving/delivery-detail-index.vue
@@ -7,7 +7,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="deliveryDetailTable"
:paramObj="paramObj"
diff --git a/src/views/warehouse/receiving/receiving-detail-index.vue b/src/views/warehouse/receiving/receiving-detail-index.vue
index c0eb44c..d5e2588 100644
--- a/src/views/warehouse/receiving/receiving-detail-index.vue
+++ b/src/views/warehouse/receiving/receiving-detail-index.vue
@@ -6,7 +6,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
ref="receivingDetailTable"
:paramObj="paramObj"
diff --git a/src/views/warehouse/return/return-detail-index.vue b/src/views/warehouse/return/return-detail-index.vue
index ed5c2ed..ab7a301 100644
--- a/src/views/warehouse/return/return-detail-index.vue
+++ b/src/views/warehouse/return/return-detail-index.vue
@@ -8,7 +8,7 @@
:isShowHide="true"
:prelang="prelang"
:options="options"
- :bottomOffset="255"
+ :bottomOffset="150"
:paramObj="paramObj"
:ajaxFun="ajaxFun"
ref="returnDetailTable"
diff --git a/src/views/warehouse/returnstock/stock-part.vue b/src/views/warehouse/returnstock/stock-part.vue
index 65d356d..e74701f 100644
--- a/src/views/warehouse/returnstock/stock-part.vue
+++ b/src/views/warehouse/returnstock/stock-part.vue
@@ -18,7 +18,7 @@
:uploadInfo="uploadInfo"
:prelang="prelang"
:options="options"
- :bottomOffset="350"
+ :bottomOffset="150"
:ajaxFun="ajaxFun"
:paramObj="paramObj"
:selColValArr="paramTemplateSelArr"
--
Gitblit v1.9.3