From eaa506e57403d1b8502f16ca5dd6e82c347724d0 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 17 七月 2025 23:09:32 +0800
Subject: [PATCH] 优化QC模块样式统一和功能完善
---
pages/QC/XJ/Add.vue | 597 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 433 insertions(+), 164 deletions(-)
diff --git a/pages/QC/XJ/Add.vue b/pages/QC/XJ/Add.vue
index 9a3048f..0bfe3bf 100644
--- a/pages/QC/XJ/Add.vue
+++ b/pages/QC/XJ/Add.vue
@@ -1,121 +1,136 @@
<template>
- <view>
- <view class="form-container">
- <form :modelValue="formData">
- <view class="form-group">
- <label class="form-label">妫�楠屽崟鍙�:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.releaseNo"/>
- </view>
- <view class="form-group">
- <label class="form-label">鍒涘缓浜�:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.createBy"/>
- </view>
- <view class="form-group">
- <label class="form-label">鍒涘缓鏃堕棿:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.createDate"/>
- </view>
- <view class="uni-form-item uni-column form-item edit">
- <text class="form-label">绾夸綋缂栧彿:</text>
- <picker v-if="isUpdate" class="picker form-input" name="selector" :range="DAA020List"
- @change="onDaa020Change">
- <text>{{ DAA020List[DAA020Index] }}</text>
- </picker>
- <input v-else class="form-input" disabled="true" type="text" v-model="formData.daa020"/>
- </view>
- <view class="uni-form-item uni-column form-item edit">
- <text class="form-label">鐗╂枡缂栫爜:</text>
- <picker v-if="isUpdate" class="picker form-input" name="selector" :range="ItemList"
- @change="onItemChange">
- <text>{{ ItemList[ItemIndex] }}</text>
- </picker>
- <input v-else class="form-input" disabled="true" type="text" v-model="formData.itemNo"/>
- </view>
- <view class="uni-form-item uni-column form-item edit">
- <text class="form-label">璁″垝缂栧彿:</text>
- <picker v-if="isUpdate" class="picker form-input" name="selector" :range="DAA001List"
- @change="onDaa001Change">
- <text>{{ DAA001List[DAA001Index] }}</text>
- </picker>
- <input v-else class="form-input" disabled="true" type="text" v-model="formData.billNo"/>
- </view>
-
- <view class="form-group">
- <label class="form-label">鐗╂枡鍚嶇О:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.itemName"/>
- </view>
- <view class="form-group">
- <label class="form-label">瑙勬牸鍨嬪彿:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.itemModel"/>
- </view>
- <view class="form-group">
- <label class="form-label">宸ュ崟鏁伴噺:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.planQty"/>
- </view>
- <view class="form-group">
- <label class="form-label">涓嶅悎鏍兼弿杩�:</label>
- <input class="form-input" disabled="true" type="text" v-model="formData.remarks"/>
- </view>
- </form>
+ <view class="container">
+ <!-- 澶撮儴 -->
+ <view class="header">
+ <view class="title">宸℃椤圭洰鏄庣粏</view>
+ <view class="order-number">宸℃鍗曞彿: {{formData.releaseNo}}</view>
</view>
- <view class="list-container">
- <uni-table ref="table" border emptyText="鏆傛棤鏇村鏁版嵁">
- <uni-tr>
- <uni-th align="center" class="th" style="color: #FFFFFF;">妫�楠岄」鐩�</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">鏄惁鍚堟牸</uni-th>
- <uni-th align="center" class="th" style="color: #FFFFFF">璁板綍(鐐瑰嚮)</uni-th>
- </uni-tr>
- <uni-tr v-for="(item, index) in tableData" :key="index">
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.projName"/>
- </uni-td>
- <uni-td align="center">
- <input class="form-input" disabled="true" type="text" v-model="item.result"/>
- </uni-td>
- <uni-td>
- <view class="uni-group">
- <button v-if="item.isCheck >=item.levelNum" type="default" @click="toDetail(item)">
- {{ item.levelNum + '/' + item.isCheck }}
- </button>
- <button v-else type="warn" @click="toDetail(item)">
- {{ item.levelNum + '/' + item.isCheck }}
- </button>
- </view>
- </uni-td>
- </uni-tr>
- </uni-table>
+ <!-- 鍩烘湰淇℃伅 -->
+ <view class="section">
+ <view class="section-header">鍩烘湰淇℃伅</view>
+ <view class="section-body">
+ <view class="info-grid">
+ <view class="info-item">
+ <view class="info-label">妫�楠屽崟鍙�</view>
+ <view class="info-value">{{ formData.releaseNo }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">鍒涘缓浜�</view>
+ <view class="info-value">{{ formData.createBy }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">鍒涘缓鏃堕棿</view>
+ <view class="info-value">{{ formData.createDate }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">绾夸綋缂栧彿</view>
+ <picker v-if="isUpdate" class="picker-input" name="selector" :range="DAA020List"
+ @change="onDaa020Change">
+ <view class="picker-value">{{ DAA020List[DAA020Index] || '璇烽�夋嫨' }}</view>
+ </picker>
+ <view v-else class="info-value">{{ formData.daa020 }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">鐗╂枡缂栫爜</view>
+ <picker v-if="isUpdate" class="picker-input" name="selector" :range="ItemList"
+ @change="onItemChange">
+ <view class="picker-value">{{ ItemList[ItemIndex] || '璇烽�夋嫨' }}</view>
+ </picker>
+ <view v-else class="info-value">{{ formData.itemNo }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">璁″垝缂栧彿</view>
+ <picker v-if="isUpdate" class="picker-input" name="selector" :range="DAA001List"
+ @change="onDaa001Change">
+ <view class="picker-value">{{ DAA001List[DAA001Index] || '璇烽�夋嫨' }}</view>
+ </picker>
+ <view v-else class="info-value">{{ formData.billNo }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">鐗╂枡鍚嶇О</view>
+ <view class="info-value">{{ formData.itemName }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">瑙勬牸鍨嬪彿</view>
+ <view class="info-value">{{ formData.itemModel }}</view>
+ </view>
+ <view class="info-item">
+ <view class="info-label">宸ュ崟鏁伴噺</view>
+ <view class="info-value highlight">{{ formData.planQty }}</view>
+ </view>
+ <view class="info-item" v-if="formData.remarks">
+ <view class="info-label">涓嶅悎鏍兼弿杩�</view>
+ <view class="info-value danger">{{ formData.remarks }}</view>
+ </view>
+ </view>
+ </view>
</view>
- <view class="plus-button">
- <button type="warn" v-if="isUpdate && !isShowTable" @click="getItem">鍒涘缓妫�楠屽崟骞剁敓鎴愰儴鍒嗛粯璁ゅ��</button>
- </view>
- <view class="plus-button">
- <button type="warn" v-if="!isUpdate && !isShowTable" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
- </view>
- <view class="plus-button">
- <button type="warn" v-if="!isUpdate && !formData.fcheckResu && !isShowTable" @click="removeXJ">鍒犻櫎鍗曟嵁</button>
- </view>
- <view class="plus-button">
- <button type="warn" v-if="!isUpdate && !isShowTable" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
+ <!-- 妫�楠岄」鐩� -->
+ <view class="section" v-if="tableData.length > 0">
+ <view class="section-header">妫�楠岄」鐩�</view>
+ <view class="section-body">
+ <view class="inspection-table">
+ <table>
+ <thead>
+ <tr>
+ <th width="20%" style="text-align: center;">妫�楠岄」鐩�</th>
+ <th width="50%" style="text-align: center;">妫�楠屾弿杩�</th>
+ <th width="15%" style="text-align: center;">璁板綍(鐐瑰嚮)</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="(item, index) in tableData" :key="index">
+ <td>{{ item.projName }}</td>
+ <td>
+ <view v-if="item.result=='鍚堟牸'" class="watermark approved">
+ {{ getStatusText(item.result) }}
+ </view>
+ <view v-if="item.result=='涓嶅悎鏍�'" class="watermark rejected">
+ {{ getStatusText(item.result) }}
+ </view>
+ <view v-if="item.result==null || item.result=='鏈畬鎴�'" class="watermark pending">
+ {{ getStatusText(item.result) }}
+ </view>
+ <view class="description-text">{{ item.projName }}</view>
+ </td>
+ <td>
+ <button v-if="item.isCheck >= item.levelNum" class="record-btn" @click="toDetail(item)">鏌ョ湅</button>
+ <button v-else class="record-btn" @click="toDetail(item)">濉啓</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </view>
+ </view>
</view>
- <view class="plus-button">
- <button type="warn" v-if="isShowTable" @click="getTable">鑾峰彇妫�楠岄」鐩�</button>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <view class="action-buttons">
+ <button class="action-btn primary" v-if="isUpdate && !isShowTable" @click="getItem">鍒涘缓妫�楠屽崟骞剁敓鎴愰儴鍒嗛粯璁ゅ��</button>
+ <button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="toImage">涓婁紶/鏌ョ湅鍥剧墖</button>
+ <button class="action-btn danger" v-if="!isUpdate && !formData.fcheckResu && !isShowTable" @click="removeXJ">鍒犻櫎鍗曟嵁</button>
+ <button class="action-btn warning" v-if="!isUpdate && !isShowTable" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button>
+ <button class="action-btn primary" v-if="isShowTable" @click="getTable">鑾峰彇妫�楠岄」鐩�</button>
+ <button class="action-btn primary" v-if="isShowTable && isUpdate" @click="saveTable">鐢熸垚妫�楠岄」鐩�</button>
</view>
- <view class="plus-button">
- <button type="warn" v-if="isShowTable && isUpdate" @click="saveTable">鐢熸垚妫�楠岄」鐩�</button>
- </view>
+ <!-- 淇敼涓嶅悎鏍兼弿杩板脊鍑烘 -->
<view v-if="remarksPopup" class="overlay">
<view class="popup">
- <h3>淇敼涓嶅悎鏍兼弿杩�</h3>
- <form>
- <view class="form-group">
- <label class="form-label">涓嶅悎鏍兼弿杩�:</label>
- <input class="form-input" type="text" v-model="remarks"/>
+ <view class="popup-header">
+ <h3>淇敼涓嶅悎鏍兼弿杩�</h3>
+ </view>
+ <view class="popup-content">
+ <view class="input-group">
+ <view class="input-label">涓嶅悎鏍兼弿杩帮細</view>
+ <input class="input-field" type="text" v-model="remarks" placeholder="璇疯緭鍏ヤ笉鍚堟牸鎻忚堪"/>
</view>
- <button type="warn" @click="editRemarks">淇敼</button>
- <button @click="remarksPopup = !remarksPopup">鍙栨秷</button>
- </form>
+ </view>
+ <view class="popup-actions">
+ <button class="action-btn primary" @click="editRemarks">淇敼</button>
+ <button class="action-btn secondary" @click="remarksPopup = !remarksPopup">鍙栨秷</button>
+ </view>
</view>
</view>
@@ -202,6 +217,27 @@
}
},
methods: {
+ getStatusClass(result) {
+ if (result === '鍚堟牸') return 'status-pass';
+ if (result === '涓嶅悎鏍�') return 'status-fail';
+ return 'status-pending';
+ },
+
+ getStatusText(status) {
+ const statusMap = {
+ approved: '鍚堟牸',
+ rejected: '涓嶅悎鏍�',
+ pending: '寰呯‘璁�'
+ }
+ if (status == null || status == '鏈畬鎴�') {
+ return statusMap['pending'] || '寰呯‘璁�';
+ } else if (status == '鍚堟牸') {
+ return statusMap['approved'] || '鍚堟牸';
+ } else {
+ return statusMap['rejected'] || '涓嶅悎鏍�';
+ }
+ },
+
removeXJ() {
if (this.formData.id) {
this.$post({
@@ -454,65 +490,242 @@
}
};
</script>
-<style>
-.form-group {
- display: flex;
- align-items: center;
- border-bottom: 1px solid #c9c9c9;
+<style scoped>
+/* 鍩虹鏍峰紡 */
+.container {
+ padding: 10px;
+ background-color: #f5f7fa;
+ min-height: 100vh;
}
-.form-label {
- margin-bottom: 0;
- padding: 5px;
-}
-.form-input {
- flex: 1;
- margin-bottom: 0;
- padding: 5px;
-}
-.picker {
- flex: 1;
- margin-bottom: 0;
- padding: 5px;
- font-size: 12px;
-}
-.uni-form-item {
- display: flex;
- border-bottom: 1px solid #c9c9c9;
-}
-.edit {
+
+/* 澶撮儴鏍峰紡 */
+.header {
background-color: white;
+ padding: 20px;
+ border-radius: 8px;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ margin-bottom: 20px;
}
-/* 榛樿鏍峰紡 */
-.list-container {
- height: 60vh;
- /* 璁剧疆鍒楄〃瀹瑰櫒鐨勯珮搴︿负鍓╀綑绌洪棿锛屽苟鍑忓幓琛ㄥ崟瀹瑰櫒鐨勯珮搴� */
- overflow-y: auto;
- /* 鍏佽鍒楄〃瀹瑰櫒鍨傜洿婊氬姩 */
- padding: 10px;
- /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇鍒楄〃鍐呭鏇寸編瑙� */
+
+.title {
+ font-size: 20px;
+ font-weight: 600;
+ color: #2c3e50;
+ margin-bottom: 8px;
}
-/* 鍦ㄥ皬灞忓箷璁惧涓婏紝閲嶇疆楂樺害涓洪�傚簲灞忓箷 */
-@media (max-width: 768px) {
- .list-container {
- height: calc(100vh - 376px);
- /* 閫傚綋璋冩暣楂樺害 */
- }
+
+.order-number {
+ font-size: 14px;
+ color: #3498db;
+ font-weight: 500;
}
-.form-container {
- padding: 10px;
- /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇琛ㄥ崟鍐呭鏇寸編瑙� */
+
+/* 鍖哄煙鏍峰紡 */
+.section {
+ background-color: white;
+ border-radius: 8px;
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ margin-bottom: 20px;
+ overflow: hidden;
}
-.th {
- background-color: lightskyblue;
- color: #FFFFFF;
+
+.section-header {
+ background-color: #f8f9fa;
+ padding: 15px 20px;
+ border-bottom: 1px solid #eee;
+ font-size: 16px;
+ font-weight: 600;
+ color: #2c3e50;
}
-.plus-button {
- line-height: 59px;
- font-size: 24px;
+
+.section-body {
+ padding: 20px;
+}
+
+/* 淇℃伅缃戞牸 */
+.info-grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+ gap: 15px;
+}
+
+.info-item {
+ display: flex;
+ flex-direction: column;
+ gap: 5px;
+}
+
+.info-label {
+ font-size: 12px;
+ color: #7f8c8d;
+ font-weight: 500;
+}
+
+.info-value {
+ font-size: 14px;
+ color: #2c3e50;
+}
+
+.info-value.highlight {
+ font-weight: 600;
+ color: #3498db;
+ font-size: 16px;
+}
+
+.info-value.danger {
+ color: #e74c3c;
+ font-weight: 500;
+}
+
+/* 閫夋嫨鍣ㄦ牱寮� */
+.picker-input {
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ padding: 8px 12px;
+ background-color: white;
cursor: pointer;
- z-index: 1000;
- margin-bottom: 10px;
}
+
+.picker-value {
+ font-size: 14px;
+ color: #2c3e50;
+}
+
+/* 妫�楠岄」鐩〃鏍� */
+.inspection-table {
+ width: 100%;
+ border-radius: 8px;
+ overflow: hidden;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+ margin: 25px 0;
+}
+
+.inspection-table table {
+ width: 100%;
+ border-collapse: collapse;
+}
+
+.inspection-table th {
+ background-color: #f8f9fa;
+ color: #34495e;
+ padding: 12px 15px;
+ font-weight: bold;
+ text-align: left;
+ border: 1px solid #ddd;
+}
+
+.inspection-table td {
+ padding: 12px 15px;
+ text-align: left;
+ border: 1px solid #ddd;
+}
+
+.inspection-table tr:nth-child(even) {
+ background-color: #f9f9f9;
+}
+
+.inspection-table tr:hover {
+ background-color: #f1f5f9;
+}
+
+/* 姘村嵃鏍峰紡 */
+.watermark {
+ position: absolute;
+ font-size: 40px;
+ font-weight: bold;
+ opacity: 1;
+ z-index: 1;
+ pointer-events: none;
+ transform: rotate(-15deg);
+ width: 100%;
+ text-align: center;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%) rotate(-15deg);
+}
+
+.watermark.approved {
+ color: #2ecc71;
+}
+
+.watermark.rejected {
+ color: #e74c3c;
+}
+
+.watermark.pending {
+ color: #f39c12;
+}
+
+/* 鎻忚堪鏂囨湰瀹瑰櫒 */
+.description-text {
+ position: relative;
+ z-index: 2;
+ padding: 25px;
+ background-color: rgba(255, 255, 255, 0.7);
+}
+
+/* 璋冩暣琛ㄦ牸鍗曞厓鏍� */
+.inspection-table td:nth-child(2) {
+ position: relative;
+ overflow: hidden;
+ padding: 0;
+}
+
+.record-btn {
+ padding: 6px 12px;
+ background-color: #f8f9fa;
+ border: 1px solid #ddd;
+ border-radius: 3px;
+ cursor: pointer;
+ transition: all 0.2s;
+ font-size: 14px;
+ color: #333;
+}
+
+.record-btn:hover {
+ background-color: #e9ecef;
+}
+
+
+/* 鎿嶄綔鎸夐挳 */
+.action-buttons {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ margin-bottom: 20px;
+}
+
+.action-btn {
+ padding: 12px 20px;
+ border: none;
+ border-radius: 6px;
+ font-size: 14px;
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.2s;
+}
+
+.action-btn.primary {
+ background-color: #3498db;
+ color: white;
+}
+
+.action-btn.secondary {
+ background-color: #95a5a6;
+ color: white;
+}
+
+.action-btn.danger {
+ background-color: #e74c3c;
+ color: white;
+}
+
+.action-btn.warning {
+ background-color: #f39c12;
+ color: white;
+}
+
+/* 寮瑰嚭妗嗘牱寮� */
.overlay {
position: fixed;
top: 0;
@@ -523,15 +736,71 @@
display: flex;
justify-content: center;
align-items: center;
+ z-index: 1000;
}
+
.popup {
- background-color: #fff;
+ background-color: white;
+ border-radius: 8px;
+ box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
+ width: 90%;
+ max-width: 400px;
+ max-height: 80vh;
+ overflow-y: auto;
+}
+
+.popup-header {
padding: 20px;
- border: 1px solid #ccc;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
- width: 68vw;
- /* 璁剧疆瀹藉害涓鸿鍙ｅ搴︾殑80% */
- height: 25vh;
- /* 璁剧疆楂樺害涓鸿鍙ｉ珮搴︾殑80% */
+ border-bottom: 1px solid #eee;
+}
+
+.popup-header h3 {
+ font-size: 18px;
+ font-weight: 600;
+ color: #2c3e50;
+ margin: 0;
+}
+
+.popup-content {
+ padding: 20px;
+}
+
+.input-group {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+}
+
+.input-label {
+ font-size: 14px;
+ color: #7f8c8d;
+ font-weight: 500;
+}
+
+.input-field {
+ padding: 8px 12px;
+ border: 1px solid #ddd;
+ border-radius: 4px;
+ font-size: 14px;
+ background-color: white;
+}
+
+.popup-actions {
+ padding: 20px;
+ border-top: 1px solid #eee;
+ display: flex;
+ gap: 10px;
+ justify-content: flex-end;
+}
+
+/* 鍝嶅簲寮忚璁� */
+@media (max-width: 768px) {
+ .info-grid {
+ grid-template-columns: 1fr;
+ }
+
+ .action-buttons {
+ flex-direction: column;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3