|
@@ -139,7 +139,8 @@ $(document).ready(() => {
|
|
|
title: '附件', colSpan: '1', rowSpan: '1', field: 'attachment', hAlign: 0, width: 60, readOnly: true, cellType: 'imageBtn',
|
|
|
normalImg: '#rela-file-icon', hoverImg: '#rela-file-hover', getValue: 'getValue.attachment'
|
|
|
},
|
|
|
- {title: '状态', colSpan: '1', rowSpan: '1', field: '', hAlign: 0, width: 120, readOnly: true, getValue: 'getValue.state', foreColor: 'red', font: '8px 宋体'},
|
|
|
+ {title: '本期批注', colSpan: '1', rowSpan: '1', field: 'postil', hAlign: 0, width: 120},
|
|
|
+ // {title: '状态', colSpan: '1', rowSpan: '1', field: '', hAlign: 0, width: 120, readOnly: true, getValue: 'getValue.state', foreColor: 'red', font: '8px 宋体'},
|
|
|
],
|
|
|
emptyRows: 0,
|
|
|
headRows: 1,
|
|
@@ -643,49 +644,46 @@ $(document).ready(() => {
|
|
|
}
|
|
|
// 获取更新信息
|
|
|
const data = {
|
|
|
- type: (col.field === 'tp' || col.field === 'name') ? 'stage' : 'info',
|
|
|
- updateData: {}
|
|
|
+ type: ['tp', 'name', 'postil'].indexOf(col.field) >= 0 ? 'stage' : 'info',
|
|
|
+ updateData: { pid: select.pid }
|
|
|
};
|
|
|
// 获取更新数据
|
|
|
- if (col.field === 'tp') {
|
|
|
- data.updateData.pid = select.pid;
|
|
|
- const [valid, msg] = payBase.isSF(select)
|
|
|
- ? paySpreadObj._checkSfExpr(validText, data.updateData)
|
|
|
- : paySpreadObj._checkExpr(validText, data.updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- return;
|
|
|
- }
|
|
|
- // if (payBase.isSF(select)) {
|
|
|
- // data.updateData.expr = data.updateData.tp;
|
|
|
- // }
|
|
|
- } else if (col.field === 'name') {
|
|
|
- data.updateData.pid = select.pid;
|
|
|
- data.updateData.name = validText;
|
|
|
- } else {
|
|
|
- data.updateData.id = select.pid;
|
|
|
- if (col.field === 'sprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkSExpr(select, validText, data.updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ switch(col.field) {
|
|
|
+ case 'tp':
|
|
|
+ const [tpValid, tpMsg] = payBase.isSF(select)
|
|
|
+ ? paySpreadObj._checkSfExpr(validText, data.updateData)
|
|
|
+ : paySpreadObj._checkExpr(validText, data.updateData);
|
|
|
+ if (!tpValid) {
|
|
|
+ toastr.warning(tpMsg);
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
return;
|
|
|
}
|
|
|
- } else if (col.field === 'rprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkRExpr(select, validText, data.updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ // if (payBase.isSF(select)) {
|
|
|
+ // data.updateData.expr = data.updateData.tp;
|
|
|
+ // }
|
|
|
+ break;
|
|
|
+ case 'name':
|
|
|
+ data.updateData.name = validText;
|
|
|
+ break;
|
|
|
+ case 'sprice':
|
|
|
+ const [sValid, sMsg] = paySpreadObj._checkSExpr(select, validText, data.updateData);
|
|
|
+ if (!sValid) {
|
|
|
+ toastr.warning(sMsg);
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
return;
|
|
|
}
|
|
|
- } else {
|
|
|
- if (validText) {
|
|
|
- data.updateData[col.field] = validText;
|
|
|
- } else {
|
|
|
- data.updateData[col.field] = null;
|
|
|
+ break;
|
|
|
+ case 'rprice':
|
|
|
+ const [rValid, rMsg] = paySpreadObj._checkRExpr(select, validText, data.updateData);
|
|
|
+ if (!rValid) {
|
|
|
+ toastr.warning(rMsg);
|
|
|
+ SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
+ return;
|
|
|
}
|
|
|
- }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ data.updateData[col.field] = validText || '';
|
|
|
+
|
|
|
}
|
|
|
// 更新至服务器
|
|
|
postData(window.location.pathname + '/save', data, function (result) {
|
|
@@ -758,32 +756,32 @@ $(document).ready(() => {
|
|
|
toast('请勿同时删除多列数据', 'warning');
|
|
|
}
|
|
|
|
|
|
- const data = {type: col.field === 'tp' ? 'stage' : 'info', updateData: []};
|
|
|
+ const data = {type: ['tp', 'postil'].indexOf(col.field) >= 0 ? 'stage' : 'info', updateData: []};
|
|
|
for (let iRow = sel.row; iRow < sel.row + sel.rowCount; iRow++) {
|
|
|
const node = sheet.zh_data[iRow];
|
|
|
- if (node && (node.ptype === 1 || node.ptype === 3)) {
|
|
|
- const updateData = {};
|
|
|
- if (col.field === 'tp') {
|
|
|
- updateData.pid = node.pid;
|
|
|
- updateData.tp = null;
|
|
|
- updateData.expr = null;
|
|
|
- } else {
|
|
|
- updateData.id = node.pid;
|
|
|
- if (col.field === 'sprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkSExpr(node, null, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ if (node && (node.ptype === 1 || node.ptype === 3 || col.field === 'postil')) {
|
|
|
+ const updateData = { pid: node.pid };
|
|
|
+ switch (col.field) {
|
|
|
+ case 'tp':
|
|
|
+ updateData.tp = null;
|
|
|
+ updateData.expr = null;
|
|
|
+ break;
|
|
|
+ case 'sprice':
|
|
|
+ const [sValid, sMsg] = paySpreadObj._checkSExpr(node, null, updateData);
|
|
|
+ if (!sValid) {
|
|
|
+ toastr.warning(sMsg);
|
|
|
return;
|
|
|
}
|
|
|
- } else if (col.field === 'rprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkRExpr(node, null, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ break;
|
|
|
+ case 'rprice':
|
|
|
+ const [rValid, rMsg] = paySpreadObj._checkRExpr(node, null, updateData);
|
|
|
+ if (!rValid) {
|
|
|
+ toastr.warning(rMsg);
|
|
|
return;
|
|
|
}
|
|
|
- } else {
|
|
|
- updateData[col.field] = null;
|
|
|
- }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ updateData[col.field] = col.type === 'Number' ? 0 : '';
|
|
|
}
|
|
|
data.updateData.push(updateData);
|
|
|
}
|
|
@@ -813,56 +811,52 @@ $(document).ready(() => {
|
|
|
|
|
|
const sortData = info.sheet.zh_data;
|
|
|
const data = {
|
|
|
- type: (col.field === 'tp' || col.field === 'name') ? 'stage' : 'info',
|
|
|
+ type: ['tp', 'name', 'postil'].indexOf(col.field) >= 0 ? 'stage' : 'info',
|
|
|
updateData: []
|
|
|
};
|
|
|
|
|
|
for (let iRow = 0; iRow < info.cellRange.rowCount; iRow++) {
|
|
|
const curRow = info.cellRange.row + iRow;
|
|
|
const node = sortData[curRow];
|
|
|
- if (node && (node.ptype === 1 || node.ptype === 3)) {
|
|
|
+ if (node && (node.ptype === 1 || node.ptype === 3 || col.field === 'postil')) {
|
|
|
const validText = info.sheet.getText(curRow, info.cellRange.col).replace('\n', '');
|
|
|
- const updateData = {};
|
|
|
- if (col.field === 'tp') {
|
|
|
- updateData.pid = node.pid;
|
|
|
- const [valid, msg] = payBase.isSF(node)
|
|
|
- ? paySpreadObj._checkSfExpr(validText, updateData)
|
|
|
- : paySpreadObj._checkExpr(validText, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
- SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
- return;
|
|
|
- }
|
|
|
- if (payBase.isSF(node)) {
|
|
|
- data.updateData.expr = data.updateData.tp;
|
|
|
- }
|
|
|
- } else if (col.field === 'name') {
|
|
|
- updateData.pid = node.pid;
|
|
|
- updateData.name = validText;
|
|
|
- } else {
|
|
|
- updateData.id = node.pid;
|
|
|
-
|
|
|
- if (col.field === 'sprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkSExpr(node, validText, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ const updateData = { pid: node.pid };
|
|
|
+ switch (col.field) {
|
|
|
+ case 'tp':
|
|
|
+ const [tpValid, tpMsg] = payBase.isSF(node)
|
|
|
+ ? paySpreadObj._checkSfExpr(validText, updateData)
|
|
|
+ : paySpreadObj._checkExpr(validText, updateData);
|
|
|
+ if (!tpValid) {
|
|
|
+ toastr.warning(tpMsg);
|
|
|
SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
return;
|
|
|
}
|
|
|
- } else if (col.field === 'rprice') {
|
|
|
- const [valid, msg] = paySpreadObj._checkRExpr(node, validText, updateData);
|
|
|
- if (!valid) {
|
|
|
- toastr.warning(msg);
|
|
|
+ // if (payBase.isSF(node)) {
|
|
|
+ // data.updateData.expr = data.updateData.tp;
|
|
|
+ // }
|
|
|
+ break;
|
|
|
+ case 'name':
|
|
|
+ updateData.name = validText;
|
|
|
+ break;
|
|
|
+ case 'sprice':
|
|
|
+ const [sValid, sMsg] = paySpreadObj._checkSExpr(node, validText, updateData);
|
|
|
+ if (!sValid) {
|
|
|
+ toastr.warning(sMsg);
|
|
|
SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
return;
|
|
|
}
|
|
|
- } else {
|
|
|
- if (validText) {
|
|
|
- updateData[col.field] = validText;
|
|
|
- } else {
|
|
|
- updateData[col.field] = null;
|
|
|
+ break;
|
|
|
+ case 'rprice':
|
|
|
+ const [rValid, rMsg] = paySpreadObj._checkRExpr(node, validText, updateData);
|
|
|
+ if (!rValid) {
|
|
|
+ toastr.warning(rMsg);
|
|
|
+ SpreadJsObj.reLoadSheetData(paySpread.getActiveSheet());
|
|
|
+ return;
|
|
|
}
|
|
|
- }
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ updateData[col.field] = validText || '';
|
|
|
+
|
|
|
}
|
|
|
data.updateData.push(updateData);
|
|
|
}
|