From 76aa50cfb9725d0399212c3c8b9e001e82811aa8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 07 七月 2025 18:09:47 +0800
Subject: [PATCH] 下单拆分为3个
---
src/views/business/inspectionTask/components/InspectionWord.vue | 13 ++++++++++++-
src/views/business/materialOrder/customsInspectionView.vue | 2 +-
src/views/login.vue | 4 ++--
package.json | 1 +
src/views/business/inspectionTask/inspection.vue | 23 +++++++++++++++++++++--
src/views/business/materialOrder/customsInspectionOrder.vue | 2 +-
6 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 7e70330..6d2ff7c 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
"sass-loader": "10.1.1",
"script-ext-html-webpack-plugin": "2.1.5",
"svg-sprite-loader": "5.1.1",
+ "thread-loader": "^4.0.4",
"vue-template-compiler": "2.6.12",
"worker-loader": "^3.0.8"
},
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 755730e..7abe3b0 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -198,6 +198,11 @@
<td :rowspan="item.child.length">{{ item.faName }}</td>
<td>{{ item.child[0].name }}</td>
<td style="text-align: left;">
+ <!-- <div v-for="(group, groupIndex) in groupByFive(item.child[0].arr)" :key="groupIndex">
+ <el-checkbox-group v-model="getDataIndex" :max="item.child[0].maxNum">
+ <el-checkbox v-for="(n, j) in group" :key="groupIndex * 5 + j" :label="groupIndex * 5 + j">{{ n }}</el-checkbox>
+ </el-checkbox-group>
+ </div> -->
<el-checkbox-group v-model="getDataIndex" :max="item.child[0].maxNum">
<el-checkbox v-for="(n, j) in item.child[0].arr" :key="j" :label="j">{{ n }}</el-checkbox>
</el-checkbox-group>
@@ -206,8 +211,14 @@
<tr v-for="(m, i) in item.child" v-show="i > 0" :key="i + 'bbbbbbbbbbbbbb'">
<td>{{ m.name }}</td>
<td style="text-align: left;">
+
+ <!-- <div v-for="(group, groupIndex) in groupByFive(m.arr)" :key="groupIndex">
+ <el-checkbox-group v-model="getDataIndex" :max="m.maxNum">
+ <el-checkbox v-for="(n, j) in group" :key="groupIndex * 5 + j" :label="groupIndex * 5 + j">{{ n }}</el-checkbox>
+ </el-checkbox-group>
+ </div> -->
<el-checkbox-group v-model="getDataIndex" :max="m.maxNum">
- <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j">{{ n }}</el-checkbox>
+ <el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j" >{{ n }}</el-checkbox>
</el-checkbox-group>
</td>
</tr>
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 3ac981d..834cf69 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -422,6 +422,8 @@
<td :rowspan="item.child.length">{{ item.faName }}</td>
<td>{{ item.child[0].name }}</td>
<td style="text-align: left">
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
<el-select v-if="item.child[0].isShowSelect" v-model="item.child[0].getDataIndex1"
:multiple-limit="item.child[0].maxNum" clearable filterable multiple placeholder="璇烽�夋嫨"
@change="setData(item)">
@@ -446,11 +448,14 @@
:max="item.child[0].maxNum">
<el-checkbox v-for="(n, j) in item.child[0].arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
</el-checkbox-group>
+ </div>
</td>
</tr>
<tr v-for="(m, i) in item.child" v-show="i > 0" :key="i + 'bbbbbbbbbbbbbb'">
<td>{{ m.name }}</td>
<td style="text-align: left">
+ <!-- 娣诲姞瀹瑰櫒 div -->
+ <div class="data-collection-items">
<el-select v-if="m.isShowSelect" v-model="m.getDataIndex1" :multiple-limit="m.maxNum" clearable
filterable multiple placeholder="璇烽�夋嫨">
<el-option v-for="(item, index1) in m.arr" :key="index1" :label="index + 1 + '^' + item.result"
@@ -473,6 +478,7 @@
<el-checkbox-group v-if="!m.isShowSelect" v-model="m.getDataIndex1" :max="m.maxNum">
<el-checkbox v-for="(n, j) in m.arr" :key="j" :label="j + '^' + n">{{ n }}</el-checkbox>
</el-checkbox-group>
+ </div>
</td>
</tr>
</template>
@@ -2076,10 +2082,12 @@
}
});
// 鏈寰幆涓昏鏄椤甸潰鍙婂悗绔紶鍙傝繘琛屽垵濮嬪寲璧嬪��
+ console.log(this.currentSample.insProduct)
this.currentSample.insProduct.forEach(async (a) => {
try {
// 璁＄畻鍊艰祴鍊�
let comValue = JSON.parse(a.insProductResult.comValue);
+
for (var i = 0; i < comValue.length; i++) {
if (
this.param[a.id].comValue.find(
@@ -2881,7 +2889,7 @@
},
};
</script>
-<style scoped>
+<styl scoped>
.custom-table .el-table__header-wrapper th {
background-color: #87ceeb;
/* 鍙甯︽湁my-custom-table绫荤殑琛ㄦ牸鐢熸晥 */
@@ -3083,7 +3091,7 @@
display: inline-flex;
align-items: center;
}
-</style>
+</styl>
<style scoped>
/* .inspection .el-form-item__label {
color: #000;
@@ -3151,4 +3159,15 @@
max-width: 1000px;
/* 璁剧疆鏈�澶у搴� */
}
+.data-collection-items {
+ display: flex;
+ flex-wrap: wrap;
+}
+.data-collection-items .el-select,
+.data-collection-items .el-checkbox {
+ flex-basis: 20% ;
+ box-sizing: border-box;
+ padding: 5px 15px;
+}
</style>
+
\ No newline at end of file
diff --git a/src/views/business/materialOrder/customsInspectionOrder.vue b/src/views/business/materialOrder/customsInspectionOrder.vue
index 044ca47..2fe4edd 100644
--- a/src/views/business/materialOrder/customsInspectionOrder.vue
+++ b/src/views/business/materialOrder/customsInspectionOrder.vue
@@ -169,7 +169,7 @@
</el-form>
</div>
<div style="margin-bottom: 6px;margin-top: 6px">
- <el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
+ <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
</div>
</div>
diff --git a/src/views/business/materialOrder/customsInspectionView.vue b/src/views/business/materialOrder/customsInspectionView.vue
index b95acfb..6037a09 100644
--- a/src/views/business/materialOrder/customsInspectionView.vue
+++ b/src/views/business/materialOrder/customsInspectionView.vue
@@ -165,7 +165,7 @@
</el-form>
</div>
<div style="margin-bottom: 6px;margin-top: 6px">
- <el-button v-show="active==1" :disabled="sampleList.length === 2" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
+ <el-button v-show="active==1" :disabled="sampleList.length === 3" size="small" type="primary" @click="handleSplitCountNum">鎷嗗垎</el-button>
</div>
</div>
diff --git a/src/views/login.vue b/src/views/login.vue
index abb6bd4..c9c9bba 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -58,8 +58,8 @@
return {
codeUrl: "",
loginForm: {
- username: "ZT-",
- password: "",
+ username: "admin",
+ password: "zttZTT123!",
rememberMe: false,
code: "",
uuid: ""
--
Gitblit v1.9.3