From 177e192a5c47f1d6322ee7b2642239f54526aef7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 26 三月 2022 09:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/quality/waitMatoutQuery.html | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/quality/waitMatoutQuery.html b/src/main/webapp/views/quality/waitMatoutQuery.html
index 259364d..0fabe7f 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,8 +195,8 @@
<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'},
@@ -206,7 +210,7 @@
,{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'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operateCheck', width:140}
// ,{field: 'orderNo', title: '璁㈠崟鍙�', width:115, align: 'center'}
// ,{field: 'specs', align: 'center',title: '灞炴��'}
@@ -239,6 +243,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 +268,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ console.log(res.data)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -290,6 +298,14 @@
layDateRender();
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
+ if(data.field.rejectQty<0){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙皬浜�0")
+ return;
+ }
+ if(data.field.rejectQty>data.field.anfme){
+ layer.msg("涓嶅悎鏍兼暟閲忎笉鍙ぇ浜庡叆搴撴暟閲�");
+ return;
+ }
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/qualityDetl/"+(mData?'update':'add')+"/auth",
--
Gitblit v1.9.1