From 2f1f5f0c98b8495127ec7b6823906d525bf19e4b Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 02 六月 2025 16:32:17 +0800
Subject: [PATCH] 1.首检认证信息优化，多选
---
H5/IPQC_SJ/Add.aspx | 98 +++++++++++++++++++++++++++++---
H5/Js/IPQC_SJ/Add.js | 56 +++++++++++++++++-
2 files changed, 141 insertions(+), 13 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index bb2767d..746911a 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/H5/IPQC_SJ/Add.aspx
@@ -127,6 +127,40 @@
font-size: .3333rem
}
+ /* 璁よ瘉淇℃伅澶氶�夋牱寮� */
+ .rzxx-action-sheet {
+ height: 70%;
+ }
+ .rzxx-action-sheet .checkbox-group-wrapper {
+ padding: 16px;
+ max-height: calc(100% - 60px);
+ overflow-y: auto;
+ }
+ .action-sheet-footer {
+ position: sticky;
+ bottom: 0;
+ background: white;
+ padding: 8px 16px;
+ box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.1);
+ }
+ .confirm-btn {
+ border-radius: 20px;
+ }
+
+ /* 璁よ瘉淇℃伅涓撶敤鏍峰紡 */
+ .rzxx-checkbox-group .rzxx-checkbox {
+ font-size: 0.5rem !important;
+ }
+
+ .rzxx-checkbox .van-checkbox__label {
+ font-size: 0.5rem !important;
+ line-height: 1.2;
+ }
+
+ .rzxx-checkbox .van-checkbox__icon {
+ font-size: 0.5rem !important;
+ }
+ /* 璁よ瘉淇℃伅澶氶�夋牱寮� */
</style>
</asp:Content>
@@ -352,17 +386,61 @@
</template>
</van-field>
- <van-field label="璁よ瘉淇℃伅" v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'" colon v-model="jymxData.ipqcrzxx" placeholder="璇烽�夋嫨璁よ瘉淇℃伅" class="wrap-field" readonly>
- <template #button>
- <van-tag type="primary" style="font-size:15px" @click="selectRzxx()">閫夋嫨</van-tag>
- </template>
- </van-field>
+ <van-field
+ label="璁よ瘉淇℃伅"
+ v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'"
+ colon
+ readonly
+ class="multi-line-field">
+ <template #input>
+ <div class="flex-container">
+ <div class="wrap-content scrollable-text" style="white-space: pre-line;">
+ {{ jymxData.ipqcrzxx }}
+ </div>
+ </div>
+ </template>
+ </van-field>
+ <van-button
+ block
+ type="info"
+ @click="selectRzxx"
+ :loading="ttrre"
+ loading-text="鍔犺浇涓�..."
+ v-if="jymxData.fcheckType === '鍏抽敭閮ㄤ欢涓�鑷存��'"
+ >璁よ瘉淇℃伅閫夋嫨</van-button>
+ <!-- <van-tag
+ type="primary"
+ style="font-size:15px; flex-shrink:0"
+ @click="selectRzxx">
+ 閫夋嫨
+ </van-tag> -->
<van-action-sheet
v-model="showRzxx"
- :actions="actions"
- @select="onRzxxSelect"
- title="璇烽�夋嫨璁よ瘉淇℃伅">
- </van-action-sheet>
+ title="璇烽�夋嫨璁よ瘉淇℃伅"
+ class="rzxx-action-sheet">
+ <div class="checkbox-group-wrapper">
+ <van-checkbox-group
+ v-model="selectedRzxx"
+ ref="checkboxGroup"
+ :max="5"
+ class="rzxx-checkbox-group">
+ <van-checkbox
+ v-for="(item, index) in rzxxOptions"
+ :key="index"
+ :name="item.value"
+ class="rzxx-checkbox">
+ {{ item.text }}
+ </van-checkbox>
+ </van-checkbox-group>
+ </div>
+ <div class="action-sheet-footer">
+ <van-button
+ block
+ type="primary"
+ @click="confirmMultiRzxx"
+ class="confirm-btn">纭閫夋嫨</van-button>
+ </div>
+ </van-action-sheet>
<van-popup v-model="showScDatePicker" position="bottom">
@@ -636,7 +714,7 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/Add.js?<%=111112111154 %>"></script>
+ <script src="../Js/IPQC_SJ/Add.js?<%=111112111156 %>"></script>
</asp:Content>
diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js
index 914d032..d19e67d 100644
--- a/H5/Js/IPQC_SJ/Add.js
+++ b/H5/Js/IPQC_SJ/Add.js
@@ -29,15 +29,20 @@
],//姘存俯閫夐」
flowOptions: [
{ value: '50ml', text: '50ml' },
+ { value: '100ml', text: '100ml' },
{ value: '120ml', text: '120ml' },
{ value: '150ml', text: '150ml' },
{ value: '160ml', text: '160ml' },
+ { value: '200ml', text: '200ml' },
{ value: '250ml', text: '250ml' },
{ value: '260ml', text: '260ml' },
+ { value: '300ml', text: '300ml' },
{ value: '350ml', text: '350ml' },
{ value: '360ml', text: '360ml' },
{ value: '450ml', text: '450ml' },
+ { value: '500ml', text: '500ml' },
{ value: '550ml', text: '550ml' },
+ { value: '600ml', text: '600ml' },
{ value: '750ml', text: '750ml' },
{ value: '999ml', text: '999ml' },
{ value: '涓�鍒嗛挓娴侀噺', text: '涓�鍒嗛挓娴侀噺' },
@@ -109,6 +114,8 @@
//璁よ瘉淇℃伅閫夋嫨
showRzxx: false,
actions: [],
+ selectedRzxx: [], // 瀛樺偍澶氶�夊��
+ rzxxOptions: [], // 璁よ瘉淇℃伅閫夐」
}
},
mounted() {
@@ -403,6 +410,30 @@
pid: mxguid,
inRzxxValue: that.rzxxValue,//杈撳叆鐨勮璇佷俊鎭�
}, true, 0).then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$notify({ type: 'success', message: '杈撳叆鎴愬姛' });
+ //that.refreshJYItem();//鍒锋柊妫�楠岄」鐩�
+ }
+ else {
+ that.$toast.fail(json.message);
+ }
+ //that.$notify({ type: 'success', message: json.message });
+ that.isLoading = false;
+ }).catch(function (error) {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.inRzxxValue = null;
+ that.isLoading = false;
+ });
+ },
+ // 淇敼鍘焤zxxConfirm鏂规硶
+ updateRzxxToServer(selectedValues) {
+ var that = this;
+ that.AxiosHttp("post", 'Ipqc/updateIpqcRzxx', {
+ gid: that.formData.guid,
+ pid: that.tableData[that.tabActive].guid,
+ inRzxxValue: that.jymxData.ipqcrzxx // 鏀逛负鏁扮粍鏍煎紡
+ }).then(res => {
var json = res;
if (json.status == 0) {
that.$notify({ type: 'success', message: '杈撳叆鎴愬姛' });
@@ -722,6 +753,7 @@
//鑾峰彇璁よ瘉淇℃伅鐩稿叧鍒楄〃
getRzxxList() {
var that = this;
+ that.rzxxOptions = [];
that.isLoading = true;
var mxguid = that.tableData[that.tabActive].guid;//妫�楠岄」鐩殑guid
that.AxiosHttp("post", 'Ipqc/GetRzxxList', {
@@ -730,9 +762,13 @@
}, false)
.then(function (res) {
if (res.status == 0) {
- that.actions = res.data.tbBillList.map(item => {
- return { name: item.defect_name } // 鏍规嵁瀹為檯鏁版嵁缁撴瀯璋冩暣
- });
+ // that.actions = res.data.tbBillList.map(item => {
+ // return { name: item.defect_name } // 鏍规嵁瀹為檯鏁版嵁缁撴瀯璋冩暣
+ // });
+ that.rzxxOptions = res.data.tbBillList.map(item => ({
+ value: item.defect_name, // 鍋囪guid鏄敮涓�鏍囪瘑绗�
+ text: item.defect_name // 璁よ瘉淇℃伅鍚嶇О
+ }));
} else {
that.$toast.fail(res.message);
}
@@ -743,6 +779,20 @@
that.$toast.fail("鑾峰彇璁よ瘉淇℃伅澶辫触");
});
},
+ // 鏂板纭澶氶�夋柟娉�
+ confirmMultiRzxx() {
+ const selectedTexts = this.rzxxOptions
+ .filter(item => this.selectedRzxx.includes(item.value))
+ .map(item => item.text);
+
+ // 淇敼杩欓噷锛氱敤鎹㈣绗︽浛浠ｉ�楀彿鍒嗛殧
+ this.jymxData.ipqcrzxx = selectedTexts.join('\n');
+ this.showRzxx = false;
+
+ // 鏇存柊澶氶�夊�煎埌鍚庣
+ this.updateRzxxToServer(selectedTexts);
+ },
+
//閫夋嫨璁よ瘉淇℃伅
onRzxxSelect(item) {
this.showRzxx = false;
--
Gitblit v1.9.3