Commit 4b522f15 by qiaoyanqi

bug修改

parent 7837f0c0
...@@ -241,7 +241,7 @@ export default { ...@@ -241,7 +241,7 @@ export default {
let obj = this.actionParam.param.masterFields.find( let obj = this.actionParam.param.masterFields.find(
(v) => v.billName == this.selectBill (v) => v.billName == this.selectBill
); );
if (Object.keys(obj).length > 0) { if (obj && Object.keys(obj).length > 0) {
obj.fieldBillRelation.forEach(v=>{ obj.fieldBillRelation.forEach(v=>{
let field = bill.billdata.billTable.masterName + "." + v.originalField; let field = bill.billdata.billTable.masterName + "." + v.originalField;
let value = this.masterFieldsObj[v.targetField]; let value = this.masterFieldsObj[v.targetField];
......
...@@ -13,8 +13,8 @@ function convertDate(date) { ...@@ -13,8 +13,8 @@ function convertDate(date) {
export function compareData(oldBillData, newBill) { export function compareData(oldBillData, newBill) {
oldBillData = _.cloneDeep(oldBillData) oldBillData = _.cloneDeep(oldBillData)
newBill = _.cloneDeep(newBill) newBill = _.cloneDeep(newBill)
delete oldBillData[SIGNATURE_TABLE_NAME] oldBillData && delete oldBillData[SIGNATURE_TABLE_NAME]
delete newBill[SIGNATURE_TABLE_NAME] newBill && delete newBill[SIGNATURE_TABLE_NAME]
for (let i in oldBillData) { for (let i in oldBillData) {
if (i.endsWith("RQ") || i.endsWith("Time") || i.endsWith("SJ")) { if (i.endsWith("RQ") || i.endsWith("Time") || i.endsWith("SJ")) {
oldBillData[i] = convertDate(oldBillData[i]); oldBillData[i] = convertDate(oldBillData[i]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment