From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚
---
src/views/business/inspectionTask/inspection.vue | 1053 +++++++++++++++------------------------------------------
1 files changed, 287 insertions(+), 766 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 796b098..68b3a9a 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -92,7 +92,6 @@
<el-descriptions-item label="闆朵欢鍙�">{{insOrder.partNo}}</el-descriptions-item>
<el-descriptions-item label="闆朵欢鍚嶇О">{{insOrder.partDetail}}</el-descriptions-item>
<el-descriptions-item label="鎵规鍙�">{{ insOrder.lotBatchNo }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鍨嬪彿" >{{currentSample.model}}</el-descriptions-item>
<el-descriptions-item label="鎶芥鏁伴噺">{{insOrder.testQuantity}}</el-descriptions-item>
<el-descriptions-item label="鍘傚瀵嗗害">{{supplierDensity}}</el-descriptions-item>
<template v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'">
@@ -109,8 +108,7 @@
<el-descriptions-item label="濮旀墭缂栧彿">{{ insOrder.entrustCode }}</el-descriptions-item>
<el-descriptions-item label="鏍峰搧缂栧彿">{{ currentSample.sampleCode }}</el-descriptions-item>
<el-descriptions-item label="鏍峰搧鍚嶇О">{{ currentSample.sample }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鏁伴噺">{{ sampleProduct.length }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鍨嬪彿">{{ currentSample.model }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鏁伴噺">{{ insOrder.testQuantity }}</el-descriptions-item>
<el-descriptions-item label="涓嬪彂鏃堕棿">{{ insOrder.sendTime }}</el-descriptions-item>
<el-descriptions-item label="绱ф�ョ▼搴�">{{ insOrder.typeName }}</el-descriptions-item>
<el-descriptions-item label="绾﹀畾鏃堕棿">{{ insOrder.appointed }}</el-descriptions-item>
@@ -119,6 +117,18 @@
<el-descriptions-item label="澶囨敞">
<el-input v-model="insOrder.remark" :disabled="state != 1" clearable placeholder="璇疯緭鍏�" size="small"
@blur="subOtherForm(insOrder.remark, 'remark')"></el-input>
+ </el-descriptions-item>
+ <el-descriptions-item v-if="isDirectTemplateOrder()" label="璁惧" :span="2">
+ <el-select v-model="selectedDeviceIds" multiple filterable clearable size="small" placeholder="璇烽�夋嫨璁惧"
+ :disabled="state != 1" @change="saveOverviewDevices">
+ <el-option v-for="device in orderDeviceOptions" :key="device.id" :label="device.label" :value="device.id" />
+ </el-select>
+ </el-descriptions-item>
+ <el-descriptions-item label="妫�楠岀粨璁�">
+ <el-radio-group v-model="reviewInsResult" :disabled="state != 2">
+ <el-radio :label="1">鍚堟牸</el-radio>
+ <el-radio :label="0">涓嶅悎鏍�</el-radio>
+ </el-radio-group>
</el-descriptions-item>
</el-descriptions>
</div>
@@ -144,7 +154,7 @@
<el-select v-if="cableTagList.length > 0" v-model="currentTab" clearable placeholder="璇烽�夋嫨" size="small"
@change="(m) => handleChangeCableTag(currentSample.id, 0, 'cableTag', m)
" @focus="getCableTag(currentSample.id)">
- <el-option v-for="item in cableTagList" :key="item.cableTag" :label="item.cableTag" :value="item.cableTag">
+ <el-option v-for="(item, index) in cableTagList" :key="index" :label="item.cableTag" :value="item.cableTag">
<span style="float: left">{{ item.cableTag }}</span>
<el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
type="danger">鏈</el-tag>
@@ -159,7 +169,7 @@
size="small" @change="(m) =>
handleChangeCableTag(currentSample.id, 0, 'repetitionTag', m)
" @focus="getRepetitionTag(currentSample.id)">
- <el-option v-for="item in repetitionTagList" :key="item.repetitionTag" :label="item.radius"
+ <el-option v-for="(item, index) in repetitionTagList" :key="index" :label="item.radius"
:value="item.repetitionTag">
<span style="float: left">{{ item.radius }}</span>
<el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
@@ -173,7 +183,7 @@
<span v-if="typeSource == '1'"> 寰呮楠屾暟閲忥細</span>
<el-select v-if="typeSource == '1'" v-model="rawMaterialTag" placeholder="璇烽�夋嫨" size="small" @change="(m) => handleChangeCableTag(currentSample.id, 4, 'cableTag', m)
" @focus="getRawMaterialTag(currentSample.id)">
- <el-option v-for="item in rawMaterialTagList" :key="item.rawMaterialTag" :label="item.rawMaterialTag"
+ <el-option v-for="(item, index) in rawMaterialTagList" :key="index" :label="item.rawMaterialTag"
:value="item.rawMaterialTag">
<span style="float: left">{{ item.rawMaterialTag }}</span>
<el-tag v-if="item.status == 0" size="small" style="float: right; margin-top: 5px"
@@ -219,7 +229,9 @@
n.v.ps.value.includes('妫�楠屽��') &&
state == 1
">
- <el-input v-if="getInspectionValueType(n.i) == 1"
+ <el-input v-if="getInspectionValueType(n.i) == 1 ||
+ (getInspectionValueType(n.i) != 2 && getInspectionValueType(n.i) != 4)
+ "
:key="'abc-' + '000' + index + '000' + i + '000' + j" v-model="n.v.v" :disabled="(getInspectionItemType(n.i) == 1 &&
!dataAcquisitionEidtAble) ||
(n.u != userId && n.u != undefined && n.u != '')
@@ -249,68 +261,13 @@
'getDataType'
)
" />
- <!-- <el-select v-else-if="getInspectionValueType(n.i) == 5" v-model="n.v.v" :disabled="state > 1 ||
- getInspectionItemType(n.i) == 1 ||
- (n.u != userId && n.u != undefined && n.u != '')
- " class="table_input" @change="(m) =>
- changeInput(
- m,
- `${item.templateId}-${n.r}-${n.c}-${n.i}`,
- n,
- 'getDataType'
- )
- " @visible-change="(e) => getDic(e, n.i)">
- <el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
- </el-select> -->
<span v-else-if="getInspectionValueType(n.i) == 4"
:style="`font-family:${n.v.ff} !important;`">/</span>
- </template>
- <template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'">
- <el-select v-if="
- (getInspectionValueType(n.i) == 2 ||
- getInspectionValueType(n.i) == 5) &&
- state == 1
- " v-model="n.v.v" class="table_input" @change="(m) =>
- changeInput(
- m,
- `${item.templateId}-${n.r}-${n.c}-${n.i}`,
- n,
- 'getDataType',
- 'changeSelect'
- )
- ">
- <el-option :value="1" label="鍚堟牸"></el-option>
- <el-option :value="0" label="涓嶅悎鏍�"></el-option>
- <el-option :value="3" label="涓嶅垽瀹�"></el-option>
- <el-option :value="2" label="寰呭畾"></el-option>
- </el-select>
- <template v-if="state > 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
- </template>
- <template v-if="getInspectionValueType(n.i) != 2 &&
- state == 1">
- <span v-if="n.v.v === 1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
- <span v-else-if="n.v.v === 0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
- <span v-else-if="n.v.v === 3"
- :style="`font-family:${n.v.ff} !important;color: #3A7BFA;`">涓嶅垽瀹�</span>
- <span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
- </template>
- </template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '璁惧缂栫爜' &&
- state == 1
- ">
- <span>{{ n.v.v }}</span>
</template>
<template v-else-if="
n.v.ps != undefined && n.v.ps.value === '璁惧鍚嶇О'
">
- <el-select v-model="n.v.v" :disabled="state > 1" class="table_input" filterable multiple
+ <el-select v-model="n.v.v" :disabled="state > 1" class="table_input" filterable multiple clearable
placeholder="璁惧" remote @change="(val) => changeEquip(val, n)"
@visible-change="(e) => getEquipOptions(e, n.i)">
<el-option v-for="item in equipOptions" :key="item.value" :label="item.label"
@@ -318,15 +275,6 @@
{{ item.label + "--" + item.value }}
</el-option>
</el-select>
- </template>
- <template v-else-if="
- n.v.ps != undefined &&
- n.v.ps.value === '瑕佹眰鍊�' &&
- state == 1
- ">
- <span :style="`font-family:${n.v.ff} !important;`">{{
- getTell(n.i)
- }}</span>
</template>
<template v-else-if="
n.v.ps != undefined &&
@@ -444,17 +392,6 @@
<el-select v-model="verifyUser" clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
<el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
</el-option>
- </el-select>
- </div>
- </div>
- <div class="body" style="display: flex; padding: 10px; align-items: center">
- <div class="search_label" style="width: 150px">
- <span class="required-span">*</span>鎶ュ憡绫诲瀷
- </div>
- <div class="search_input" style="width: 100%">
- <el-select v-model="reportType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option label="妫�娴嬫姤鍛�" :value="0"></el-option>
- <el-option label="妫�楠屾姤鍛�" :value="1"></el-option>
</el-select>
</div>
</div>
@@ -641,6 +578,9 @@
checkSubmitPlan,
submitPlan,
saveInsContext,
+ saveTemplateContext,
+ getOrderDevices,
+ saveOrderDevices,
selectUserCondition,
downFile,
getFileList,
@@ -723,16 +663,18 @@
comparisonList: [],
excelMethodList: [],
equipOptions: [],
+ orderDeviceOptions: [],
+ selectedDeviceIds: [],
reviewLoading: false,
reviewDia: false,
noReason: "",
+ reviewInsResult: null,
tableWidth: 1000,
currentTable: null,
tableLists: [],
widthList: [],
addVerifyDia: false,
verifyUser: null,
- reportType: null,
personList: [],
enumList: [],
tableLoading: false,
@@ -756,6 +698,10 @@
result: null,
worker: null,
worker0: null,
+ // 妫�楠屽�兼寜瑙﹀彂椤哄簭涓茶淇濆瓨锛岄伩鍏嶅悓涓�妫�楠岄」鐨勬棫璇锋眰瑕嗙洊鏂拌姹傘��
+ saveQueue: null,
+ calculationRevision: 0,
+ completedCalculationRevision: 0,
wareLength: [],
dataAcquisitionInfo: {},
dataAcquisitionInfoNew: {},
@@ -887,7 +833,6 @@
},
tableLoading0: false,
// 浠诲姟鍒囨崲鍒楄〃--缁撴潫
- isSplit: 0, // 鏄惁鏄媶鍗曡繃鏉ョ殑
};
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -898,7 +843,8 @@
},
},
created() {
- let { sonLaboratory, orderId, state, inspectorList, typeSource,isSplit } =
+ this.saveQueue = Promise.resolve();
+ let { sonLaboratory, orderId, state, inspectorList, typeSource } =
this.$route.query;
this.sonLaboratory = sonLaboratory;
this.orderId = orderId;
@@ -906,7 +852,6 @@
this.state = state;
this.inspectorList = inspectorList;
this.typeSource = typeSource;
- this.isSplit = isSplit;
},
mounted() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -932,8 +877,9 @@
this.refreshView()
},
// 鐩戝惉褰撳墠妯℃澘鍙樺寲
- currentTable(val1, val0) {
+ async currentTable(val1, val0) {
if (val0 != null && val1 != val0) {
+ await this.waitForPendingSaves();
if (this.changeType && this.changeType > 0) {
// 濡傛灉鏄厜绾ゃ�佸厜绾ゅ甫锛屽垯涓嶆墽琛屼笅闈㈡搷浣�
return;
@@ -942,17 +888,7 @@
if (m.templateId == val1) {
let list = await this.getCurrentProduct(this.currentSample.id, 0);
this.currentSample.insProduct = this.HaveJson(list); //璧嬪�煎綋鍓嶆牱鍝佺殑妫�楠岄」
- this.param = {}; //鍒濆鍖栦紶鍒板悗绔殑鍙傛暟
- this.currentSample.insProduct.forEach((a, j) => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null,
- };
- });
+ this.param = {}; //鍒濆鍖栦紶鍒板悗绔殑鍙傛暟,鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍団�濆瓨
// 鍘婚噸妯℃澘锛岃繑鍥炴湁鍑犱釜妯℃澘
const mySet1 = new Set();
this.tableLists = this.currentSample.insProduct.filter((m) => {
@@ -1137,13 +1073,15 @@
this.checkUser = "";
},
// 鍒锋柊椤甸潰
- refreshView() {
+ async refreshView() {
+ await this.waitForPendingSaves();
this.loading = true;
doInsOrder({
id: this.id,
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
+ this.reviewInsResult = this.insOrder.insResult;
if(res.data.insOrder.ifsOrderType==='02wg'){
//鏌ヨ闆朵欢灞炴��
this.getPartProps(res.data.insOrder.ifsInventoryId)
@@ -1176,22 +1114,15 @@
this.rawMaterialTag = "1";
}
this.getEquipOptions(1);
+ if (this.sonLaboratory === "鏂拌仛") {
+ this.loadOverviewDevices();
+ }
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
let list = await this.getCurrentProduct(this.currentSample.id, 0);
this.currentSample.insProduct = this.HaveJson(list);
// 鍒濆鍖栦紶閫掑埌鍚庣鐨勫弬鏁�
this.param = {};
this.changeType = 0;
- this.currentSample.insProduct.forEach((a) => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null,
- };
- });
if (this.currentSample.index == undefined)
this.currentSample["index"] = 1;
let bushing = this.currentSample.bushing;
@@ -1739,6 +1670,7 @@
},
// 鍒囨崲鏍峰搧
async handleChangeSample(row, column, event) {
+ await this.waitForPendingSaves();
// 鍒濆鍖栨暟鎹�
this.param = {};
this.sampleVisible = false;
@@ -1750,16 +1682,6 @@
// 鍒濆鍖栧悗绔紶鍙�
this.param = {};
this.changeType = 0;
- this.currentSample.insProduct.forEach((a, j) => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null,
- };
- });
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
this.getTableLists();
this.currentKey = row.index;
@@ -1795,16 +1717,6 @@
let list = await this.getCurrentProduct(m, type, cableTag);
if (list && list.length > 0) {
this.param = {};
- list.forEach((a) => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null,
- };
- });
this.getTableLists0(list);
this.worker.postMessage(
JSON.stringify({
@@ -1948,209 +1860,18 @@
count++;
});
});
- // 鏈寰幆涓昏鏄帶鍒跺悎骞�,浠ュ強鎺у埗妫�楠岄」淇℃伅鏄惁灞曠ず鍑烘潵,浠ヤ究鍚庣画妫�楠�
+ // 鎸夊悗绔笅鍙戠殑鈥滄ā鏉縄D + 妯℃澘琛屽彿鈥濈洿鎺ョ粦瀹氭楠岄」锛屼笉鍋氬悕绉版瘮瀵癸紝涓嶉殣钘忎换浣曡
this.tableList.forEach((a) => {
- let dels = new Set(); //闇�瑕佸垹闄ょ殑琛�
- let ids = []; //鎵�鏈夋楠岄」鐨刬d
- let set3 = new Set();
- a.template.forEach((b) => {
- let size1 = set3.size;
- let size2 = set3.add(b.r).size;
- if (size1 < size2) {
- let str = "";
- let str2 = "";
- let unit2 = "";
- let count4 = 0;
- let isThree = 0;
- a.template.forEach((c) => {
- // 鑾峰彇鍒� 妫�楠岄」鍒嗙被+妫�楠岄」+妫�楠屽瓙椤圭殑鎷兼帴,濡傛灉妯℃澘閲岀殑淇℃伅璺熸帴鍙ｈ繑鍥炵殑妫�楠岄」淇℃伅鑳藉鍖归厤鍒欏睍绀哄嚭鏉�
- if (b.r === c.r) {
- if (
- c.v.ps != undefined &&
- c.v.ps.value === "妫�楠岄」鍒嗙被" &&
- count4 === 0
- ) {
- // 涓夌骇鍒嗙被
- isThree = 1;
- } else if (
- c.v.ps != undefined &&
- c.v.ps.value === "妫�楠岄」" &&
- count4 === 0
- ) {
- // 浜岀骇鍒嗙被
- isThree = 0;
- }
- if (isThree == 0) {
- if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」") {
- if (count4 === 0) {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str += c.v.v;
- count4 += 1;
- }
- } else if (
- c.v.ps != undefined &&
- c.v.ps.value === "妫�楠屽瓙椤�"
- ) {
- if (count4 === 1) {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str += c.v.v;
- count4 += 1;
- }
- }
- } else if (isThree == 1) {
- if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」鍒嗙被") {
- if (count4 === 0) {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str += c.v.v;
- count4 += 1;
- }
- } else if (c.v.ps != undefined && c.v.ps.value === "妫�楠岄」") {
- if (count4 === 1) {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str += c.v.v;
- count4 += 1;
- }
- } else if (
- c.v.ps != undefined &&
- c.v.ps.value === "妫�楠屽瓙椤�"
- ) {
- if (count4 === 2) {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str += c.v.v;
- count4 += 1;
- }
- }
- }
- if (str === "鏈烘鎬ц兘骞叉�佹媺浼稿己搴�(绾靛悜)") {
- if (c.v.ps != undefined && c.v.ps.value === "鍗曚綅") {
- if (c.v.v) {
- c.v.v = c.v.v.replace(/\s*/g, "");
- }
- str2 = str + c.v.v;
- unit2 = c.v.v;
- }
- }
- }
- });
- if (str != "") {
- let count2 = 0;
- for (let i in this.currentSample.insProduct) {
- let inspectionItemClass =
- this.currentSample.insProduct[i].inspectionItemClass ==
- null ||
- this.currentSample.insProduct[i].inspectionItemClass ==
- undefined
- ? ""
- : this.currentSample.insProduct[i].inspectionItemClass;
- inspectionItemClass = inspectionItemClass.replace(/\s*/g, "");
- let inspectionItem =
- this.currentSample.insProduct[i].inspectionItem == null ||
- this.currentSample.insProduct[i].inspectionItem == undefined
- ? ""
- : this.currentSample.insProduct[i].inspectionItem;
- inspectionItem = inspectionItem.replace(/\s*/g, "");
- let inspectionItemSubclass =
- this.currentSample.insProduct[i].inspectionItemSubclass ==
- null ||
- this.currentSample.insProduct[i].inspectionItemSubclass ==
- undefined
- ? ""
- : this.currentSample.insProduct[i].inspectionItemSubclass;
- inspectionItemSubclass = inspectionItemSubclass.replace(
- /\s*/g,
- ""
- );
- if (inspectionItemSubclass === "骞叉�佹媺浼稿己搴�(绾靛悜)") {
- // 妫�楠屽瓙椤逛负'骞叉�佹媺浼稿己搴�(绾靛悜)'鏃讹紝妯＄増閲屾槸涓や釜璁＄畻鍊煎搴旂浉鍚岀殑妫�楠屽�煎苟涓旇绠楁柟寮忎笉鍚岋紝瑕佹牴鎹浉鍚岀殑'鍗曚綅'鍋氱壒娈婄殑娓叉煋
- const unit = this.currentSample.insProduct[i].unit;
- if (
- (this.currentSample.insProduct[i].templateId ===
- a.templateId &&
- inspectionItemClass +
- inspectionItem +
- inspectionItemSubclass +
- unit ===
- str2) ||
- (this.currentSample.insProduct[i].templateId ===
- a.templateId &&
- !unit2.includes("/") &&
- inspectionItemClass +
- inspectionItem +
- inspectionItemSubclass ===
- str)
- ) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i],
- });
- break;
- }
- } else {
- // 濡傛灉鐩哥瓑,閭ｄ箞璇存槑鎵惧埌浜�,骞朵笖鎶奿d瀛樿捣鏉�,鍚庣画妫�楠岄」涔熶細鍦ㄩ〉闈腑鏄剧ず鍑烘潵
- if (
- this.currentSample.insProduct[i].templateId ===
- a.templateId &&
- inspectionItemClass +
- inspectionItem +
- inspectionItemSubclass ===
- str
- ) {
- ids.push({
- r: b.r,
- id: this.currentSample.insProduct[i].id,
- product: this.currentSample.insProduct[i],
- });
- break;
- }
- }
- count2++;
- }
- if (count2 == this.currentSample.insProduct.length) {
- dels.add(b.r);
- }
+ const directProducts = this.currentSample.insProduct.filter(
+ (product) => product.templateId === a.templateId &&
+ product.templateRowIndex !== null && product.templateRowIndex !== undefined
+ );
+ directProducts.forEach((product) => {
+ a.template.forEach((cell) => {
+ if (cell.r === product.templateRowIndex) {
+ cell.i = product.id;
}
- }
- });
- // 鎿嶄綔鍒犻櫎
- dels.forEach((del) => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === del) {
- a.template.splice(b, 1);
- b -= 1;
- }
- }
- });
- // 鎿嶄綔璧嬪��--涓昏璧嬪�煎崟浣�,璇曢獙鏂规硶绛変俊鎭�
- ids.forEach((id) => {
- for (let b = 0; b < a.template.length; b++) {
- if (a.template[b].r === id.r) {
- a.template[b].i = id.id;
- if (
- a.template[b].v.ps != undefined &&
- a.template[b].v.ps.value === "鍗曚綅"
- ) {
- a.template[b].v.v = id.product.unit;
- }
- if (
- a.template[b].v.ps != undefined &&
- (a.template[b].v.ps.value === "璇曢獙鏂规硶" ||
- a.template[b].v.ps.value === "妫�娴嬫柟娉�")
- ) {
- a.template[b].v.v = id.product.methodS;
- }
- }
- }
+ });
});
let set2 = new Set();
// 鍚堝苟鐨勬暟鎹鐞�,cs rs 浠ｈ〃鍚堝苟鐨勬暟閲�
@@ -2173,20 +1894,11 @@
}
});
});
- // 鏈寰幆涓昏鏄鍚庣浼犲弬杩涜鍒濆鍖�,鏍峰紡閫昏緫淇敼
+ // 鏈寰幆涓昏鍋氭牱寮忛�昏緫澶勭悊,鍙紪杈戝崟鍏冩牸鍒濆鍖�
this.tableList.forEach((a) => {
let arrs = [];
let set = new Set();
let count1 = 0;
- let conclusionList = []; //缁撹鍒楄〃
- let finalList = []; //鏈�缁堝�煎垪琛�
- // 缁撹涓庢渶缁堝�煎湪杩欓噷涓�涓�瀵瑰簲,浠ヤ笅涓や釜鍒楄〃闀垮害鑲畾鏄竴鏍风殑,濡傛灉鏈変笉涓�鏍�,閭ｄ箞澶氬崐鏄ā鏉块厤缃緱闂
- conclusionList = a.template.filter(
- (n) => n.v.ps != undefined && n.v.ps.value === "缁撹"
- ); //缁撹鍒楄〃
- finalList = a.template.filter(
- (n) => n.v.ps != undefined && n.v.ps.value === "鏈�缁堝��"
- ); //鏈�缁堝�煎垪琛�
a.template.forEach((b) => {
if (
b.v.ps != undefined &&
@@ -2197,61 +1909,18 @@
count1++;
b.v.v = count1;
}
- if (b.v.ps != undefined && b.v.ps.value === "瑕佹眰鍊�") {
- // 瀵硅姹傚�艰繘琛岃祴鍊�
- b.v.v = this.getAsk(b.i);
- }
- // 瀵归〉闈㈢殑鍜岀粰鍚庣浼犲弬鐨勬楠屽��,璁＄畻鍊�,璁惧缂栫爜,璁惧鍚嶇О,鏈�缁堝��,缁撹杩涜鍒濆鍖�
+ // 鍒濆鍖栧彲濉啓/鍙绠楀崟鍏冩牸,鍚庣画鎸夊潗鏍囧洖鏄�
if (
b.v.ps != undefined &&
typeof b.v.ps.value === "string" &&
- b.v.ps.value.includes("妫�楠屽��")
+ (b.v.ps.value.includes("妫�楠屽��") ||
+ b.v.ps.value === "璁＄畻鍊�" ||
+ b.v.ps.value === "鏈�缁堝��" ||
+ b.v.ps.value === "璁惧鍚嶇О")
) {
this.$set(b.v, "v", "");
- // b.v.v = ''
- b.u = "";
- b.i && this.param[b.i] && this.param[b.i].insValue.push(b);
- }
- if (b.v.ps != undefined && b.v.ps.value === "璁＄畻鍊�") {
- this.$set(b.v, "v", "");
- // b.v.v = ''
- b.i && this.param[b.i] && this.param[b.i].comValue.push(b);
- }
- if (b.v.ps != undefined && b.v.ps.value === "璁惧缂栫爜") {
- // b.v.v = ''
- this.$set(b.v, "v", "");
- b.i && this.param[b.i] && this.param[b.i].equipValue.push(b);
- }
- if (b.v.ps != undefined && b.v.ps.value === "璁惧鍚嶇О") {
- this.$set(b.v, "v", "");
- // b.v.v = ''
- b.i && this.param[b.i] && this.param[b.i].equipName.push(b);
- }
- if (b.v.ps != undefined && b.v.ps.value === "鏈�缁堝��") {
- // b.v.v = ''
- this.$set(b.v, "v", "");
- if (
- b.i !== undefined &&
- this.param[b.i] &&
- !this.param[b.i].resValue
- ) {
- this.param[b.i].resValue = b;
- }
- }
- if (b.v.ps != undefined && b.v.ps.value === "缁撹") {
- if (
- b.i !== undefined &&
- this.param[b.i] &&
- !this.param[b.i].insResult
- ) {
- this.param[b.i].insResult = b;
- conclusionList.forEach((n, i) => {
- if (n.r == b.r && n.c == b.c) {
- b.v.f = `(${this.comparisonList.find((j) => j.value == finalList[i].c)
- .label
- }${finalList[i].r + 1})`;
- }
- });
+ if (b.v.ps.value.includes("妫�楠屽��")) {
+ b.u = "";
}
}
set.add(b.r);
@@ -2279,110 +1948,56 @@
a.style.columnlen[i] === undefined ? 100 : a.style.columnlen[i];
}
});
- // 鏈寰幆涓昏鏄椤甸潰鍙婂悗绔紶鍙傝繘琛屽垵濮嬪寲璧嬪��
- 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(
- (m) => m.c == comValue[i].c && m.r == comValue[i].r
- )
- ) {
- this.param[a.id].comValue.find(
- (m) => m.c == comValue[i].c && m.r == comValue[i].r
- ).v.v = this.toFixed(
- comValue[i].v,
- this.param[a.id].comValue.find(
- (m) => m.c == comValue[i].c && m.r == comValue[i].r
- ).v.ct
- );
- } else if (!comValue[i].c || !comValue[i].r) {
- this.param[a.id].comValue[i].v.v = this.toFixed(
- comValue[i].v,
- this.param[a.id].comValue[i].v.ct
- );
- }
- }
- } catch (e) { }
- try {
- // 妫�楠屽�艰祴鍊�
- let insValue = JSON.parse(a.insProductResult.insValue);
- for (let i = 0; i < insValue.length; i++) {
- if (
- this.param[a.id].insValue.find(
- (m) => m.c == insValue[i].c && m.r == insValue[i].r
- )
- ) {
- this.param[a.id].insValue.find(
- (m) => m.c == insValue[i].c && m.r == insValue[i].r
- ).v.v = this.toFixed(
- insValue[i].v,
- this.param[a.id].insValue.find(
- (m) => m.c == insValue[i].c && m.r == insValue[i].r
- ).v.ct
- );
- this.param[a.id].insValue.find(
- (m) => m.c == insValue[i].c && m.r == insValue[i].r
- ).u = insValue[i].u;
- // this.param[a.id].insValue[i].v.v = insValue[i].v
- // this.param[a.id].insValue[i].u = insValue[i].u
- }
- }
- } catch (e) { }
- try {
- // 璁惧缂栧彿璧嬪��
- let equipValue = JSON.parse(a.insProductResult.equipValue);
- for (let i = 0; i < equipValue.length; i++) {
- // 鏅�氳澶囪祴鍊�
- this.param[a.id].equipValue[i].v.v = equipValue[i].v;
- }
- } catch (e) { }
- try {
- // 璁惧鍚嶇О璧嬪��
- let equipName = JSON.parse(a.insProductResult.equipName);
- for (let i = 0; i < equipName.length; i++) {
- equipName[i].v !== "" &&
- equipName[i].v.map((val) => {
- const index = this.equipOptions.findIndex(
- (item) => item.value === val
- );
- if (index > -1) {
- // 鏍规嵁璁惧缂栫爜杞崲涓虹浉搴旂殑璁惧鍚嶇О
- val = this.equipOptions[index].deviceName;
- }
- });
- }
- for (let i = 0; i < equipName.length; i++) {
- // 鏅�氳澶囧悕绉拌祴鍊�
- this.param[a.id].equipName[i].v.v = equipName[i].v;
- }
- } catch (e) {
- console.log("璁惧鍚嶇О璧嬪��----", e);
- }
- try {
- // 鏈�缁堝�艰祴鍊�
- this.param[a.id].resValue.v.v = this.toFixed(
- a.lastValue,
- this.param[a.id].resValue.v.ct
- );
- // 缁撹璧嬪��
- this.param[a.id].insResult.v.v = a.insResult;
- } catch (e) { }
- });
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆洖鏄惧凡淇濆瓨鐨勫��
+ this.initParamByCoordinate();
// 瀵筫xcel鍑芥暟杩涜澶勭悊
this.handleExcelMethod();
},
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濆洖鏄惧凡淇濆瓨鐨勫��
+ initParamByCoordinate() {
+ this.param = {};
+ this.tableList.forEach((a) => {
+ this.param[a.templateId] = {};
+ const product = this.currentSample.insProduct.find(
+ (m) => m.templateId === a.templateId
+ );
+ let saved =
+ (product && (product.recordValues || product.insProductResult)) || {};
+ if (typeof saved === "string") {
+ try {
+ saved = JSON.parse(saved);
+ } catch (e) {
+ saved = {};
+ }
+ }
+ a.template.forEach((cell) => {
+ const key = `${cell.r}-${cell.c}`;
+ const item = saved[key];
+ if (item === undefined || item === null) {
+ return;
+ }
+ const value = typeof item === "object" ? item.v : item;
+ if (value === undefined || value === null) {
+ return;
+ }
+ cell.v.v = value;
+ if (typeof item === "object" && item.u) {
+ cell.u = item.u;
+ }
+ this.param[a.templateId][key] = {
+ v: value,
+ u: typeof item === "object" ? item.u : cell.u,
+ };
+ });
+ });
+ },
// 妫�楠屽�艰緭鍏ュ悗瑙﹀彂鐨勫嚱鏁�
- changeInput(m, code, n, getDataType, changeSelect) {
+ changeInput(m, code, n, getDataType) {
// 涓烘暟閲囧畾涔変竴涓�昏緫鍙傛暟
if (getDataType == "getDataType") {
this.getDataType = 2;
}
- let currentInsItemId = null; //褰撳墠妫�楠岄」id
if (n) {
- currentInsItemId = JSON.parse(JSON.stringify(n.i));
// 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
if (typeof n.v.v == "string") {
function isValidFraction(fraction) {
@@ -2396,6 +2011,7 @@
}
}
try {
+ const revision = ++this.calculationRevision;
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.worker.postMessage(
JSON.stringify({
@@ -2410,164 +2026,51 @@
getDataTypeId: this.getDataTypeId,
modelType: this.sampleProduct[0].model,
currentInsItem: n,
+ revision: revision,
})
);
+ // 鍏堜繚瀛樹富绾跨▼涓凡缁忚緭鍏ョ殑鍘熷鍊笺�俉orker 瀹屾垚璁＄畻鍚庝細鍐嶆鍏ラ槦淇濆瓨璁＄畻缁撴灉銆�
+ // 杩欐牱鍗充娇鐢ㄦ埛杈撳叆鍚庣珛鍗冲埛鏂般�佸垏鎹㈡垨杩斿洖锛屾渶鍚庣紪杈戠殑鍗曞厓鏍间篃涓嶄細涓㈠け銆�
+ if (n) {
+ this.saveInsContext();
+ }
} catch (error) {
console.log(444, error);
}
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker.onmessage = (event) => {
- this.result = JSON.parse(event.data);
- switch (this.result.method) {
+ const workerResult = JSON.parse(event.data);
+ if (workerResult.revision != null && workerResult.revision < this.calculationRevision) {
+ return;
+ }
+ this.result = workerResult;
+ switch (workerResult.method) {
case "saveInsContext":
this.$nextTick(() => {
- // this.$delete(this.tableList[0],'arr')
+ const resultValue = workerResult.value;
this.$set(
this.tableList[0],
"arr",
- this.result.value.tableList[0].arr
+ resultValue.tableList[0].arr
);
- this.param = this.result.value.param;
- if (this.result.value.currentInsItemId) {
- currentInsItemId = this.result.value.currentInsItemId;
- }
- // 鐗规畩澶勭悊涓�涓嬬粨璁�,浼氭湁杩欑鐗规畩鎯呭喌
- for (var i in this.param) {
- if (
- this.param[i].insResult &&
- this.param[i].insResult.v &&
- this.param[i].insResult.v.v
- ) {
- if (this.param[i].insResult.v.v == "鍚堟牸") {
- this.$set(this.param[i].insResult.v, "v", 1);
- } else if (this.param[i].insResult.v.v == "涓嶅悎鏍�") {
- this.$set(this.param[i].insResult.v, "v", 0);
- }
- }
- }
- this.saveInsContext(currentInsItemId);
+ this.param = resultValue.param;
+ this.saveInsContext();
+ this.completedCalculationRevision = Math.max(
+ this.completedCalculationRevision,
+ workerResult.revision || 0
+ );
});
break;
case "tableList":
this.$nextTick(() => {
// 鏇存柊鏁版嵁
this.$delete(this.tableList[0], "arr");
- this.$set(this.tableList[0], "arr", this.result.value[0].arr);
- // this.param = this.result.value.param
- if (this.result.value.currentInsItem) {
- currentInsItemId = this.result.value.currentInsItem.i;
- }
+ this.$set(this.tableList[0], "arr", workerResult.value[0].arr);
});
- break;
- case "getCurrentInsProduct":
- // 鏇存柊椤甸潰鏁版嵁
- this.getCurrentInsProduct(this.result.value);
break;
}
};
- // 淇濆瓨鏁版嵁
- setTimeout(() => {
- if (changeSelect) {
- this.saveInsContext(currentInsItemId);
- }
- }, 200);
- },
- // 鏍规嵁鍚庣浼犲弬鏇存柊椤甸潰鏁版嵁 param => this.tableList[0].insProductResult
- getCurrentInsProduct(pId) {
- if (!this.tableList[0].insProductResult) {
- this.tableList[0].insProductResult = {};
- }
- for (let m in this.param[pId]) {
- let value = this.param[pId][m];
- switch (m) {
- case "comValue":
- // 璧嬪�艰绠楀��
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- };
- this.tableList[0].insProductResult[m].push(obj);
- });
- try {
- this.tableList[0].insProductResult[m] = JSON.stringify(
- this.tableList[0].insProductResult[m]
- );
- } catch (error) {
- console.log(555, error);
- }
- }
- break;
- // 璧嬪�兼楠屽��
- case "insValue":
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- u: a.u,
- };
- this.tableList[0].insProductResult[m].push(obj);
- });
- try {
- this.tableList[0].insProductResult[m] = JSON.stringify(
- this.tableList[0].insProductResult[m]
- );
- } catch (error) {
- console.log(666, error);
- }
- }
- break;
- // 璧嬪�艰澶囩紪鍙�
- case "equipValue":
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- };
- this.tableList[0].insProductResult[m].push(obj);
- });
- try {
- this.tableList[0].insProductResult[m] = JSON.stringify(
- this.tableList[0].insProductResult[m]
- );
- } catch (error) {
- console.log(777, error);
- }
- }
- break;
- // 璧嬪�艰澶囧悕绉�
- case "equipName":
- if (value && value.length > 0) {
- this.tableList[0].insProductResult[m] = [];
- value.forEach((a, i) => {
- let obj = {
- v: a.v.v,
- };
- this.tableList[0].insProductResult[m].push(obj);
- });
- try {
- this.tableList[0].insProductResult[m] = JSON.stringify(
- this.tableList[0].insProductResult[m]
- );
- } catch (error) {
- console.log(888, error);
- }
- }
- break;
- // 璧嬪�兼渶缁堝��
- case "resValue":
- this.tableList[0].lastValue = value ? value.v.v : "";
- break;
- // 璧嬪�肩粨璁�
- case "insResult":
- this.tableList[0].insResult = value ? value.v.v : "";
- break;
- }
- }
},
// 瀵笶XCEL鍑芥暟杩涜澶勭悊
handleExcelMethod() {
@@ -2611,14 +2114,6 @@
}
}
},
- // 鑾峰彇瑕佹眰鎻忚堪
- getTell(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].tell;
- }
- }
- },
// 鍔ㄦ�佽幏鍙栧崟鍏冩牸瀹藉害
handleWidth(n) {
let sum = 0;
@@ -2659,14 +2154,6 @@
}
}
},
- // 鑾峰彇瑕佹眰鍊�
- getAsk(id) {
- for (var a in this.currentSample.insProduct) {
- if (this.currentSample.insProduct[a].id == id) {
- return this.currentSample.insProduct[a].ask;
- }
- }
- },
// 鑾峰彇鎵�鏈夎澶�
getEquipOptions(e, id) {
if (e) {
@@ -2685,17 +2172,6 @@
});
}
},
- // getDic(e, id) {
- // if (e) {
- // for (var a in this.currentSample.insProduct) {
- // if (this.currentSample.insProduct[a].id == id) {
- // let str = this.currentSample.insProduct[a].dic;
- // this.selectEnumByCategoryOfSelect(str);
- // return str;
- // }
- // }
- // }
- // },
openAddCheck() {
this.addCheck = true;
},
@@ -2703,6 +2179,10 @@
upInsReview(e) {
if (e == 1) {
// 閫氳繃
+ if (this.reviewInsResult !== 0 && this.reviewInsResult !== 1) {
+ this.$message.error("璇烽�夋嫨妫�楠岀粨璁�");
+ return;
+ }
this.reviewLoading = true;
verifyPlan({
orderId: this.orderId,
@@ -2710,6 +2190,7 @@
laboratory: this.sonLaboratory,
tell: null,
userId: this.checkUser,
+ insResult: this.reviewInsResult,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2755,17 +2236,15 @@
this.$refs.viewManHourDia.showDialog(this.id, 99);
},
openAddVerifyDia() {
- this.reportType = null;
this.addVerifyDia = true;
},
- confirmSubmit(registerInsResults){
+ confirmSubmit(){
submitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode,
- registerInsResults: this.reportType === 1 && registerInsResults,
- reportType: this.reportType
+ registerInsResults: false,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2779,13 +2258,13 @@
this.submitLoading = false;
});
},
- submit() {
+ async submit() {
if (this.verifyUser === null || this.verifyUser === "") {
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
return;
}
- if (this.reportType === null || this.reportType === "") {
- this.$message.error("璇烽�夋嫨鎶ュ憡绫诲瀷");
+ if (this.isDirectTemplateOrder() && (!this.selectedDeviceIds || this.selectedDeviceIds.length === 0)) {
+ this.$message.error("璇烽�夋嫨璁惧");
return;
}
if (!this.otherForm.humidity && this.insOrder.ifsOrderType!=='02wg') {
@@ -2800,31 +2279,16 @@
this.$message.error("璇峰～鍐橧FS搴撳瓨鐗╂枡鎵规灞炴��");
return;
}
+ await this.waitForPendingSaves();
this.submitLoading = true;
checkSubmitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
- reportType: this.reportType,
}).then((res) => {
if (res.code === 200) {
if (!res.data || res.data.errorMsg.length == 0) {
this.submitLoading = true;
- //妫�楠岀被鍨嬩负鍘熸潗鏂�
- if(this.reportType === 1 && this.typeSource==1 && res.data.unInsOrderCount==0 && this.isSplit==1){
- const htmlStr = "鏄惁鐧昏IFS閲囪喘妫�楠岀粨鏋滃苟绉诲簱锛熻鎿嶄綔浼氱櫥璁�<span style='color:#ff4949'>鍚屼竴闆朵欢鍚屼竴璁㈠崟鐨勬墍鏈夋媶鍒嗘壒娆�</span>锛岃璋ㄦ厧閫夋嫨銆�"
- this.$confirm(htmlStr, '鎻愮ず', {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- dangerouslyUseHTMLString: true
- }).then(() => {
- this.confirmSubmit(true)
- }).catch(() => {
- this.confirmSubmit(false)
- });
- }else{
- this.confirmSubmit(true)
- }
+ this.confirmSubmit();
} else {
let newData = [];
const h = this.$createElement;
@@ -2860,7 +2324,7 @@
})
.then(() => {
this.submitLoading = true;
- this.confirmSubmit(false)
+ this.confirmSubmit()
// submitPlan({
// orderId: this.orderId,
// laboratory: this.sonLaboratory,
@@ -2888,99 +2352,165 @@
});
return;
},
+ // 鎸夆�滄ā鏉縤d + 鍗曞厓鏍煎潗鏍�(r-c)鈥濅粠褰撳墠妯℃澘蹇収鍑哄緟淇濆瓨鍙傛暟
+ buildParam() {
+ const param = {};
+ this.tableList.forEach((a) => {
+ param[a.templateId] = {};
+ // Worker 鍥炰紶鍚� arr 鏄〉闈笂鐨勬渶鏂板璞★紝template 浠嶅彲鑳戒繚鐣欒绠楀墠鐨勬棫鍊笺��
+ const cells = a.arr && a.arr.length
+ ? a.arr.reduce((all, row) => all.concat(row), [])
+ : a.template;
+ const resultHeader = cells.find((cell) =>
+ cell.v && String(cell.v.v || "").trim() === "妫�楠岀粨鏋�"
+ );
+ const exportRows = new Set(cells.filter((cell) =>
+ cell.v && cell.v.ps && cell.v.ps.value === "瀵煎嚭鍊�"
+ ).map((cell) => cell.r));
+ cells.forEach((cell) => {
+ const isEditable =
+ cell.v.ps != undefined &&
+ typeof cell.v.ps.value === "string" &&
+ (cell.v.ps.value.includes("妫�楠屽��") ||
+ cell.v.ps.value === "璁＄畻鍊�" ||
+ cell.v.ps.value === "鏈�缁堝��" ||
+ cell.v.ps.value === "璁惧鍚嶇О");
+ const isExportResult = resultHeader && exportRows.has(cell.r) && cell.c === resultHeader.c;
+ if (!isEditable && !isExportResult) {
+ return;
+ }
+ if (
+ isEditable &&
+ cell.v.ps.value.includes("妫�楠屽��") &&
+ (cell.v.v === "" || cell.v.v === null || cell.v.v === undefined)
+ ) {
+ return;
+ }
+ param[a.templateId][`${cell.r}-${cell.c}`] = {
+ v: cell.v.v,
+ u: cell.u,
+ };
+ });
+ });
+ return param;
+ },
// 缁熶竴鍦ㄨ繖閲屼繚瀛樻暟鎹�
- saveInsContext(currentInsItemId) {
+ saveInsContext() {
try {
- if (this.param) {
- let param = null;
- if (currentInsItemId) {
- param = { [currentInsItemId]: this.param[currentInsItemId] };
- } else {
- param = this.param;
- }
- let isNoTestValue = ''
- for (let key in param) {
- if (param[key]) {
- if (param[key].insValue?.length === 0) {
- isNoTestValue = 1
- } else {
- isNoTestValue = ''
- }
- }
- }
- saveInsContext({
- param: JSON.stringify(param),
- currentTable: this.currentTable,
- sampleId: this.currentSample.id,
- orderId: this.orderId,
- sonLaboratory: this.sonLaboratory,
- isNoTestValue: isNoTestValue
- }).then((res) => {
- this.$message.success("宸蹭繚瀛�");
- });
- // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
- this.worker.postMessage(
- JSON.stringify({
- modelType: this.sampleProduct[0].model,
- type: "saveData",
- tableList: this.tableList,
- param: this.param,
- currentTable: this.currentTable,
- })
- );
+ if (!this.param) {
+ return;
}
+ const param = this.buildParam();
+ this.param = param;
+ let isNoTestValue = "";
+ this.tableList.forEach((a) => {
+ a.template.forEach((cell) => {
+ if (
+ cell.v.ps != undefined &&
+ typeof cell.v.ps.value === "string" &&
+ cell.v.ps.value.includes("妫�楠屽��") &&
+ (cell.v.v === "" || cell.v.v === null || cell.v.v === undefined)
+ ) {
+ isNoTestValue = 1;
+ }
+ });
+ });
+ const payload = {
+ param: JSON.stringify(param),
+ currentTable: this.currentTable,
+ sampleId: this.currentSample.id,
+ orderId: this.orderId,
+ sonLaboratory: this.sonLaboratory,
+ isNoTestValue: isNoTestValue
+ };
+ const previousSave = this.saveQueue || Promise.resolve();
+ this.saveQueue = previousSave
+ .catch(() => undefined)
+ .then(() => this.isDirectTemplateOrder()
+ ? saveTemplateContext({
+ orderId: this.orderId,
+ sampleId: this.currentSample.id,
+ templateId: this.currentTable,
+ values: param[this.currentTable] || {},
+ })
+ : saveInsContext(payload))
+ .then(() => {
+ this.$message.success("宸蹭繚瀛�");
+ })
+ .catch((error) => {
+ console.error("妫�楠屾暟鎹繚瀛樺け璐�", error);
+ this.$message.error("妫�楠屾暟鎹繚瀛樺け璐ワ紝璇烽噸璇�");
+ });
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(
+ JSON.stringify({
+ modelType: this.sampleProduct[0].model,
+ type: "saveData",
+ tableList: this.tableList,
+ param: this.param,
+ currentTable: this.currentTable,
+ })
+ );
} catch (error) {
console.log(999, error);
}
},
- // 璁惧鏀瑰彉
- changeEquip(val, n, v) {
- try {
- // this.$set(n.v,'v',val)
- this.tableList[0].arr.forEach((item, index) => {
- item.forEach((m, i) => {
- if (this.param[m.i]) {
- this.param[m.i].state = 1;
+ async waitForPendingSaves() {
+ const targetRevision = this.calculationRevision;
+ if (this.completedCalculationRevision < targetRevision) {
+ await new Promise((resolve) => {
+ const startedAt = Date.now();
+ const waitWorker = () => {
+ if (this.completedCalculationRevision >= targetRevision || Date.now() - startedAt > 5000) {
+ resolve();
+ return;
}
- // if(m.i==n.i&&m.v.ps&&m.v.ps.value=='璁惧鍚嶇О'&&v){
- // this.$set(m.v,'v',v)
- // }
+ setTimeout(waitWorker, 20);
+ };
+ waitWorker();
+ });
+ }
+ if (this.saveQueue) {
+ await this.saveQueue;
+ }
+ },
+ // 璁惧鏀瑰彉
+ changeEquip(val, n) {
+ const selectedDevices = Array.isArray(val) ? [...val] : [];
+ const deviceCodes = selectedDevices.join("锛�");
+ this.$set(n.v, "v", selectedDevices);
+ this.tableList.forEach((table) => {
+ (table.arr || []).forEach((row) => {
+ row.forEach((cell) => {
+ if (cell.i == n.i && cell.v.ps) {
+ if (cell.v.ps.value === "璁惧鍚嶇О") {
+ this.$set(cell.v, "v", [...selectedDevices]);
+ } else if (cell.v.ps.value === "璁惧缂栫爜") {
+ this.$set(cell.v, "v", deviceCodes);
+ }
+ }
});
});
- for (let i in this.param) {
- if (this.param[i].state != 1) {
- delete this.param[i];
- }
- }
- // this.equipOptions涓鸿澶囧悕绉颁笅鎷夋閫夐」鏁版嵁
- for (let i1 in this.param[n.i].equipName) {
- if (
- this.param[n.i].equipName[i1].i === n.i &&
- this.param[n.i].equipName[i1].r === n.r
- ) {
- this.$delete(this.param[n.i].equipValue[i1].v, "v");
- // 灏嗘暟缁勮祴鍊肩粰璁惧缂栫爜
- this.$set(this.param[n.i].equipValue[i1].v, "v", val.join("锛�"));
- this.$delete(this.param[n.i].equipName[i1].v, "v");
- // 灏嗘暟缁勮祴鍊肩粰璁惧缂栫爜
- this.$set(this.param[n.i].equipName[i1].v, "v", val);
- this.tableList[0].arr.forEach((item, index) => {
- item.forEach((m) => {
- if (m.i == n.i && m.v.ps && m.v.ps.value == "璁惧缂栫爜") {
- this.$set(m.v, "v", val.join("锛�"));
- }
- if (m.i == n.i && m.v.ps && m.v.ps.value == "璁惧鍚嶇О") {
- this.$set(m.v, "v", val);
- }
- });
- });
- }
- }
- // 淇濆瓨鏁版嵁
- this.saveInsContext(n.i);
- } catch (e) {
- console.log("changeEquip----", e);
- }
+ });
+ // 閫夋嫨銆佺Щ闄ゃ�佹竻绌哄潎鐢� change 浜嬩欢瑙﹀彂锛岀珛鍗充繚瀛樸��
+ this.saveInsContext();
+ },
+ isDirectTemplateOrder() {
+ return this.sonLaboratory === "鏂拌仛" && this.currentSample &&
+ (this.currentSample.insProduct || []).some((product) => product.templateRowIndex != null);
+ },
+ loadOverviewDevices() {
+ Promise.all([search({ status: 0 }), getOrderDevices({ orderId: this.orderId })]).then(([devices, selected]) => {
+ this.orderDeviceOptions = (devices.data || []).map((device) => ({
+ id: device.id,
+ label: `${device.deviceName}--${device.managementNumber}`,
+ }));
+ this.selectedDeviceIds = selected.data || [];
+ });
+ },
+ saveOverviewDevices() {
+ return saveOrderDevices({ orderId: this.orderId, deviceIds: this.selectedDeviceIds })
+ .then(() => this.$message.success("璁惧宸蹭繚瀛�"));
},
getAuthorizedPerson() {
selectUserCondition({ type: 1 }).then((res) => {
@@ -3040,16 +2570,6 @@
// 鍒濆鍖栧悗绔紶鍙�
this.param = {};
this.changeType = 0;
- this.currentSample.insProduct.forEach((a, j) => {
- this.param[a.id] = {
- insValue: [],
- comValue: [],
- resValue: null,
- equipValue: [],
- equipName: [],
- insResult: null,
- };
- });
// 椤甸潰鏁版嵁澶勭悊
this.getTableLists();
// 鏇存柊鍒板绾跨▼
@@ -3110,7 +2630,8 @@
return v;
}
},
- goback() {
+ async goback() {
+ await this.waitForPendingSaves();
this.$router.go(-1)
}
},
--
Gitblit v1.9.3