From dcab0e19a1764af5c05ac8868ddc080dce81d8c0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:28:26 +0800
Subject: [PATCH] 单元格合并；修复部分bug
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 16 +++++++++-------
src/components/view/b1-inspect-order-plan.vue | 4 ++--
src/components/view/b1-sample.vue | 2 +-
static/js/menu.js | 5 +++++
src/components/view/a6-device-management.vue | 7 +++++--
5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 1858949..dee79ce 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -674,13 +674,15 @@
}
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
- 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.i!==undefined){
+ 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})`
+ }
+ })
+ }
}
set.add(b.r)
if (b.v.f) {
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index 813729c..ad072e5 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -633,6 +633,9 @@
//row = 鐐瑰嚮瀵瑰簲琛屽�间竴琛屽��
//澶嶅埗缁檉ormData
this.formData = this.HaveJson(row);
+ if(typeof(row.insProductIds)==='number'){
+ row.insProductIds = row.insProductIds+''
+ }
this.formData.insProductIds = row.insProductIds ? row.insProductIds.split(',') : [];
},
beforeUpload(file) {
@@ -664,12 +667,12 @@
}
},
submitForm() {
- this.upLoad = true;
delete this.formData.createTime
delete this.formData.updateTime
delete this.formData.createUser
delete this.formData.updateUser
this.formData.insProductIds = this.formData.insProductIds.join()
+ this.upLoad = true;
this.$axios.post(this.$api.deviceScope.upDeviceParameter, this.formData, {
headers: {
'Content-Type': 'application/json'
@@ -691,7 +694,7 @@
},
submitForm2() {
this.upLoad2 = true;
- this.formData.insProductIds = this.formData.insProductIds.join()
+ this.formData2.insProductIds = this.formData2.insProductIds.join()
this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
headers: {
'Content-Type': 'application/json'
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index eb1ea21..867b6f1 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -245,9 +245,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- disabFun: (row, index) => {
+ /* disabFun: (row, index) => {
return row.userId == null || row.insState != 3
- }
+ } */
}, {
id: '',
font: '璁ら',
diff --git a/src/components/view/b1-sample.vue b/src/components/view/b1-sample.vue
index f87b81d..80d7259 100644
--- a/src/components/view/b1-sample.vue
+++ b/src/components/view/b1-sample.vue
@@ -853,7 +853,7 @@
isEdit: false, //寮规--鏄惁鏄慨鏀�,榛樿涓篺alse
isDetail: false, //璇︽儏--鏄惁灞曠ず涓鸿鎯呴〉闈紝榛樿涓篺alse
currentEdit:null,//褰撳墠瑕佺淮鎶ょ殑淇℃伅
- tableLoading:true,
+ tableLoading:false,
sampleCode:'',
currentId:null,
searchSampleCode:''
diff --git a/static/js/menu.js b/static/js/menu.js
index 59e9dce..98b2997 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -39,6 +39,11 @@
i: "font icon-erjidaohang",
u: "b1-sample",
p: "selectWarehouse"
+ }, {
+ v: "涓嶅悎鏍肩鐞�",
+ i: "font icon-erjidaohang",
+ u: "",
+ p: ""
}]
},
{
--
Gitblit v1.9.3