From e4c5b0f332afbc2b4fe8abf07f348e8a1d278562 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 10:34:32 +0800
Subject: [PATCH] 原辅材和成品下单调整，前端加起始时间、终止时间、试验条件等原始记录模板信息
---
src/views/standard/standardLibrary/index.vue | 2 +-
src/views/business/materialOrder/customsInspection.vue | 7 ++++---
src/views/business/productOrder/components/add.vue | 4 ++--
src/views/business/inspectionTask/inspection.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index c2e85d8..e83d703 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -285,7 +285,7 @@
state == 1
"><span :style="`font-family:${n.v.ff} !important;`">{{
toFixed(n.v.v, n.v.ct)
- }}</span></template>
+ }}</span></template>
<template v-else-if="
n.v.ps != undefined &&
n.v.ps.value === '鏈�缁堝��' &&
@@ -318,6 +318,20 @@
" :style="`font-family:${n.v.ff} !important;`">
{{ currentSample.model }}
</div>
+ </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">
+ </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">
+ </el-date-picker>
</template>
<span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)"></span>
</div>
@@ -1947,7 +1961,13 @@
(a.template[b].v.ps.value === "璇曢獙鏂规硶" ||
a.template[b].v.ps.value === "妫�娴嬫柟娉�")
) {
- a.template[b].v.v = id.product.methodS;
+ a.template[b].v.v = id.product.method;
+ }
+ if (
+ a.template[b].v.ps != undefined &&
+ a.template[b].v.ps.value === "璇曢獙鏉′欢"
+ ) {
+ a.template[b].v.v = id.product.radius;
}
}
}
@@ -2036,6 +2056,26 @@
// 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 === "璧峰鏃堕棿") {
+ this.$set(b.v, "v", "");
+ b.u = "";
+ let obj = this.currentSample.insProduct.find(m => m.id == b.i)
+ if (obj) {
+ this.$set(b, "u", obj.checkUserId);
+ }
+ // 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 === "缁堟鏃堕棿") {
+ this.$set(b.v, "v", "");
+ b.u = "";
+ let obj = this.currentSample.insProduct.find(m => m.id == b.i)
+ if (obj) {
+ this.$set(b, "u", obj.checkUserId);
+ }
+ // 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", "");
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index bd454b1..6864494 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -303,11 +303,12 @@
</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="methodS" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
- <el-input v-if="active == 1" v-model="methodS" placeholder="璇疯緭鍏�" size="mini" @input="searchFilterList" />
+ <el-input v-if="active == 1" v-model="scope.row.method" placeholder="璇疯緭鍏�" size="mini"
+ @input="searchFilterList" />
</div>
</template>
</el-table-column>
@@ -1061,7 +1062,7 @@
},
sampleList: sampleList.map(a => {
a.standardMethodListId = JSON.stringify(a.standardMethodListId)
- a.insProduct = this.fullProductList
+ a.insProduct = this.fullProductList
if (a.modelNum) {
// 鏍规嵁x鍙峰垽鏂瀷鍙峰弬鏁颁笌鏍峰搧鍨嬪彿鐨勬嫾鎺ヤ綅缃�
// 渚嬪脳4锛屽氨涓�500ML脳4锛�4脳锛屽氨涓�4脳500ML
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 55d3413..d052ad3 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -361,11 +361,11 @@
<span v-else>{{ scope.row.radius }}</span>
</template>
</el-table-column>
- <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="methodS" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏂规硶" min-width="120" prop="method" show-overflow-tooltip>
<template slot="header" slot-scope="scope">
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
- <el-input v-if="active == 1" v-model="methodS" placeholder="璇疯緭鍏�" size="mini"
+ <el-input v-if="active == 1" v-model="scope.row.method" placeholder="璇疯緭鍏�" size="mini"
@input="searchFilterList" />
</div>
</template>
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index 7f94c3a..d6ea973 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -138,7 +138,7 @@
<el-select v-if="
checkPermi(['standard:standardLibrary:upStandardProduct'])
" v-model="scope.row.radius" clearable placeholder="璇曢獙鏉′欢" size="small" @change="(value) => upStandardProductListOfRadius(value, scope.row.id)
- " :disabled="!!auditId || standardCkeck">
+ " :disabled="!!auditId || standardCkeck" allow-create filterable>
<el-option v-for="(a, i) in scope.row.radiusList &&
JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
</el-select>
--
Gitblit v1.9.3