From d17c089f1d7ff3be848b05161917346e7f664a1d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 26 四月 2022 15:17:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/quality/waitMatoutQuery.html | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/quality/waitMatoutQuery.html b/src/main/webapp/views/quality/waitMatoutQuery.html
index 259364d..dddd0cc 100644
--- a/src/main/webapp/views/quality/waitMatoutQuery.html
+++ b/src/main/webapp/views/quality/waitMatoutQuery.html
@@ -170,9 +170,13 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">璐ㄦ鐘舵��: </label>
+ <label class="layui-form-label">瀹℃牳鐘舵��: </label>
<div class="layui-input-block">
- <input class="layui-input" name="quaStatus" placeholder="璇疯緭鍏�" disabled>
+ <select name="quaStatus">
+ <option value="0">寰呮</option>
+ <option value="1">鍚堟牸</option>
+ <option value="2">涓嶅悎鏍�</option>
+ </select>
</div>
</div>
</div>
@@ -191,22 +195,24 @@
<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="checkQuality">妫�楠�</a>
</script>
<script>
-
var pageCurr;
+ var billNo=parent.getbillData().billNo;
function getCol() {
var cols = [
// {type: 'checkbox', fixed: 'left'},
{field: 'billNo', title: '妫�楠屽崟鍙�', align: 'center', width: 175}
- ,{field: 'seqNo', title: '琛屽彿', align: 'center'}
- ,{field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center'}
+ ,{field: 'seqNo', title: '琛屽彿', align: 'center', width: 60}
+ ,{field: 'orderNo', title: '鍏ュ簱鍗曞彿', align: 'center', width: 175}
,{field: 'anfme', title: '鏁伴噺', align: 'center'}
- ,{field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center'}
+ ,{field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center', width: 175}
,{field: 'maktx', title: '鍟嗗搧鍚嶇О', align: 'center'}
,{field: 'batch', title: '鎵瑰彿', align: 'center'}
,{field: 'prodDate$', title: '鐢熶骇鏃ユ湡', align: 'center'}
,{field: 'rejectQty', title: '涓嶅悎鏍兼暟閲�', align: 'center'}
,{field: 'rejectReason', title: '涓嶅悎鏍煎師鍥�', align: 'center'}
- ,{field: 'quaStatus', title: '涔嬮棿鐘舵��', align: 'center'}
+ ,{field: 'quaStatus$', title: '璐ㄦ鐘舵��', align: 'center'}
+ ,{field: 'quaUser$', title: '璐ㄦ浜哄憳', align: 'center'}
+ ,{field: 'quaDate$', title: '璐ㄦ鏃堕棿', align: 'center'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operateCheck', width:140}
// ,{field: 'orderNo', title: '璁㈠崟鍙�', width:115, align: 'center'}
// ,{field: 'specs', align: 'center',title: '灞炴��'}
@@ -239,6 +245,9 @@
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/qualityDetl/list/auth',
+ where:{
+ bill_no:billNo
+ },
page: true,
limit: 10,
even: true,
@@ -261,6 +270,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res.data)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -290,6 +300,14 @@
layDateRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ if(data.field.rejectQty<0){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙皬浜�0")
+ return false;
+ }
+ if(Number(data.field.rejectQty)>Number(data.field.anfme)){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙ぇ浜庡叆搴撴暟閲�");
+ return false;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/qualityDetl/"+(mData?'update':'add')+"/auth",
--
Gitblit v1.9.1