From f3a9a3ad429d86028c884e3476dc0badcd8da966 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 21 六月 2025 15:13:18 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/QualityControl/InspectionRequest.html | 225 ++++++++++++++++++++++++++++---------------------------
1 files changed, 114 insertions(+), 111 deletions(-)
diff --git a/HTML/views/QualityControl/InspectionRequest.html b/HTML/views/QualityControl/InspectionRequest.html
index b452057..54c6286 100644
--- a/HTML/views/QualityControl/InspectionRequest.html
+++ b/HTML/views/QualityControl/InspectionRequest.html
@@ -23,12 +23,11 @@
display: none;
}
- /* 鏍峰紡鐢ㄤ簬缇庡寲鍥剧墖灞曠ず */
- .layui-table-cell img {
- max-width: 100px;
- max-height: 100px;
- }
-
+ /* 鏍峰紡鐢ㄤ簬缇庡寲鍥剧墖灞曠ず */
+ .layui-table-cell img {
+ max-width: 100px;
+ max-height: 100px;
+ }
</style>
<script>
// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
@@ -130,10 +129,11 @@
<div style="display: none;" id="UploadImageView">
- <div id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
- <label>涓婁紶鍥剧墖:</label><button type="button" class="layui-btn" id="uploadBtn" style="margin-left: 20px;" >娴忚</button>
+ <div id="UploadImage" style="margin-left: 35px;margin-top: 30px;">
+ <label>涓婁紶鍥剧墖:</label><button type="button" class="layui-btn" id="uploadBtn"
+ style="margin-left: 20px;">娴忚</button>
<button type="button" class="layui-btn" id="upload" style="margin-left: 20px;">涓婁紶</button>
-
+
</div>
</div>
@@ -311,14 +311,14 @@
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate','upload'], function () {
+ }).use(['index', 'table', 'laypage', 'element', 'layer', 'laydate', 'upload'], function () {
var table = layui.table,
form = layui.form,
element = layui.element,
laypage = layui.laypage,
layer = layui.layer,
laydate = layui.laydate,
- upload = layui.upload;
+ upload = layui.upload;
var h1 = GetTableTabHeight();
laydate.render({
elem: '#StartTime'
@@ -404,8 +404,11 @@
{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' },
{ field: 'RequestTime', title: '璇烽獙鏃ユ湡', align: 'center', width: 165, templet: '#templetCompleteTime' },
{ field: 'RequestUser', title: '璇烽獙浜�', align: 'center', width: 165 },
- { field: 'UDF5', title: '鍥剧墖', align: 'center', width: 100 ,templet: function (d) {
- return d.image ? '<img src="' + d.image + '" alt="鍥剧墖">' : '鏃犲浘鐗�';}},
+ {
+ field: 'UDF5', title: '鍥剧墖', align: 'center', width: 100, templet: function (d) {
+ return d.image ? '<img src="' + d.image + '" alt="鍥剧墖">' : '鏃犲浘鐗�';
+ }
+ },
// { field: 'UDF2', title: '鑷畾涔�2', align: 'center', width: 100 },
// { field: 'UDF3', title: '鑷畾涔�3', align: 'center', width: 100 },
// { field: 'UDF4', title: '鑷畾涔�4', align: 'center', width: 100 },
@@ -488,7 +491,7 @@
sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
for (var k = 0; k < res.data.length; k++) {
-
+
if (res.data[k].MenuName == "涓婁紶") {
$(function () {
$(".shangClass").show();
@@ -535,64 +538,64 @@
var data = obj.data;
switch (obj.event) {
case "upImage":
- layer.open({
- type:1,
- title: '涓婁紶鍥剧墖',
- content: $('#UploadImageView'),
- maxmin: true,
- area: ['350px','215px'],
- btn: ['纭畾'],
- success: function(index, layero){
- upload.render({
- elem: '#uploadBtn',
- url: IP + '/BllQuality/UploadImage',
- accept: 'images',
- exts:'jpg|png|gif',
- multiple: false,
- size: 1024 * 5, // 5MB
- auto: false,
- bindAction: '#upload',
- headers: { ToKen: $.cookie('token') },
- xhrFields: {
- withCredentials: true // 鎼哄甫cookie
- },
- before: function(){
- this.data = {
- qualityId:data.Id
- };
- layer.load(1, {shade: [0.5, '#000']});
- },
- done: function(res){
+ layer.open({
+ type: 1,
+ title: '涓婁紶鍥剧墖',
+ content: $('#UploadImageView'),
+ maxmin: true,
+ area: ['350px', '215px'],
+ btn: ['纭畾'],
+ success: function (index, layero) {
+ upload.render({
+ elem: '#uploadBtn',
+ url: IP + '/BllQuality/UploadImage',
+ accept: 'images',
+ exts: 'jpg|png|gif',
+ multiple: false,
+ size: 1024 * 5, // 5MB
+ auto: false,
+ bindAction: '#upload',
+ headers: { ToKen: $.cookie('token') },
+ xhrFields: {
+ withCredentials: true // 鎼哄甫cookie
+ },
+ before: function () {
+ this.data = {
+ qualityId: data.Id
+ };
+ layer.load(1, { shade: [0.5, '#000'] });
+ },
+ done: function (res) {
layer.closeAll('loading');
- if(res.code == 0){
- layer.msg('涓婁紶鎴愬姛', {icon: 1});
+ if (res.code == 0) {
+ layer.msg('涓婁紶鎴愬姛', { icon: 1 });
// 涓婁紶鎴愬姛鍚庣殑鍥炶皟锛屽鍒锋柊琛ㄦ牸绛�
// table.reload('LAY-app-content-list');
} else {
- layer.msg(res.msg || '涓婁紶澶辫触', {icon: 2});
+ layer.msg(res.msg || '涓婁紶澶辫触', { icon: 2 });
}
- },
- error: function(){
+ },
+ error: function () {
layer.closeAll('loading');
- layer.msg('涓婁紶澶辫触', {icon: 2});
- }
- });
- }
- });
- break;
- case "ViewImage":
- layer.open({
- type:1,
- title: '鏌ョ湅鍥剧墖',
- content: $('#ImagesShowView'),
- maxmin: true,
- area: ['650px','315px'],
- btn: ['纭畾'],
- success: function(index, layero){
- getImage(data.Id);
+ layer.msg('涓婁紶澶辫触', { icon: 2 });
}
});
- break;
+ }
+ });
+ break;
+ case "ViewImage":
+ layer.open({
+ type: 1,
+ title: '鏌ョ湅鍥剧墖',
+ content: $('#ImagesShowView'),
+ maxmin: true,
+ area: ['650px', '315px'],
+ btn: ['纭畾'],
+ success: function (index, layero) {
+ getImage(data.Id);
+ }
+ });
+ break;
case "add":
layer.confirm('纭畾瑕佸彂璧疯楠岋紵', function (index) {
var param = {
@@ -725,54 +728,54 @@
}
});
- function getImage(id)
- {
- var param = {
- Id:id
- }
- sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- $("#ImagesShow").html('');
- res.data.forEach(function (item) {
- $("#ImagesShow").append('<div>'+
- '<a href='+item+' target="_blank" class="image-item"><img src="'+ item + '" /></a>'+
- '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url='+item+' >鍒犻櫎</button>'+
- '</div>');
- })
- $('.delete-btn').on('click', function ( ) {
- var item = $(this);
- var QualityId = id;
- var imageUrl = item.attr('data_Url');
- layer.confirm('纭畾鍒犻櫎鍚楋紵', function (index) {
- var param = {
- QualityId: QualityId,
- ImageUrl: imageUrl
- }
- sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- getImage(id);
- });
- } else {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- });
- })});
- } else { //涓嶆垚鍔�
- $("#ImagesShow").html('');
- res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }
- }
- })
+ function getImage(id) {
+ var param = {
+ Id: id
}
+ sendData(IP + "/BllQuality/GetImage", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ $("#ImagesShow").html('');
+ res.data.forEach(function (item) {
+ $("#ImagesShow").append('<div>' +
+ '<a href=' + item + ' target="_blank" class="image-item"><img src="' + item + '" /></a>' +
+ '<button class="layui-btn layui-btn-primary layui-btn-sm delete-btn" data-type="customCols" data_Url=' + item + ' >鍒犻櫎</button>' +
+ '</div>');
+ })
+ $('.delete-btn').on('click', function () {
+ var item = $(this);
+ var QualityId = id;
+ var imageUrl = item.attr('data_Url');
+ layer.confirm('纭畾鍒犻櫎鍚楋紵', function (index) {
+ var param = {
+ QualityId: QualityId,
+ ImageUrl: imageUrl
+ }
+ sendData(IP + "/BllQuality/DeleteImage", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ getImage(id);
+ });
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ })
+ });
+ } else { //涓嶆垚鍔�
+ $("#ImagesShow").html('');
+ res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }
+ }
+ })
+ }
// 鍙栨牱鏄庣粏鍗曟満浜嬩欢
table.on('tool(SamplingDetails)', function (obj) {
--
Gitblit v1.8.0