user5 1 год назад
Родитель
Сommit
9dc8a2cb30

BIN
src/assets/img/login/login2.png


+ 1 - 1
src/components/footer/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-footer class="footer"
-		>Copyright © 2022 JeePlus All Rights Reserved</el-footer
+		><!--Copyright © 2022 JeePlus All Rights Reserved--></el-footer
 	>
 </template>
 

+ 1 - 1
src/config/index.js

@@ -2,7 +2,7 @@ const DEFAULT_CONFIG = {
 	// APP NAME
 	APP_NAME: "JeePlus微服务平台",
 	//首页地址
-	DASHBOARD_URL: "/home",
+	DASHBOARD_URL: "/dashboard/index",
 
 	//内核版本号
 	CORE_VER: "1.0.0",

+ 4 - 4
src/views/sys/login/components/banner.vue

@@ -28,7 +28,7 @@ export default {
 	computed: {
 		carouselItem() {
 			return [
-				{
+				/*{
 					slogan: "低代码快速开发",
 					subSlogan:
 						"PC/移动代码生成,大屏/图表/报表/首页设计器,数据权限,OSS文件存储",
@@ -38,11 +38,11 @@ export default {
 					slogan: "微服务架构",
 					subSlogan: "可视化工作流/动态表单/多租户/多语言",
 					image: image1,
-				},
+				},*/
 				{
-					slogan: "Spring Cloud & Alibaba",
+					slogan: "",
 					subSlogan:
-						"Vue3 & Element Plus & Spring Security & Mybatis-Plus",
+						"",
 					image: image2,
 				},
 			];

+ 2 - 2
src/views/sys/login/components/login-form.vue

@@ -38,7 +38,7 @@
 				</template>
 			</el-dropdown>
 		</div>
-		<div class="login-form-title">{{ $t2("t_login") }}</div>
+		<div class="login-form-title">登录</div>
 		<div class="login-form-sub-title">{{ $t2("t_login_description") }}</div>
 		<div class="login-form-error-msg">{{ errorMessage }}</div>
 		<el-form
@@ -95,7 +95,7 @@
 					:loading="loading"
 					class="login-submit"
 					@click="login"
-					>{{ $t2("t_login") }}</el-button
+					>登录</el-button
 				>
 			</el-form-item>
 			<el-form-item> </el-form-item>

+ 28 - 0
src/views/sys/user/UserForm.vue

@@ -355,6 +355,30 @@
 				</el-col>
 
 				<el-col :span="12">
+					<el-form-item  prop="manageOfficeIds" label="管理部门" >
+						<!-- 单选 -->
+						<!--<el-select v-model="form.treeData" placeholder="请选择" style="width: 16rem">-->
+						<!-- 多选 -->
+						<SelectTree
+							ref="officeTree"
+							:props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+							size="middle"
+							:url="`/jeeplus-system/sys/office/treeData3?type=2`"
+							:value="inputForm.manageOfficeIds"
+							:clearable="false"
+							:accordion="true"
+							:showCheckbox="true"
+							:checkStrictly="true"
+							:checkOnClickNode="true"
+							@getValue="(value) => {inputForm.manageOfficeIds=value}"/>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="12">
 					<el-form-item
 						label="工号"
 						prop="no"
@@ -456,6 +480,7 @@
 </template>
 
 <script>
+import SelectTree from '@/components/treeSelect/treeSelect.vue'
 import userService from "@/api/sys/userService";
 import postService from "@/api/sys/postService";
 import roleService from "@/api/sys/roleService";
@@ -506,6 +531,9 @@ export default {
 			},
 		};
 	},
+	components: {
+		SelectTree
+	},
 	methods: {
 		init(method, id, tenantId) {
 			this.method = method;

+ 2 - 0
src/views/workClient/WorkClientForm.vue

@@ -732,8 +732,10 @@
             //   return
             // } else {
             let flag = true
+			  console.log(this.inputForm.workClientBank)
             this.inputForm.workClientBank.forEach(item => {
               if (item.ourBank === null || item.ourBank === undefined || item.ourBank === '') {
+              	console.log('开票银行未填写')
                 this.$message.error('开票银行未填写')
                 this.loading = false
                 flag = false