From c4cc315e6b46adabc9f649c7b14e6c2b0bcc3346 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 14:00:42 +0800
Subject: [PATCH] 修改检验任务
---
src/views/business/materialOrder/customsInspection.vue | 140 ++--------------------------------
src/views/business/productOrder/components/add.vue | 2
src/views/business/inspectionTask/inspection.vue | 42 +++++++++-
3 files changed, 47 insertions(+), 137 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index e83d703..c0d9c56 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -323,14 +323,14 @@
">
<span v-if="state > 1 || (n.u != userId && n.u != undefined && n.u != '')">{{ n.v.v }}</span>
<el-date-picker v-else v-model="n.v.v" type="datetime" placeholder="" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss">
+ value-format="yyyy-MM-dd HH:mm:ss" @change="m => saveInsContext(n.i)">
</el-date-picker>
</template>
<template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁堟鏃堕棿'
">
<span v-if="state > 1 || (n.u != userId && n.u != undefined && n.u != '')">{{ n.v.v }}</span>
<el-date-picker v-else v-model="n.v.v" type="datetime" placeholder="" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss">
+ value-format="yyyy-MM-dd HH:mm:ss" @change="m => saveInsContext(n.i)">
</el-date-picker>
</template>
<span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)"></span>
@@ -837,6 +837,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 鍘婚噸妯℃澘锛岃繑鍥炴湁鍑犱釜妯℃澘
@@ -991,6 +993,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
if (this.currentSample.index == undefined)
@@ -1558,6 +1562,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 澶勭悊椤甸潰鍒楄〃鏁版嵁
@@ -1603,6 +1609,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
this.getTableLists0(list);
@@ -1961,7 +1969,7 @@
(a.template[b].v.ps.value === "璇曢獙鏂规硶" ||
a.template[b].v.ps.value === "妫�娴嬫柟娉�")
) {
- a.template[b].v.v = id.product.method;
+ a.template[b].v.v = id.product.methodS;
}
if (
a.template[b].v.ps != undefined &&
@@ -2064,7 +2072,7 @@
this.$set(b, "u", obj.checkUserId);
}
// b.v.v = ''
- // b.i && this.param[b.i] && this.param[b.i].equipName.push(b);
+ b.i && this.param[b.i] && (this.param[b.i].testStartTime = b);
}
if (b.v.ps != undefined && b.v.ps.value === "缁堟鏃堕棿") {
this.$set(b.v, "v", "");
@@ -2074,7 +2082,7 @@
this.$set(b, "u", obj.checkUserId);
}
// b.v.v = ''
- // b.i && this.param[b.i] && this.param[b.i].equipName.push(b);
+ b.i && this.param[b.i] && (this.param[b.i].testEndTime = b);
}
if (b.v.ps != undefined && b.v.ps.value === "鏈�缁堝��") {
// b.v.v = ''
@@ -2215,6 +2223,20 @@
} catch (e) {
console.log("璁惧鍚嶇О璧嬪��----", e);
}
+ try {
+ // 璧峰鏃堕棿璧嬪��
+ let testStartTime = JSON.parse(a.insProductResult.testStartTime);
+ for (let i = 0; i < testStartTime.length; i++) {
+ this.param[a.id].testStartTime.v.v = testStartTime.v;
+ }
+ } catch (e) { }
+ try {
+ // 缁堟鏃堕棿璧嬪��
+ let testEndTime = JSON.parse(a.insProductResult.testEndTime);
+ for (let i = 0; i < testEndTime.length; i++) {
+ this.param[a.id].testEndTime.v.v = testEndTime.v;
+ }
+ } catch (e) { }
try {
// 鏈�缁堝�艰祴鍊�
this.param[a.id].resValue.v.v = this.toFixed(
@@ -2411,6 +2433,14 @@
console.log(888, error);
}
}
+ break;
+ // 璧嬪�艰捣濮嬫椂闂�
+ case "testEndTime":
+ this.tableList[0][m] = value ? value.v.v : "";
+ break;
+ // 璧嬪�肩粓姝㈡椂闂�
+ case "testStartTime":
+ this.tableList[0][m] = value ? value.v.v : "";
break;
// 璧嬪�兼渶缁堝��
case "resValue":
@@ -2860,6 +2890,8 @@
equipValue: [],
equipName: [],
insResult: null,
+ testEndTime: null,
+ testStartTime: null,
};
});
// 椤甸潰鏁版嵁澶勭悊
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 3677dda..538acdd 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -289,7 +289,7 @@
</template>
</el-table-column>
<el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip></el-table-column>
- <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
@@ -1047,10 +1047,7 @@
},
sampleList: sampleList.map(a => {
a.standardMethodListId = JSON.stringify(a.standardMethodListId)
- a.insProduct = this.fullProductList.map(item => ({
- ...item,
- state: 1
- }))
+ a.insProduct = this.productList
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
@@ -1591,9 +1588,13 @@
}).then(res => {
this.getProductLoad = false
// 鐩存帴灏嗘煡璇㈢粨鏋滆祴鍊肩粰 productList
- this.fullProductList = res.data
- this.productList = res.data
- this.productList0 = res.data
+ // this.fullProductList = res.data
+ this.productList = res.data.forEach(m => {
+ m.state = 1
+ })
+ this.productList0 = res.data.forEach(m => {
+ m.state = 1
+ })
this.$refs.sampleTable.setCurrentRow(row)
setTimeout(() => {
this.productList.forEach(a => {
@@ -1669,129 +1670,6 @@
}
this.changeProductList0()
this.currentMethod.insProduct = this.productList0
- },
- // 鍗曢�夐�夋嫨妫�楠岄」鐨勫洖璋�
- selectOne(selection, row) {
- this.bsm1DiaList = []
- row.state = row.state == 1 ? 0 : 1
- if (row.section === null) {
- row.section = ""
- }
- if (row.sectionCopy === undefined && row.section) {
- if (row.section.indexOf('[') > -1) {
- this.$set(row, 'sectionCopy', row.section)
- }
- }
- if (row.ask.includes('[')) {
- this.$set(row, 'askCopy', row.ask)
- }
- if (row.tell.includes('[')) {
- this.$set(row, 'tellCopy', row.tell)
- }
- let arr = this.productList.filter(m => m.state == 1 && row.sectionCopy && row.sectionCopy.includes(m.sectionCopy) && m.ask && m.sectionCopy.indexOf('[') == -1)
- if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.sectionCopy !== undefined && row.state === 1 && arr.length == 0) {
- if (row.sectionCopy.indexOf('[') > -1) {
- row.bsmRow = this.HaveJson(row)
- }
- row.bsm1 = true
- this.bsm1DiaList.push(row)
- this.bsm1DiaAll = true
- } else if (row.bsm === '1' && row.sectionCopy !== '' && row.sectionCopy !== null && row.state === 0 && arr.length == 0) {
- row.bsm1 = false
- } else if (arr.length > 0) {
- try {
- row.bsmRow = this.HaveJson(row)
- let section = arr[0].section
- let arr0 = JSON.parse(row.section)
- let arr1 = JSON.parse(row.ask)
- let arr4 = JSON.parse(row.tell)
- let index = arr0.indexOf(section)
- row.section = section
- row.ask = arr1[index]
- row.tell = arr4[index]
- } catch (e) { }
- }
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- if (m.id == row.id) {
- m.state = row.state;
- }
- return m;
- })
- }
- return item
- })
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- },
- handleAll(e) {
- if (e.length > 0) {
- this.productList.map(m => {
- if (e.find(a => a.id == m.id)) {
- m.state = 1
- }
- return m
- })
- } else {
- this.productList.map(m => {
- m.state = 0
- return m
- })
- }
- this.bsmRow3 = [];
- this.bsm1DiaList = []
- this.productList.forEach(p => {
- if (p.sectionCopy === undefined && p.section) {
- if (p.section.indexOf('[') > -1) {
- this.$set(p, 'sectionCopy', p.section)
- }
- }
- if (p.ask.includes('[')) {
- this.$set(p, 'askCopy', p.ask)
- }
- if (p.tell.includes('[')) {
- this.$set(p, 'tellCopy', p.tell)
- }
- if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.sectionCopy !== undefined && p.state === 1) {
- if (p.sectionCopy.indexOf('[') > -1) {
- p.bsmRow = this.HaveJson(p)
- }
- p.bsm1 = true
- this.bsm1DiaList.push(p)
- this.bsm1DiaAll = true
- } else if (p.bsm === '1' && p.sectionCopy !== '' && p.sectionCopy !== null && p.state === 0) {
- p.bsm1 = false
- }
- })
- if (e.length > 0) {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- m.state = 1
- return m;
- })
- }
- return item
- })
- } else {
- this.sampleList.map(item => {
- if (this.sampleIds.indexOf(item.id) > -1) {
- item.insProduct.map(m => {
- m.state = 0
- return m;
- })
- }
- return item
- })
- }
- this.changeProductList0()
- this.currentMethod.insProduct = this.productList0
- this.getProNum()
- this.$nextTick(() => {
- this.$refs.productTable.doLayout()
- })
},
changeProductList0() {
this.productList0.forEach(a => {
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index aa85fa8..55d3413 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -361,7 +361,7 @@
<span v-else>{{ scope.row.radius }}</span>
</template>
</el-table-column>
- <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
--
Gitblit v1.9.3