From 56e5ef90ee97e296014b4faf6863315ad0c2ace4 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 10 六月 2021 19:08:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml | 118 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 43 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml
index f73c653..df77998 100644
--- a/zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Expert/Edit.cshtml
@@ -29,7 +29,7 @@
@*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
<link href="~/css/style.min.css" rel="stylesheet">
- <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+ <link href="~/css/plugins/chosen/chosen.css?v=7" rel="stylesheet">
@*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
@*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
<link href="~/css/style.min.css" rel="stylesheet">
@@ -101,7 +101,7 @@
@*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
@*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
@*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
- <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+ <script language="javascript" src="~/js/chosen_v1.8.7/chosen.jquery.js" type="text/javascript"></script>
@*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
<script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
@*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
@@ -212,7 +212,36 @@
</div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇勫鍝佺洰<i class="red">*</i></label>
+ <div class="col-sm-11 col-md-11" grouptype="Vdata">
+ <select id="ReviewItem" class="form-control" name="ReviewItem" multiple data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in ReviewItem)
+ {
+ @if (Model.ReviewItem != null && Model.ReviewItem.Split(',').Contains(item.CodeSn))
+ {
+ <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+ @item.Comments
+ </option>
+ }
+ else
+ {
+ <option value="@item.CodeSn" hassubinfo="true">
+ @item.Comments
+ </option>
+ }
+ }
+
+
+ </select>
+
+
+
+
+ </div>
+ </div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">涓撳绾у埆<i class="red">*</i></label>
@@ -235,7 +264,7 @@
}
}
-
+
</select>
@@ -251,36 +280,9 @@
<input class="form-control" label="涓撳璇佸彿" name="CertiNumber" id="CertiNumber" labtype="txt" addvisible="true" editvisible="true" maxlength="500" reg="" ismust="true" type="text" value="@Model.CertiNumber">
</div>
-
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">璇勫鍝佺洰<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
- <select id="ReviewItem" class="form-control" name="ReviewItem" multiple data-placeholder="閫夋嫨 搴忓垪 ...">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in ReviewItem)
- {
- @if (Model.ReviewItem !=null && Model.ReviewItem.Split(',').Contains(item.CodeSn))
- {
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
- }
- else
- {
- <option value="@item.CodeSn" hassubinfo="true" >
- @item.Comments
- </option>
- }
-
- }
-
-
- </select>
-
-
-
-
- </div>
</div>
+
+
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -432,10 +434,10 @@
<p>涓婁紶鑱岀О璇佷功</p>
</div>
@*</div>
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <div class="col-sm-1 col-md-1 img-row">
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <div class="col-sm-1 col-md-1 img-row">
- </div>*@
+ </div>*@
<div class="col-sm-2 col-md-2 img-box">
<div id="TitileImg5" class="TitileImg5"></div>
<input type="hidden" id="TitileCerti5" name="TitileCerti5" value="@Model.TitileCerti5" />
@@ -473,9 +475,9 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
- <label class="text-right col-sm-1 col-md-1 control-label">澶囨敞</label>
- <div class="col-sm-6 col-md-6">
- <textarea id="Remark" name="Remark" style="overflow-y:hidden" cols="100" rows="10">@Model.Remark </textarea>
+ <label class="text-right col-sm-1 col-md-1 control-label">涓撳绠�浠�</label>
+ <div class="col-sm-11 col-md-11">
+ <textarea id="Remark" name="Remark" class="form-control bt" style="resize:none;overflow-y:hidden; min-height:80px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Remark </textarea>
</div>
</div>
@@ -537,7 +539,9 @@
}
+ var Remark = document.getElementById("Remark");
+ Remark.style.height = Remark.scrollHeight + 'px';
var imgPath = "@Url.Content("~/UploadFile/")";
@@ -563,6 +567,7 @@
imgs.TitileImg = imgUploadCallback(files);
if (imgs.TitileImg !== "") {
$("#TitileCerti").val(imgPath + imgs.TitileImg);
+ $("#TitileCerti1").parent().show();
}
}
@@ -570,8 +575,9 @@
new DragImgUpload("#TitileImg1", {
callback: function (files) {
imgs.TitileImg1 = imgUploadCallback(files);
- if (imgs.TitileImg1!== "") {
+ if (imgs.TitileImg1 !== "") {
$("#TitileCerti1").val(imgPath + imgs.TitileImg1);
+ $("#TitileCerti2").parent().show();
}
}
@@ -581,6 +587,7 @@
imgs.TitileImg2 = imgUploadCallback(files);
if (imgs.TitileImg2 !== "") {
$("#TitileCerti2").val(imgPath + imgs.TitileImg2);
+ $("#TitileCerti3").parent().show();
}
}
@@ -590,6 +597,7 @@
imgs.TitileImg3 = imgUploadCallback(files);
if (imgs.TitileImg3 !== "") {
$("#TitileCerti3").val(imgPath + imgs.TitileImg3);
+ $("#TitileCerti4").parent().show();
}
}
@@ -599,6 +607,7 @@
imgs.TitileImg4 = imgUploadCallback(files);
if (imgs.TitileImg4 !== "") {
$("#TitileCerti4").val(imgPath + imgs.TitileImg4);
+ $("#TitileCerti5").parent().show();
}
}
@@ -608,6 +617,7 @@
imgs.TitileImg5 = imgUploadCallback(files);
if (imgs.TitileImg5 !== "") {
$("#TitileCerti5").val(imgPath + imgs.TitileImg5);
+ $("#TitileCerti6").parent().show();
}
}
@@ -617,6 +627,7 @@
imgs.TitileImg6 = imgUploadCallback(files);
if (imgs.TitileImg6 !== "") {
$("#TitileCerti6").val(imgPath + imgs.TitileImg6);
+ $("#TitileCerti7").parent().show();
}
}
@@ -626,6 +637,7 @@
imgs.TitileImg7 = imgUploadCallback(files);
if (imgs.TitileImg7 !== "") {
$("#TitileCerti7").val(imgPath + imgs.TitileImg7);
+ $("#TitileCerti8").parent().show();
}
}
@@ -635,6 +647,7 @@
imgs.TitileImg8 = imgUploadCallback(files);
if (imgs.TitileImg8 !== "") {
$("#TitileCerti8").val(imgPath + imgs.TitileImg8);
+ $("#TitileCerti9").parent().show();
}
}
@@ -644,6 +657,7 @@
imgs.TitileImg9 = imgUploadCallback(files);
if (imgs.TitileImg9 !== "") {
$("#TitileCerti9").val(imgPath + imgs.TitileImg9);
+ $("#TitileCerti10").parent().show();
}
}
@@ -659,7 +673,16 @@
});
$(function () {
-
+ $("#TitileCerti1").parent().hide();
+ $("#TitileCerti2").parent().hide();
+ $("#TitileCerti3").parent().hide();
+ $("#TitileCerti4").parent().hide();
+ $("#TitileCerti5").parent().hide();
+ $("#TitileCerti6").parent().hide();
+ $("#TitileCerti7").parent().hide();
+ $("#TitileCerti8").parent().hide();
+ $("#TitileCerti9").parent().hide();
+ $("#TitileCerti10").parent().hide();
imgs.frontImg = $.trim( $("#CertiFont").val() );
imgs.BackImg = $.trim( $("#CertiBack").val());
@@ -692,60 +715,70 @@
$("#TitileImg img").each(function (i) {
$(this).attr("src", imgs.TitileImg);
});
+ $("#TitileCerti1").parent().show();
}
if (imgs.TitileImg1 !== "") {
$("#TitileImg1 img").each(function (i) {
$(this).attr("src", imgs.TitileImg1);
});
+ $("#TitileCerti2").parent().show();
}
if (imgs.TitileImg2 !== "") {
$("#TitileImg2 img").each(function (i) {
$(this).attr("src", imgs.TitileImg2);
});
+ $("#TitileCerti3").parent().show();
}
if (imgs.TitileImg3 !== "") {
$("#TitileImg3 img").each(function (i) {
$(this).attr("src", imgs.TitileImg3);
});
+ $("#TitileCerti4").parent().show();
}
if (imgs.TitileImg4 !== "") {
$("#TitileImg4 img").each(function (i) {
$(this).attr("src", imgs.TitileImg4);
});
+ $("#TitileCerti5").parent().show();
}
if (imgs.TitileImg5 !== "") {
$("#TitileImg5 img").each(function (i) {
$(this).attr("src", imgs.TitileImg5);
});
+ $("#TitileCerti6").parent().show();
}
if (imgs.TitileImg6 !== "") {
$("#TitileImg6 img").each(function (i) {
$(this).attr("src", imgs.TitileImg6);
});
+ $("#TitileCerti7").parent().show();
}
if (imgs.TitileImg7 !== "") {
$("#TitileImg7 img").each(function (i) {
$(this).attr("src", imgs.TitileImg7);
});
+ $("#TitileCerti8").parent().show();
}
if (imgs.TitileImg8 !== "") {
$("#TitileImg8 img").each(function (i) {
$(this).attr("src", imgs.TitileImg8);
});
+ $("#TitileCerti9").parent().show();
}
if (imgs.TitileImg9 !== "") {
$("#TitileImg9 img").each(function (i) {
$(this).attr("src", imgs.TitileImg9);
});
+ $("#TitileCerti10").parent().show();
}
if (imgs.TitileImg10 !== "") {
@@ -756,9 +789,8 @@
- $("#ReviewItem").chosen({
- search_contains: true,
- disable_search_threshold: 5
+ $("#ReviewItem").chosen({
+ hide_results_on_select: false
});
--
Gitblit v1.9.1