From fc75f2f27f1ce66801c5637175046f8c65a81249 Mon Sep 17 00:00:00 2001 From: zhang_12370 <z2864490065@outlook.com> Date: 星期四, 26 六月 2025 09:58:18 +0800 Subject: [PATCH] 完善部分页面查看 --- src/views/basicInformation/index.vue | 10 +++++----- src/views/index.vue | 18 ++++++++++++++---- src/views/basicInformation/mould/coalMeiZhiZiDuanWeiHu.vue | 4 ++-- src/views/procureMent/components/ProductionDialog.vue | 4 ++-- src/views/basicInformation/mould/coal.vue | 4 ++-- src/views/basicInformation/mould/supplier.vue | 4 ++-- src/views/basicInformation/mould/customer.vue | 4 ++-- 7 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/views/basicInformation/index.vue b/src/views/basicInformation/index.vue index 7e36228..238cbf2 100644 --- a/src/views/basicInformation/index.vue +++ b/src/views/basicInformation/index.vue @@ -369,11 +369,11 @@ */ const searchPlaceholder = computed(() => { const placeholderMap = { - supplier: "渚涘簲鍟�/璇嗗埆鐮�/璇︾粏鍦板潃", - customer: "渚涘簲鍟�/璇嗗埆鐮�/璇︾粏鍦板潃", - coal: "璇疯緭鍏ユ悳绱俊鎭�", - coalQualityMaintenance: "璇疯緭鍏ユ悳绱俊鎭�", - coalMeiZhiZiDuanWeiHu: "璇疯緭鍏ユ悳绱俊鎭�", + supplier: "渚涘簲鍟�/缁熶竴璇嗗埆鐮�/璇︾粏鍦板潃", + customer: "渚涘簲鍟�/缁熶竴璇嗗埆鐮�/璇︾粏鍦板潃", + coal: "璇疯緭鍏ョ叅绉嶄俊鎭�", + coalQualityMaintenance: "璇疯緭鍏ョ叅璐ㄦ柟妗堜俊鎭�", + coalMeiZhiZiDuanWeiHu: "璇疯緭鍏ョ叅璐ㄥ瓧娈典俊鎭�", }; return placeholderMap[tabName.value] || "璇疯緭鍏ユ悳绱俊鎭�"; }); diff --git a/src/views/basicInformation/mould/coal.vue b/src/views/basicInformation/mould/coal.vue index a8197c2..1063da0 100644 --- a/src/views/basicInformation/mould/coal.vue +++ b/src/views/basicInformation/mould/coal.vue @@ -38,8 +38,8 @@ <el-form-item class="dialog-footer"> <el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button> - <el-button v-if="addOrEdit === 'add'" @click="cancelForm">鍙栨秷</el-button> - <el-button type="primary" @click="submitForm"> + <el-button v-if="addOrEdit === 'add'||addOrEdit.includes('viewRow')" @click="cancelForm">鍙栨秷</el-button> + <el-button type="primary" @click="submitForm" v-if="!isViewMode"> 纭畾 </el-button> </el-form-item> diff --git a/src/views/basicInformation/mould/coalMeiZhiZiDuanWeiHu.vue b/src/views/basicInformation/mould/coalMeiZhiZiDuanWeiHu.vue index 6a43441..45cb626 100644 --- a/src/views/basicInformation/mould/coalMeiZhiZiDuanWeiHu.vue +++ b/src/views/basicInformation/mould/coalMeiZhiZiDuanWeiHu.vue @@ -29,11 +29,11 @@ >閲嶇疆 </el-button > - <el-button v-if="addOrEdit === 'add'" @click="cancelForm" + <el-button v-if="addOrEdit === 'add' || addOrEdit.includes('viewRow')" @click="cancelForm" >鍙栨秷 </el-button > - <el-button type="primary" @click="submitForm"> 纭畾</el-button> + <el-button type="primary" v-if="!isViewMode" @click="submitForm" > 纭畾</el-button> </el-form-item> </el-form> </el-dialog> diff --git a/src/views/basicInformation/mould/customer.vue b/src/views/basicInformation/mould/customer.vue index 7202287..37db037 100644 --- a/src/views/basicInformation/mould/customer.vue +++ b/src/views/basicInformation/mould/customer.vue @@ -43,8 +43,8 @@ </el-form-item> <el-form-item class="dialog-footer"> <el-button v-if="addOrEdit === 'edit'" @click="resetForm">閲嶇疆</el-button> - <el-button v-if="addOrEdit === 'add'" @click="cancelForm">鍙栨秷</el-button> - <el-button type="primary" @click="submitForm"> + <el-button v-if="addOrEdit === 'add' || addOrEdit.includes('viewRow')" @click="cancelForm">鍙栨秷</el-button> + <el-button type="primary" v-if="!isViewMode" @click="submitForm"> 纭畾 </el-button> </el-form-item> diff --git a/src/views/basicInformation/mould/supplier.vue b/src/views/basicInformation/mould/supplier.vue index 6ff557f..7922ca7 100644 --- a/src/views/basicInformation/mould/supplier.vue +++ b/src/views/basicInformation/mould/supplier.vue @@ -127,10 +127,10 @@ <el-button v-if="addOrEdit === 'edit'" @click="resetForm" >閲嶇疆</el-button > - <el-button v-if="addOrEdit !== 'edit'" @click="cancelForm" + <el-button v-if="addOrEdit !== 'edit'||addOrEdit.includes('viewRow')" @click="cancelForm" >鍙栨秷</el-button > - <el-button type="primary" @click="submitForm"> 纭畾</el-button> + <el-button type="primary" @click="submitForm" v-if="!isViewMode"> 纭畾</el-button> </el-form-item> </el-form> </el-dialog> diff --git a/src/views/index.vue b/src/views/index.vue index 452fcfa..525a893 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -325,11 +325,12 @@ } </script> -<style scoped> +<style scoped lang="scss"> .dashboard { padding: 20px; background-color: #f5f7fa; - min-height: 100vh; + min-height: 91vh; + box-sizing: border-box; } /* 椤堕儴缁熻鍗$墖 */ @@ -507,7 +508,7 @@ /* 琛ㄦ牸鏍峰紡璋冩暣 */ .bottom-card.table { - min-width: 320px; + width: 100%; } .bottom-card.table .el-table { @@ -518,7 +519,16 @@ .bottom-card.table .el-table th { padding: 8px 0; } - +:deep(.el-scrollbar__view){ + width: 100% !important; + +} +:deep(.el-table__header,){ + width: 100% !important; + } +:deep(.el-table__body,){ + width: 100% !important; + } /* 鍝嶅簲寮忚璁� */ @media (max-width: 1200px) { .bottom-section { diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue index 677eba9..c8195ff 100644 --- a/src/views/procureMent/components/ProductionDialog.vue +++ b/src/views/procureMent/components/ProductionDialog.vue @@ -112,7 +112,7 @@ <template #footer> <div class="dialog-footer"> <!-- 閲嶇疆鍜屽彇娑� --> - <el-button @click="handleClose" v-if="title.includes('鏂板')" + <el-button @click="handleClose" v-if="title.includes('鏂板') || title.includes('鏌ョ湅')" >鍙栨秷 </el-button > @@ -120,7 +120,7 @@ >閲嶇疆 </el-button > - <el-button type="primary" @click="handleSubmit">纭</el-button> + <el-button type="primary" v-if="!isViewMode" @click="handleSubmit">纭</el-button> </div> </template> </el-dialog> -- Gitblit v1.9.3