From de1ecd434ef51cf7aa43850d2d648162bfe86289 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 06 十二月 2024 11:57:58 +0800
Subject: [PATCH] 12.06
---
src/views/reservation/reservations/index.vue | 4 ++--
src/views/system/tijian/index.vue | 15 ++++++++++++++-
src/views/system/tijian/TreeTransfer.vue | 2 +-
src/views/system/tijianall/index.vue | 2 +-
src/views/sampling/sampling/index.vue | 2 ++
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index d1144aa..b95de86 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -273,17 +273,17 @@
type="text"
icon="el-icon-s-order"
@click="handleUpdate1(scope.row)"
- v-hasPermi="['reservation:reservation:edit']"
title="棰勭害璇︾粏"
></el-button>
+ <!-- v-hasPermi="['reservation:reservation:edit']" -->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['reservation:reservation:edit']"
title="淇敼"
></el-button>
+ <!-- v-hasPermi="['reservation:reservation:edit']" -->
<el-button
size="mini"
type="text"
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 700a605..9908694 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -461,6 +461,8 @@
// this.getNowTime();
getTxmmccd().then((res) => {
this.msg = Number(res.msg);
+ console.log(res,444);
+
});
this.getdate();
},
diff --git a/src/views/system/tijian/TreeTransfer.vue b/src/views/system/tijian/TreeTransfer.vue
index 7525415..5377fba 100644
--- a/src/views/system/tijian/TreeTransfer.vue
+++ b/src/views/system/tijian/TreeTransfer.vue
@@ -87,7 +87,7 @@
},
created() {
this.leftNodeData = this.nodeData
- console.log(this.leftNodeData,111);
+ // console.log(this.leftNodeData,111);
this.rightKeys.length > 0 ? this.rerenderData(this.rightKeys) : ''
},
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index faca2d3..b1f4f3f 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1014,6 +1014,7 @@
v-for="(item, index) in tableData1"
:key="'info1-' + index"
>
+
<el-collapse-item :name="index">
<template slot="title">
<div style="width: 70%">
@@ -1044,7 +1045,7 @@
style="width: 100%"
height="270"
>
- <el-table-column prop="proName" label="椤圭洰" width="180">
+ <el-table-column prop="s" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
<template
@@ -1695,6 +1696,9 @@
},
mounted() {
console.log(this.dict.type.dict_user_marry, 555);
+ console.log(this.dict.type.dict_user_national, 666);
+
+
},
methods: {
@@ -2203,6 +2207,12 @@
}
if (this.form.tjType === null) {
this.form.tjType = "3";
+ }
+ if (this.form.cusMarryStatus === "null") {
+ this.form.cusMarryStatus = "5";
+ }
+ if (this.form.cusNational === "null") {
+ this.form.cusNational = "1";
}
if (this.form.reservationId != null) {
if (this.form.groupingId) {
@@ -3309,6 +3319,9 @@
}
this.list1 = false;
this.list3 = true;
+ this.list2 = false;
+ console.log(this.list1)
+ console.log(this.list3)
} else {
this.list1 = true;
this.TotalPrice = "0.00";
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 5df77de..f7b3e84 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -1743,7 +1743,7 @@
this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
}
} else {
- this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
+ this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
}
/* else if (resultObj.resultFlag == "-1") {
if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
--
Gitblit v1.8.0