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/SJ/Add.vue | 656 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 459 insertions(+), 197 deletions(-) diff --git a/pages/QC/SJ/Add.vue b/pages/QC/SJ/Add.vue index 12c96b8..810f3b3 100644 --- a/pages/QC/SJ/Add.vue +++ b/pages/QC/SJ/Add.vue @@ -1,130 +1,159 @@ <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.billNo" /> - </view> - <view class="form-group"> - <label class="form-label">鍒涘缓鏃堕棿:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.createTime" /> - </view> - <view class="form-group"> - <label class="form-label">妫�楠岀被鍨�:</label> - <picker v-if="isUpdate" class="form-input" :range="SJ_MJList" :value="SJ_MJIndex" @change="onSJ_MJChange"> - <view>{{ SJ_MJList[SJ_MJIndex] }}</view> - </picker> - <input v-else class="form-input" disabled="true" type="text" v-model="formData.SJ_MJ" /> - </view> - <view class="uni-form-item uni-column form-item edit"> - <text class="form-label">鐢熶骇绾垮埆:</text> - <superwei-combox v-if="isUpdate" :candidates="DAA020List" placeholder="璇烽�夋嫨鎴栬緭鍏�" - v-model="formData.line" @select="onDaa020Change" class="picker form-input" - style="border: none;"></superwei-combox> - <input v-else class="form-input" disabled="true" type="text" v-model="formData.line" /> - </view> - <view class="uni-form-item uni-column form-item edit"> - <text class="form-label">鐗╂枡缂栫爜:</text> - <superwei-combox v-if="isUpdate" :candidates="boardItems" placeholder="璇烽�夋嫨鎴栬緭鍏�" - v-model="formData.itemNo" :isJSON="true" keyName="itemName" @select="onItemChange" - class="picker form-input" style="border: none;"></superwei-combox> - <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.daa001" /> - </view> - <view class="form-group"> - <label class="form-label">閿�鍞鍗曞彿:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.caa015" /> - </view> - <view class="form-group"> - <label class="form-label">瀹㈡埛:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.cust" /> - </view> - <view class="form-group"> - <label class="form-label">浜у搧鍚嶇О:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.daa003" /> - </view> - <view class="form-group"> - <label class="form-label">瑙勬牸鍨嬪彿:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.daa004" /> - </view> - <view class="form-group"> - <label class="form-label">宸ュ崟鏁伴噺:</label> - <input class="form-input" disabled="true" type="text" v-model="formData.daa008" /> - </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="inspection-sheet"> + <!-- 澶撮儴淇℃伅 --> + <view class="sheet-header"> + <h1>棣栨妫�楠屽崟</h1> + <view class="inspection-number">棣栨鍗曞彿锛歿{formData.billNo}}</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)"> + + <!-- 鍩烘湰淇℃伅鍖� --> + <view class="basic-info"> + <view class="info-row"> + <span class="info-label">鍒涘缓鏃堕棿锛�</span> + <span class="info-value">{{formData.createTime}}</span> + <span class="info-label">妫�楠岀被鍨嬶細</span> + <span class="info-value">{{formData.SJ_MJ}}</span> + </view> + <view class="info-row" v-if="isUpdate"> + <span class="info-label">妫�楠岀被鍨嬶細</span> + <picker class="info-picker" :range="SJ_MJList" :value="SJ_MJIndex" @change="onSJ_MJChange"> + <view>{{ SJ_MJList[SJ_MJIndex] }}</view> + </picker> + </view> + </view> + + <!-- 鐢熶骇淇℃伅鍖� --> + <view class="material-info"> + <view class="info-block"> + <view class="info-label">鐢熶骇绾垮埆锛�</view> + <superwei-combox v-if="isUpdate" :candidates="DAA020List" placeholder="璇烽�夋嫨鎴栬緭鍏�" + v-model="formData.line" @select="onDaa020Change" class="info-picker-input"></superwei-combox> + <view v-else class="info-value">{{formData.line}}</view> + </view> + + <view class="info-block"> + <view class="info-label">鐗╂枡缂栫爜锛�</view> + <superwei-combox v-if="isUpdate" :candidates="boardItems" placeholder="璇烽�夋嫨鎴栬緭鍏�" + v-model="formData.itemNo" :isJSON="true" keyName="itemName" @select="onItemChange" + class="info-picker-input"></superwei-combox> + <view v-else class="info-value">{{formData.itemNo}}</view> + </view> + + <view class="info-block"> + <view class="info-label">璁″垝缂栧彿锛�</view> + <picker v-if="isUpdate" class="info-picker" name="selector" :range="DAA001List" + @change="onDaa001Change"> + <text>{{ DAA001List[DAA001Index] }}</text> + </picker> + <view v-else class="info-value">{{formData.daa001}}</view> + </view> + + <view class="info-block"> + <view class="info-label">閿�鍞鍗曞彿锛�</view> + <view class="info-value">{{formData.caa015}}</view> + </view> + + <view class="info-block"> + <view class="info-label">瀹㈡埛锛�</view> + <view class="info-value">{{formData.cust}}</view> + </view> + + <view class="info-block"> + <view class="info-label">浜у搧鍚嶇О锛�</view> + <view class="info-value">{{formData.daa003}}</view> + </view> + + <view class="info-block"> + <view class="info-label">瑙勬牸鍨嬪彿锛�</view> + <view class="info-value">{{formData.daa004}}</view> + </view> + + <view class="info-block"> + <view class="info-label">宸ュ崟鏁伴噺锛�</view> + <view class="info-value highlight">{{formData.daa008}}</view> + </view> + + <view class="info-block" v-if="formData.remarks"> + <view class="info-label">涓嶅悎鏍兼弿杩帮細</view> + <view class="info-value">{{formData.remarks}}</view> + </view> + </view> + + <!-- 妫�楠岄」鐩〃鏍� --> + <view class="inspection-table" v-if="tableData.length > 0"> + <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">妫�楠岄」鐩鎯�</view> + </td> + <td> + <button class="record-btn" @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> + </td> + </tr> + </tbody> + </table> </view> - <view class="plus-button"> - <button type="warn" v-if="isUpdate && !isShowTable" @click="save">鍒涘缓妫�楠屽崟骞剁敓鎴愰儴鍒嗛粯璁ゅ��</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 && !isShowTable && formData.xjGenFlag == 0" - @click="saveXJ">鐢熸垚宸℃</button> - </view> - <view class="plus-button"> - <button type="warn" v-if="!isUpdate && formData.result == '鏈畬鎴�' && !isShowTable" @click="removeXJ">鍒犻櫎鍗曟嵁 + <!-- 鎿嶄綔鎸夐挳鍖� --> + <view class="action-buttons"> + <button class="action-btn primary" v-if="isUpdate && !isShowTable" @click="save"> + 鍒涘缓妫�楠屽崟骞剁敓鎴愰儴鍒嗛粯璁ゅ�� + </button> + <button class="action-btn secondary" v-if="!isUpdate && !isShowTable" @click="toImage"> + 涓婁紶/鏌ョ湅鍥剧墖 + </button> + <button class="action-btn secondary" v-if="!isUpdate && !isShowTable && formData.xjGenFlag == 0" + @click="saveXJ"> + 鐢熸垚宸℃ + </button> + <button class="action-btn danger" v-if="!isUpdate && formData.result == '鏈畬鎴�' && !isShowTable" @click="removeXJ"> + 鍒犻櫎鍗曟嵁 + </button> + <button class="action-btn secondary" 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="!isUpdate && !isShowTable" @click="saveRemarks">娣诲姞涓嶅悎鏍兼弿杩�</button> - </view> - <view class="plus-button"> - <button type="warn" v-if="isShowTable" @click="getTable">鑾峰彇妫�楠岄」鐩�</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="info-block"> + <view class="info-label">涓嶅悎鏍兼弿杩帮細</view> + <input class="info-input" 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> </view> @@ -211,6 +240,16 @@ } }, methods: { + getResultClass(result) { + if (result === '鍚堟牸') return 'result-pass'; + if (result === '涓嶅悎鏍�') return 'result-fail'; + return 'result-pending'; + }, + getStatusText(status) { + if (status === '鍚堟牸') return '鍚堟牸'; + if (status === '涓嶅悎鏍�') return '涓嶅悎鏍�'; + return '鏈畬鎴�'; + }, removeXJ() { if (this.formData.id) { this.$post({ @@ -497,99 +536,322 @@ }; </script> -<style> - .form-group { - display: flex; - align-items: center; - border-bottom: 1px solid #c9c9c9; - } +<style scoped> +/* 鍩虹鏍峰紡 */ +.inspection-sheet { + padding: 10px; + background-color: #f5f7fa; + min-height: 100vh; +} - .form-label { - margin-bottom: 0; - padding: 5px; - } +/* 澶撮儴鏍峰紡 */ +.sheet-header { + background-color: white; + padding: 20px; + border-radius: 8px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05); + margin-bottom: 20px; +} - .form-input { - flex: 1; - margin-bottom: 0; - padding: 5px; - } +.sheet-header h1 { + font-size: 24px; + font-weight: 600; + color: #2c3e50; + margin-bottom: 10px; +} +.inspection-number { + font-size: 16px; + color: #3498db; + font-weight: 500; +} - .picker { - flex: 1; - margin-bottom: 0; - padding: 5px; - font-size: 12px; - } +/* 鍩烘湰淇℃伅鍖� */ +.basic-info { + background-color: white; + padding: 20px; + border-radius: 8px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05); + margin-bottom: 20px; +} - .uni-form-item { - display: flex; - border-bottom: 1px solid #c9c9c9; - } +.info-row { + display: flex; + align-items: center; + margin-bottom: 15px; +} - .edit { - background-color: white; - } +.info-label { + font-size: 14px; + color: #7f8c8d; + margin-right: 10px; + min-width: 80px; +} - /* 榛樿鏍峰紡 */ - .list-container { - height: 60vh; - /* 璁剧疆鍒楄〃瀹瑰櫒鐨勯珮搴︿负鍓╀綑绌洪棿锛屽苟鍑忓幓琛ㄥ崟瀹瑰櫒鐨勯珮搴� */ - overflow-y: auto; - /* 鍏佽鍒楄〃瀹瑰櫒鍨傜洿婊氬姩 */ - padding: 10px; - /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇鍒楄〃鍐呭鏇寸編瑙� */ - } +.info-value { + font-size: 14px; + color: #2c3e50; + margin-right: 20px; +} - /* 鍦ㄥ皬灞忓箷璁惧涓婏紝閲嶇疆楂樺害涓洪�傚簲灞忓箷 */ - @media (max-width: 768px) { - .list-container { - height: calc(100vh - 376px); - /* 閫傚綋璋冩暣楂樺害 */ - } - } +.info-picker { + padding: 8px 12px; + border: 1px solid #ddd; + border-radius: 4px; + background-color: white; + font-size: 14px; + margin-right: 20px; +} +/* 鐗╂枡淇℃伅鍖� */ +.material-info { + background-color: white; + padding: 20px; + border-radius: 8px; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05); + margin-bottom: 20px; +} - .form-container { - padding: 10px; - /* 鍙�夛細娣诲姞涓�浜涘唴杈硅窛锛屼娇琛ㄥ崟鍐呭鏇寸編瑙� */ - } +.info-block { + display: flex; + align-items: center; + margin-bottom: 15px; +} - .th { - background-color: lightskyblue; - color: #FFFFFF; - } +.info-block .info-label { + min-width: 100px; + font-size: 14px; + color: #7f8c8d; +} +.info-block .info-value { + font-size: 14px; + color: #2c3e50; + flex: 1; +} - .plus-button { - line-height: 59px; - font-size: 24px; - cursor: pointer; - z-index: 1000; - margin-bottom: 10px; - } +.info-picker-input { + flex: 1; + padding: 8px 12px; + border: 1px solid #ddd; + border-radius: 4px; + background-color: white; + font-size: 14px; +} - .overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - } +.info-input { + flex: 1; + padding: 8px 12px; + border: 1px solid #ddd; + border-radius: 4px; + background-color: white; + font-size: 14px; +} - .popup { - background-color: #fff; - padding: 20px; - border: 1px solid #ccc; - box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); - width: 68vw; - /* 璁剧疆瀹藉害涓鸿鍙e搴︾殑80% */ - height: 25vh; - /* 璁剧疆楂樺害涓鸿鍙i珮搴︾殑80% */ - } +.highlight { + font-weight: 600; + color: #e74c3c; + font-size: 16px; +} + +/* 妫�楠岄」鐩〃鏍� */ +.inspection-table { + margin: 25px 0; +} + +.inspection-table table { + width: 100%; + border-collapse: collapse; +} + +.inspection-table th, +.inspection-table td { + padding: 12px 15px; + border: 1px solid #ddd; + text-align: left; +} + +.inspection-table th { + background-color: #f8f9fa; + font-weight: bold; + color: #34495e; +} + +.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; + 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; + background-color: rgba(255, 255, 255, 0.7); + padding: 10px; + font-size: 14px; + color: #2c3e50; +} + +/* 璋冩暣琛ㄦ牸鍗曞厓鏍� */ +.inspection-table td:nth-child(2) { + position: relative; + overflow: hidden; + padding: 0; +} + +/* 鎸夐挳鏍峰紡 */ +.record-btn { + padding: 6px 12px; + background-color: #f8f9fa; + border: 1px solid #ddd; + cursor: pointer; + transition: all 0.2s; + font-size: 12px; +} + +.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; + transition: all 0.2s; + cursor: pointer; +} + +.action-btn.primary { + background-color: #3498db; + color: white; +} + +.action-btn.primary:hover { + background-color: #2980b9; +} + +.action-btn.secondary { + background-color: #95a5a6; + color: white; +} + +.action-btn.secondary:hover { + background-color: #7f8c8d; +} + +.action-btn.danger { + background-color: #e74c3c; + color: white; +} + +.action-btn.danger:hover { + background-color: #c0392b; +} + +/* 寮瑰嚭妗嗘牱寮� */ +.overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); + display: flex; + justify-content: center; + align-items: center; + z-index: 1000; +} + +.popup { + 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-bottom: 1px solid #eee; +} + +.popup-header h3 { + font-size: 18px; + font-weight: 600; + color: #2c3e50; + margin: 0; +} + +.popup-content { + padding: 20px; +} + +.popup-actions { + padding: 20px; + border-top: 1px solid #eee; + display: flex; + gap: 10px; + justify-content: flex-end; +} + +/* 鍝嶅簲寮忚璁� */ +@media (max-width: 768px) { + .info-row { + flex-direction: column; + align-items: flex-start; + } + + .info-label { + margin-bottom: 5px; + } + + .project-item { + flex-direction: column; + align-items: flex-start; + } + + .project-actions { + margin-top: 10px; + width: 100%; + } +} </style> \ No newline at end of file -- Gitblit v1.9.3