|
|
@@ -989,6 +989,7 @@ $(document).ready(() => {
|
|
|
(leaf.dwgc ? leaf.dwgc : '') + '!_!' + (leaf.fbgc ? leaf.fbgc : '') + '!_!' + (leaf.fxgc ? leaf.fxgc : '')
|
|
|
+ '!_!' + (leaf.gcl_id ? leaf.gcl_id : '0') + '!_!' + (leaf.mx_id ? leaf.mx_id : '') + '!_!' +
|
|
|
(bwmx !== undefined ? bwmx : leaf.jldy ? leaf.jldy : '') + '*;*' + quantity;
|
|
|
+ console.log(pushMsg, data_bwmx);
|
|
|
const isChecked = data_bwmx.indexOf(pushMsg) !== -1 && isCheck ? 'checked ' : '';
|
|
|
const existGcl = _.find(changeList, {gcl_id: leaf.gcl_id, bwmx: (bwmx ? bwmx : leaf.jldy ? leaf.jldy : ''), oamount: leaf.quantity});
|
|
|
const isUsed = existGcl ? _.find(changeUsedData, { cbid: existGcl.id }) : null;
|
|
|
@@ -1646,7 +1647,7 @@ function tableDataRemake(changeListData) {
|
|
|
(leafInfo.fxgc ? leafInfo.fxgc : '') + '!_!' +
|
|
|
(leafInfo.gcl_id ? leafInfo.gcl_id : '') + '!_!' +
|
|
|
(leafInfo.mx_id ? leafInfo.mx_id : '') + '!_!' +
|
|
|
- (leafInfo.bwmx !== undefined ? leafInfo.bwmx : (listinfo.leafXmjs.length > 1 && listinfo.name ? listinfo.name : (leafInfo.jldy !== undefined ? leafInfo.jldy : ''))) + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
|
|
|
+ (leafInfo.bwmx !== undefined ? leafInfo.bwmx : (leafInfo.jldy !== undefined ? leafInfo.jldy : '')) + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
|
|
|
} else {
|
|
|
toastr.warning('台账清单列表已不存在'+ clinfo.code +'，已更新变更清单列表');
|
|
|
if (changeStatus !== auditConst.status.revise) {
|
|
|
@@ -1686,7 +1687,7 @@ function tableDataRemake(changeListData) {
|
|
|
(leafInfo.fxgc ? leafInfo.fxgc : '') + '!_!' +
|
|
|
(leafInfo.gcl_id ? leafInfo.gcl_id : '') + '!_!' +
|
|
|
(leafInfo.mx_id ? leafInfo.mx_id : '') + '!_!' +
|
|
|
- (leafInfo.bwmx !== undefined ? leafInfo.bwmx : (listinfo.leafXmjs.length > 1 && listinfo.name ? listinfo.name : (leafInfo.jldy !== undefined ? leafInfo.jldy : ''))) + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
|
|
|
+ (leafInfo.bwmx !== undefined ? leafInfo.bwmx : (leafInfo.jldy !== undefined ? leafInfo.jldy : '')) + '*;*' + (leafInfo.quantity !== null ? leafInfo.quantity : 0);
|
|
|
} else {
|
|
|
// console.log(clinfo, listinfo.leafXmjs);
|
|
|
// changeList.splice(index, 1);
|
