From 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期五, 27 八月 2021 09:46:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmasrs' into xgmasrs
---
src/main/webapp/views/matOut/waitMatoutQuery.html | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/matOut/waitMatoutQuery.html b/src/main/webapp/views/matOut/waitMatoutQuery.html
index 8095354..8756b0f 100644
--- a/src/main/webapp/views/matOut/waitMatoutQuery.html
+++ b/src/main/webapp/views/matOut/waitMatoutQuery.html
@@ -95,12 +95,13 @@
var pageCurr;
function getCol() {
var cols = [
- {type: 'checkbox'}
- ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {type: 'checkbox', fixed: 'left'}
+ ,{field: 'qty', title: '閫氱煡鍑哄簱閲�', fixed: 'left', width:100}
+ ,{field: 'outQty', title: '宸插嚭搴撻噺', fixed: 'left', width:90}
];
- cols.push.apply(cols, detlCols);
- cols.push(
- {field: 'memo', align: 'center',title: '澶囨敞'}
+ cols.push.apply(cols, matCols);
+ cols.push({field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
+ ,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
return cols;
@@ -116,7 +117,7 @@
locDetlTableIns = table.render({
elem: '#stockOut',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/stock/out/list/auth',
+ url: baseUrl+'/waitMatout/list/auth',
page: true,
limit: 10,
even: true,
@@ -142,9 +143,9 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;
- $('.layui-form-checkbox').css("pointer-events", "none");
- $('td[data-field="0').css("cursor", "pointer")
+ // pageCurr=curr;
+ // $('.layui-form-checkbox').css("pointer-events", "none");
+ // $('td[data-field="0').css("cursor", "pointer")
}
});
--
Gitblit v1.9.1