From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index 362ff1b..5ba1c62 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -45,6 +45,7 @@
<input hidden id="role" value="${role}">
<input hidden id="type" value="${item.type}">
+ @if(role=='1'){
<div class="form-group">
<label class="col-sm-3 control-label">门店类型：</label>
<div class="col-sm-9">
@@ -52,23 +53,25 @@
<input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店
</div>
</div>
+ @}
@if(role=='1'){
<div class="form-group" id="yys" hidden >
<label class="col-sm-3 control-label">所属运营商：</label>
<div class="col-sm-9">
- <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)">
+ <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
@for(obj in yysList){
<option value="${obj.id}" ${obj.id == item.operatorId ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
</div>
+ @}
<div class="form-group" id="provinceCode">
<label class="col-sm-3 control-label">所在省：</label>
<div class="col-sm-9">
- <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange2(this)">
+ <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
@for(obj in list){
- <option value="${obj.id}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
+ <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
@@ -77,14 +80,12 @@
<label class="col-sm-3 control-label">所在市：</label>
<div class="col-sm-9">
<select class="form-control" id="cCode" name="cCode">
- <option value="">选择市</option>
@for(obj in list1){
- <option value="${obj.id}" ${item.cityCode == obj.code ? 'selected=selected' : ''}>${obj.name}</option>
+ <option value="${obj.code}" ${item.cityCode == obj.code ? 'selected=selected' : ''}>${obj.name}</option>
@}
</select>
</div>
</div>
- @}
<#input id="name" name="门店名称" type="text" value="${item.name}"/>
<#input id="phone" name="联系电话" type="text" value="${item.phone}"/>
<div hidden id="longitude" value="${item.lon}"></div>
@@ -140,7 +141,9 @@
</div>
<div class="row btn-group-m-t">
<div class="col-sm-10 col-sm-offset-5">
+ @if(type !=0){
<#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
+ @}
<#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
</div>
</div>
@@ -152,11 +155,41 @@
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<script>
- laydate.render({
- elem: '#time'
- ,type: 'time',format: "HH:mm"
- ,range: true
- });
+ layui.use('laydate', function(){
+ var laydate = layui.laydate;
+ //时间范围
+ laydate.render({
+ elem: '#time'
+ , type: 'time'
+ , range: true
+ , format: 'HH:mm'
+ , theme: '#368ee0'
+ , ready: function (date) {
+ var dom = $(".laydate-time-list").children("li");
+ for (var i = 0; i < dom.length; i++) {
+ if (i == 2 || i == 5) {
+ $(dom[i]).remove();
+ } else if(i==1||i==4) {
+ var li = $(dom[i]).children("ol").children("li")
+ //console.log(li.length);
+ for (var j = 0; j < li.length; j++) {
+ //console.log($(li[j]).text())
+ if ($(li[j]).text() != 00 && $(li[j]).text()!=30) {
+ $(li[j]).remove();
+ }
+ }
+ }
+ }
+ }
+ });
+ })
+
+
+
+
+
+
+
let id = "${item.realPicture}"
let obj = []
@@ -179,22 +212,8 @@
methods: {
handleAvatarSuccess(res, file) {
file.url =file.response
- TCarInfoDlg.goodsPicArray.push(file);
+ TCarInfoDlg.goodsPicArray.push(res);
console.log(TCarInfoDlg.goodsPicArray)
- },
- changeImg(){
- var i = id.split(",")
- for (let j = 0; j <i.length; j++) {
- let obj={
- fileName:i[j],
- uuid:i[j],
- url:i[j],
- response:i[j],
- }
- this.imageUrl2.push(obj)
-
- }
- console.log( this.imageUrl2,111)
},
beforeAvatarUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 10;
@@ -207,7 +226,19 @@
TCarInfoDlg.goodsPicArray = TCarInfoDlg.goodsPicArray.filter(item => {
return item.uid != file.uid;
});
-
+ },
+ changeImg(){
+ var i = id.split(",")
+ for (let j = 0; j <i.length; j++) {
+ let obj={
+ fileName:i[j],
+ uuid:i[j],
+ url:i[j],
+ response:i[j],
+ }
+ this.imageUrl2.push(obj)
+ }
+ console.log( this.imageUrl2,111)
},
},
created() {
--
Gitblit v1.7.1