From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/business/unpass/components/PurchaseVerification.vue | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/src/views/business/unpass/components/PurchaseVerification.vue b/src/views/business/unpass/components/PurchaseVerification.vue
index 2e66c74..ae4619d 100644
--- a/src/views/business/unpass/components/PurchaseVerification.vue
+++ b/src/views/business/unpass/components/PurchaseVerification.vue
@@ -1,10 +1,10 @@
<template>
<div>
- <el-dialog title="杩涜揣楠岃瘉鍘熷璁板綍" :visible.sync="isShow" width="1000px" :show-close="false" :close-on-click-modal="false"
- style="max-height: 96vh; margin-top: 2vh" :modal-append-to-body="false" :close-on-press-escape="false">
+ <el-dialog title="杩涜揣楠岃瘉鍘熷璁板綍" :visible.sync="isShow" width="70%" :show-close="false" :close-on-click-modal="false"
+ :modal-append-to-body="false" :close-on-press-escape="false">
<div class="search">
<el-form :inline="true" :model="purchaseForm" label-position="right" :rules="purchaseFormRules"
- ref="purchaseForm" class="form-inline" label-width="130px">
+ ref="purchaseForm" class="form-inline" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="妫�楠岀紪鍙�:">
@@ -55,50 +55,49 @@
</h4>
<div class="title">涓�銆佷緵鏂逛骇鍝佹娴嬫姤鍛婄殑鍩烘湰淇℃伅纭</div>
<el-form-item label="鏉愭枡鍚嶇О:" prop="basicName">
- <el-radio-group v-model="purchaseForm.basicName" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicName" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿:" prop="basicModel">
- <el-radio-group v-model="purchaseForm.basicModel" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicModel" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鏉愭枡鎵瑰彿:" prop="basicBatchNo">
- <el-radio-group v-model="purchaseForm.basicBatchNo" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicBatchNo" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鎵ц鏍囧噯:" prop="basicStandard">
- <el-radio-group v-model="purchaseForm.basicStandard" :disabled="operationType === 'view'"
- v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicStandard" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鐢熶骇鏃ユ湡:" prop="basicDate">
- <el-radio-group v-model="purchaseForm.basicDate" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicDate" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="渚涜揣鏁伴噺:" prop="basicNumber">
- <el-radio-group v-model="purchaseForm.basicNumber" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicNumber" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="鏉愭枡棰滆壊:" prop="basicColor">
- <el-radio-group v-model="purchaseForm.basicColor" :disabled="operationType === 'view'" v-removeAriaHidden>
+ <el-radio-group v-model="purchaseForm.basicColor" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
@@ -125,12 +124,13 @@
</span>
</div>
<div>
- <el-table :data="factoryVerifyItemList" style="width: 98%" v-loading="tableLoading">
+ <el-table :data="factoryVerifyItemList" style="width: 98%" v-loading="tableLoading"
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column type="index" label="搴忓彿" width="180" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰" width="300"></el-table-column>
<el-table-column prop="result" label="楠岃瘉缁撴灉">
<template slot-scope="scope">
- <el-radio-group v-model="scope.row.result" v-removeAriaHidden :disabled="operationType === 'view'">
+ <el-radio-group v-model="scope.row.result" :disabled="operationType === 'view'">
<el-radio label="1">绗﹀悎</el-radio>
<el-radio label="2">涓嶇鍚�</el-radio>
<el-radio label="3">涓嶉�傜敤</el-radio>
@@ -149,16 +149,15 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="$emit('resetPurchaseDialog')">鍙� 娑�</el-button>
- <el-button type="primary" @click="handlePurchase" :loading="handlePurchaseLoading"
- v-if="operationType === 'add'">纭�
- 瀹�</el-button>
+ <el-button type="primary" @click="handlePurchase" :loading="handlePurchaseLoading" v-if="operationType === 'add'">纭畾</el-button>
</span>
</el-dialog>
<el-dialog title="寰呴獙璇侀」鐩�" :visible.sync="factoryVerifyItemDia" width="1000px"
style="max-height: 96vh; margin-top: 2vh" :show-close="false" :close-on-click-modal="false"
:close-on-press-escape="false">
<el-table :data="tableList" style="width: 100%" v-loading="tableLoading"
- @selection-change="handleSelectionChange">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="搴忓彿" width="60" align="center"></el-table-column>
<el-table-column prop="inspectionItem" label="楠岃瘉椤圭洰"></el-table-column>
@@ -346,7 +345,6 @@
.headLine>>>.el-form-item__content {
width: 68%;
}
-
>>>.el-form-item__content {
display: inline-block;
}
@@ -370,7 +368,7 @@
}
>>>.el-dialog__body {
- max-height: 700px;
+ max-height: 600px;
overflow-y: auto;
}
</style>
--
Gitblit v1.9.3