diff --git a/src/so/public/lang/standard/simpchn/4006delivery.json b/src/so/public/lang/standard/simpchn/4006delivery.json index bec1185..26f08d6 100644 --- a/src/so/public/lang/standard/simpchn/4006delivery.json +++ b/src/so/public/lang/standard/simpchn/4006delivery.json @@ -46,5 +46,14 @@ "4006DELIVERY-000044": "科箭TMS", "4006DELIVERY-000045": "单据号", "4006DELIVERY-000046": "已经发货关闭。", - "4006DELIVERY-000047": "错误" + "4006DELIVERY-000047": "错误", + "4006DELIVERY-000048": "请先录入发货类型!", + "4006DELIVERY-000049": "发运清单", + "4006DELIVERY-000050": "发运出库", + "4006DELIVERY-000051": "发运出库成功", + "4006DELIVERY-000052": "选择", + "4006DELIVERY-000053": "确定", + "4006DELIVERY-000054": "取消", + "4006DELIVERY-000055": "销售出库交易类型", + "4006DELIVERY-000056": "销售出库交易类型不能为空" } diff --git a/src/so/public/lang/standard/simpchn/4006deliveryreport.json b/src/so/public/lang/standard/simpchn/4006deliveryreport.json index ea9ca38..56bf816 100644 --- a/src/so/public/lang/standard/simpchn/4006deliveryreport.json +++ b/src/so/public/lang/standard/simpchn/4006deliveryreport.json @@ -1,3 +1,3 @@ { - "4006DELIVERYREPORT-000000":"请选择数据" + "4006DELIVERYREPORT-000000": "请选择数据" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006mergedaily.json b/src/so/public/lang/standard/simpchn/4006mergedaily.json index 8d0778c..f77bdaa 100644 --- a/src/so/public/lang/standard/simpchn/4006mergedaily.json +++ b/src/so/public/lang/standard/simpchn/4006mergedaily.json @@ -1,5 +1,5 @@ { - "4006MERGEDAILY-000000":"财务模块未启用,无法执行查询!", - "4006MERGEDAILY-000001":"库存模块未启用,无法执行查询!", - "4006MERGEDAILY-000002":"存货核算模块未启用,无法执行查询!" + "4006MERGEDAILY-000000": "财务模块未启用,无法执行查询!", + "4006MERGEDAILY-000001": "库存模块未启用,无法执行查询!", + "4006MERGEDAILY-000002": "存货核算模块未启用,无法执行查询!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006multipleprofit.json b/src/so/public/lang/standard/simpchn/4006multipleprofit.json index 30f1f8c..adc4c62 100644 --- a/src/so/public/lang/standard/simpchn/4006multipleprofit.json +++ b/src/so/public/lang/standard/simpchn/4006multipleprofit.json @@ -1,5 +1,5 @@ { - "4006MULTIPLEPROFIT-000000":"财务模块未启用,无法执行查询!", - "4006MULTIPLEPROFIT-000001":"库存模块未启用,无法执行查询!", - "4006MULTIPLEPROFIT-000002":"存货核算模块未启用,无法执行查询!" + "4006MULTIPLEPROFIT-000000": "财务模块未启用,无法执行查询!", + "4006MULTIPLEPROFIT-000001": "库存模块未启用,无法执行查询!", + "4006MULTIPLEPROFIT-000002": "存货核算模块未启用,无法执行查询!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006ordersummary.json b/src/so/public/lang/standard/simpchn/4006ordersummary.json index c0c2029..69c10ab 100644 --- a/src/so/public/lang/standard/simpchn/4006ordersummary.json +++ b/src/so/public/lang/standard/simpchn/4006ordersummary.json @@ -1,3 +1,3 @@ { - "4006ORDERSUMMARY-000000":"应收模块未启用!" + "4006ORDERSUMMARY-000000": "应收模块未启用!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006replenishmentarrange.json b/src/so/public/lang/standard/simpchn/4006replenishmentarrange.json index 7df3c28..8a9f6f1 100644 --- a/src/so/public/lang/standard/simpchn/4006replenishmentarrange.json +++ b/src/so/public/lang/standard/simpchn/4006replenishmentarrange.json @@ -13,5 +13,9 @@ "4006REPLENISHMENTARRANGE-000011": "总数量", "4006REPLENISHMENTARRANGE-000012": "补货安排", "4006REPLENISHMENTARRANGE-000013": "工厂", - "4006REPLENISHMENTARRANGE-000014": "对应下游单据未轻量化" + "4006REPLENISHMENTARRANGE-000014": "对应下游单据未轻量化", + "4006REPLENISHMENTARRANGE-000015": "请启用采购管理模块!", + "4006REPLENISHMENTARRANGE-000016": "请启用内部交易模块!", + "4006REPLENISHMENTARRANGE-000017": "请启用委外加工模块!", + "4006REPLENISHMENTARRANGE-000018": "请启用生产制造模块!" } diff --git a/src/so/public/lang/standard/simpchn/4006returnpolicy.json b/src/so/public/lang/standard/simpchn/4006returnpolicy.json index 3589cdb..666d408 100644 --- a/src/so/public/lang/standard/simpchn/4006returnpolicy.json +++ b/src/so/public/lang/standard/simpchn/4006returnpolicy.json @@ -30,5 +30,7 @@ "4006RETURNPOLICY-000028": "退货政策设置-集团", "4006RETURNPOLICY-000029": "销售组织", "4006RETURNPOLICY-000030": "退货政策设置-销售组织", - "4006RETURNPOLICY-000031": "判断退货条件(\"{0}\")" + "4006RETURNPOLICY-000031": "判断退货条件(\"{0}\")", + "4006RETURNPOLICY-000032": "存在被删除的数据,请刷新界面重新查询" + } diff --git a/src/so/public/lang/standard/simpchn/4006saleinvoice.json b/src/so/public/lang/standard/simpchn/4006saleinvoice.json index 7167b12..6824201 100644 --- a/src/so/public/lang/standard/simpchn/4006saleinvoice.json +++ b/src/so/public/lang/standard/simpchn/4006saleinvoice.json @@ -101,5 +101,6 @@ "4006SALEINVOICE-000100": "发票已经开票,不允许删行!", "4006SALEINVOICE-000101": "选择期初发出商品", "4006SALEINVOICE-000102": "对冲生成的发票不允许增行!", - "4006SALEINVOICE-000103": "生成开票申请的发票不允许增行或删行!" + "4006SALEINVOICE-000103": "生成开票申请的发票不允许增行或删行!", + "4006SALEINVOICE-000104": "冲抵金额超过费用单余额!" } diff --git a/src/so/public/lang/standard/simpchn/4006saleorder.json b/src/so/public/lang/standard/simpchn/4006saleorder.json index 823eca4..8ac144d 100644 --- a/src/so/public/lang/standard/simpchn/4006saleorder.json +++ b/src/so/public/lang/standard/simpchn/4006saleorder.json @@ -4,7 +4,7 @@ "4006SALEORDER-000002": "确认取消", "4006SALEORDER-000003": "是否确认要取消?", "4006SALEORDER-000004": "取消成功", - "4006SALEORDER-000005": "该订单没有保存,不能查看兑付记录!", + "4006SALEORDER-000005": "该订单没有保存过,不能查看兑付记录!", "4006SALEORDER-000006": "费用兑付明细", "4006SALEORDER-000007": "关闭", "4006SALEORDER-000008": "关闭/打开原因", @@ -25,9 +25,9 @@ "4006SALEORDER-000023": "冻结成功!", "4006SALEORDER-000024": "费用冲抵后不允许赠品价格分摊!", "4006SALEORDER-000025": "请先录入交易类型!", - "4006SALEORDER-000026": "交易类型为赠品兑付,不允许赠品价格分摊!", + "4006SALEORDER-000026": "订单交易类型属性“赠品对付”为是时,不允许做赠品价格分摊!", "4006SALEORDER-000027": "赠品、折扣和劳务行不做冲抵,过滤掉价税合计为空和0的行后,没有可冲抵的行,请检查冲抵比例是否为0!", - "4006SALEORDER-000028": "交易类型为赠品兑付,不允许费用冲抵!", + "4006SALEORDER-000028": "订单交易类型属性“赠品对付”为是时,不允许做费用冲抵!", "4006SALEORDER-000029": "费用冲抵", "4006SALEORDER-000030": "错误", "4006SALEORDER-000031": "请确保您选定的行输入冲抵金额不为0!", @@ -124,5 +124,16 @@ "4006SALEORDER-000122": "选择预订单", "4006SALEORDER-000123": "销售订单已做过收款,该字段不可编辑!", "4006SALEORDER-000124": "销售订单已做过费用冲抵,该字段不可编辑!", - "4006SALEORDER-000125": "销售订单已做过赠品分摊,该字段不可编辑!" -} \ No newline at end of file + "4006SALEORDER-000125": "销售订单已做过赠品分摊,该字段不可编辑!", + "4006SALEORDER-000126": "销售订单未勾选发运清单,不能散件发货!", + "4006SALEORDER-000127": "生成发运清单", + "4006SALEORDER-000128": "预留成功", + "4006SALEORDER-000129": "预警设置", + "4006SALEORDER-000130": "物料不可为空", + "4006SALEORDER-000131": "发货库存组织不可为空", + "4006SALEORDER-000132": "所选物料不是模型件物料,不支持选配", + "4006SALEORDER-000133": "冲抵金额超过费用单余额!", + "4006SALEORDER-000134": "销售订单已做过费用冲抵,不允许做模型选配操作!", + "4006SALEORDER-000135": "销售订单已做过赠品分摊,不允许做模型选配操作!", + "4006SALEORDER-000136": "费用冲抵后不允许复制行!" +} diff --git a/src/so/public/lang/standard/simpchn/4006saleorderprofit.json b/src/so/public/lang/standard/simpchn/4006saleorderprofit.json index 506c369..3efee72 100644 --- a/src/so/public/lang/standard/simpchn/4006saleorderprofit.json +++ b/src/so/public/lang/standard/simpchn/4006saleorderprofit.json @@ -1,5 +1,5 @@ { - "4006SALEORDERPROFIT-000000":"财务模块未启用,无法执行查询!", - "4006SALEORDERPROFIT-000001":"库存模块未启用,无法执行查询!", - "4006SALEORDERPROFIT-000002":"存货核算模块未启用,无法执行查询!" + "4006SALEORDERPROFIT-000000": "财务模块未启用,无法执行查询!", + "4006SALEORDERPROFIT-000001": "库存模块未启用,无法执行查询!", + "4006SALEORDERPROFIT-000002": "存货核算模块未启用,无法执行查询!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006saleorderrevise.json b/src/so/public/lang/standard/simpchn/4006saleorderrevise.json index 82f6ce6..297ac06 100644 --- a/src/so/public/lang/standard/simpchn/4006saleorderrevise.json +++ b/src/so/public/lang/standard/simpchn/4006saleorderrevise.json @@ -33,5 +33,8 @@ "4006SALEORDERREVISE-000031": "当前行没有价格组成信息", "4006SALEORDERREVISE-000032": "毛利预估", "4006SALEORDERREVISE-000033": "执行情况", - "4006SALEORDERREVISE-000034": "价格组成" + "4006SALEORDERREVISE-000034": "价格组成", + "4006SALEORDERREVISE-000035": "销售订单已立项,不允许删行", + "4006SALEORDERREVISE-000036": "已有下游发运清单数据,不允许删行", + "4006SALEORDERREVISE-000037": "预警设置" } diff --git a/src/so/public/lang/standard/simpchn/4006saleoutexesum.json b/src/so/public/lang/standard/simpchn/4006saleoutexesum.json index 54fb0a4..9ae1140 100644 --- a/src/so/public/lang/standard/simpchn/4006saleoutexesum.json +++ b/src/so/public/lang/standard/simpchn/4006saleoutexesum.json @@ -1,5 +1,5 @@ { - "4006SALEOUTEXESUM-000000":"财务模块未启用,无法执行查询!", - "4006SALEOUTEXESUM-000001":"库存模块未启用,无法执行查询!", - "4006SALEOUTEXESUM-000002":"存货核算模块未启用,无法执行查询!" + "4006SALEOUTEXESUM-000000": "财务模块未启用,无法执行查询!", + "4006SALEOUTEXESUM-000001": "库存模块未启用,无法执行查询!", + "4006SALEOUTEXESUM-000002": "存货核算模块未启用,无法执行查询!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006saleoutprofit.json b/src/so/public/lang/standard/simpchn/4006saleoutprofit.json index afd2a55..26b8e49 100644 --- a/src/so/public/lang/standard/simpchn/4006saleoutprofit.json +++ b/src/so/public/lang/standard/simpchn/4006saleoutprofit.json @@ -1,5 +1,5 @@ { - "4006SALEOUTPROFIT-000000":"财务模块未启用,无法执行查询!", - "4006SALEOUTPROFIT-000001":"库存模块未启用,无法执行查询!", - "4006SALEOUTPROFIT-000002":"存货核算模块未启用,无法执行查询!" + "4006SALEOUTPROFIT-000000": "财务模块未启用,无法执行查询!", + "4006SALEOUTPROFIT-000001": "库存模块未启用,无法执行查询!", + "4006SALEOUTPROFIT-000002": "存货核算模块未启用,无法执行查询!" } \ No newline at end of file diff --git a/src/so/public/lang/standard/simpchn/4006sellingrequistion.json b/src/so/public/lang/standard/simpchn/4006sellingrequistion.json index 50ffc14..195bc9d 100644 --- a/src/so/public/lang/standard/simpchn/4006sellingrequistion.json +++ b/src/so/public/lang/standard/simpchn/4006sellingrequistion.json @@ -5,7 +5,7 @@ "4006sellingrequistion-000003": "已生成下游订单,不允许修订!", "4006sellingrequistion-000004": "不允许修订!", "4006sellingrequistion-000005": "请先录入交易类型!", - "4006sellingrequistion-000006": "客户、销售组织、物料、库存组织不能为空!", + "4006sellingrequistion-000006": "客户不能为空!", "4006sellingrequistion-000007": "请先录入物料信息", "4006sellingrequistion-000008": "单据信用查询", "4006sellingrequistion-000009": "确定", @@ -38,5 +38,6 @@ "4006sellingrequistion-000036": "调整折扣", "4006sellingrequistion-000037": "打开成功", "4006sellingrequistion-000038": "关闭成功", - "4006sellingrequistion-000039": "批次号" + "4006sellingrequistion-000039": "批次号", + "4006sellingrequistion-000040": "预留成功" } diff --git a/src/so/public/lang/standard/simpchn/4006sellingrequistionarrange.json b/src/so/public/lang/standard/simpchn/4006sellingrequistionarrange.json index ae094b4..6b34988 100644 --- a/src/so/public/lang/standard/simpchn/4006sellingrequistionarrange.json +++ b/src/so/public/lang/standard/simpchn/4006sellingrequistionarrange.json @@ -19,5 +19,6 @@ "4006SELLINGREQUISTIONARRANGE-000017": "调拨订单", "4006SELLINGREQUISTIONARRANGE-000018": "待发货安排主数量", "4006SELLINGREQUISTIONARRANGE-000019": "退出转单", - "4006SELLINGREQUISTIONARRANGE-000020": "有未保存的单据,确定要退出转单吗?" + "4006SELLINGREQUISTIONARRANGE-000020": "有未保存的单据,确定要退出转单吗?", + "4006SELLINGREQUISTIONARRANGE-000021": "序号为{num}的数据行,散户不能为空!" } diff --git a/src/so/public/lang/standard/simpchn/4006sendarrange.json b/src/so/public/lang/standard/simpchn/4006sendarrange.json index 19e83df..f1addcb 100644 --- a/src/so/public/lang/standard/simpchn/4006sendarrange.json +++ b/src/so/public/lang/standard/simpchn/4006sendarrange.json @@ -19,5 +19,6 @@ "4006SENDARRANGE-000017": "调拨订单", "4006SENDARRANGE-000018": "待发货安排主数量", "4006SENDARRANGE-000019": "退出转单", - "4006SENDARRANGE-000020": "有未保存的单据,确定要退出转单吗?" + "4006SENDARRANGE-000020": "有未保存的单据,确定要退出转单吗?", + "4006SENDARRANGE-000021": "请先录入发货类型" } diff --git a/src/so/public/lang/standard/simpchn/refer.json b/src/so/public/lang/standard/simpchn/refer.json index 0b5aaae..99cc993 100644 --- a/src/so/public/lang/standard/simpchn/refer.json +++ b/src/so/public/lang/standard/simpchn/refer.json @@ -9,5 +9,14 @@ "REFER-000007": "退货条件编码", "REFER-000008": "退货条件名称", "REFER-000009": "退货条件表达式名称", - "REFER-000010": "退货条件表述" + "REFER-000010": "退货条件表述", + "REFER-000011": "销售订单", + "REFER-000012": "销售组织", + "REFER-000013": "开票客户", + "REFER-000014": "单据日期", + "REFER-000015": "单据号", + "REFER-000016": "订单类型", + "REFER-000017": "币种", + "REFER-000018": "总价税合计", + "REFER-000019": "实际收款" } diff --git a/src/so/so/pub/pubrule/headTotalCalRule.js b/src/so/so/pub/pubrule/headTotalCalRule.js index 554420c..e3e886f 100644 --- a/src/so/so/pub/pubrule/headTotalCalRule.js +++ b/src/so/so/pub/pubrule/headTotalCalRule.js @@ -1,3 +1,4 @@ +/*170hMnCqNSHHX84AUgVf1stZOxJLjD3c3eco9+PidT0=*/ /* * @Author: zhangjyp * @PageInfo: 计算表头合计 @@ -47,3 +48,5 @@ export default function calHeadTotal(props, pageId, formId, tableId, keymaps) { }); } } + +/*170hMnCqNSHHX84AUgVf1stZOxJLjD3c3eco9+PidT0=*/ \ No newline at end of file diff --git a/src/so/so/pub/pubrule/vbillcodeBeforeEvent.js b/src/so/so/pub/pubrule/vbillcodeBeforeEvent.js index f87f50a..85d1521 100644 --- a/src/so/so/pub/pubrule/vbillcodeBeforeEvent.js +++ b/src/so/so/pub/pubrule/vbillcodeBeforeEvent.js @@ -1,3 +1,4 @@ +/*rV0bQibesG0UGdyoLFMSM7410XISRh6ukPKiIb9FaMU=*/ /** * 编辑前处理,需要物料 * 这类方法必须有返回值,返回true为可编辑,false为不可编辑 @@ -47,3 +48,5 @@ export default function(props, constance) { } }); } + +/*rV0bQibesG0UGdyoLFMSM7410XISRh6ukPKiIb9FaMU=*/ \ No newline at end of file diff --git a/src/so/so/pub/pubrule/vfreeBeforeEvent.js b/src/so/so/pub/pubrule/vfreeBeforeEvent.js index efa86f0..c132ebf 100644 --- a/src/so/so/pub/pubrule/vfreeBeforeEvent.js +++ b/src/so/so/pub/pubrule/vfreeBeforeEvent.js @@ -1,55 +1,58 @@ +/*VN6N61ClU/zPuqLSyAXrv36kgZ5RYa4FfXkmFt0zCLI=*/ /** * 物料自由辅助属性编辑前处理,需要物料的固定辅助属性库存状态启用 * 这类方法必须有返回值,返回true为可编辑,false为不可编辑 */ import { ajax } from 'nc-lightapp-front'; -export default function(props, constance) { - return new Promise(function(resolve, reject) { - let { key, areahid, areabid, index, cmaterialid } = constance; - //组织为空,不可编辑 - let pk_org = props.form.getFormItemsValue(areahid, 'pk_org'); - if (!pk_org) { - resolve(false); - } - //物料为空,不可编辑 - let cmaterialvid = props.cardTable.getValByKeyAndIndex(areabid, index, cmaterialid); - if (!cmaterialvid || !cmaterialvid.value) { - resolve(false); - } else { - let data = { - key: key, - params: { - cmaterialvid: cmaterialvid.value, - pk_org: pk_org.value, - key: key - } - }; +export default function (props, constance) { + return new Promise(function (resolve, reject) { + let { rowid, key, areahid, areabid, index, cmaterialid } = constance; + //组织为空,不可编辑 + let pk_org = props.form.getFormItemsValue(areahid, 'pk_org'); + if (!pk_org) { + resolve(false); + } + //物料为空,不可编辑 + let cmaterialvid = props.cardTable.getValByKeyAndRowId(areabid, rowid, cmaterialid); + if (!cmaterialvid || !cmaterialvid.value) { + resolve(false); + } else { + let data = { + key: key, + params: { + cmaterialvid: cmaterialvid.value, + pk_org: pk_org.value, + key: key, + }, + }; - ajax({ - url: '/nccloud/so/pub/bodybefore.do', - data: data, - success: (res) => { - if (res.data) { - let isedit = res.data.isedit; - if (isedit) { - resolve(isedit); - } else if (res.data.message) { - toast({ - color: 'warning', - content: res.data.message - }); - } - resolve(false); - } - }, - error: (error) => { - toast({ - color: 'warning', - content: error.message - }); - resolve(false); - } - }); - } - }); + ajax({ + url: '/nccloud/so/pub/bodybefore.do', + data: data, + success: (res) => { + if (res.data) { + let isedit = res.data.isedit; + if (isedit) { + resolve(isedit); + } else if (res.data.message) { + toast({ + color: 'warning', + content: res.data.message, + }); + } + resolve(false); + } + }, + error: (error) => { + toast({ + color: 'warning', + content: error.message, + }); + resolve(false); + }, + }); + } + }); } + +/*VN6N61ClU/zPuqLSyAXrv36kgZ5RYa4FfXkmFt0zCLI=*/ \ No newline at end of file diff --git a/src/so/so/pub/queryarea/queryAreaInit.js b/src/so/so/pub/queryarea/queryAreaInit.js index 57a5e4e..925ad29 100644 --- a/src/so/so/pub/queryarea/queryAreaInit.js +++ b/src/so/so/pub/queryarea/queryAreaInit.js @@ -1,14 +1,94 @@ +/*9s06cI9qriZwm9mh0Mrs2v5n+PTUxsbrUhg0bAz4Pfc=*/ /* * @Author: wangceb * @PageInfo: 页面功能描述 * @Date: 2018-08-13 16:54:23 - * @Last Modified by: cuijun - * @Last Modified time: 2020-03-10 20:11:04 + * @Last Modified by: liulux + * @Last Modified time: 2023-03-24 10:53:34 */ import { transtypeUtils } from '../../../../scmpub/scmpub/pub/tool'; +import { PAGEAREA } from '../../saleinvoice/transfer/const'; function renderCompleteEvent(moduleId, orgfield, callback, ctrantypeid) { // 设置默认值 transtypeUtils.setQueryDefaultValue.call(this, this.props, moduleId, ctrantypeid); + let props = this.props; + if (props.displayData) { + if (props.displayData.pk_org) { + if (moduleId == PAGEAREA.SERACHALL) { + props.search.setSearchValByField(PAGEAREA.SERACHALL, 'pk_org', props.displayData.pk_org); + props.search.setSearchValByField(PAGEAREA.SERACHALL, 'pk_org', props.displayData.pk_org, 'normal'); + props.search.setSearchValByField(PAGEAREA.SERACHALL, 'pk_org', props.displayData.pk_org, 'super'); + props.search.setDisabledByField(PAGEAREA.SERACHALL, 'pk_org', true); + } + if (moduleId == PAGEAREA.SERACH30) { + props.search.setSearchValByField(PAGEAREA.SERACH30, 'so_saleorder_b.csettleorgid', props.displayData.pk_org); + props.search.setSearchValByField(PAGEAREA.SERACH30, 'so_saleorder_b.csettleorgid', props.displayData.pk_org, 'normal'); + props.search.setSearchValByField(PAGEAREA.SERACH30, 'so_saleorder_b.csettleorgid', props.displayData.pk_org, 'super'); + props.search.setDisabledByField(PAGEAREA.SERACH30, 'so_saleorder_b.csettleorgid', true); + } + if (moduleId == PAGEAREA.SERACH4C) { + props.search.setSearchValByField(PAGEAREA.SERACH4C, 'cfanaceorgoid', props.displayData.pk_org); + props.search.setSearchValByField(PAGEAREA.SERACH4C, 'cfanaceorgoid', props.displayData.pk_org, 'normal'); + props.search.setSearchValByField(PAGEAREA.SERACH4C, 'cfanaceorgoid', props.displayData.pk_org, 'super'); + props.search.setDisabledByField(PAGEAREA.SERACH4C, 'cfanaceorgoid', true); + } + + + + } + if (props.displayData.customer) { + if (moduleId == PAGEAREA.SERACHALL) { + props.search.setSearchValByField(PAGEAREA.SERACHALL, 'cinvoicecustid', props.displayData.customer); + props.search.setSearchValByField( + PAGEAREA.SERACHALL, + 'cinvoicecustid', + props.displayData.customer, + 'normal' + ); + props.search.setSearchValByField( + PAGEAREA.SERACHALL, + 'cinvoicecustid', + props.displayData.customer, + 'super' + ); + props.search.setDisabledByField(PAGEAREA.SERACHALL, 'cinvoicecustid', true); + } + if (moduleId == PAGEAREA.SERACH30) { + props.search.setSearchValByField(PAGEAREA.SERACH30, 'cinvoicecustid', props.displayData.customer); + props.search.setSearchValByField( + PAGEAREA.SERACH30, + 'cinvoicecustid', + props.displayData.customer, + 'normal' + ); + props.search.setSearchValByField( + PAGEAREA.SERACH30, + 'cinvoicecustid', + props.displayData.customer, + 'super' + ); + props.search.setDisabledByField(PAGEAREA.SERACH30, 'cinvoicecustid', true); + } + if (moduleId == PAGEAREA.SERACH4C) { + props.search.setSearchValByField(PAGEAREA.SERACH4C, 'cgeneralbid.cinvoicecustid', props.displayData.customer); + props.search.setSearchValByField( + PAGEAREA.SERACH4C, + 'cgeneralbid.cinvoicecustid', + props.displayData.customer, + 'normal' + ); + props.search.setSearchValByField( + PAGEAREA.SERACH4C, + 'cgeneralbid.cinvoicecustid', + props.displayData.customer, + 'super' + ); + props.search.setDisabledByField(PAGEAREA.SERACH4C, 'cgeneralbid.cinvoicecustid', true); + } + + } + } + let pk_org_value = this.props.search.getSearchValByField(moduleId, orgfield); let arr = null; if (pk_org_value && pk_org_value.value && pk_org_value.value.firstvalue) { @@ -27,3 +107,5 @@ function renderCompleteEvent(moduleId, orgfield, callback, ctrantypeid) { } export { renderCompleteEvent }; + +/*9s06cI9qriZwm9mh0Mrs2v5n+PTUxsbrUhg0bAz4Pfc=*/ \ No newline at end of file diff --git a/src/so/so/pub/tool/SearchTool.js b/src/so/so/pub/tool/SearchTool.js index fde83d2..c9e09c8 100644 --- a/src/so/so/pub/tool/SearchTool.js +++ b/src/so/so/pub/tool/SearchTool.js @@ -1,3 +1,4 @@ +/*Cb8MTr5qR67cvq+nos7DlH+FxOS12KSQ9wA1NqqlgmU=*/ /* * @Author: wangceb * @PageInfo: 查询区常用工具 @@ -18,3 +19,5 @@ function getSearchValByField(props, searchId, field) { } export { getSearchValByField }; + +/*Cb8MTr5qR67cvq+nos7DlH+FxOS12KSQ9wA1NqqlgmU=*/ \ No newline at end of file diff --git a/src/so/so/pub/tool/TransferTool.js b/src/so/so/pub/tool/TransferTool.js index 2720f13..5a88b1a 100644 --- a/src/so/so/pub/tool/TransferTool.js +++ b/src/so/so/pub/tool/TransferTool.js @@ -1,3 +1,4 @@ +/*XqIkjfsfunKy+hfouHD5cxN+YW8cQkFSgYG38hCXxC0=*/ /* * @Author: wangceb * @PageInfo: 转单界面工具类 @@ -61,3 +62,5 @@ function formatNumber(value) { } return ret; } + +/*XqIkjfsfunKy+hfouHD5cxN+YW8cQkFSgYG38hCXxC0=*/ \ No newline at end of file diff --git a/src/so/so/pub/tool/TrimZeroUtil.js b/src/so/so/pub/tool/TrimZeroUtil.js index f126b4d..018c67c 100644 --- a/src/so/so/pub/tool/TrimZeroUtil.js +++ b/src/so/so/pub/tool/TrimZeroUtil.js @@ -1,3 +1,4 @@ +/*Z8rANEvCYYFtqTbCYDvR5Cn++w1AZR0Ijqm7jNDiTPU=*/ /* * @Author: zhangjyp * @PageInfo: 数值取精度,例如:2.3,精度是1 @@ -15,3 +16,5 @@ export default function trimZero(data) { return length - 1 - start; } + +/*Z8rANEvCYYFtqTbCYDvR5Cn++w1AZR0Ijqm7jNDiTPU=*/ \ No newline at end of file diff --git a/src/so/so/pub/util/operateDataUtil.js b/src/so/so/pub/util/operateDataUtil.js index 1041437..3cecfbb 100644 --- a/src/so/so/pub/util/operateDataUtil.js +++ b/src/so/so/pub/util/operateDataUtil.js @@ -1,3 +1,4 @@ +/*dkS8HPbHFEj6+q7wB+z0gzTfR5UufDtXc/jwCRxg814=*/ /* * @Author: sunxxf * @PageInfo: 收回数据组装 @@ -38,3 +39,5 @@ function getPkTsDataIncludeBodyInCard(props, params) { } export { getPkTsDataIncludeBodyInCard }; + +/*dkS8HPbHFEj6+q7wB+z0gzTfR5UufDtXc/jwCRxg814=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/addinvoice/index.js b/src/so/so/saleinvoice/addinvoice/index.js index ce86201..3ff931c 100644 --- a/src/so/so/saleinvoice/addinvoice/index.js +++ b/src/so/so/saleinvoice/addinvoice/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: zhangjyp * @PageInfo: 开票组件 @@ -94,3 +95,5 @@ class AddInvoice extends Component { } AddInvoice = createPage({})(AddInvoice); export default AddInvoice; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/LinkQueryVoucherBtnClick.js b/src/so/so/saleinvoice/card/btnClicks/LinkQueryVoucherBtnClick.js index 4ce759b..c8e4675 100644 --- a/src/so/so/saleinvoice/card/btnClicks/LinkQueryVoucherBtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/LinkQueryVoucherBtnClick.js @@ -1,3 +1,4 @@ +/*Z5f/1tPct3SmDpZSfknGQo4fQ/SvAmzRlniEoFa+bOA1G9J+R7vAoodjjqh81P88*/ /* * @Author: 刘奇 * @PageInfo: 联查凭证 @@ -60,3 +61,5 @@ export default function(props) { } }); } + +/*Z5f/1tPct3SmDpZSfknGQo4fQ/SvAmzRlniEoFa+bOA1G9J+R7vAoodjjqh81P88*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/ReArrangeRowno_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/ReArrangeRowno_BtnClick.js index e503f70..9d35710 100644 --- a/src/so/so/saleinvoice/card/btnClicks/ReArrangeRowno_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/ReArrangeRowno_BtnClick.js @@ -1,3 +1,4 @@ +/*XO7fk4hupjDvEkpKRJPTZyl378+aD3eEtQQd+qFM3DKQ64Z8VfTIMG+koHH02yq4*/ /* * @Author: zhangjyp * @PageInfo: 重排行号 @@ -9,3 +10,5 @@ import { RownoUtils } from '../../../../../scmpub/scmpub/pub/tool/cardTableTools export default function reArrangeRowno(props) { RownoUtils.resetRowNo(props, this.tableId, 'crowno'); } + +/*XO7fk4hupjDvEkpKRJPTZyl378+aD3eEtQQd+qFM3DKQ64Z8VfTIMG+koHH02yq4*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/addRow_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/addRow_BtnClick.js index 86b9d5c..8aa189d 100644 --- a/src/so/so/saleinvoice/card/btnClicks/addRow_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/addRow_BtnClick.js @@ -1,3 +1,4 @@ +/*lEASkUianxZU9+t3hhmkRixRh3na+GC+favU9WDKiyI=*/ /* * @Author: zhangjyp * @PageInfo: 新增行事件 @@ -8,12 +9,14 @@ import { RownoUtils } from '../../../../../scmpub/scmpub/pub/tool/cardTableTools'; import { setRowDefaultValue } from '../init/setDefaultValue'; import { setEditEnable } from '../viewController/cardEditController'; -export default function clickAddRowBtn(props) { +export default function clickAddRowBtn(props,isAuto) { // 新增行给表体赋默认值 - props.cardTable.addRow(this.tableId, undefined, setRowDefaultValue(props)); + props.cardTable.addRow(this.tableId, undefined, setRowDefaultValue(props),isAuto ? false : true); RownoUtils.setRowNo(props, this.tableId, 'crowno'); // 设置编辑性 setEditEnable.call(this, this.props, this.combineCache.combinvo); } + +/*lEASkUianxZU9+t3hhmkRixRh3na+GC+favU9WDKiyI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/add_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/add_BtnClick.js index d41bb45..ab53867 100644 --- a/src/so/so/saleinvoice/card/btnClicks/add_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/add_BtnClick.js @@ -1,3 +1,4 @@ +/*dXoPbESH9BnI4reHcyjq+1cjOAFBELH2HiHmMbZ9Fas=*/ /* * @Author: zhangjyp * @PageInfo: 卡片开票按钮事件 @@ -20,3 +21,5 @@ export default function clickAddBtn(props) { ctranstype: transtypeUtils.getTranstypeCode.call(this) }); } + +/*dXoPbESH9BnI4reHcyjq+1cjOAFBELH2HiHmMbZ9Fas=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/approveInfo_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/approveInfo_BtnClick.js index acc1004..75d76ea 100644 --- a/src/so/so/saleinvoice/card/btnClicks/approveInfo_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/approveInfo_BtnClick.js @@ -1,3 +1,4 @@ +/*+q8X/E+A5I3aW/kLS07ziOeFGgb551fJRsobAe7DKFY=*/ /* * @Author: zhangjyp * @PageInfo: 审批详情按钮 @@ -14,3 +15,5 @@ export default function(props) { transtype: transtype }); } + +/*+q8X/E+A5I3aW/kLS07ziOeFGgb551fJRsobAe7DKFY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/arsubDetail_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/arsubDetail_BtnClick.js index 31959ac..7aacf83 100644 --- a/src/so/so/saleinvoice/card/btnClicks/arsubDetail_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/arsubDetail_BtnClick.js @@ -1,9 +1,10 @@ +/*h//wWPp3FlUjEW9bb3W/Z69sQAXiTsLsFDNqSEkw3S0=*/ /* * @Author: wangceb * @PageInfo: 费用兑付明细 * @Date: 2018-04-19 10:37:43 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-12 15:04:31 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-11 14:42:43 */ import { ajax } from 'nc-lightapp-front'; import { URL, PAGEID } from '../../const'; @@ -46,10 +47,14 @@ export default function buttonClick(props) { /> ), - rightBtnName: '' //右侧按钮名称,默认关闭 + // rightBtnName: '' //右侧按钮名称,默认关闭 + hideRightBtn: true, + hideLeftBtn: true }); } } }); } + +/*h//wWPp3FlUjEW9bb3W/Z69sQAXiTsLsFDNqSEkw3S0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/back_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/back_BtnClick.js index 291c4a0..30905a3 100644 --- a/src/so/so/saleinvoice/card/btnClicks/back_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/back_BtnClick.js @@ -1,3 +1,4 @@ +/*hULvJC0v4bBIwR6ZwNP2Q5PV+fZigEEDSEbCv6lpGVI=*/ /* * @Author: zhangjyp * @PageInfo: 返回按钮事件 @@ -54,3 +55,5 @@ function backtoAddInvocie(props) { }); } } + +/*hULvJC0v4bBIwR6ZwNP2Q5PV+fZigEEDSEbCv6lpGVI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/billLinkQuery_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/billLinkQuery_BtnClick.js index 30c98d1..d84f93a 100644 --- a/src/so/so/saleinvoice/card/btnClicks/billLinkQuery_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/billLinkQuery_BtnClick.js @@ -1,3 +1,4 @@ +/*8Mg99cNjhyMO4rSyVXqvUZc0zVHgrpKvFxaJ1tyJpgptZI7VhD3C3PXW5v9Hadrc*/ /* * @Author: zhangjyp * @PageInfo:销售发票单据联查 @@ -13,3 +14,5 @@ export default function(props) { pk: csaleinvoiceid }); } + +/*8Mg99cNjhyMO4rSyVXqvUZc0zVHgrpKvFxaJ1tyJpgptZI7VhD3C3PXW5v9Hadrc*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/body_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/body_BtnClick.js index 4229d5f..064a752 100644 --- a/src/so/so/saleinvoice/card/btnClicks/body_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/body_BtnClick.js @@ -1,3 +1,4 @@ +/*QxQxIdC7hL9eZPhKtSQCz0n/IxFd/FalDCgPsuoRiIE=*/ /* * @Author: zhangjyp * @PageInfo: 卡片表体按钮事件 @@ -47,3 +48,5 @@ export default function(type, props, key) { break; } } + +/*QxQxIdC7hL9eZPhKtSQCz0n/IxFd/FalDCgPsuoRiIE=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/buttonClick.js b/src/so/so/saleinvoice/card/btnClicks/buttonClick.js index 7a6d194..5e6b078 100644 --- a/src/so/so/saleinvoice/card/btnClicks/buttonClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/buttonClick.js @@ -1,9 +1,10 @@ +/*q2LCmxM8POvl78IL0Liydie4F5UAgLwHceRljsFF3P0=*/ /* * @Author: zhangjyp * @PageInfo: 按钮点击事件 * @Date: 2018-04-19 10:37:30 - * @Last Modified by: mikey.zhaopeng - * @Last Modified time: 2024-05-13 11:12:46 + * @Last Modified by: zhangllb + * @Last Modified time: 2021-12-16 17:04:43 */ import backBtnClick from './back_BtnClick'; import addBtnClick from './add_BtnClick'; @@ -11,7 +12,7 @@ import delBtnClick from './del_BtnClick'; import editBtnClick from './edit_BtnClick'; import cancelBtnClick from './cancel_BtnClick'; import saveBtnClick from './save_BtnClick'; -import allSaveBtnClick from './saveAll_BtnClick'; + import refresh_BtnClick from './refresh_BtnClick'; import opposeAddBtnClick from './opposeAdd_BtnClick'; import offsetBtnClick from './offset_BtnClick'; @@ -42,15 +43,13 @@ import issueInv_BtnClick from './issueInv_BtnClick'; import maintainInvoice_BtnClick from './maintainInvoice_BtnClick'; import linkInvoice_BtnClick from './linkInvoice_BtnClick'; import coop25_BtnClick from './coop25_BtnClick'; -import headTotalCalRule from '../../../pub/pubrule/headTotalCalRule'; import redInvoice_BtnClick from './redInvoice_BtnClick'; import LinkQueryVoucherBtnClick from './LinkQueryVoucherBtnClick'; -import { PAGEAREA, PAGEID } from '../../const'; +import { PAGEAREA } from '../../const'; import printCountQuery from '../../../../../scmpub/scmpub/pub/tool/printCountQuery'; import InvoiceComponent from 'sscivm/invoiceComponent/compoundComponent/component'; import { showWarningInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; -import { ajax, toast } from 'nc-lightapp-front'; export default function clickBtn(type, index, props, id) { let makeinv_value = null; @@ -59,8 +58,6 @@ export default function clickBtn(type, index, props, id) { makeinv_value = id.substring(btnIndex + 1); id = id.substr(0, btnIndex + 1); } - let keymaps = new Map(); - keymaps.set('ntaxmny', 'vdef5'); switch (id) { // 新增 case 'Add': @@ -113,14 +110,8 @@ export default function clickBtn(type, index, props, id) { break; // 保存 case 'Save': - headTotalCalRule(props, PAGEID.CARD, PAGEAREA.FORMID, PAGEAREA.TABLEID, keymaps); saveBtnClick.call(this, props, type); break; - // 批量保存 - case 'AllSaveBtn': - headTotalCalRule(props, PAGEID.CARD, PAGEAREA.FORMID, PAGEAREA.TABLEID, keymaps); - allSaveBtnClick.call(this, props, type); - break; // 提交 case 'Commit': commitBtnClick.call(this, props); @@ -190,15 +181,6 @@ export default function clickBtn(type, index, props, id) { break; // 开票申请 case 'MakeInv_': - //yuyy 外贸客户 电子发票(增值税专用)-31 和电子发票(普通发票)-32 需校验是否已匹配AEO - let vdef15 = props.form.getFormItemsValue('head','vdef15').value; - if(vdef15 == '外贸客户' && (makeinv_value == '31' || makeinv_value == '32')){ - let vdef14 = props.form.getFormItemsValue('head','vdef14').value; - if(!vdef14){ - toast({color:'warning',content:'本单据为外贸类发票,未与AEO进行信息匹配,不允许提交开票'}); - break; - } - } issueInv_BtnClick.call(this, props, makeinv_value); break; // 红字发票 @@ -241,19 +223,7 @@ export default function clickBtn(type, index, props, id) { let CONST = { hid: 'csaleinvoiceid', area: PAGEAREA.FORMID }; printCountQuery.call(this, props, { type: 2, CONST, modal: 'code-config' }); break; - // yuyy 预录单 - case 'Aeo': - ajax({ - url:'/nccloud/so/saleinvoice/readAeo.do', - data:{ - csaleinvoiceid:props.form.getFormItemsValue('head','csaleinvoiceid').value - }, - success:(res)=>{ - if(res.success){ - refresh_BtnClick.call(this); - } - } - }) - break; } } + +/*q2LCmxM8POvl78IL0Liydie4F5UAgLwHceRljsFF3P0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/cancel_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/cancel_BtnClick.js index e5c3ea3..ead7536 100644 --- a/src/so/so/saleinvoice/card/btnClicks/cancel_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/cancel_BtnClick.js @@ -1,3 +1,4 @@ +/*oICVasQrIWqSHQSq91EX93QOxjJxliPkomg44b5xbIc=*/ /* * @Author: zhangjyp * @PageInfo: 取消按钮事件 @@ -96,3 +97,5 @@ function cancel(props, type, index) { buttonController.call(this); props.updatePage(this.formId, this.tableId); } + +/*oICVasQrIWqSHQSq91EX93QOxjJxliPkomg44b5xbIc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/checkAddline.js b/src/so/so/saleinvoice/card/btnClicks/checkAddline.js index fc936c8..06922b1 100644 --- a/src/so/so/saleinvoice/card/btnClicks/checkAddline.js +++ b/src/so/so/saleinvoice/card/btnClicks/checkAddline.js @@ -1,3 +1,4 @@ +/*Sq7R1nOST/ekUGmrvBp6jOyJFPxIN3KqqcyXJz16mLA=*/ /* * @Author: liulux * @PageInfo: 判断是否能增行 @@ -23,3 +24,5 @@ export default function(props) { } return flag; } + +/*Sq7R1nOST/ekUGmrvBp6jOyJFPxIN3KqqcyXJz16mLA=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/checkDeleteLine.js b/src/so/so/saleinvoice/card/btnClicks/checkDeleteLine.js index 9da6b67..c88e860 100644 --- a/src/so/so/saleinvoice/card/btnClicks/checkDeleteLine.js +++ b/src/so/so/saleinvoice/card/btnClicks/checkDeleteLine.js @@ -1,3 +1,4 @@ +/*H63tRBDvlvIdo/rgscH0QhIAIAXZvSMMtdtxnbkDapY=*/ /* * @Author: liulux * @PageInfo: 判断是否能删行 @@ -14,4 +15,5 @@ export default function(props){ flag = false; } return flag; -} \ No newline at end of file +} +/*H63tRBDvlvIdo/rgscH0QhIAIAXZvSMMtdtxnbkDapY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/commit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/commit_BtnClick.js index fadc6f2..8d8d6a2 100644 --- a/src/so/so/saleinvoice/card/btnClicks/commit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/commit_BtnClick.js @@ -1,3 +1,4 @@ +/*4roxSwWSoRYPZWqEwx7TZJrD4MtXBHSUQfMR2t1Oc3k=*/ /* * @Author: zhangjyp * @PageInfo:提交按钮事件 @@ -165,3 +166,5 @@ export default function clickCommitBtn(props, assign, skipCodes, savecallback, t } }); } + +/*4roxSwWSoRYPZWqEwx7TZJrD4MtXBHSUQfMR2t1Oc3k=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/commonSearch_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/commonSearch_BtnClick.js index 8ee09e5..b1a3406 100644 --- a/src/so/so/saleinvoice/card/btnClicks/commonSearch_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/commonSearch_BtnClick.js @@ -1,3 +1,4 @@ +/*MKhAr9efcx6R2yL0XZ82Wj/Hlw4oiXllAzwge6P6TgduFCOBa04VO4auQ7bqaUwz*/ /* * @Author: zhangjyp * @PageInfo:卡片查询 @@ -155,3 +156,5 @@ export default function(keys, callback) { }); } } + +/*MKhAr9efcx6R2yL0XZ82Wj/Hlw4oiXllAzwge6P6TgduFCOBa04VO4auQ7bqaUwz*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/coop25_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/coop25_BtnClick.js index 91816ce..f9a7afe 100644 --- a/src/so/so/saleinvoice/card/btnClicks/coop25_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/coop25_BtnClick.js @@ -1,3 +1,4 @@ +/*RgOIMdrmGV+tlT/hu9Lltqye7t1vrhuoSsQCZY1OQa8=*/ /* * @Author: zhangjyp * @PageInfo:提交按钮事件 @@ -77,3 +78,5 @@ export default function coop25(props, assign, skipCodes, savecallback, type) { } }); } + +/*RgOIMdrmGV+tlT/hu9Lltqye7t1vrhuoSsQCZY1OQa8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/custCredit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/custCredit_BtnClick.js index 3e285c5..069dee8 100644 --- a/src/so/so/saleinvoice/card/btnClicks/custCredit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/custCredit_BtnClick.js @@ -1,9 +1,10 @@ +/*f+vtQPByU1yDLodYCsoAs+d5v06z5H17Gv75aeIP+pI=*/ /* * @Author: wangceb * @PageInfo: 信用查询 * @Date: 2018-04-19 10:37:43 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-12 15:25:43 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-08 09:47:59 */ import { URL } from '../../const'; @@ -28,9 +29,13 @@ export default function buttonClick(props) { ), - rightBtnName: '' //右侧按钮名称,默认关闭 + rightBtnName: '', //右侧按钮名称,默认关闭 + hideRightBtn: true, //隐藏足部右边的按钮 + hideLeftBtn: true //隐藏足部左边的按钮 }); } } }); } + +/*f+vtQPByU1yDLodYCsoAs+d5v06z5H17Gv75aeIP+pI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/delRow_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/delRow_BtnClick.js index f5ef363..906642b 100644 --- a/src/so/so/saleinvoice/card/btnClicks/delRow_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/delRow_BtnClick.js @@ -1,3 +1,4 @@ +/*WCWV9dY2X2+qdR/KYgG2+pR6694vcAKyD02eXGWwLUI=*/ /* * @Author: zhangjyp * @PageInfo: 删除选中的行事件 @@ -42,3 +43,5 @@ export default function clickDelRowBtn(props) { } }); } + +/*WCWV9dY2X2+qdR/KYgG2+pR6694vcAKyD02eXGWwLUI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/del_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/del_BtnClick.js index 7528711..5b97f82 100644 --- a/src/so/so/saleinvoice/card/btnClicks/del_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/del_BtnClick.js @@ -1,9 +1,10 @@ +/*HQJYRjmlHqUTbE/KrIVjwYi+wzh5INB6oTw9ZEopNlE=*/ /* * @Author: zhangjyp * @PageInfo: 删除按钮事件 * @Date: 2018-04-19 10:36:58 * @Last Modified by: liulux - * @Last Modified time: 2022-03-10 18:31:09 + * @Last Modified time: 2023-03-31 16:21:51 */ import { ajax } from 'nc-lightapp-front'; @@ -11,7 +12,6 @@ import { deleteCacheData, getNextId, changeUrlParam } from '../../../../../scmpu import { showResumeModal } from 'scmpub/scmpub/components/ResumeModal'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import buttonController from '../viewController/buttonController'; -import commonSearch_BtnClick from './commonSearch_BtnClick'; import { URL, SaleInvoiceHeadItem, SaleInvoiceCacheKey, SALEINVOICE_CONST, PAGEID } from '../../const'; import { showSingleDeleteDialog } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; const { DELURL, ADDINVOICEURL } = URL; @@ -19,9 +19,13 @@ const { CARD } = PAGEID; import { showSuccessInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; import { pageInfoClick } from '.'; export default function clickDelBtn(props, type, skipCodes) { - showSingleDeleteDialog({ - beSureBtnClick: deleteBill.bind(this, props, type, skipCodes) - }); /* 国际化处理: 删除,确定要删除吗?*/ + if (!skipCodes) { + showSingleDeleteDialog({ + beSureBtnClick: deleteBill.bind(this, props, type, skipCodes) + }); /* 国际化处理: 删除,确定要删除吗?*/ + } else { + deleteBill.call(this, props, type, skipCodes); + } } function deleteBill(props, type, skipCodes) { // let CardData = props.createMasterChildData(this.pageId, this.formId, this.tableId); @@ -111,3 +115,5 @@ function deleteBill(props, type, skipCodes) { } }); } + +/*HQJYRjmlHqUTbE/KrIVjwYi+wzh5INB6oTw9ZEopNlE=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/edit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/edit_BtnClick.js index 287ea27..4218db6 100644 --- a/src/so/so/saleinvoice/card/btnClicks/edit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/edit_BtnClick.js @@ -1,3 +1,4 @@ +/*LTIZmau2nOVKYyx4vfT7ithlJIcjhDMsLDqYED5lM1U=*/ /* * @Author: zhangjyp * @PageInfo: 修改按钮事件 @@ -15,12 +16,10 @@ import { showErrorInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; export default function clickEditBtn(props, type) { - //begin 项目需求 - // if (this.combineCache.combinvo.bcombinflag) { - // showErrorInfo(getLangByResId(this, '4006SALEINVOICE-000094')); /* 国际化处理: 汇总状态下不允许进行修改!*/ - // return; - // } - //end + if (this.combineCache.combinvo.bcombinflag) { + showErrorInfo(getLangByResId(this, '4006SALEINVOICE-000094')); /* 国际化处理: 汇总状态下不允许进行修改!*/ + return; + } // 编辑态取消勾选 this.props.cardTable.selectAllRows(this.tableId, false); //end @@ -69,3 +68,5 @@ export default function clickEditBtn(props, type) { } }); } + +/*LTIZmau2nOVKYyx4vfT7ithlJIcjhDMsLDqYED5lM1U=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/exportGoldTax_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/exportGoldTax_BtnClick.js index b417515..24d503b 100644 --- a/src/so/so/saleinvoice/card/btnClicks/exportGoldTax_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/exportGoldTax_BtnClick.js @@ -1,3 +1,4 @@ +/*h6pV1Stt0msgqsSn3QsWlzVa7SHxBuwlbKiC8l3a73xjXS7tTumnnHTsF2D4Argo*/ /* * @Author: zhangjyp * @PageInfo: 传金税按钮事件 @@ -82,3 +83,5 @@ function translateGoldTaxResult() { commonSearch_BtnClick.call(this, [ 'btogoldtaxflag', 'tgoldtaxtime', 'ts' ]); }, 500); } + +/*h6pV1Stt0msgqsSn3QsWlzVa7SHxBuwlbKiC8l3a73xjXS7tTumnnHTsF2D4Argo*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/fetchCost_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/fetchCost_BtnClick.js index 9c9d698..f7f328e 100644 --- a/src/so/so/saleinvoice/card/btnClicks/fetchCost_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/fetchCost_BtnClick.js @@ -1,3 +1,4 @@ +/*9OU9aWIXVQwvDbMFdyNhWHtOYQUv2pGFPAqfAim76aE=*/ /* * @Author: zhangjyp * @PageInfo: 取成本价按钮事件 @@ -60,3 +61,5 @@ export default function clickFetchCostBtn(props) { } }); } + +/*9OU9aWIXVQwvDbMFdyNhWHtOYQUv2pGFPAqfAim76aE=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/file_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/file_BtnClick.js index b18697e..d11ee08 100644 --- a/src/so/so/saleinvoice/card/btnClicks/file_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/file_BtnClick.js @@ -1,3 +1,4 @@ +/*Fxn6zGFAX6e8z9mfETwF2VRh3zhiE3gbOw++7awjRY8=*/ /* * @Author: zhangjyp * @PageInfo: 销售发票附件管理 @@ -17,3 +18,5 @@ export default function() { pk: pk }); } + +/*Fxn6zGFAX6e8z9mfETwF2VRh3zhiE3gbOw++7awjRY8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/imageScan_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/imageScan_BtnClick.js index 0f7c2f9..136de49 100644 --- a/src/so/so/saleinvoice/card/btnClicks/imageScan_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/imageScan_BtnClick.js @@ -1,3 +1,4 @@ +/*8gcIg4mnFUCt6cb+OTuVNg96IC3wQ8iuqktFA1VGLI8=*/ /* * @Author: zhangjyp * @PageInfo: 影像扫描按钮事件 @@ -25,3 +26,5 @@ export default function clickCancelBtn(props, type, index) { SCMImageScan.call(this, props, data); } + +/*8gcIg4mnFUCt6cb+OTuVNg96IC3wQ8iuqktFA1VGLI8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/imageView_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/imageView_BtnClick.js index 271c796..c6b801c 100644 --- a/src/so/so/saleinvoice/card/btnClicks/imageView_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/imageView_BtnClick.js @@ -1,3 +1,4 @@ +/*m0hsPgB73UGRG9fBCRimxJ/HlaPau7Z269vacnqFJXA=*/ /* * @Author: zhangjyp * @PageInfo: 影响查看按钮事件 @@ -19,3 +20,5 @@ export default function clickCancelBtn(props, type, index) { SCMImageView.call(this, props, data); } + +/*m0hsPgB73UGRG9fBCRimxJ/HlaPau7Z269vacnqFJXA=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/index.js b/src/so/so/saleinvoice/card/btnClicks/index.js index 5a0e733..8a64d7a 100644 --- a/src/so/so/saleinvoice/card/btnClicks/index.js +++ b/src/so/so/saleinvoice/card/btnClicks/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import buttonClick from './buttonClick'; import pageInfoClick from './pageInfo_BtnClick'; @@ -18,3 +19,5 @@ export { coop25_BtnClick, saveAndCommit_BtnClick }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/invoiceQueryExec_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/invoiceQueryExec_BtnClick.js index 3b88943..d1c944d 100644 --- a/src/so/so/saleinvoice/card/btnClicks/invoiceQueryExec_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/invoiceQueryExec_BtnClick.js @@ -1,9 +1,10 @@ +/*2xyiDu0ozfQo4k4+CR/M9E9NC4predQbb+DoUuw2wg8AAhWYNkd/92u5cG7q+8KA*/ /* * @Author: 刘奇 * @PageInfo: 发票执行情况 * @Date: 2019-05-17 10:14:05 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:48:39 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-01 12:34:50 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA } from '../../const'; @@ -26,10 +27,10 @@ export default function invoiceQueryExec_BtnClick(props) { title: getLangByResId(this, '4006SALEINVOICE-000078') /* 国际化处理:发票执行情况 */, noFooter: true, content: ( -
-
+
+ -
+
) }); @@ -38,3 +39,5 @@ export default function invoiceQueryExec_BtnClick(props) { } }); } + +/*2xyiDu0ozfQo4k4+CR/M9E9NC4predQbb+DoUuw2wg8AAhWYNkd/92u5cG7q+8KA*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/issueInv_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/issueInv_BtnClick.js index 5eeec7f..f376548 100644 --- a/src/so/so/saleinvoice/card/btnClicks/issueInv_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/issueInv_BtnClick.js @@ -1,3 +1,4 @@ +/*TijAZezwfAUbsk5SXg42Zoy5/LFaX5hwC1i6o9Ovh/s=*/ /* * @Author: wangceb * @PageInfo: 电子发票(成品油) @@ -36,3 +37,5 @@ export default function buttonClick(props, type) { } }); } + +/*TijAZezwfAUbsk5SXg42Zoy5/LFaX5hwC1i6o9Ovh/s=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/linkFromFIP_Btn_Click.js b/src/so/so/saleinvoice/card/btnClicks/linkFromFIP_Btn_Click.js index 966543f..99b2dff 100644 --- a/src/so/so/saleinvoice/card/btnClicks/linkFromFIP_Btn_Click.js +++ b/src/so/so/saleinvoice/card/btnClicks/linkFromFIP_Btn_Click.js @@ -1,3 +1,4 @@ +/*gdmeya0Knve0FFKnJBOsx/MByaF6z93uuS/ZXqMYnjHbqXNyCpIu3W8TNBCRCp3a*/ /* * @Author: zhangjyp @@ -69,4 +70,5 @@ export default function(){ } }); } -} \ No newline at end of file +} +/*gdmeya0Knve0FFKnJBOsx/MByaF6z93uuS/ZXqMYnjHbqXNyCpIu3W8TNBCRCp3a*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/linkInvoice_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/linkInvoice_BtnClick.js index c52fb4c..e7654b7 100644 --- a/src/so/so/saleinvoice/card/btnClicks/linkInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/linkInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*Jh3G9na7tIP6xkCREvej6JjH0u0MQbkaKWLHq118/+c=*/ /* * @Author: wangceb * @PageInfo: 联查税务发票 @@ -24,3 +25,5 @@ export default function buttonClick(props) { } ); } + +/*Jh3G9na7tIP6xkCREvej6JjH0u0MQbkaKWLHq118/+c=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/maintainInvoice_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/maintainInvoice_BtnClick.js index 4f2a37c..49eed6b 100644 --- a/src/so/so/saleinvoice/card/btnClicks/maintainInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/maintainInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*PDzNa3V5op52VGnXxoZ5q8goFG39IwrAw/CAQTBDCaVz6gpkLWPmaN/L0xHa4xHa*/ /* * @Author: wangceb * @PageInfo: 维护税务发票 @@ -33,4 +34,5 @@ function maintainInvoice(props) { this.invoiceComponent.linkSituation.show(); } ); -} \ No newline at end of file +} +/*PDzNa3V5op52VGnXxoZ5q8goFG39IwrAw/CAQTBDCaVz6gpkLWPmaN/L0xHa4xHa*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/offset_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/offset_BtnClick.js index a8b17b6..fe88aab 100644 --- a/src/so/so/saleinvoice/card/btnClicks/offset_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/offset_BtnClick.js @@ -1,9 +1,10 @@ +/*F0oPM7eBp5SEHceMLl9uL0xm1X30T7mul6dDRg5CzVQ=*/ /* - * @Author: zhangjyp + * @Author: zhangjyp * @PageInfo: 卡片费用冲抵按钮事件 - * @Date: 2018-04-19 10:38:05 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:54:56 + * @Date: 2018-04-19 10:38:05 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-09 18:49:32 */ import OffSetTable from 'so/so/components/offset'; import { ajax } from 'nc-lightapp-front'; @@ -18,205 +19,230 @@ const { OFFSET } = PAGEID; const { GENERAL } = OpposeFlag; export default function clickOffsetBtn(props) { - props.cardTable.filterEmptyRows(this.tableId, ['cmaterialvid'], 'include'); + props.cardTable.filterEmptyRows(this.tableId, ['cmaterialvid'], 'include'); - if (this.combineCache.combinvo.bcombinflag == true) { - showErrorInfo( - getLangByResId(this, '4006SALEINVOICE-000000'), - getLangByResId(this, '4006SALEINVOICE-000020') - ); /* 国际化处理: 错误,汇总状态下,不可做费用冲抵*/ + if (this.combineCache.combinvo.bcombinflag == true) { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000000'), + getLangByResId(this, '4006SALEINVOICE-000020') + ); /* 国际化处理: 错误,汇总状态下,不可做费用冲抵*/ - return; - } - let fopposeflag = props.form.getFormItemsValue(this.formId, 'fopposeflag').value; - if (GENERAL == fopposeflag) { - showErrorInfo( - getLangByResId(this, '4006SALEINVOICE-000000'), - getLangByResId(this, '4006SALEINVOICE-000021') - ); /* 国际化处理: 错误,对冲生成的发票不能做费用冲抵*/ + return; + } + let fopposeflag = props.form.getFormItemsValue(this.formId, 'fopposeflag').value; + if (GENERAL == fopposeflag) { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000000'), + getLangByResId(this, '4006SALEINVOICE-000021') + ); /* 国际化处理: 错误,对冲生成的发票不能做费用冲抵*/ - return; - } - let so15 = getSO15.call(this, props.form.getFormItemsValue(this.formId, 'pk_org').value); + return; + } + let so15 = getSO15.call(this, props.form.getFormItemsValue(this.formId, 'pk_org').value); } function getOffsetHeadInfo(cardData) { - let headInfo = cardData.head.head.rows[0].values; - let offSetHeadInfo = { - cinvoicecustid: headInfo.cinvoicecustid, - corigcurrencyid: headInfo.corigcurrencyid, - vbillcode: headInfo.vbillcode, - ntotalorigmny: headInfo.ntotalorigmny - }; - return offSetHeadInfo; + let headInfo = cardData.head.head.rows[0].values; + let offSetHeadInfo = { + cinvoicecustid: headInfo.cinvoicecustid, + corigcurrencyid: headInfo.corigcurrencyid, + vbillcode: headInfo.vbillcode, + ntotalorigmny: headInfo.ntotalorigmny, + }; + return offSetHeadInfo; } function offset() { - let canOffsetRows = isCanOffset(this.props.cardTable.getAllData(this.tableId)); - let cardData = this.props.createMasterChildDataSimple(this.pageId, this.formId, this.tableId); - if (canOffsetRows > 0) { - this.offsetCache.billvo = cardData; - const { show } = this.props.modal; - show('modal', { - size: 'xlg', - title: getLangByResId(this, '4006SALEINVOICE-000022') /* 国际化处理: 费用冲抵*/, - userControl: true, //用户自己控制是否关掉弹出框 - content: ( -
- -
- -
-
- ), - noFooter: false, - leftBtnName: getLangByResId(this, '4006SALEINVOICE-000003'), //左侧按钮名称, 默认确认/* 国际化处理: 确认*/ - rightBtnName: getLangByResId(this, '4006SALEINVOICE-000023'), //右侧按钮名称,默认关闭/* 国际化处理: 取消*/ - closeModalEve: close.bind(this), - cancelBtnClick: close.bind(this), - beSureBtnClick: clickOkBtn.bind(this) - }); - } else { - showErrorInfo( - getLangByResId(this, '4006SALEINVOICE-000000'), - getLangByResId(this, '4006SALEINVOICE-000024') - ); /* 国际化处理: 错误,赠品、折扣和劳务行不做冲抵,过滤后没有可冲抵的行*/ - } + let canOffsetRows = isCanOffset(this.props.cardTable.getAllData(this.tableId)); + let cardData = this.props.createMasterChildDataSimple(this.pageId, this.formId, this.tableId); + if (canOffsetRows > 0) { + this.offsetCache.billvo = cardData; + const { show } = this.props.modal; + show('modal', { + size: 'xlg', + title: getLangByResId(this, '4006SALEINVOICE-000022') /* 国际化处理: 费用冲抵*/, + userControl: true, //用户自己控制是否关掉弹出框 + content: ( +
+ +
+ ), + noFooter: false, + leftBtnName: getLangByResId(this, '4006SALEINVOICE-000003'), //左侧按钮名称, 默认确认/* 国际化处理: 确认*/ + rightBtnName: getLangByResId(this, '4006SALEINVOICE-000023'), //右侧按钮名称,默认关闭/* 国际化处理: 取消*/ + closeModalEve: close.bind(this), + cancelBtnClick: close.bind(this), + beSureBtnClick: clickOkBtn.bind(this) + }); + } else { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000000'), + getLangByResId(this, '4006SALEINVOICE-000024') + ); /* 国际化处理: 错误,赠品、折扣和劳务行不做冲抵,过滤后没有可冲抵的行*/ + } } function close() { - this.props.modal.close('modal'); + this.props.modal.close('modal'); } function isCanOffset(body) { - let canOffsetRows = 0; - for (let bvo of body.rows) { - //劳务类 - let blaborflag = bvo.values.blaborflag.value; - // 折扣类 - let bdiscountflag = bvo.values.bdiscountflag.value; - // 赠品 - let blargessflag = bvo.values.blargessflag.value; - // 劳务类,折扣类,赠品物料不可冲抵 - if (bdiscountflag == true || blaborflag == true || blargessflag == true) { - continue; - } - let origtaxmny = bvo.values.norigtaxmny.value; - // 价税合计为空或0 不可冲抵 - if (origtaxmny == undefined || origtaxmny == null || origtaxmny == 0) { - continue; - } - canOffsetRows++; - } - return canOffsetRows; + let canOffsetRows = 0; + for (let bvo of body.rows) { + //劳务类 + let blaborflag = bvo.values.blaborflag.value; + // 折扣类 + let bdiscountflag = bvo.values.bdiscountflag.value; + // 赠品 + let blargessflag = bvo.values.blargessflag.value; + // 劳务类,折扣类,赠品物料不可冲抵 + if (bdiscountflag == true || blaborflag == true || blargessflag == true) { + continue; + } + let origtaxmny = bvo.values.norigtaxmny.value; + // 价税合计为空或0 不可冲抵 + if (origtaxmny == undefined || origtaxmny == null || origtaxmny == 0) { + continue; + } + canOffsetRows++; + } + return canOffsetRows; } // 读取组织级业务参数 SO15 并隐藏字段 function getSO15(pk_org) { - let so15; - let params = {}; - params.pk_org = pk_org; - params.initCodes = ['SO15']; - ajax({ - // 批量查询业务参数设置 - url: QUERYPARAURL, - data: params, + let so15; + let params = {}; + params.pk_org = pk_org; + params.initCodes = ['SO15']; + ajax({ + // 批量查询业务参数设置 + url: QUERYPARAURL, + data: params, - success: (res) => { - if (res.data.SO15) { - if (res.data.SO15 == 0.0) { - showErrorInfo( - getLangByResId(this, '4006SALEINVOICE-000000'), - getLangByResId(this, '4006SALEINVOICE-000025') - ); /* 国际化处理: 错误,发票冲抵比例为0*/ - } else { - offset.call(this); - } - } - } - }); - return so15; + success: (res) => { + if (res.data.SO15) { + if (res.data.SO15 == 0.0) { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000000'), + getLangByResId(this, '4006SALEINVOICE-000025') + ); /* 国际化处理: 错误,发票冲抵比例为0*/ + } else { + offset.call(this); + } + } + }, + }); + return so15; } function clickOkBtn() { - let offsetVOs = this.offsetCache.offsetVO; - let isClose = checkOffsetData(offsetVOs); - if (isClose == true) { - close.call(this); - } else { - showErrorInfo( - getLangByResId(this, '4006SALEINVOICE-000000'), - getLangByResId(this, '4006SALEINVOICE-000026') - ); /* 国际化处理: 错误,请确保您选定的行输入冲抵金额不为0!*/ - - return; - } - let data = {}; - let carddata = this.props.createMasterChildDataSimple(this.pageId, this.formId, this.tableId); - this.offsetCache.billvo = carddata; - // this.setState({ - // billvo: carddata - // }); - - if (offsetVOs.length > 0) { - let table = { - areaType: 'table', - pageinfo: { - pageIndex: -1 - }, - rows: offsetVOs - }; - - data = { - grid: { - pageid: "400601200_offset", - table: table - }, - card: this.offsetCache.billvo, - tempvo: this.offsetCache.offsetTempVO - }; - } - else { - return; - } - ajax({ - url: '/nccloud/so/saleinvoice/unitarsub.do', - - data: data, - success: (res) => { - if (res.success) { - if (res.data) { - this.props.beforeUpdatePage(); - if (res.data.card.head && res.data.card.head[this.formId]) { - this.props.form.setAllFormValue({ [this.formId]: res.data.card.head[this.formId] }); - } - if (res.data.card.body && res.data.card.body[this.tableId]) { - this.props.cardTable.updateDataByRowId(this.tableId, res.data.card.body[this.tableId]); - } - if (res.data.tempvo) { - this.offsetCache.offsetTempVO = res.data.tempvo; - } - // 控制按钮显示隐藏 - buttonController.call(this); - // 设置编辑性 - setEditEnable.call(this, this.props, this.combineCache.combinvo); - this.props.updatePage(this.formId, this.tableId); - } - } + let offsetVOs = this.offsetCache.offsetVO; + let isClose = checkOffsetData(offsetVOs); + if (isClose == true) { + let isCheckThissubmny = checkOffsetThissubmny(offsetVOs); + if (isCheckThissubmny === true) { + close.call(this, this.props); + } else { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000104') + ); /* 国际化处理:冲抵金额超过费用单余额!*/ + return; } - }); + } else { + showErrorInfo( + getLangByResId(this, '4006SALEINVOICE-000000'), + getLangByResId(this, '4006SALEINVOICE-000026') + ); /* 国际化处理: 错误,请确保您选定的行输入冲抵金额不为0!*/ + + return; + } + let data = {}; + let carddata = this.props.createMasterChildDataSimple(this.pageId, this.formId, this.tableId); + this.offsetCache.billvo = carddata; + // this.setState({ + // billvo: carddata + // }); + + if (offsetVOs.length > 0) { + let table = { + areaType: 'table', + pageinfo: { + pageIndex: -1, + }, + rows: offsetVOs, + }; + + data = { + grid: { + pageid: '400601200_offset', + table: table, + }, + card: this.offsetCache.billvo, + tempvo: this.offsetCache.offsetTempVO, + }; + } else { + return; + } + ajax({ + url: '/nccloud/so/saleinvoice/unitarsub.do', + + data: data, + success: (res) => { + if (res.success) { + if (res.data) { + this.props.beforeUpdatePage(); + if (res.data.card.head && res.data.card.head[this.formId]) { + this.props.form.setAllFormValue({ [this.formId]: res.data.card.head[this.formId] }); + } + if (res.data.card.body && res.data.card.body[this.tableId]) { + this.props.cardTable.updateDataByRowId(this.tableId, res.data.card.body[this.tableId]); + } + if (res.data.tempvo) { + this.offsetCache.offsetTempVO = res.data.tempvo; + } + // 控制按钮显示隐藏 + buttonController.call(this); + // 设置编辑性 + setEditEnable.call(this, this.props, this.combineCache.combinvo); + this.props.updatePage(this.formId, this.tableId); + } + } + }, + }); } function checkOffsetData(offsetVOs) { - let nmny = 0; + let nmny = 0; + if (null == offsetVOs) { + return false; + } + for (let offsetvo of offsetVOs) { + nmny += offsetvo.values.nthissubmny.value; + } + if (Number(nmny) === 0 || Number(nmny) == 'NaN') { + return false; + } else { + return true; + } +} + +function checkOffsetThissubmny(offsetVOs) { + let nnum = 0; if (null == offsetVOs) { return false; } for (let offsetvo of offsetVOs) { - nmny += offsetvo.values.nthissubmny.value; + let nthissubmny = offsetvo.values.nthissubmny.value; + let nremainmny= offsetvo.values.nremainmny.value; + if (Number(nthissubmny) > Number(nremainmny)){ + nnum = nnum + 1; + } } - if (Number(nmny) === 0 || Number(nmny) == 'NaN') { + if (Number(nnum) > 0 ) { return false; } else { return true; } } + +/*F0oPM7eBp5SEHceMLl9uL0xm1X30T7mul6dDRg5CzVQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/opposeAdd_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/opposeAdd_BtnClick.js index 4c74a6c..9f89388 100644 --- a/src/so/so/saleinvoice/card/btnClicks/opposeAdd_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/opposeAdd_BtnClick.js @@ -1,3 +1,4 @@ +/*oazXRORN60E5qVBmhlzub/DDZQYndhZTEyfrpoHhdgo=*/ /* * @Author: zhangjyp * @PageInfo: 卡片生成对冲发票按钮事件 @@ -29,3 +30,5 @@ export default function clickOpposeAddBtn(props, callback) { getOpposeAddData.call(this, callback); } + +/*oazXRORN60E5qVBmhlzub/DDZQYndhZTEyfrpoHhdgo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/outPut_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/outPut_BtnClick.js index b067767..a490916 100644 --- a/src/so/so/saleinvoice/card/btnClicks/outPut_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/outPut_BtnClick.js @@ -1,3 +1,4 @@ +/*xCKRIwbmLno8GBqR+zvmEpestFzWd0Dv7FaqDblpekg=*/ /* * @Author: zhangjyp * @PageInfo: 卡片输出按钮事件 @@ -18,3 +19,5 @@ export default function(props) { data: { oids: [ pk ], outputType: 'output' } }); } + +/*xCKRIwbmLno8GBqR+zvmEpestFzWd0Dv7FaqDblpekg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/pageInfo_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/pageInfo_BtnClick.js index ab4eec1..6f7bdae 100644 --- a/src/so/so/saleinvoice/card/btnClicks/pageInfo_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/pageInfo_BtnClick.js @@ -1,3 +1,4 @@ +/*34aa3yvwJQSmoijK55YNuPY/eCyr7fZonxufelAs9nQ=*/ /* * @Author: zhangjyp * @PageInfo: 卡片翻页按钮事件 @@ -57,3 +58,5 @@ export default function(props, pk) { buttonController.call(this); this.props.updatePage(this.formId, this.tableId); } + +/*34aa3yvwJQSmoijK55YNuPY/eCyr7fZonxufelAs9nQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/print_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/print_BtnClick.js index 273ef2b..5409284 100644 --- a/src/so/so/saleinvoice/card/btnClicks/print_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/print_BtnClick.js @@ -1,9 +1,10 @@ +/*9a1eTd5yO0nmu7639LcU5sCoU1HACH/C90odhEYY9MI=*/ /* * @Author: zhangjyp * @PageInfo: 卡片打印按钮事件 * @Date: 2018-04-19 10:38:05 - * @Last Modified by: songyt13 - * @Last Modified time: 2021-08-12 15:34:21 + * @Last Modified by: liulux + * @Last Modified time: 2023-07-19 14:57:35 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA, URL, SALEINVOICE_CONST } from '../../const'; @@ -12,27 +13,31 @@ const { printPreview } = poc; const { FORMID } = PAGEAREA; const { PRINTURL, PRINTDATAPERMISSION } = URL; -export default function(props) { +export default function (props) { let pk = props.form.getFormItemsValue(FORMID, 'csaleinvoiceid').value; - + let pk_org = props.form.getFormItemsValue(FORMID, 'pk_org').value; ajax({ url: PRINTDATAPERMISSION, - data: { pks: [ pk ] }, + data: { pks: [pk] }, success: (res) => { if (res.success) { let printParams = { appcode: props.getAppCode(), nodekey: null, - oids: [ pk ], + oids: [pk], printType: true, realData: true, controlPrintNum: true, - userjson: JSON.stringify(this.combineCache.combinvo) + userjson: JSON.stringify(this.combineCache.combinvo), + pk_org: [pk_org], + billtype: SALEINVOICE_CONST.billtype }; // 审批场景再传这个参数(transactiontype-交易类型编码, billtype-单据类型,这两个参数每次只能传一个) if (SALEINVOICE_CONST.approvesce == props.getUrlParam(SALEINVOICE_CONST.scene) || SALEINVOICE_CONST.ssctp == props.getUrlParam(SALEINVOICE_CONST.scene)) { // 其他情况,需要根据单据类型找维护应用 - printParams.billtype = SALEINVOICE_CONST.billtype; + // printParams.billtype = SALEINVOICE_CONST.billtype; + printParams.istransbilltype = true; + printParams.userjson = JSON.stringify({ istransbilltype: true }); } /** @@ -48,3 +53,5 @@ export default function(props) { } }); } + +/*9a1eTd5yO0nmu7639LcU5sCoU1HACH/C90odhEYY9MI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/quit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/quit_BtnClick.js index 80629e1..e7816dd 100644 --- a/src/so/so/saleinvoice/card/btnClicks/quit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/quit_BtnClick.js @@ -1,3 +1,4 @@ +/*RSLtwhBExFdOE5rTJwTT6kzN+0FzV5VuyIwekQ9asEk=*/ /* * @Author: zhangjyp * @PageInfo: 退出转单事件 @@ -40,3 +41,5 @@ function quit(props) { }); } } + +/*RSLtwhBExFdOE5rTJwTT6kzN+0FzV5VuyIwekQ9asEk=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/redInvoice_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/redInvoice_BtnClick.js index 9941830..babe3f0 100644 --- a/src/so/so/saleinvoice/card/btnClicks/redInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/redInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*0z+Sj7+btWpd7tXPGieIf64B6v1BnK9Sop4R8Sjljtc=*/ /* * @Author: wangceb * @PageInfo: 红字发票 @@ -9,7 +10,7 @@ import { ajax } from 'nc-lightapp-front'; import { URL, PAGEID, PAGEAREA, SaleInvoiceHeadItem } from '../../const'; import { showWarningInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; -import InvoiceComponent from 'src/sscivm/invoiceComponent/compoundComponent/component'; +import InvoiceComponent from 'sscivm/invoiceComponent/compoundComponent/component'; export default function buttonClick(props) { let csaleinvoiceid = props.form.getFormItemsValue(this.formId, SaleInvoiceHeadItem.CSALEINVOICEID).value; @@ -66,3 +67,5 @@ export default function buttonClick(props) { }); }); } + +/*0z+Sj7+btWpd7tXPGieIf64B6v1BnK9Sop4R8Sjljtc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/refAddLineComfirm_Btn_Click.js b/src/so/so/saleinvoice/card/btnClicks/refAddLineComfirm_Btn_Click.js index c1b0ff5..c63e07c 100644 --- a/src/so/so/saleinvoice/card/btnClicks/refAddLineComfirm_Btn_Click.js +++ b/src/so/so/saleinvoice/card/btnClicks/refAddLineComfirm_Btn_Click.js @@ -1,3 +1,4 @@ +/*9SXo2dIjtemLH9shhv1q/LxxMzJmcnQg8lNA+iv/v0SjnhG3HR5R+R3y+7DpGshD*/ import transfer from '../init/transfer'; import getTranferData from '../init/getTranferData'; export default function refAddLineConfirm(type, combineflag, isRefAddLine) { @@ -5,3 +6,5 @@ export default function refAddLineConfirm(type, combineflag, isRefAddLine) { let idts = getTranferData.call(this, type, combineflag); transfer.call(this, idts, isRefAddLine); } + +/*9SXo2dIjtemLH9shhv1q/LxxMzJmcnQg8lNA+iv/v0SjnhG3HR5R+R3y+7DpGshD*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/refAddLine_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/refAddLine_BtnClick.js index 957c1fc..090327c 100644 --- a/src/so/so/saleinvoice/card/btnClicks/refAddLine_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/refAddLine_BtnClick.js @@ -1,14 +1,16 @@ +/*pI1wdSJeJL7AODyiH6BG5+7iI8YoJgkeoXdnx5zNTOw=*/ /* * @Author: zhangjyp * @PageInfo:销售发票参照增行 * @Date: 2018-06-08 15:52:15 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-11 10:54:03 + * @Last Modified by: chaiwx + * @Last Modified time: 2023-08-08 13:56:38 */ import { ajax } from 'nc-lightapp-front'; import { URL } from '../../const'; import refAddLineComfirm_Btn_Click from './refAddLineComfirm_Btn_Click'; import MultiTransferTable from '../../transfer/refline'; +import '../index.less'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; @@ -37,8 +39,9 @@ export default function refAddLine(props) { if (data) { if (data.length > 0) { for (let row of data) { - if (row.busitypes && row.busitypes.indexOf(curBusitype) != -1) + if (row.busitypes && row.busitypes.indexOf(curBusitype) != -1) { srcbilltype.push(row.src_billtype); + } } } // 如果来源单据类型里有销售出库单就显示多来源 @@ -49,7 +52,7 @@ export default function refAddLine(props) { noFooter: true, hasCloseBtn: true, className: 'ref-add-line', - zIndex: 280, + zIndex: 230, content: ( -
+
-
) }); @@ -54,3 +53,5 @@ export default function saleProfit_BtnClick(props) { } }); } + +/*jHHX4BZGJ+c3sSWFwRgTrTI+6jf9pltQ8Q2eZ2BMz/E=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/saveAndCommit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/saveAndCommit_BtnClick.js index 3d36b15..94135f7 100644 --- a/src/so/so/saleinvoice/card/btnClicks/saveAndCommit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/saveAndCommit_BtnClick.js @@ -1,3 +1,4 @@ +/*8YlaFdhX2aTGARIQ1DT2kk7Xd4RdRnMkmN5ZoXeBXxXa4S/2AhRlEDH5Wd4svB9t*/ /* * @Author: zhangjyp * @PageInfo: 保存提交按钮事件 @@ -223,7 +224,7 @@ export default function clickSaveAndCommitBtn(props, type, skipCodes, assign, ca props.cardPagination.setCardPaginationId({ id: csaleinvoiceid, status: 1 }); } if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { - props.dealFormulamsg( + this.props.dealFormulamsg( res.formulamsg //参数一:返回的公式对象 ); } @@ -236,3 +237,5 @@ export default function clickSaveAndCommitBtn(props, type, skipCodes, assign, ca }); }); } + +/*8YlaFdhX2aTGARIQ1DT2kk7Xd4RdRnMkmN5ZoXeBXxXa4S/2AhRlEDH5Wd4svB9t*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/save_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/save_BtnClick.js index 760fd6d..4510142 100644 --- a/src/so/so/saleinvoice/card/btnClicks/save_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/save_BtnClick.js @@ -1,3 +1,4 @@ +/*Ul4F8fkq5E+3GAjBdCwg7JrmUVNjEDw5n9Grwtm5LYY=*/ /* * @Author: zhangjyp * @PageInfo: 保存按钮事件 @@ -193,7 +194,7 @@ export default function clickSaveBtn(props, type, skipCodes, callbackbtn) { props.cardPagination.setCardPaginationId({ id: csaleinvoiceid, status: 1 }); } if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { - props.dealFormulamsg( + this.props.dealFormulamsg( res.formulamsg //参数一:返回的公式对象 ); } @@ -205,3 +206,5 @@ export default function clickSaveBtn(props, type, skipCodes, callbackbtn) { }); }); } + +/*Ul4F8fkq5E+3GAjBdCwg7JrmUVNjEDw5n9Grwtm5LYY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/showCombine_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/showCombine_BtnClick.js index f5b2d2c..94a8466 100644 --- a/src/so/so/saleinvoice/card/btnClicks/showCombine_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/showCombine_BtnClick.js @@ -1,9 +1,10 @@ +/*Q85yItnMKM87n/jHGFVBH3M2SMmyRfIjRhJe/UPRWvc=*/ /* * @Author: zhangjyp * @PageInfo: 显示汇总按钮 * @Date: 2018-05-16 18:33:24 - * @Last Modified by: mikey.zhaopeng - * @Last Modified time: 2024-07-16 10:14:32 + * @Last Modified by: zhangjyp + * @Last Modified time: 2018-09-29 17:29:54 */ import { URL } from '../../const'; @@ -37,17 +38,6 @@ export default function clickShowCombineBtn(props) { props.form.setAllFormValue({ [this.formId]: res.data.card.head[this.formId] }); } if (res.data.card.body && res.data.card.body[this.tableId]) { - // let rows = res.data.card.body[this.tableId].rows; - // rows.forEach((item, index) => { - // // 设置小数点保留位数 - // let fields = ['nqtorigtaxprice','nqtorignetprice', 'nqttaxprice', 'nqtnetprice']; - // fields.forEach(field => { - // if(item.values[field]) { - // item.values[field].scale = '2'; - // item.values[field].value = Number(item.values[field].value).toFixed(2); - // } - // }); - // }); props.cardTable.setTableData(this.tableId, res.data.card.body[this.tableId]); } if (res.data.combinrela) { @@ -67,3 +57,5 @@ export default function clickShowCombineBtn(props) { } }); } + +/*Q85yItnMKM87n/jHGFVBH3M2SMmyRfIjRhJe/UPRWvc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/showDetail_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/showDetail_BtnClick.js index 3010554..41bf440 100644 --- a/src/so/so/saleinvoice/card/btnClicks/showDetail_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/showDetail_BtnClick.js @@ -1,9 +1,10 @@ +/*2aC8zyYcLsaizFrgBRFZXXSv1oagyrkiZK9gpKQ4bWg=*/ /* * @Author: zhangjyp * @PageInfo: 显示明细按钮 * @Date: 2018-05-16 18:32:53 - * @Last Modified by: mikey.zhaopeng - * @Last Modified time: 2024-07-15 21:20:40 + * @Last Modified by: zhangjyp + * @Last Modified time: 2018-09-29 17:29:56 */ import { URL } from '../../const'; import { ajax } from 'nc-lightapp-front'; @@ -34,17 +35,6 @@ export default function clickShowDetailBtn(props) { props.form.setAllFormValue({ [this.formId]: res.data.card.head[this.formId] }); } if (res.data.card.body && res.data.card.body[this.tableId]) { - // let rows = res.data.card.body[this.tableId].rows; - // rows.forEach((item, index) => { - // // 设置小数点保留位数 - // let fields = ['nqtorigtaxprice','nqtorignetprice', 'nqttaxprice', 'nqtnetprice']; - // fields.forEach(field => { - // if(item.values[field]) { - // item.values[field].scale = '2'; - // item.values[field].value = Number(item.values[field].value).toFixed(2); - // } - // }); - // }); props.cardTable.setTableData(this.tableId, res.data.card.body[this.tableId]); } if (res.data.combinvo) { @@ -64,3 +54,5 @@ export default function clickShowDetailBtn(props) { } }); } + +/*2aC8zyYcLsaizFrgBRFZXXSv1oagyrkiZK9gpKQ4bWg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/unCommit_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/unCommit_BtnClick.js index 882c881..dba558f 100644 --- a/src/so/so/saleinvoice/card/btnClicks/unCommit_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/unCommit_BtnClick.js @@ -1,3 +1,4 @@ +/*I7vQLPJUaNNqfNSmpKY00Xox2XkA8auROOE7ZteWcfo=*/ /* * @Author: zhangjyp * @PageInfo:收回按钮事件 @@ -88,3 +89,5 @@ export default function clickUnCommitBtn(props) { } }); } + +/*I7vQLPJUaNNqfNSmpKY00Xox2XkA8auROOE7ZteWcfo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/unoffset_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/unoffset_BtnClick.js index aff7a7d..11ff850 100644 --- a/src/so/so/saleinvoice/card/btnClicks/unoffset_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/unoffset_BtnClick.js @@ -1,3 +1,4 @@ +/*IiyxvPmC0NO3o2ZTB53owGcEcj43x2J68Ms6vtEPYXY=*/ /* * @Author: zhangjyp * @PageInfo: 卡片取消费用冲抵按钮事件 @@ -83,3 +84,5 @@ function clickOkBtn(props) { } }); } + +/*IiyxvPmC0NO3o2ZTB53owGcEcj43x2J68Ms6vtEPYXY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/btnClicks/vatsub_BtnClick.js b/src/so/so/saleinvoice/card/btnClicks/vatsub_BtnClick.js index 5c827aa..aadfb25 100644 --- a/src/so/so/saleinvoice/card/btnClicks/vatsub_BtnClick.js +++ b/src/so/so/saleinvoice/card/btnClicks/vatsub_BtnClick.js @@ -1,9 +1,10 @@ +/*sFmmDN6ioEg4gEeJGVA0jZuxOEFOKtEFYPe2Udi1CFg=*/ /* * @Author: 刘奇 * @PageInfo: 税额小计 * @Date: 2019-05-17 10:21:28 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:47:17 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-01 12:37:34 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA, PAGEID } from '../../const'; @@ -33,10 +34,8 @@ export default function vatsub_BtnClick(props) { title: getLangByResId(this, '4006SALEINVOICE-000076') /* 国际化处理:税额小计 */, noFooter: true, content: ( -
-
+
-
) }); @@ -45,3 +44,5 @@ export default function vatsub_BtnClick(props) { } }); } + +/*sFmmDN6ioEg4gEeJGVA0jZuxOEFOKtEFYPe2Udi1CFg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/IsEditableCheckRule.js b/src/so/so/saleinvoice/card/events/IsEditableCheckRule.js index 0bc9292..bc0ab49 100644 --- a/src/so/so/saleinvoice/card/events/IsEditableCheckRule.js +++ b/src/so/so/saleinvoice/card/events/IsEditableCheckRule.js @@ -1,3 +1,4 @@ +/*FDMGLraVXRe66lVGinb2IByA+mRdvaYz7rNd72jlsj4=*/ /* * @Author: wangceb * @PageInfo: 销售发票修订字段是否能编辑检查规则 @@ -56,3 +57,5 @@ function isEditableItem(props, moduleId, row, key) { } export { isCanRevise }; + +/*FDMGLraVXRe66lVGinb2IByA+mRdvaYz7rNd72jlsj4=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/afterEvent.js b/src/so/so/saleinvoice/card/events/afterEvent.js index 0e5477f..ae82d6f 100644 --- a/src/so/so/saleinvoice/card/events/afterEvent.js +++ b/src/so/so/saleinvoice/card/events/afterEvent.js @@ -1,3 +1,4 @@ +/*DncIqBreQz6WZRX+v7OzgcZHMDCanfcUW5KKXHaOBOc=*/ /* * @Author: zhangjyp * @PageInfo: 编辑事件 @@ -20,3 +21,5 @@ export default function afterEvent(props, moduleId, key, value, rows, i, s, g) { bodyEvents.call(this, props, moduleId, key, value, rows, i, s, g); } } + +/*DncIqBreQz6WZRX+v7OzgcZHMDCanfcUW5KKXHaOBOc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/batchEvents.js b/src/so/so/saleinvoice/card/events/batchEvents.js index 8d5c464..2da117d 100644 --- a/src/so/so/saleinvoice/card/events/batchEvents.js +++ b/src/so/so/saleinvoice/card/events/batchEvents.js @@ -1,10 +1,12 @@ +/*8nIjANkSB9VpkQdmnMi+FH+RuCNHXu5W/uY4vXkgGks=*/ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA, URL, PAGEID } from '../../const'; import { createBodyAfterEventData4Batch, processBillCardBodyEditResult4Batch } from '../../../../../scmpub/scmpub/pub/tool/afterEditUtil'; -import headTotalCalRule from '../../../pub/pubrule/headTotalCalRule'; +import vfreeBeforeEvent from '../../../pub/pubrule/vfreeBeforeEvent'; +import { marAsstUtils } from '../../../../../scmpub/scmpub/pub/tool'; const copyFields = [ 'nastnum', @@ -18,9 +20,13 @@ const copyFields = [ 'norigtaxnetprice', 'norignetprice', 'ntaxrate', - 'vrownote' + 'vrownote', + 'norigmny' ]; -export default function (obj) { + +const FixAssts = [ 'cproductorid', 'cvendorvid', 'cvendorid', 'cmffileid' ]; + +export default async function(obj) { let areaCode = obj.areaCode; //区域编码 let column = obj.column; //列信息 let newValue = obj.newValue; //变更的行信息 @@ -30,20 +36,39 @@ export default function (obj) { let indexs = []; let rows = []; let attrcode = column.attrcode; //列code - let queryCondition; //统一过滤的过滤条件 + let queryCondition = {}; //统一过滤的过滤条件 let isManyCondition = null; //是否多个过滤条件 let pasteData = obj.pasteData; //粘贴的值 - if (attrcode.startsWith('vbdef')) { + + //2022212版本新增:生产厂商、供应商、自由辅助属性、无税金额、价税合计、税码、收支项目 + if (attrcode.startsWith('vbdef') || FixAssts.includes(attrcode) || attrcode == 'ccostsubjid') { for (let i = 0; i < newValue.length; i++) { + if (!await checkEditableByAttrcode.call(this, attrcode, newValue[i].values, i)) { + continue; + } queryValue.push(newValue[i]); indexs[i] = currentIndex + i; - rows[i] = [i]; + rows[i] = [ i ]; + + if (attrcode === 'cmffileid') { + // 配置码需要根据物料过滤 + let cmaterialvid = (newValue[i].values.cmaterialvid || {}).value; + queryValue[i].queryCondition = { cmaterialvid: cmaterialvid }; + } + } + + if (attrcode == 'cmffileid') { + isManyCondition = true; + } else { + let pk_org = this.props.form.getFormItemsValue(PAGEAREA.FORMID, 'pk_org').value; + queryCondition = { pk_org: pk_org }; + isManyCondition = false; } - let pk_org = this.props.form.getFormItemsValue(PAGEAREA.FORMID, 'pk_org').value; - queryCondition = { pk_org: pk_org }; - isManyCondition = false; } else if (copyFields.includes(attrcode)) { for (let i = 0; i < newValue.length; i++) { + if (!await checkEditableByAttrcode.call(this, attrcode, newValue[i].values, i)) { + continue; + } queryValue.push(newValue[i]); // 粘贴后不自动增行 if ( @@ -53,7 +78,88 @@ export default function (obj) { ) { indexs[i] = currentIndex + i; } - rows[i] = [i]; + rows[i] = [ i ]; + } + } else if (attrcode.startsWith('vfree')) { + for (let i = 0; i < newValue.length; i++) { + if (!await checkEditableByAttrcode.call(this, attrcode, newValue[i].values, i)) { + continue; + } + // 自由辅助属性编辑前 + let constance = { + key: attrcode, + areahid: PAGEAREA.FORMID, + areabid: PAGEAREA.TABLEID, + index: currentIndex + i, + cmaterialid: 'cmaterialvid', + rowid: newValue[i].rowid + }; + let isEdit = await vfreeBeforeEvent.call(this, this.props, constance); + if (!isEdit) { + continue; + } + queryValue.push(newValue[i]); + indexs[i] = currentIndex + i; + let freefield = { + cvendorid: 'cvendorid', + cvendorvid: 'cvendorvid' + }; + queryValue[queryValue.length - 1].queryCondition = marAsstUtils.getVfreeQueryCondition.call( + this, + this.props, + '400601200', + PAGEID.CARD, + PAGEAREA.TABLEID, + attrcode, + newValue[i], + freefield + ); + } + let pk_org = this.props.form.getFormItemsValue(PAGEAREA.FORMID, 'pk_org').value; + queryCondition = { pk_org: pk_org }; + isManyCondition = true; + } else if (attrcode == 'ctaxcodeid') { + // 税码 + for (let i = 0; i < newValue.length; i++) { + if (!await checkEditableByAttrcode.call(this, attrcode, newValue[i].values, i)) { + continue; + } + queryValue.push(newValue[i]); + // 粘贴后不自动增行 + if ( + newValue[i].values[attrcode].value != '' && + newValue[i].values.pk_org && + newValue[i].values.pk_org.value != '' + ) { + indexs[i] = currentIndex + i; + } + rows[i] = [ i ]; + } + let fbuysellflag = (this.props.form.getFormItemsValue(this.formId, 'fbuysellflag') || {}).value; + // 税码 + let ctaxcountryid = this.props.form.getFormItemsValue(this.formId, 'ctaxcountryid'); + queryCondition = { + SCM_REPTAXCOUNTRY: (ctaxcountryid || {}).value, + SCM_PURSALETYPE: fbuysellflag, + GridRefActionExt: 'nccloud.web.scmpub.ref.TaxCodeRefFilterUtils' + }; + isManyCondition = true; + } else if (attrcode == 'norigtaxmny') { + // 价税合计 + for (let i = 0; i < newValue.length; i++) { + if (!await checkEditableByAttrcode.call(this, attrcode, newValue[i].values, i)) { + continue; + } + queryValue.push(newValue[i]); + // 粘贴后不自动增行 + if ( + newValue[i].values[attrcode].value != '' && + newValue[i].values.pk_org && + newValue[i].values.pk_org.value != '' + ) { + indexs[i] = currentIndex + i; + } + rows[i] = [ i ]; } } else { return; @@ -95,7 +201,7 @@ export default function (obj) { async: false, success: (res) => { if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { - props.dealFormulamsg( + this.props.dealFormulamsg( res.formulamsg, //参数一:返回的公式对象 { //参数二:界面使用的表格类型 @@ -103,19 +209,51 @@ export default function (obj) { } ); } - //cyoung 2024年04月25日 17:24:42 无税净价 和 本币无税净价 四舍五入保留两位小数 - res.data.billCard.body.saleinvoice_b.rows.forEach(function (row) { - row.values.nqtorignetprice.scale = 6; - row.values.nqtorignetprice.value = Number(row.values.nqtorignetprice.value).toFixed(2); - row.values.nqtnetprice.scale = 6; - row.values.nqtnetprice.value = Number(row.values.nqtnetprice.value).toFixed(2); - }); processBillCardBodyEditResult4Batch(props, PAGEAREA.TABLEID, res.data, indexs); this.forceUpdate(); } }); - let keymaps = new Map(); - keymaps.set('ntaxmny', 'vdef5'); - headTotalCalRule(this.props, PAGEID.CARD, PAGEAREA.FORMID, PAGEAREA.TABLEID, keymaps); }); } + +/** + * 检查指定字段的编辑性x + * @param {*} attrcode + * @param {*} record + */ +async function checkEditableByAttrcode(attrcode, record, index) { + let canEdit = true; + // 没有物料的行相当于空行,不允许编辑 + if (!(record['cmaterialvid'] && record['cmaterialvid'].value)) { + canEdit = false; + return canEdit; + } + if ('cmaterialvid' == attrcode) { + canEdit = true; + // 价税合计 + } else if (attrcode == 'norigtaxmny') { + // 已做过费用冲抵的对冲发票,数量和价税合计不可改(即不可以做部分对冲) + let bsubunitflag = this.props.form.getFormItemsValue(this.formId, 'bsubunitflag'); + let fopposeflag = this.props.form.getFormItemsValue(this.formId, 'fopposeflag'); + if (bsubunitflag && bsubunitflag.value && fopposeflag && fopposeflag.value == '2') { + showWarningInfo(null, getLangByResId(this, '4006SALEINVOICE-000096')); /* 国际化处理: 已冲抵的对冲发票不可以修改数量和价税合计*/ + canEdit = false; + } + + //汇总显示的对冲发票,数量和价税合计不可改(即不可以做部分对冲) + if (this.combineCache.combinvo && this.combineCache.combinvo.bcombinflag) { + showWarningInfo(null, getLangByResId(this, '4006SALEINVOICE-000097')); /* 国际化处理: 汇总显示的对冲发票不可以修改数量和价税合计*/ + canEdit = false; + } + } else if (attrcode == 'ctaxcodeid') { + // 税码 + let ctaxcountryid = this.props.form.getFormItemsValue(this.formId, 'ctaxcountryid'); + // 报税国为空,不可编辑 + if (!ctaxcountryid || !ctaxcountryid.value) { + return false; + } + } + return canEdit; +} + +/*8nIjANkSB9VpkQdmnMi+FH+RuCNHXu5W/uY4vXkgGks=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/beforeEvent.js b/src/so/so/saleinvoice/card/events/beforeEvent.js index 8d6e867..b66a42b 100644 --- a/src/so/so/saleinvoice/card/events/beforeEvent.js +++ b/src/so/so/saleinvoice/card/events/beforeEvent.js @@ -1,3 +1,4 @@ +/*lA7FrGfHlashLvM+HJWGNXPr9oOKTzcij2k2Znrh0rE=*/ import body_beforeEvent from './body_beforeEvent'; import head_beforeEvent from './head_beforeEvent'; import { PAGEAREA } from '../../const'; @@ -12,3 +13,5 @@ export default function(props, moduleId, key, value, index, record) { return body_beforeEvent.call(this, props, moduleId, key, value, index, record); } } + +/*lA7FrGfHlashLvM+HJWGNXPr9oOKTzcij2k2Znrh0rE=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/body_afterEvent.js b/src/so/so/saleinvoice/card/events/body_afterEvent.js index 5a30e3b..da60544 100644 --- a/src/so/so/saleinvoice/card/events/body_afterEvent.js +++ b/src/so/so/saleinvoice/card/events/body_afterEvent.js @@ -1,9 +1,10 @@ +/*b31B7ixJwi12Pfc4XUBx2RcOAe5amcgbJkqG8TY35Z4=*/ /* * @Author: zhangjyp * @PageInfo: 表体编辑后事件 * @Date: 2018-04-24 10:38:43 - * @Last Modified by: mikey.zhaopeng - * @Last Modified time: 2024-05-13 11:10:27 + * @Last Modified by: chaiwx + * @Last Modified time: 2023-06-05 16:26:11 */ import { ajax } from 'nc-lightapp-front'; @@ -19,9 +20,9 @@ const { CARD } = PAGEID; const { FORMID, TABLEID } = PAGEAREA; import headTotalCalRule from '../../../pub/pubrule/headTotalCalRule'; import { marAsstUtils } from '../../../../../scmpub/scmpub/pub/tool'; -let fixAssts = ['cproductorid', 'cprojectid', 'cvendorvid', 'cvendorid']; +let fixAssts = [ 'cproductorid', 'cprojectid', 'cvendorvid', 'cvendorid', 'cmffileid' ]; // 编辑事件不关注的字段 -const NOTPRO_FIELDS = ['crowno', 'vrownote']; +const NOTPRO_FIELDS = [ 'crowno', 'vrownote' ]; export default function bodyAfterEvent(props, moduleId, key, value, rows, i, record) { if (NOTPRO_FIELDS.includes(key)) { return; @@ -41,7 +42,7 @@ export default function bodyAfterEvent(props, moduleId, key, value, rows, i, rec let freefield = { cvendorid: 'cvendorid', cvendorvid: 'cvendorvid' - } + }; marAsstUtils.afterEdit.call(this, props, null, CARD, moduleId, key, 'cmaterialvid', record, i, freefield); } let data = createBodyAfterEventData(this.props, CARD, FORMID, TABLEID, moduleId, key, rows, i); @@ -52,25 +53,6 @@ export default function bodyAfterEvent(props, moduleId, key, value, rows, i, rec async: false, success: (res) => { if (res.data && res.data.billCard) { - //cyoung 2024年05月13日 10:29:41 本币无税净价四舍五入小数点后两位并补零 - let bodyrows = res.data.billCard.body[TABLEID].rows - bodyrows.forEach((element) => { - //本币无水净价 - let nqtnetprice = element.values.nqtnetprice; - if(nqtnetprice && nqtnetprice.value){ - nqtnetprice.scale = 6; - nqtnetprice.value = parseFloat(Number(nqtnetprice.value).toFixed(2)); - nqtnetprice._display_ = parseFloat(Number(nqtnetprice.value).toFixed(2)); - } - //无税净价 - // let nqtorignetprice = element.values.nqtorignetprice; - // if(nqtorignetprice && nqtorignetprice.value){ - // nqtorignetprice.scale = 6; - // nqtorignetprice.value = parseFloat(Number(nqtorignetprice.value).toFixed(2)); - // nqtorignetprice._display_ = parseFloat(Number(nqtorignetprice.value).toFixed(2)); - // } - }); - props.form.setAllFormValue({ [FORMID]: res.data.billCard.head[FORMID] }, false); processBillCardBodyEditResult(this.props, TABLEID, res.data, i); // 如果编辑字段影响单价金额算法,则触发表头合计 @@ -80,14 +62,13 @@ export default function bodyAfterEvent(props, moduleId, key, value, rows, i, rec keymaps.set('norigtaxmny', 'ntotalorigmny'); keymaps.set('norigsubmny', 'ntotalorigsubmny'); keymaps.set('norigdiscount', 'nhvoicedismny'); - keymaps.set('ntaxmny', 'vdef5'); headTotalCalRule(this.props, CARD, FORMID, TABLEID, keymaps); } processCardTableAutoAddRow(props, TABLEID, i, { isMuli: rows.length > 1 ? true : false, isAutoAddFunc: isAutoAdd.bind(this, this.props), - autoAddFunc: addRowBtnClick.bind(this, this.props) + autoAddFunc: addRowBtnClick.bind(this, this.props, true) }); } } @@ -96,3 +77,5 @@ export default function bodyAfterEvent(props, moduleId, key, value, rows, i, rec function isAutoAdd(props) { return true; } + +/*b31B7ixJwi12Pfc4XUBx2RcOAe5amcgbJkqG8TY35Z4=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/body_beforeEvent.js b/src/so/so/saleinvoice/card/events/body_beforeEvent.js index cfff080..7788c38 100644 --- a/src/so/so/saleinvoice/card/events/body_beforeEvent.js +++ b/src/so/so/saleinvoice/card/events/body_beforeEvent.js @@ -1,3 +1,4 @@ +/*ChwtK7xNbiE0T80ETHXkTySkNYb7sbI9JKSb7kPLmfU=*/ import { ajax } from 'nc-lightapp-front'; import vfreeBeforeEvent from '../../../pub/pubrule/vfreeBeforeEvent'; import { PAGEAREA, URL, PAGEID } from '../../const'; @@ -46,7 +47,19 @@ export default async function(props, moduleId, key, value, index, record) { } } - if (key == 'cmaterialvid') { + if (key.indexOf('vbdef') == 0) { + // 收货地址 + let pk_org = props.form.getFormItemsValue(this.formId, 'pk_org').value; + props.cardTable.setQueryCondition(TABLEID, { + [key]: () => { + return { + pk_org: pk_org + }; + } + }); + + return true; + } else if (key == 'cmaterialvid') { // 物料只可参照到服务类,折扣类物料 let item = meta[moduleId].items.find((item) => item.attrcode == 'cmaterialvid'); @@ -234,20 +247,20 @@ export default async function(props, moduleId, key, value, index, record) { } else if (key == 'ntax') { //汇总显示的对冲发票,税额不可编辑(即不可以做部分对冲) if (this.combineCache.combinvo && this.combineCache.combinvo.bcombinflag) { - return true; + return false; } - // 已做过费用冲抵,税额不可编辑 - let bsubunitflag = props.form.getFormItemsValue(this.formId, 'bsubunitflag'); - if (bsubunitflag && bsubunitflag.value) { + // // 已做过费用冲抵,税额不可编辑 + // let bsubunitflag = props.form.getFormItemsValue(this.formId, 'bsubunitflag'); + // if (bsubunitflag && bsubunitflag.value) { + // return false; + // } else { + // 传开票申请了,税额不可编辑,税务发票红冲或作废了,可编辑 + if (!this.invoicestatusForSSC) { return false; } else { - // 传开票申请了,税额不可编辑,税务发票红冲或作废了,可编辑 - if (!this.invoicestatusForSSC) { - return false; - } else { - return true; - } + return true; } + // } } else if (key == 'creceiveaddrid') { // 收货地址 let creceivecustid = record.values.creceivecustid.value; @@ -288,13 +301,13 @@ export default async function(props, moduleId, key, value, index, record) { let fopposeflag = props.form.getFormItemsValue(this.formId, 'fopposeflag'); if (bsubunitflag && bsubunitflag.value && fopposeflag && fopposeflag.value == '2') { showWarningInfo(null, getLangByResId(this, '4006SALEINVOICE-000096')); /* 国际化处理: 已冲抵的对冲发票不可以修改数量和价税合计*/ - return true; + return false; } //汇总显示的对冲发票,数量和价税合计不可改(即不可以做部分对冲) if (this.combineCache.combinvo && this.combineCache.combinvo.bcombinflag) { showWarningInfo(null, getLangByResId(this, '4006SALEINVOICE-000097')); /* 国际化处理: 汇总显示的对冲发票不可以修改数量和价税合计*/ - return true; + return false; } } else if (key == 'norigdiscount') { // 已做过费用冲抵的对冲发票,折扣额不可编辑 @@ -305,11 +318,11 @@ export default async function(props, moduleId, key, value, index, record) { } //汇总显示的对冲发票,折扣额不可改(即不可以做部分对冲) if (this.combineCache.combinvo && this.combineCache.combinvo.bcombinflag) { - return true; + return false; } } - let fixAssts = [ 'cproductorid', 'cprojectid', 'cvendorvid' ]; + let fixAssts = [ 'cproductorid', 'cprojectid', 'cvendorvid', 'cmffileid' ]; if (key.indexOf('vfree') == 0 || fixAssts.includes(key)) { let cmaterialvid = record.values.cmaterialvid; // 如果物料为空不可编辑 @@ -325,19 +338,38 @@ export default async function(props, moduleId, key, value, index, record) { areahid: FORMID, areabid: TABLEID, index: index, - cmaterialid: 'cmaterialvid' + cmaterialid: 'cmaterialvid', + rowid: record.rowid }; flag = await vfreeBeforeEvent.call(this, props, constance); + // + let scrcbid = props.cardTable.getValByKeyAndRowId(TABLEID, record.rowid, 'csrcbid'); + if (scrcbid && scrcbid.value) { + flag = false; + } } if (flag) { - this.props.cardTable.setQueryCondition(PAGEAREA.TABLEID, { - [key]: () => { - let pk_org = (this.props.form.getFormItemsValue(PAGEAREA.FORMID, 'pk_org') || {}).value; - return { - pk_org: pk_org - }; - } - }); + if (key === 'cmffileid') { + // 配置码需要根据物料过滤 + this.props.cardTable.setQueryCondition(TABLEID, { + [key]: () => { + let cmaterialvid = (record.values.cmaterialvid || {}).value; + return { + cmaterialvid: cmaterialvid + }; + } + }); + } else { + this.props.cardTable.setQueryCondition(PAGEAREA.TABLEID, { + [key]: () => { + let pk_org = (this.props.form.getFormItemsValue(PAGEAREA.FORMID, 'pk_org') || {}).value; + return { + pk_org: pk_org + }; + } + }); + } + let freefield = { cvendorid: 'cvendorid', cvendorvid: 'cvendorvid' @@ -388,3 +420,5 @@ export function changeRateBeforeEvent(key, record, cunitkey) { }); }); } + +/*ChwtK7xNbiE0T80ETHXkTySkNYb7sbI9JKSb7kPLmfU=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/head_afterEvent.js b/src/so/so/saleinvoice/card/events/head_afterEvent.js index 8dc1785..bba67f2 100644 --- a/src/so/so/saleinvoice/card/events/head_afterEvent.js +++ b/src/so/so/saleinvoice/card/events/head_afterEvent.js @@ -1,9 +1,10 @@ +/*BAFdiJLVkqxmxJX3rMB6zF/YCrUtru8RzHC9z8HtWsM=*/ /* * @Author: zhangjyp * @PageInfo: 表头编辑后事件 * @Date: 2018-04-24 10:37:19 - * @Last Modified by: mikey.zhaopeng - * @Last Modified time: 2024-04-11 14:04:21 + * @Last Modified by: zhaoypm + * @Last Modified time: 2020-10-21 14:42:30 */ import { ajax } from 'nc-lightapp-front'; import { @@ -11,7 +12,6 @@ import { processBillCardHeadEditResult } from '../../../../../scmpub/scmpub/pub/tool/afterEditUtil'; import { PAGEID, URL } from '../../const'; -import bodyAfterEvent from './body_afterEvent'; const { CARD } = PAGEID; const { HEADAFTERURL } = URL; @@ -29,17 +29,6 @@ export default function headAfterEvent(props, moduleId, key, value, oldValue, i) props.form.setFormItemsValue(moduleId, { vtrantypecode: { value: i.refcode } }); return; } - // 20230411 guoxqc销售结算函 - if (key === 'vdef1') { - props.cardTable.setColValue(this.tableId, 'nqtorigtaxprice', { value: '123' }); - const rows = props.cardTable.getVisibleRows(this.tableId); - rows.forEach((item, index) => { - debugger - bodyAfterEvent.call(this, props, this.tableId, 'nqtorigtaxprice', '123', [{ newvalue: { value: '123' }, oldvalue: { value: '' } }], index, item); - }); - // props.cardTable.setValByKeyAndIndex(this.tableId,0,'nqtorigtaxprice',{value:'123',display:''}); - return; - } let bodyFileds = [ 'vbdef1', 'vbdef2', @@ -149,20 +138,9 @@ export default function headAfterEvent(props, moduleId, key, value, oldValue, i) success: (res) => { if (res.data && res.data.billCard) { processBillCardHeadEditResult(props, this.formId, this.tableId, res.data); - //cyoung 2024年04月11日 11:09:40 - debugger - if (key === 'corigcurrencyid' || key === 'cratetype' || key === 'nexchangerate' || key === 'dratedate') { - let nexchangerate = props.form.getFormItemsValue(moduleId, 'nexchangerate').value; - if (nexchangerate == null || nexchangerate == '' || nexchangerate == undefined) { - return - } - let ntotalorigmny = props.form.getFormItemsValue(moduleId, 'ntotalorigmny').value; - ntotalorigmny = (ntotalorigmny == null || ntotalorigmny == '' || ntotalorigmny == undefined) ? Number(0) : Number(ntotalorigmny) - let vdef5 = (parseFloat(nexchangerate) * parseFloat(ntotalorigmny)).toFixed(2) - debugger - props.form.setFormItemsValue(moduleId, { vdef5: { value: vdef5 } }); - } } } }); } + +/*BAFdiJLVkqxmxJX3rMB6zF/YCrUtru8RzHC9z8HtWsM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/head_beforeEvent.js b/src/so/so/saleinvoice/card/events/head_beforeEvent.js index ee30c74..539544a 100644 --- a/src/so/so/saleinvoice/card/events/head_beforeEvent.js +++ b/src/so/so/saleinvoice/card/events/head_beforeEvent.js @@ -1,3 +1,4 @@ +/*JW/GII0d7JU5CumqY1a9vapNImv8Xuo/ZOsWpC1ZoBo=*/ import vbillcodeBeforeEvent from '../../../pub/pubrule/vbillcodeBeforeEvent'; import { URL, PAGEAREA } from '../../const'; import { ajax } from 'nc-lightapp-front'; @@ -138,19 +139,6 @@ export default async function(props, moduleId, key, value, record) { } else { return true; } - }else if (key == 'vdef1') {// 20230411 guoxqc - let cinvoicecustid = props.form.getFormItemsValue(moduleId, 'cinvoicecustid').value;// 客户 - let meta=props.meta.getMeta(); - meta[moduleId].items.forEach(item=>{ - if(item.attrcode==key){ - item.queryCondition=()=>{ - return { - pk_customer:cinvoicecustid - }; - }; - } - }) - props.meta.setMeta(meta) } return true; @@ -237,3 +225,5 @@ function isNull(value) { } return false; } + +/*JW/GII0d7JU5CumqY1a9vapNImv8Xuo/ZOsWpC1ZoBo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/index.js b/src/so/so/saleinvoice/card/events/index.js index 16dcc96..b9c25d9 100644 --- a/src/so/so/saleinvoice/card/events/index.js +++ b/src/so/so/saleinvoice/card/events/index.js @@ -1,5 +1,8 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import afterEvent from './afterEvent'; import beforeEvent from './beforeEvent'; import batchEvents from './batchEvents'; export { afterEvent, beforeEvent, batchEvents }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/events/isEditEvent.js b/src/so/so/saleinvoice/card/events/isEditEvent.js index d4e9649..fc636e2 100644 --- a/src/so/so/saleinvoice/card/events/isEditEvent.js +++ b/src/so/so/saleinvoice/card/events/isEditEvent.js @@ -1,3 +1,4 @@ +/*y3a/eQFZ7PtzyGh+e43WblppJz0l9U81Qm+KUOoXbao=*/ import { URL, PAGEAREA } from '../../const'; import { ajax } from 'nc-lightapp-front'; const { HEADBEFOREURL } = URL; @@ -64,3 +65,5 @@ function isBillHasSrc(props) { }); return flag; } + +/*y3a/eQFZ7PtzyGh+e43WblppJz0l9U81Qm+KUOoXbao=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/index.js b/src/so/so/saleinvoice/card/index.js index a8c3a48..aed081f 100644 --- a/src/so/so/saleinvoice/card/index.js +++ b/src/so/so/saleinvoice/card/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import React, { Component } from 'react'; import { createPage, base, high } from 'nc-lightapp-front'; @@ -124,7 +125,7 @@ class SaleInvoiceCard extends Component { }; componentWillMount() { - initLang(this, [ '4006saleinvoice' ], 'so', initTemplate.bind(this, this.props)); + initLang(this, ['4006saleinvoice'], 'so', initTemplate.bind(this, this.props)); window.onbeforeunload = () => { let status = this.props.form.getFormStatus(this.formId); if (status != SALEINVOICE_CONST.BROWSE) { @@ -180,7 +181,11 @@ class SaleInvoiceCard extends Component { let result = []; bodys.map((body, index) => { if (body.values['blargessflag'].value) { - result.push({ code: [ 'norigtaxmny', 'nglobaltaxmny', 'ngrouptaxmny', 'ntax' ], indexArr: index }); + result.push({ + code: ['norigtaxmny', 'nglobaltaxmny', 'ngrouptaxmny', 'ntax', 'ntaxmny', 'norigmny', 'norigdiscount', 'ncaltaxmny', 'nmny', 'ngroupmny', 'nglobalmny', 'nglobaltaxmny', 'nbforigsubmny', 'norigsubmny', 'ndiscount', 'ntotalincomemny', 'ntotalpaymny', 'ntotalopposemny'], + //价税合计、本币价税合计、集团本币价税合计、税额、本币价税合计、无税金额、折扣额、计税金额、本币无税金额、集团本币无税金额、全局本币无税金额、全局本币价税合计、冲抵前金额、费用冲抵金额、本币折扣额、累计确认应收金额、累计收款金额、累计对冲金额、 + indexArr: index + }); } }); return result; @@ -235,9 +240,9 @@ class SaleInvoiceCard extends Component { let { createModal } = modal; let { showUploader, target } = this.state; let transfer = this.props.getUrlParam('type') == 'transfer'; + let singletransfer = this.props.getUrlParam('type') == 'singletransfer'; const { socket } = this.props; - -debugger + return (
{socket.connectMesg({ @@ -269,9 +274,8 @@ debugger
-
- {transfer ? ( + {transfer || singletransfer ? ( createTransferList({ dataSource: TRANSFERCACAHEKEY, //表格组件id @@ -292,11 +296,12 @@ debugger
{createForm(this.formId, { - expandArr: [ LIST ], + expandArr: [LIST], onAfterEvent: afterEvent.bind(this), onBeforeEvent: beforeEvent.bind(this) })}
+
{createCardTable(this.tableId, { tableHead: this.getTableHead.bind(this, this.type), @@ -312,8 +317,9 @@ debugger modelDelRow: delLineForCardEdit.bind(this), modelAddRow: addLineForCardEdit.bind(this), noTotalRows: this.calTotal, - adaptionHeight: true + adaptionHeight: true, // modelFooter: this.modelFooter.bind(this) + onBatchSelected: rowButtonController.bind(this) })}
@@ -386,7 +392,6 @@ debugger let { showUploader, target } = this.state; const { createCardPagination } = cardPagination; const { socket } = this.props; -debugger return (
{socket.connectMesg({ @@ -461,7 +466,8 @@ debugger noTotalRows: this.calTotal, adaptionHeight: true, modelAddRowBefore: checkAddLine.bind(this), - modelDelRowBefore: checkDeleteLine.bind(this) + modelDelRowBefore: checkDeleteLine.bind(this), + onBatchSelected: rowButtonController.bind(this) })}
@@ -527,10 +533,11 @@ debugger // 主方法 render() { let transfer = this.props.getUrlParam('type') == 'transfer'; + let singletransfer = this.props.getUrlParam('type') == 'singletransfer'; let { createModal } = this.props.modal; return (
- {transfer ? this.getTransferView() : this.getNormalView()} + {transfer || singletransfer ? this.getTransferView() : this.getNormalView()} {createModal('linkmodal', { content: '', rightBtnName: '' @@ -569,7 +576,9 @@ SaleInvoiceCard = createPage({ headcode: FORMID, bodycode: { [TABLEID]: 'cardTable' } }, - orderOfHotKey: [ FORMID, TABLEID ] + orderOfHotKey: [FORMID, TABLEID] })(SaleInvoiceCard); export default SaleInvoiceCard; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/PasteLineToTail_BtnClick.js b/src/so/so/saleinvoice/card/init/PasteLineToTail_BtnClick.js index 0ca326b..7dc2d85 100644 --- a/src/so/so/saleinvoice/card/init/PasteLineToTail_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/PasteLineToTail_BtnClick.js @@ -1,3 +1,4 @@ +/*1BnsDOfmtSi8ZBXVncQ5HPxt1EwcKD63zn0Fhft3NX6xEbRE9klAtqnRyhdXygSR*/ /* * @Author: wangceb * @PageInfo: 卡片粘贴到末尾按钮事件 @@ -41,3 +42,5 @@ export default function buttonClick(props, record, index) { } }); } + +/*1BnsDOfmtSi8ZBXVncQ5HPxt1EwcKD63zn0Fhft3NX6xEbRE9klAtqnRyhdXygSR*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/cancelCopy_BtnClick.js b/src/so/so/saleinvoice/card/init/cancelCopy_BtnClick.js index c0cbd14..0dab9bd 100644 --- a/src/so/so/saleinvoice/card/init/cancelCopy_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/cancelCopy_BtnClick.js @@ -1,3 +1,4 @@ +/*pImLxuOsfC04tgFWieVitNP50JiiMxAGxMvNFjc0GHQ=*/ /* * @Author: wangceb * @PageInfo: 卡片复制行按钮事件 @@ -15,3 +16,5 @@ export default function buttonClick(props) { rowButtonController.call(this); } + +/*pImLxuOsfC04tgFWieVitNP50JiiMxAGxMvNFjc0GHQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/copyLine_BtnClick.js b/src/so/so/saleinvoice/card/init/copyLine_BtnClick.js index dd0e4bf..5b0e57a 100644 --- a/src/so/so/saleinvoice/card/init/copyLine_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/copyLine_BtnClick.js @@ -1,3 +1,4 @@ +/*sj7u2lqSgUdBFf1f30rnPPFBcFdRgDm1PAhzQmMrOBI=*/ import { SaleInvoiceBodyItem, BTNCODE, BTN } from '../../const'; import { rowCopyPasteUtils } from '../../../../../scmpub/scmpub/pub/tool/cardTableTools'; const { BTNCARD } = BTN; @@ -10,3 +11,5 @@ export default function buttonClick(props, record, index) { rowCopyPasteUtils.copyRows.call(this, props, this.tableId, BTNCARD.ROW.EDIT, BTNCARD.ROW.PASTE); } } + +/*sj7u2lqSgUdBFf1f30rnPPFBcFdRgDm1PAhzQmMrOBI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/delLine_BtnClick.js b/src/so/so/saleinvoice/card/init/delLine_BtnClick.js index 4546c58..ccd861c 100644 --- a/src/so/so/saleinvoice/card/init/delLine_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/delLine_BtnClick.js @@ -1,3 +1,4 @@ +/*1BxuGDdX+0thCsXQ217T+0m007RxxNvNVAiwxeHXRzw=*/ /* * @Author: zhangjyp * @PageInfo: 卡片操作列按钮事件 @@ -43,3 +44,5 @@ export default function clickBtn(props, record, index) { } }); } + +/*1BxuGDdX+0thCsXQ217T+0m007RxxNvNVAiwxeHXRzw=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/getOpposeAddData.js b/src/so/so/saleinvoice/card/init/getOpposeAddData.js index 37aaa2d..866049c 100644 --- a/src/so/so/saleinvoice/card/init/getOpposeAddData.js +++ b/src/so/so/saleinvoice/card/init/getOpposeAddData.js @@ -1,10 +1,12 @@ +/*6Vy7v4c6fhn5tekuOcso6Ljq5Fp2o6brH45zBzPC7qY=*/ import { PAGEAREA, PAGEID, URL } from '../../const'; const { TOCARDURL, OPPOSEADDURL } = URL; const { CARD } = PAGEID; import { ajax } from 'nc-lightapp-front'; -import buttonController from '../viewController/buttonController'; +import buttonController from '../viewController/buttonController'; import { setEditEnable } from '../viewController/cardEditController'; -export default function() { +import { changeUrlParam } from '../../../../../scmpub/scmpub/pub/cache'; +export default function () { let data = { pk: this.props.getUrlParam('id'), pageId: this.pageId, @@ -26,7 +28,7 @@ export default function() { } if (res.data.card.body && res.data.card.body[_this.tableId]) { // 第四个参数为false说明不缓存当前数据,取消可恢复到之前参数为true时所设置的数据 - _this.props.cardTable.setTableData(_this.tableId, res.data.card.body[_this.tableId],null,false); + _this.props.cardTable.setTableData(_this.tableId, res.data.card.body[_this.tableId], null, false); } } if (res.data.combinvo) { @@ -43,17 +45,18 @@ export default function() { billCode: res.data.card.head[this.formId].rows[0].values.vbillcode.value || '' //修改单据号---非必传 }); - + _this.props.form.setFormStatus(this.formId, 'add'); _this.props.cardTable.setStatus(this.tableId, 'edit'); - - _this.props.pushTo(TOCARDURL, { - pagecode: CARD, - status: 'edit', - from: _this.props.getUrlParam('from'), - id: _this.props.getUrlParam('id') - }); + + // _this.props.pushTo(TOCARDURL, { + // pagecode: CARD, + // status: 'edit', + // from: _this.props.getUrlParam('from'), + // id: _this.props.getUrlParam('id') + // }); + changeUrlParam(_this.props, { status: 'edit' }); // 默认没有传开票申请 this.invoicestatusForSSC = true; // 控制按钮显示隐藏 @@ -65,3 +68,5 @@ export default function() { } }); } + +/*6Vy7v4c6fhn5tekuOcso6Ljq5Fp2o6brH45zBzPC7qY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/getTranferData.js b/src/so/so/saleinvoice/card/init/getTranferData.js index 4660a09..af4f6c3 100644 --- a/src/so/so/saleinvoice/card/init/getTranferData.js +++ b/src/so/so/saleinvoice/card/init/getTranferData.js @@ -1,5 +1,7 @@ +/*X0npQghSKwTid3uQ99nzg1lU6JL+D2YuHpPhJ6KLkbY=*/ export default function getTranferData(type, isInitoutreg) { let ids = null; + if (type == 'transfer') { let transferIds = this.props.transferTable.getTransferTableMultiSelectedId(); let orderhids = []; @@ -39,8 +41,6 @@ export default function getTranferData(type, isInitoutreg) { } } ids = [ - // - { cbilltype: 'SSCIVA', hidts: orderhids, bidts: orderbids }, { cbilltype: '30', hidts: orderhids, bidts: orderbids }, { cbilltype: '4C', hidts: outhids, bidts: outbids }, { cbilltype: '4330', hidts: inithids, bidts: initbids } @@ -87,3 +87,5 @@ export default function getTranferData(type, isInitoutreg) { } return ids; } + +/*X0npQghSKwTid3uQ99nzg1lU6JL+D2YuHpPhJ6KLkbY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/index.js b/src/so/so/saleinvoice/card/init/index.js index 35e910b..5758444 100644 --- a/src/so/so/saleinvoice/card/init/index.js +++ b/src/so/so/saleinvoice/card/init/index.js @@ -1,5 +1,8 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import initTemplate from './initTemplate'; import transfer from './transfer'; import {initEditEnble} from '../viewController/cardEditController' export { initTemplate, transfer, initEditEnble }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/initCardData.js b/src/so/so/saleinvoice/card/init/initCardData.js index 1d10f02..9f5814f 100644 --- a/src/so/so/saleinvoice/card/init/initCardData.js +++ b/src/so/so/saleinvoice/card/init/initCardData.js @@ -1,3 +1,4 @@ +/*tF8Re0Ur4FGy9OqbyI5LncZ40pqRgHDuLrsGZyXRBn0=*/ import transfer from './transfer'; import getOpposeAddData from './getOpposeAddData'; import { setEditEnable } from '../viewController/cardEditController'; @@ -72,3 +73,5 @@ function initData(props) { }); } } + +/*tF8Re0Ur4FGy9OqbyI5LncZ40pqRgHDuLrsGZyXRBn0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/initTemplate.js b/src/so/so/saleinvoice/card/init/initTemplate.js index 69f4f12..21c5781 100644 --- a/src/so/so/saleinvoice/card/init/initTemplate.js +++ b/src/so/so/saleinvoice/card/init/initTemplate.js @@ -1,9 +1,10 @@ +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ /* * @Author: zhangjyp * @PageInfo: 卡片初始化模板 * @Date: 2018-04-19 10:34:51 - * @Last Modified by: liulux - * @Last Modified time: 2022-05-06 09:25:54 + * @Last Modified by: zhangllb + * @Last Modified time: 2023-07-10 10:18:14 */ import { PAGEID, PAGEAREA, BTN, BTNAREA, BTNCODE, SaleInvoiceBodyItem, URL } from '../../const'; @@ -18,6 +19,7 @@ import { showErrorInfo, showSuccessInfo } from '../../../../../scmpub/scmpub/pub import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import commonSearch_BtnClick from '../btnClicks/commonSearch_BtnClick'; import { columnSortUtils } from '../../../../../scmpub/scmpub/pub/tool/columnSortUtils'; +import { batchSetHyperlinkForTableFields } from '../../../../../scmpub/scmpub/pub/tool/hyperlinkUtil'; const { FORMID, TABLEID } = PAGEAREA; const { CARD } = PAGEID; @@ -48,37 +50,10 @@ export default function(props) { if (data.button) { let button = data.button; let pageMsgType = this.props.getUrlParam('scene'); - // approvesce 审批中心 审批中心的时候不去循环开票按钮注册名称 + // approvesce 审批中心 审批中心的时候不去循环开票按钮注册编码 if ((pageMsgType && pageMsgType != 'approvesce') || !pageMsgType) { - let assitGroup = button.filter((assitgroupitem) => { - return assitgroupitem.key == 'AssitGroup'; - }); - let astActionGroup_invoice; - if (assitGroup && assitGroup[0]) { - astActionGroup_invoice = assitGroup[0].children; - } - let invoicebtn; - if (astActionGroup_invoice && astActionGroup_invoice[0]) { - invoicebtn = astActionGroup_invoice.filter((invoicebtns) => { - return invoicebtns.key == 'AstActionGroup_invoice'; - }); - } - - let invoicebtnchild; - if (invoicebtn && invoicebtn[0]) { - invoicebtnchild = invoicebtn[0].children; - } - let makeInvinvoices; - if (invoicebtnchild && invoicebtnchild[0]) { - makeInvinvoices = invoicebtnchild.filter((makeInv_invoice) => { - return makeInv_invoice.key.startsWith('MakeInv_'); - }); - } - if (makeInvinvoices && makeInvinvoices[0]) { - for (let item of makeInvinvoices) { - this.makeInvInvoice.push(item.key); - } - } + //循环取开票按钮放到makeInvInvoice中 + createMakeInvArray.call(this, button); } mofifierBtn.call(this, props, button); @@ -95,8 +70,6 @@ function mofifierBtn(props, button) { authorization: 'authorization-text' }, onChange: (info) => { - if (info.file.status !== 'uploading') { - } if (info.file.status === 'done') { if (info.file.response.error) { showErrorInfo( @@ -108,7 +81,6 @@ function mofifierBtn(props, button) { showSuccessInfo(getLangByResId(this, '4006SALEINVOICE-000041')); /* 国际化处理: 导入成功!*/ // 导入税票号后更新表头金税票号 commonSearch_BtnClick.call(this, [ 'vgoldtaxcode', 'ts' ]); - } else if (info.file.status === 'error') { } } }; /* 这里的config只是示例,具体的参数说明详见tinper-bee中Upload组件文档 */ @@ -121,6 +93,21 @@ function mofifierBtn(props, button) { } function modifierMeta(props, meta) { + // 来源单据号 + let linkmap = new Map([ + [ + 'vsrccode', + { + billtypeField: 'vsrctype', + pkField: 'csrcid' + } + ] + ]); + let linkConfig = { + moduleId: TABLEID, + linkmap: linkmap + }; + batchSetHyperlinkForTableFields.call(this, props, meta, linkConfig); let status = props.getUrlParam('status'); initEditEnble.call(this, meta); meta[FORMID].status = status; @@ -170,3 +157,17 @@ function modifierMeta(props, meta) { columnSortUtils.numberSort(meta, TABLEID, SaleInvoiceBodyItem.CROWNO); return meta; } + +//客户可以任意位置配置开票按钮,开票按钮都以MakeInv_开头 +function createMakeInvArray(button) { + for (let i = 0; i < button.length; i++) { + if (button[i].key.startsWith('MakeInv_')) { + this.makeInvInvoice.push(button[i].key); + } + if (button[i].children) { + createMakeInvArray.call(this, button[i].children); + } + } +} + +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/insertLine_BtnClick.js b/src/so/so/saleinvoice/card/init/insertLine_BtnClick.js index 6febdb5..af76b2b 100644 --- a/src/so/so/saleinvoice/card/init/insertLine_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/insertLine_BtnClick.js @@ -1,3 +1,4 @@ +/*R8CWpcubIIDo7ifMEzWQLlmkyZcssXbuumpK3FQb13U=*/ /* * @Author: zhangjyp * @PageInfo: 卡片操作列按钮事件 @@ -20,3 +21,5 @@ export default function clickBtn(props, record, index) { RownoUtils.setRowNo(props, this.tableId, 'crowno'); } + +/*R8CWpcubIIDo7ifMEzWQLlmkyZcssXbuumpK3FQb13U=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/open_BtnClick.js b/src/so/so/saleinvoice/card/init/open_BtnClick.js index 0d5b0db..f133990 100644 --- a/src/so/so/saleinvoice/card/init/open_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/open_BtnClick.js @@ -1,3 +1,4 @@ +/*tYnMVd9p7Xg2uKAziFweogoDJCaL+LFP/LPJOLCMbs8=*/ /* * @Author: zhangjyp * @PageInfo: 列表操作列展开按钮事件 @@ -17,3 +18,5 @@ export default function clickBtn(props, record, index) { } } + +/*tYnMVd9p7Xg2uKAziFweogoDJCaL+LFP/LPJOLCMbs8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/pastLine_BtnClick.js b/src/so/so/saleinvoice/card/init/pastLine_BtnClick.js index ec5e784..2d066f8 100644 --- a/src/so/so/saleinvoice/card/init/pastLine_BtnClick.js +++ b/src/so/so/saleinvoice/card/init/pastLine_BtnClick.js @@ -1,3 +1,4 @@ +/*66qDWq02dkx0odI85Ul49NoD1cryUL52waycktq2zWM=*/ /* * @Author: zhangjyp * @PageInfo: 卡片粘贴行按钮事件 @@ -49,3 +50,5 @@ export default function(props, record, index) { } + +/*66qDWq02dkx0odI85Ul49NoD1cryUL52waycktq2zWM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/rowButtonClick.js b/src/so/so/saleinvoice/card/init/rowButtonClick.js index ae55738..bc88c93 100644 --- a/src/so/so/saleinvoice/card/init/rowButtonClick.js +++ b/src/so/so/saleinvoice/card/init/rowButtonClick.js @@ -1,3 +1,4 @@ +/*roZ3/j0EXAzsRZFlHU8MFhfWr7sC025wartiJoHRHNM=*/ /* * @Author: zhangjyp * @PageInfo: 列表操作列按钮事件 @@ -45,3 +46,5 @@ export default function clickBtn(props, key, record, index) { break; } } + +/*roZ3/j0EXAzsRZFlHU8MFhfWr7sC025wartiJoHRHNM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/setDefaultValue.js b/src/so/so/saleinvoice/card/init/setDefaultValue.js index aaf3294..e6f672d 100644 --- a/src/so/so/saleinvoice/card/init/setDefaultValue.js +++ b/src/so/so/saleinvoice/card/init/setDefaultValue.js @@ -1,3 +1,4 @@ +/*se8mmyUP0H/+BxI3Sip0clnwAZjmrY+Hc7hlQA6fuG0=*/ import { SaleInvoiceHeadItem, SaleInvoiceBodyItem, SALEINVOICE_CONST, PAGEAREA } from '../../const'; function setRowDefaultValue(props) { @@ -30,3 +31,5 @@ function getHeadValue(props, key) { } export { setRowDefaultValue }; + +/*se8mmyUP0H/+BxI3Sip0clnwAZjmrY+Hc7hlQA6fuG0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/init/transfer.js b/src/so/so/saleinvoice/card/init/transfer.js index 7a1d3a3..fcdefb4 100644 --- a/src/so/so/saleinvoice/card/init/transfer.js +++ b/src/so/so/saleinvoice/card/init/transfer.js @@ -1,3 +1,4 @@ +/*pbob02jKuM7PRltf0xCNRHgDVFk+5ls1k7S4Bqa8zeU=*/ import { ajax } from 'nc-lightapp-front'; import { URL, TRANSFERCACAHEKEY, SaleInvoiceHeadItem } from '../../const'; @@ -26,7 +27,6 @@ export default function(ids, isRefAddLine) { data: data, success: (res) => { - debugger if (res.success) { _this.props.beforeUpdatePage(); if (res.data || res.data.cards) { @@ -70,7 +70,6 @@ export default function(ids, isRefAddLine) { } }); } - debugger _this.props.transferTable.setTransferListValue( _this.left, res.data.cards @@ -79,7 +78,15 @@ export default function(ids, isRefAddLine) { // } ); } - + // let transtypecode = getDefData(TRANSFERCACAHEKEY, 'transtypecode'); + // if (transtypecode) { + // let billtypename = getDefData(TRANSFERCACAHEKEY, 'billtypename'); + // let billtypeid = getDefData(TRANSFERCACAHEKEY, 'billtypeid'); + // _this.props.form.setFormItemsValue(_this.formId, { + // [SaleInvoiceHeadItem.CTRANTYPEID]: { value: billtypeid, display: billtypename }, + // [SaleInvoiceHeadItem.VTRANTYPECODE]: { value: transtypecode, display: transtypecode } + // }); + // } if (isRefAddLine == true) { _this.props.form.setFormStatus(_this.formId, 'edit'); // 重置表体肩部按钮状态 @@ -96,3 +103,5 @@ export default function(ids, isRefAddLine) { } }); } + +/*pbob02jKuM7PRltf0xCNRHgDVFk+5ls1k7S4Bqa8zeU=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/viewController/buttonController.js b/src/so/so/saleinvoice/card/viewController/buttonController.js index b5ed4c1..2df73de 100644 --- a/src/so/so/saleinvoice/card/viewController/buttonController.js +++ b/src/so/so/saleinvoice/card/viewController/buttonController.js @@ -1,9 +1,10 @@ +/*kmMeNHXPpdljPj98yiqeQfdPJV3PYPMsvMdu1tik4Qw=*/ /* * @Author: zhangjyp * @PageInfo: 根据页面状态设置按钮显示 * @Date: 2018-05-26 11:45:07 - * @Last Modified by: zhangllb - * @Last Modified time: 2022-03-21 14:36:34 + * @Last Modified by: mikey.zhaopeng + * @Last Modified time: 2023-09-28 13:00:21 */ import { BTNCODE, BTN, BTNAREA } from '../../const'; @@ -96,13 +97,13 @@ function setOtherButtonVisible(status) { this.props.button.setButtonVisible([ 'Add' ], false); // 为什么转单不显示对冲发票呢?NCC-53758 先把这一行注释掉吧 // this.props.button.setButtonVisible([ 'OpposeAdd' ], false); - this.props.button.setButtonVisible([ 'Quit','AllSaveBtn' ], true); + this.props.button.setButtonVisible([ 'Quit' ], true); this.props.BillHeadInfo.setBillHeadInfoVisible({ showBackBtn: true //控制显示返回按钮: true为显示,false为隐藏 ---非必传 }); } else { // 卡片界面,退出转单不显示 - this.props.button.setButtonVisible([ 'Quit','AllSaveBtn' ], false); + this.props.button.setButtonVisible([ 'Quit' ], false); } // 4.根据单据状态控制按钮显示隐藏 if (!this.props.form.getFormItemsValue(this.formId, 'fstatusflag')) { @@ -112,11 +113,11 @@ function setOtherButtonVisible(status) { // 自由态和审批不通过的按钮可用修改,删除,提交 if (fstatusflag != 1 && fstatusflag != 8) { this.props.button.setButtonVisible(EDIT, false); - this.props.button.setButtonVisible([COMMIT,'Aeo'], false); + this.props.button.setButtonVisible(COMMIT, false); } // 审批不通过设置提交按钮不可用 if (fstatusflag == 8) { - this.props.button.setButtonVisible([COMMIT,'Aeo'], false); + this.props.button.setButtonVisible(COMMIT, false); } if (fstatusflag != 1) { this.props.button.setButtonVisible(DELETE, false); @@ -132,7 +133,7 @@ function setOtherButtonVisible(status) { // this.props.button.setButtonVisible([ Coop25, REDINVOICE, MAINTAININVOICE, LINKINVOICE ], false); this.props.button.setButtonVisible([ Coop25 ], false); let ntotalorigmny = this.props.form.getFormItemsValue(this.formId, 'ntotalorigmny').value; - if (ntotalorigmny > 0) { + if (ntotalorigmny > 0 || ntotalorigmny == 0 ) { this.props.button.setButtonVisible([ REDINVOICE ], false); } else { this.props.button.setButtonVisible([ REDINVOICE ], true); @@ -165,7 +166,7 @@ function setOtherButtonVisible(status) { } } else { let ntotalorigmny = this.props.form.getFormItemsValue(this.formId, 'ntotalorigmny').value; - if (ntotalorigmny > 0) { + if (ntotalorigmny > 0 || ntotalorigmny == 0 ) { this.props.button.setButtonVisible([ REDINVOICE ], false); } else { this.props.button.setButtonVisible([ Coop25 ], false); @@ -201,7 +202,7 @@ function setMainButton() { this.props.button.setMainButton(EDIT, true); } else if (fstatusflag == 1) { // 自由态主按钮为提交 - this.props.button.setMainButton([COMMIT,'Aeo'], true); + this.props.button.setMainButton(COMMIT, true); } } function setBackButtonVisiable(flag) { @@ -212,3 +213,5 @@ function setBackButtonVisiable(flag) { function setCardPaginationVisible(flag) { this.props.cardPagination.setCardPaginationVisible('cardPaginationBtn', !flag); } + +/*kmMeNHXPpdljPj98yiqeQfdPJV3PYPMsvMdu1tik4Qw=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/viewController/cardEditController.js b/src/so/so/saleinvoice/card/viewController/cardEditController.js index 3c5a797..df2908b 100644 --- a/src/so/so/saleinvoice/card/viewController/cardEditController.js +++ b/src/so/so/saleinvoice/card/viewController/cardEditController.js @@ -1,3 +1,4 @@ +/*z1PZ3bHupoImZy6gZUM3r/WPorQxBNZx9QJxfnjTwWY=*/ import { KEY, OpposeFlag } from '../../const'; const { NOEDITHEADKEY, NOEDITBODYKEY } = KEY; // 恢复表体编辑性 @@ -251,3 +252,5 @@ function initEditEnble(meta) { } export { initEditEnble, setEditEnable, resumeHeadEdit, resumeBodyEdit }; + +/*z1PZ3bHupoImZy6gZUM3r/WPorQxBNZx9QJxfnjTwWY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/viewController/extCardEditController.js b/src/so/so/saleinvoice/card/viewController/extCardEditController.js index 432921b..fcd8979 100644 --- a/src/so/so/saleinvoice/card/viewController/extCardEditController.js +++ b/src/so/so/saleinvoice/card/viewController/extCardEditController.js @@ -1,3 +1,4 @@ +/*duICv/BJBtZzXTi0rdLRi7Of2/O5uIZYDqdcEmTIouDh6M8t6dTEmiAC+iKxqhuq*/ import rowButtonController from './rowButtonController'; import { setRowDefaultValue } from '../init/setDefaultValue'; import { RownoUtils } from '../../../../../scmpub/scmpub/pub/tool/cardTableTools'; @@ -8,4 +9,5 @@ function addLineForCardEdit(props, moduleId, modelIndex){ this.props.cardTable.setValByKeysAndIndex(this.tableId, modelIndex + 1, setRowDefaultValue(this.props)); RownoUtils.setRowNo(this.props, this.tableId); } -export {delLineForCardEdit,addLineForCardEdit}; \ No newline at end of file +export {delLineForCardEdit,addLineForCardEdit}; +/*duICv/BJBtZzXTi0rdLRi7Of2/O5uIZYDqdcEmTIouDh6M8t6dTEmiAC+iKxqhuq*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/card/viewController/rowButtonController.js b/src/so/so/saleinvoice/card/viewController/rowButtonController.js index 71c9b23..bd4e54e 100644 --- a/src/so/so/saleinvoice/card/viewController/rowButtonController.js +++ b/src/so/so/saleinvoice/card/viewController/rowButtonController.js @@ -1,3 +1,4 @@ +/*x9GWXTIarsnnuv39FonwqOHf4jGnHcvT1OUPy5ye9PA=*/ import { BTNCODE, OpposeFlag } from '../../const'; const { ADDLINE, DELETELINE, COPYLINE, REFLINE, REARRANGEROWNO } = BTNCODE; export default function() { @@ -54,3 +55,5 @@ export default function() { } } } + +/*x9GWXTIarsnnuv39FonwqOHf4jGnHcvT1OUPy5ye9PA=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/const/btnConst.js b/src/so/so/saleinvoice/const/btnConst.js index e6d7e64..325d12e 100644 --- a/src/so/so/saleinvoice/const/btnConst.js +++ b/src/so/so/saleinvoice/const/btnConst.js @@ -1,9 +1,10 @@ +/*sAIp/5rooyZMPCeYl5+mIqK0TIYWKubmSt5RKizNwe8=*/ /* * @Author: zhangjyp * @PageInfo: 按钮常量 * @Date: 2018-05-26 14:03:53 - * @Last Modified by: zhangllb - * @Last Modified time: 2022-01-07 10:41:34 + * @Last Modified by: songyt13 + * @Last Modified time: 2023-06-20 14:14:39 */ const BTNCODE = { @@ -27,6 +28,7 @@ const BTNCODE = { CREDITQUERY: 'CreditQuery', OFFSETINFO: 'OffsetInfo', FILE: 'File', + FileBatch: 'FileBatch', ADDLINE: 'AddLine', INSERTLINE: 'InsertLine', COPYLINE: 'CopyLine', @@ -39,7 +41,6 @@ const BTNCODE = { PRINT_LIST: 'Print_list', BILLLINKQUERY: 'QueryAboutBusiness', QUIT: 'Quit', - ALLSAVE:'AllSaveBtn', REFLINE: 'RefLine', ASTACTIONGROUP: 'AstActionGroup', LINKGROUP: 'LinkGroup', @@ -78,6 +79,7 @@ const { IMPORTTAXCODE, EXPORTGOLDTAX, FILE, + FileBatch, ADDLINE, INSERTLINE, COPYLINE, @@ -114,6 +116,7 @@ const BTN = { EXPORTGOLDTAX, UNCOMMIT, FILE, + FileBatch, PRINT, OUTPUT, CROSSPROFITRPT, @@ -156,12 +159,12 @@ const BTN = { DELETE, COMMIT, UNCOMMIT, - 'Aeo', BACK, OPPOSEADD, IMPORTTAXCODE, EXPORTGOLDTAX, FILE, + FileBatch, SHOWDETAIL, SHOWCOMBINE, CREDITQUERY, @@ -227,3 +230,5 @@ const BTN = { } }; export { BTNCODE, BTN }; + +/*sAIp/5rooyZMPCeYl5+mIqK0TIYWKubmSt5RKizNwe8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/const/index.js b/src/so/so/saleinvoice/const/index.js index 42fbdb0..24edf2e 100644 --- a/src/so/so/saleinvoice/const/index.js +++ b/src/so/so/saleinvoice/const/index.js @@ -1,132 +1,134 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: zhangjyp * @PageInfo: 销售发票常量 * @Date: 2018-04-19 10:28:28 - * @Last Modified by: songyt13 - * @Last Modified time: 2022-01-24 14:05:07 + * @Last Modified by: zhangllb + * @Last Modified time: 2023-11-13 14:35:04 */ import { BTNCODE, BTN } from './btnConst'; import { - KEY, - SaleInvoiceBodyItem, - SaleInvoiceCacheKey, - SaleInvoiceHeadItem, - TRANSFERCACAHEKEY, - EditableAndRewiteItems + KEY, + SaleInvoiceBodyItem, + SaleInvoiceCacheKey, + SaleInvoiceHeadItem, + TRANSFERCACAHEKEY, + EditableAndRewiteItems, } from './keyConst'; const SALEINVOICE_CONST = { - MODULEID: '4006', //模块id - billtype: '32', // 单据类型 - BROWSE: 'browse', //状态 - scene: 'scene', - approvesce: 'approvesce', - ssctp: 'zycl', - EDIT: 'edit', - ADD: 'add', + MODULEID: '4006', //模块id + billtype: '32', // 单据类型 + BROWSE: 'browse', //状态 + scene: 'scene', + approvesce: 'approvesce', + ssctp: 'zycl', + EDIT: 'edit', + ADD: 'add', - APPID: '1009Z0100000000WWSI1' + APPID: '1009Z0100000000WWSI1', }; const OpposeFlag = { - GENERAL: 2 + GENERAL: 2, }; // 按钮区域 const BTNAREA = { - LIST_HEAD: 'list_head', - LIST_INNER: 'list_inner', - CARD_HEAD: 'card_head', - CARD_BODY_INNER: 'card_body_inner', - CARD_BODY: 'card_body' + LIST_HEAD: 'list_head', + LIST_INNER: 'list_inner', + CARD_HEAD: 'card_head', + CARD_BODY_INNER: 'card_body_inner', + CARD_BODY: 'card_body', }; // 页面区域 const PAGEAREA = { - FORMID: 'head', //表头区域 - TABLEID: 'saleinvoice_b', //表体区域 - TABLEID2: 'childform2', - SEARCHID: '40060501', - LEFT: 'left' + FORMID: 'head', //表头区域 + TABLEID: 'saleinvoice_b', //表体区域 + TABLEID2: 'childform2', + SEARCHID: '40060501', + LEFT: 'left', }; // URL const URL = { - QUERYCARDURL: '/nccloud/so/saleinvoice/querycard.do', - SAVECOMMITURL: '/nccloud/so/saleinvoice/savecommit.do', - QUERYURL: '/nccloud/so/saleinvoice/query.do', - PAGEQUERYURL: '/nccloud/so/saleinvoice/querypagebypks.do', - DELURL: '/nccloud/so/saleinvoice/delete.do', - GRIDDELURL: '/nccloud/so/saleinvoice/griddelete.do', - SAVEURL: '/nccloud/so/saleinvoice/save.do', - COMMITURL: '/nccloud/so/saleinvoice/commit.do', - UNCOMMITURL: '/nccloud/so/saleinvoice/uncommit.do', - SHOWDETAILURL: '/nccloud/so/saleinvoice/showdetail.do', - COOP25: '/nccloud/so/saleinvoice/coop25.do', - BATCHCOOP25: '/nccloud/so/saleinvoice/batchcoop25.do', - SHOWCOMBINEURL: '/nccloud/so/saleinvoice/showcombine.do', - BODYAFTERURL: '/nccloud/so/saleinvoice/bodyafter.do', - TOCARDURL: '/card', - TOLISTURL: '/list', - TOTRANSFERURL: '/so/so/saleinvoice/transfer/index.html', - TOSINGLETRANSFERURL: '/so/so/saleinvoice/singletransfer/index.html', - QUERYPARAURL: '/nccloud/baseapp/param/paBatchQry.do', - HEADAFTERURL: '/nccloud/so/saleinvoice/headafter.do', - UNOFFSETURL: '/nccloud/so/saleinvoice/cancelunitarsub.do', - FETCHCOSTURL: '/nccloud/so/saleinvoice/fetchcost.do', - GRIDCOMMITURL: '/nccloud/so/saleinvoice/gridcommit.do', - GRIDUNCOMMITURL: '/nccloud/so/saleinvoice/griduncommit.do', - CREDITQUERYURL: '/nccloud/so/saleinvoice/creditquery.do', - GRIDCEDITQUERYURL: '/nccloud/so/saleinvoice/gridcreditquery.do', - ISSUEINVURL: '/nccloud/so/saleinvoice/issueInvoice.do', - ADDINVOICEURL: '/addinvoice', - ARSUBDETAILQUERYURL: '/nccloud/so/saleinvoice/arsubdetail.do', - GRIDARSUBDETAILQUERYURL: '/nccloud/so/saleinvoice/gridarsubdetail.do', - QUERYADDTABURL: '/nccloud/so/saleinvoice/queryaddtab.do', - TRANSFERURL: '/nccloud/so/saleinvoice/transfer.do', - REFADDLINEURL: '/nccloud/so/saleinvoice/refaddline.do', - BODYBEFOREURL: '/nccloud/so/saleinvoice/bodybefore.do', - // BATCHPRINTURL: '/nccloud/so/saleinvoice/batchprint.do', - PRINTURL: '/nccloud/so/saleinvoice/print.do', - PRINTDATAPERMISSION: '/nccloud/so/saleinvoice/printpermission.do', - OPPOSEADDURL: '/nccloud/so/saleinvoice/opposeadd.do', - HEADBEFOREURL: '/nccloud/so/saleinvoice/headbefore.do', - EDITURL: '/nccloud/so/saleinvoice/edit.do', - ROWOPRURL: '/nccloud/so/saleinvoice/rowopr.do', - LINKQUERYFROMVOUCHER: '/nccloud/so/saleinvoice/linkqueryfromvoucher.do', - linkQueryVoucher: '/nccloud/so/saleinvoice/linkQueryVoucher.do', //联查凭证 - CHECKSAGASTATUS: '/nccloud/so/saleinvoice/checkSagaStatus.do', //检查单据saga状态 - queryAddTab: '/nccloud/so/pub/queryaddtab.do' //查询单据业务流可用信息 + QUERYCARDURL: '/nccloud/so/saleinvoice/querycard.do', + SAVECOMMITURL: '/nccloud/so/saleinvoice/savecommit.do', + QUERYURL: '/nccloud/so/saleinvoice/query.do', + PAGEQUERYURL: '/nccloud/so/saleinvoice/querypagebypks.do', + DELURL: '/nccloud/so/saleinvoice/delete.do', + GRIDDELURL: '/nccloud/so/saleinvoice/griddelete.do', + SAVEURL: '/nccloud/so/saleinvoice/save.do', + COMMITURL: '/nccloud/so/saleinvoice/commit.do', + UNCOMMITURL: '/nccloud/so/saleinvoice/uncommit.do', + SHOWDETAILURL: '/nccloud/so/saleinvoice/showdetail.do', + COOP25: '/nccloud/so/saleinvoice/coop25.do', + BATCHCOOP25: '/nccloud/so/saleinvoice/batchcoop25.do', + SHOWCOMBINEURL: '/nccloud/so/saleinvoice/showcombine.do', + BODYAFTERURL: '/nccloud/so/saleinvoice/bodyafter.do', + TOCARDURL: '/card', + TOLISTURL: '/list', + TOTRANSFERURL: '/so/so/saleinvoice/transfer/index.html', + TOSINGLETRANSFERURL: '/so/so/saleinvoice/singletransfer/index.html', + QUERYPARAURL: '/nccloud/baseapp/param/paBatchQry.do', + HEADAFTERURL: '/nccloud/so/saleinvoice/headafter.do', + UNOFFSETURL: '/nccloud/so/saleinvoice/cancelunitarsub.do', + FETCHCOSTURL: '/nccloud/so/saleinvoice/fetchcost.do', + GRIDCOMMITURL: '/nccloud/so/saleinvoice/gridcommit.do', + GRIDUNCOMMITURL: '/nccloud/so/saleinvoice/griduncommit.do', + CREDITQUERYURL: '/nccloud/so/saleinvoice/creditquery.do', + GRIDCEDITQUERYURL: '/nccloud/so/saleinvoice/gridcreditquery.do', + ISSUEINVURL: '/nccloud/so/saleinvoice/issueInvoice.do', + ADDINVOICEURL: '/addinvoice', + ARSUBDETAILQUERYURL: '/nccloud/so/saleinvoice/arsubdetail.do', + GRIDARSUBDETAILQUERYURL: '/nccloud/so/saleinvoice/gridarsubdetail.do', + QUERYADDTABURL: '/nccloud/so/saleinvoice/queryaddtab.do', //查询单据业务流可用信息 + TRANSFERURL: '/nccloud/so/saleinvoice/transfer.do', + REFADDLINEURL: '/nccloud/so/saleinvoice/refaddline.do', + BODYBEFOREURL: '/nccloud/so/saleinvoice/bodybefore.do', + // BATCHPRINTURL: '/nccloud/so/saleinvoice/batchprint.do', + PRINTURL: '/nccloud/so/saleinvoice/print.do', + PRINTDATAPERMISSION: '/nccloud/so/saleinvoice/printpermission.do', + OPPOSEADDURL: '/nccloud/so/saleinvoice/opposeadd.do', + HEADBEFOREURL: '/nccloud/so/saleinvoice/headbefore.do', + EDITURL: '/nccloud/so/saleinvoice/edit.do', + ROWOPRURL: '/nccloud/so/saleinvoice/rowopr.do', + LINKQUERYFROMVOUCHER: '/nccloud/so/saleinvoice/linkqueryfromvoucher.do', + linkQueryVoucher: '/nccloud/so/saleinvoice/linkQueryVoucher.do', //联查凭证 + CHECKSAGASTATUS: '/nccloud/so/saleinvoice/checkSagaStatus.do', //检查单据saga状态 }; // const CODE = { - TYPE: 'type', - TRANSFER: 'transfer', - SINGLETRANSFER: 'singletransfer' + TYPE: 'type', + TRANSFER: 'transfer', + SINGLETRANSFER: 'singletransfer', }; const PAGEID = { - CARD: '400601200_card', //卡片pagecode - LIST: '400601200_list', //列表pagecode - ARSUBDETAIL: '400601200_casharsub', //费用冲抵情况pagecode - OFFSET: '400601200_offset' + CARD: '400601200_card', //卡片pagecode + LIST: '400601200_list', //列表pagecode + ARSUBDETAIL: '400601200_casharsub', //费用冲抵情况pagecode + OFFSET: '400601200_offset', }; const TAB = { - TOCOMMIT: 'toCommit', - APPROVING: 'approving', - ALL: 'all' + TOCOMMIT: 'toCommit', + APPROVING: 'approving', + ALL: 'all', }; export { - SALEINVOICE_CONST, - OpposeFlag, - PAGEID, - URL, - PAGEAREA, - BTNAREA, - BTNCODE, - BTN, - KEY, - TAB, - CODE, - SaleInvoiceBodyItem, - SaleInvoiceHeadItem, - SaleInvoiceCacheKey, - TRANSFERCACAHEKEY, - EditableAndRewiteItems + SALEINVOICE_CONST, + OpposeFlag, + PAGEID, + URL, + PAGEAREA, + BTNAREA, + BTNCODE, + BTN, + KEY, + TAB, + CODE, + SaleInvoiceBodyItem, + SaleInvoiceHeadItem, + SaleInvoiceCacheKey, + TRANSFERCACAHEKEY, + EditableAndRewiteItems, }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/const/keyConst.js b/src/so/so/saleinvoice/const/keyConst.js index fe86a7b..0c1b9bb 100644 --- a/src/so/so/saleinvoice/const/keyConst.js +++ b/src/so/so/saleinvoice/const/keyConst.js @@ -1,3 +1,4 @@ +/*ADyS+klHBUwYoYhzqrAKGdE9SerCsQfshUDqWR7MYQg=*/ const KEY = { // 触发单价金额算法的字段 NEEDCALKEY: [ @@ -125,6 +126,7 @@ const KEY = { // 对冲允许编辑的表体字段 OPPBODY_CANEDITKEY: [ 'nastnum', + //'nnum', 'norigtaxmny', 'ntax', 'norigdiscount', @@ -178,8 +180,7 @@ const KEY = { 'vbdef47', 'vbdef48', 'vbdef49', - 'vbdef50', - 'ntotalorigmny' + 'vbdef50' ], //表头不可编辑事件 NOEDITHEADKEY: [ @@ -187,7 +188,7 @@ const KEY = { 'ccurrencyid', 'ccustbankid', 'ntotalastnum', - // 'ntotalorigmny', + 'ntotalorigmny', 'btogoldtaxflag', 'tgoldtaxtime', 'fopposeflag', @@ -265,12 +266,6 @@ const KEY = { 'nastnum', 'nnum', 'nqtunitnum', - //begin - 'norigprice',//主无税单价 - 'norigtaxprice',//主含税单价 - 'nqtorigprice',// 无税单价 - 'nqtorigtaxprice',//含税单价 - //end // 价税合计、无税金额 'norigtaxmny', 'norigmny', @@ -436,8 +431,7 @@ const EditableAndRewiteItems = { 'vdef47', 'vdef48', 'vdef49', - 'vdef50', - 'ntotalorigmny'// guoxqc + 'vdef50' ] }; const SaleInvoiceCacheKey = 'scm.so.saleinvoice.saleinvoicecachekey'; @@ -453,3 +447,5 @@ export { blargessflag, EditableAndRewiteItems }; + +/*ADyS+klHBUwYoYhzqrAKGdE9SerCsQfshUDqWR7MYQg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/invoiceExec/index.js b/src/so/so/saleinvoice/invoiceExec/index.js index 2dbd767..8b6372a 100644 --- a/src/so/so/saleinvoice/invoiceExec/index.js +++ b/src/so/so/saleinvoice/invoiceExec/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: wangshrc * @PageInfo: 执行情况查询 @@ -45,3 +46,5 @@ InvoiceExec = createPage({ initTemplate: initTemplate })(InvoiceExec); export default InvoiceExec; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/invoiceExec/init/index.js b/src/so/so/saleinvoice/invoiceExec/init/index.js index 8d22888..44df524 100644 --- a/src/so/so/saleinvoice/invoiceExec/init/index.js +++ b/src/so/so/saleinvoice/invoiceExec/init/index.js @@ -1,3 +1,6 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import initTemplate from './initTemplate'; export { initTemplate }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/invoiceExec/init/initTemplate.js b/src/so/so/saleinvoice/invoiceExec/init/initTemplate.js index 1a4cd88..9ba34ac 100644 --- a/src/so/so/saleinvoice/invoiceExec/init/initTemplate.js +++ b/src/so/so/saleinvoice/invoiceExec/init/initTemplate.js @@ -1,3 +1,4 @@ +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ /* * @Author: wangshrc * @PageInfo: 单据执行信息 @@ -23,3 +24,5 @@ export default function(props) { } ); } + +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/LinkQueryVoucherBtnClick.js b/src/so/so/saleinvoice/list/btnClicks/LinkQueryVoucherBtnClick.js index 0d9f795..0258db9 100644 --- a/src/so/so/saleinvoice/list/btnClicks/LinkQueryVoucherBtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/LinkQueryVoucherBtnClick.js @@ -1,3 +1,4 @@ +/*Z5f/1tPct3SmDpZSfknGQo4fQ/SvAmzRlniEoFa+bOA1G9J+R7vAoodjjqh81P88*/ /* * @Author: chaiwx * @PageInfo: 联查凭证 @@ -68,3 +69,5 @@ export default function(props) { } }); } + +/*Z5f/1tPct3SmDpZSfknGQo4fQ/SvAmzRlniEoFa+bOA1G9J+R7vAoodjjqh81P88*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/add_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/add_BtnClick.js index 16dc716..47fa6a0 100644 --- a/src/so/so/saleinvoice/list/btnClicks/add_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/add_BtnClick.js @@ -1,3 +1,4 @@ +/*dXoPbESH9BnI4reHcyjq+1cjOAFBELH2HiHmMbZ9Fas=*/ /* * @Author: zhangjyp * @PageInfo: 新增按钮处理 @@ -18,3 +19,5 @@ export default function clickAddBtn(props) { ctranstype: transtypeUtils.getTranstypeCode.call(this) }); } + +/*dXoPbESH9BnI4reHcyjq+1cjOAFBELH2HiHmMbZ9Fas=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/arsubDetail_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/arsubDetail_BtnClick.js index 45ee002..b4c6c58 100644 --- a/src/so/so/saleinvoice/list/btnClicks/arsubDetail_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/arsubDetail_BtnClick.js @@ -1,3 +1,4 @@ +/*h//wWPp3FlUjEW9bb3W/Z69sQAXiTsLsFDNqSEkw3S0=*/ /* * @Author: wangceb * @PageInfo: 费用兑付明细 @@ -49,3 +50,5 @@ export default function buttonClick(props) { } }); } + +/*h//wWPp3FlUjEW9bb3W/Z69sQAXiTsLsFDNqSEkw3S0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/billLinkQuery_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/billLinkQuery_BtnClick.js index cd6f404..6c17796 100644 --- a/src/so/so/saleinvoice/list/btnClicks/billLinkQuery_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/billLinkQuery_BtnClick.js @@ -1,3 +1,4 @@ +/*8Mg99cNjhyMO4rSyVXqvUZc0zVHgrpKvFxaJ1tyJpgptZI7VhD3C3PXW5v9Hadrc*/ /* * @Author: zhangjyp * @PageInfo:销售发票单据联查 @@ -28,3 +29,5 @@ export default function(props) { }); } } + +/*8Mg99cNjhyMO4rSyVXqvUZc0zVHgrpKvFxaJ1tyJpgptZI7VhD3C3PXW5v9Hadrc*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/buttonClick.js b/src/so/so/saleinvoice/list/btnClicks/buttonClick.js index bb7fdf4..46f48c7 100644 --- a/src/so/so/saleinvoice/list/btnClicks/buttonClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/buttonClick.js @@ -1,9 +1,10 @@ +/*q2LCmxM8POvl78IL0Liydie4F5UAgLwHceRljsFF3P0=*/ /* * @Author: zhangjyp * @PageInfo: 按钮事件 * @Date: 2018-04-19 10:34:04 - * @Last Modified by: zhangllb - * @Last Modified time: 2022-01-05 09:39:01 + * @Last Modified by: songyt13 + * @Last Modified time: 2023-06-21 15:45:47 */ import addBtnClick from './add_BtnClick'; @@ -36,6 +37,8 @@ import LinkQueryVoucherBtnClick from './LinkQueryVoucherBtnClick'; import printCountQuery from '../../../../../scmpub/scmpub/pub/tool/printCountQuery'; import { PAGEAREA } from '../../const'; import InvoiceComponent from 'sscivm/invoiceComponent/compoundComponent/component'; +import attachManageBatchBtnClick from '../../../pub/btnClicks/attachManageBatchBtnClick'; +import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; export default function clickBtn(props, id, assign) { let makeinv_value = null; @@ -165,5 +168,16 @@ export default function clickBtn(props, id, assign) { let CONST = { hid: 'csaleinvoiceid', area: PAGEAREA.FORMID }; printCountQuery.call(this, props, { type: 1, CONST, modal: 'code-config' }); break; + // 附近批量下载 + case 'FileBatch': + attachManageBatchBtnClick.call( + this, + props, + PAGEAREA.FORMID, + getLangByResId(this, '4006SALEINVOICE-000039'), + 'csaleinvoiceid' + ); } } + +/*q2LCmxM8POvl78IL0Liydie4F5UAgLwHceRljsFF3P0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/commit_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/commit_BtnClick.js index 4f6584e..55c409f 100644 --- a/src/so/so/saleinvoice/list/btnClicks/commit_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/commit_BtnClick.js @@ -1,3 +1,4 @@ +/*4roxSwWSoRYPZWqEwx7TZJrD4MtXBHSUQfMR2t1Oc3k=*/ /* * @Author: zhangjyp * @PageInfo: 列表提交按钮处理方法 @@ -93,3 +94,5 @@ export default function clickCommitBtn(props, assign, skipCodes) { } }); } + +/*4roxSwWSoRYPZWqEwx7TZJrD4MtXBHSUQfMR2t1Oc3k=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/commonSearch_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/commonSearch_BtnClick.js index bbd83ae..1d43eb2 100644 --- a/src/so/so/saleinvoice/list/btnClicks/commonSearch_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/commonSearch_BtnClick.js @@ -1,3 +1,4 @@ +/*MKhAr9efcx6R2yL0XZ82Wj/Hlw4oiXllAzwge6P6TgduFCOBa04VO4auQ7bqaUwz*/ /* * @Author: zhangjyp * @PageInfo: 查询按钮处理方法 @@ -97,3 +98,5 @@ export default function clickSerachBtn(tabCode, searchVal, type, callback, isRef } }); } + +/*MKhAr9efcx6R2yL0XZ82Wj/Hlw4oiXllAzwge6P6TgduFCOBa04VO4auQ7bqaUwz*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/coop25_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/coop25_BtnClick.js index b453050..a1b8f29 100644 --- a/src/so/so/saleinvoice/list/btnClicks/coop25_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/coop25_BtnClick.js @@ -1,3 +1,4 @@ +/*RgOIMdrmGV+tlT/hu9Lltqye7t1vrhuoSsQCZY1OQa8=*/ /* * @Author: zhangchqf * @PageInfo: 协同生成采购发票 @@ -93,3 +94,5 @@ export default function clickCommitBtn(props, assign, skipCodes) { } }); } + +/*RgOIMdrmGV+tlT/hu9Lltqye7t1vrhuoSsQCZY1OQa8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/creditQuery_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/creditQuery_BtnClick.js index 08563d4..65fb0c6 100644 --- a/src/so/so/saleinvoice/list/btnClicks/creditQuery_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/creditQuery_BtnClick.js @@ -1,9 +1,10 @@ +/*FfY2rAdUn/RmXi3k6eV+igzMVY0+AozrBa8Wzoc5R7w=*/ /* * @Author: wangceb * @PageInfo: 列表下信用查询按钮事件 * @Date: 2018-04-19 10:38:05 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-12 15:25:59 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-08 10:14:58 */ import { ajax } from 'nc-lightapp-front'; import { URL } from '../../const'; @@ -36,9 +37,13 @@ export default function buttonClick(props) {
), - beSureBtnClick: '' + beSureBtnClick: '', + hideRightBtn: true, + hideLeftBtn: true }); } } }); } + +/*FfY2rAdUn/RmXi3k6eV+igzMVY0+AozrBa8Wzoc5R7w=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/delete_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/delete_BtnClick.js index 88bb054..72d06df 100644 --- a/src/so/so/saleinvoice/list/btnClicks/delete_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/delete_BtnClick.js @@ -1,3 +1,4 @@ +/*09MFRu7iSOlVV+xuGkFYf1qDbxgzgVZkzvQ1VdugnrQ=*/ /* * @Author: zhangjyp * @PageInfo: 删除按钮点击事件 @@ -74,3 +75,5 @@ function clickDelOKBtn(props) { } }); } + +/*09MFRu7iSOlVV+xuGkFYf1qDbxgzgVZkzvQ1VdugnrQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/double_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/double_BtnClick.js index 94ca722..bc4fd71 100644 --- a/src/so/so/saleinvoice/list/btnClicks/double_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/double_BtnClick.js @@ -1,3 +1,4 @@ +/*Gq+j+L49pJSeXMeRfO6jQKbsu223HsduRVy5leeNrCE=*/ /* * @Author: zhangjyp * @PageInfo: 列表双击进入卡片 @@ -16,3 +17,5 @@ export default function doubleClick(record, index, e) { id: record.csaleinvoiceid.value }); } + +/*Gq+j+L49pJSeXMeRfO6jQKbsu223HsduRVy5leeNrCE=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/exportGoldTax_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/exportGoldTax_BtnClick.js index b209fca..bba3cc3 100644 --- a/src/so/so/saleinvoice/list/btnClicks/exportGoldTax_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/exportGoldTax_BtnClick.js @@ -1,3 +1,4 @@ +/*h6pV1Stt0msgqsSn3QsWlzVa7SHxBuwlbKiC8l3a73xjXS7tTumnnHTsF2D4Argo*/ /* * @Author: zhangjyp * @PageInfo: 传金税按钮事件 @@ -103,3 +104,5 @@ function translateGoldTaxResult() { commonSearchBtnClick.call(this, this.state.currentTab, serchVal, 'exportGoldTax'); }, 100); } + +/*h6pV1Stt0msgqsSn3QsWlzVa7SHxBuwlbKiC8l3a73xjXS7tTumnnHTsF2D4Argo*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/file_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/file_BtnClick.js index 17a9b63..97da31d 100644 --- a/src/so/so/saleinvoice/list/btnClicks/file_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/file_BtnClick.js @@ -1,3 +1,4 @@ +/*Fxn6zGFAX6e8z9mfETwF2VRh3zhiE3gbOw++7awjRY8=*/ /* * @Author: zhangjyp * @PageInfo: 销售发票附件管理 @@ -19,3 +20,5 @@ export default function() { }); } } + +/*Fxn6zGFAX6e8z9mfETwF2VRh3zhiE3gbOw++7awjRY8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/index.js b/src/so/so/saleinvoice/list/btnClicks/index.js index 58f92e9..fd3ea8c 100644 --- a/src/so/so/saleinvoice/list/btnClicks/index.js +++ b/src/so/so/saleinvoice/list/btnClicks/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import buttonClick from './buttonClick'; import searchBtnClick from './searchBtnClick'; import pageInfoClick from './pageInfoClick'; @@ -6,3 +7,5 @@ import doubleBtnClick from './double_BtnClick'; import {listLinkQuery} from './linkInitData'; import commit_BtnClick from './commit_BtnClick'; export { buttonClick, searchBtnClick, commit_BtnClick, pageInfoClick, commonSearchBtnClick, doubleBtnClick, listLinkQuery }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/invoiceQueryExec_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/invoiceQueryExec_BtnClick.js index ba68f7b..3c948e0 100644 --- a/src/so/so/saleinvoice/list/btnClicks/invoiceQueryExec_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/invoiceQueryExec_BtnClick.js @@ -1,9 +1,10 @@ +/*2xyiDu0ozfQo4k4+CR/M9E9NC4predQbb+DoUuw2wg8AAhWYNkd/92u5cG7q+8KA*/ /* * @Author: 刘奇 * @PageInfo: 毛利预估 * @Date: 2019-05-17 10:14:05 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:48:23 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-01 12:38:20 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA } from '../../const'; @@ -37,10 +38,8 @@ export default function invoiceQueryExec_BtnClick(props) { title: getLangByResId(this, '4006SALEINVOICE-000078') /* 国际化处理:发票执行情况 */, noFooter: true, content: ( -
-
+
-
) }); @@ -49,3 +48,5 @@ export default function invoiceQueryExec_BtnClick(props) { } }); } + +/*2xyiDu0ozfQo4k4+CR/M9E9NC4predQbb+DoUuw2wg8AAhWYNkd/92u5cG7q+8KA*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/issueInv_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/issueInv_BtnClick.js index ae3c747..19d9cf1 100644 --- a/src/so/so/saleinvoice/list/btnClicks/issueInv_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/issueInv_BtnClick.js @@ -1,3 +1,4 @@ +/*TijAZezwfAUbsk5SXg42Zoy5/LFaX5hwC1i6o9Ovh/s=*/ /* * @Author: wangceb * @PageInfo: **发票 @@ -56,3 +57,5 @@ export default function buttonClick(props, type) { } }); } + +/*TijAZezwfAUbsk5SXg42Zoy5/LFaX5hwC1i6o9Ovh/s=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/linkInitData.js b/src/so/so/saleinvoice/list/btnClicks/linkInitData.js index cfb3632..4c0b3e6 100644 --- a/src/so/so/saleinvoice/list/btnClicks/linkInitData.js +++ b/src/so/so/saleinvoice/list/btnClicks/linkInitData.js @@ -1,3 +1,4 @@ +/*LZyxu0E0NIxXKBEk7IVNX7oBX7GtVK8HOlyoOAEtmao=*/ /* * 会计平台联查销售发票列表 * @Author: wangpju @@ -27,3 +28,5 @@ function listLinkQuery(props) { } } export { listLinkQuery }; + +/*LZyxu0E0NIxXKBEk7IVNX7oBX7GtVK8HOlyoOAEtmao=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/linkInvoice_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/linkInvoice_BtnClick.js index aee9f6b..cc39790 100644 --- a/src/so/so/saleinvoice/list/btnClicks/linkInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/linkInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*Jh3G9na7tIP6xkCREvej6JjH0u0MQbkaKWLHq118/+c=*/ /* * @Author: wangceb * @PageInfo: 联查税务发票 @@ -27,3 +28,5 @@ export default function buttonClick(props) { ); } } + +/*Jh3G9na7tIP6xkCREvej6JjH0u0MQbkaKWLHq118/+c=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/listPageData.js b/src/so/so/saleinvoice/list/btnClicks/listPageData.js index bc083a7..299fe6b 100644 --- a/src/so/so/saleinvoice/list/btnClicks/listPageData.js +++ b/src/so/so/saleinvoice/list/btnClicks/listPageData.js @@ -1,3 +1,4 @@ +/*iwIuqiA8nGDZnDTa83riE9bUm1IfeIje0LQEikn/AUM=*/ /* * @Author: wangceb * @PageInfo: 销售订单列表获取选中数据 @@ -47,3 +48,5 @@ function getSelectedOperaDatas(props, record, index) { } export default getSelectedOperaDatas; + +/*iwIuqiA8nGDZnDTa83riE9bUm1IfeIje0LQEikn/AUM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/maintainInvoice_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/maintainInvoice_BtnClick.js index 00925bf..21ee0e2 100644 --- a/src/so/so/saleinvoice/list/btnClicks/maintainInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/maintainInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*PDzNa3V5op52VGnXxoZ5q8goFG39IwrAw/CAQTBDCaVz6gpkLWPmaN/L0xHa4xHa*/ /* * @Author: wangceb * @PageInfo: 维护税务发票 @@ -24,3 +25,5 @@ export default function buttonClick(props) { ); } } + +/*PDzNa3V5op52VGnXxoZ5q8goFG39IwrAw/CAQTBDCaVz6gpkLWPmaN/L0xHa4xHa*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/opposeAdd_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/opposeAdd_BtnClick.js index 34eb1f2..0078542 100644 --- a/src/so/so/saleinvoice/list/btnClicks/opposeAdd_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/opposeAdd_BtnClick.js @@ -1,3 +1,4 @@ +/*oazXRORN60E5qVBmhlzub/DDZQYndhZTEyfrpoHhdgo=*/ /* * @Author: zhangjyp * @PageInfo: 列表生成对冲发票按钮事件 @@ -46,3 +47,5 @@ export default function clickOpposeAddBtn(props, callback) { id: seldatas.bills[0].pk }); } + +/*oazXRORN60E5qVBmhlzub/DDZQYndhZTEyfrpoHhdgo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/outPut_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/outPut_BtnClick.js index 5aa4a34..0f0c6fe 100644 --- a/src/so/so/saleinvoice/list/btnClicks/outPut_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/outPut_BtnClick.js @@ -1,3 +1,4 @@ +/*xCKRIwbmLno8GBqR+zvmEpestFzWd0Dv7FaqDblpekg=*/ import { output } from 'nc-lightapp-front'; import { PAGEAREA, URL } from '../../const'; @@ -26,3 +27,5 @@ export default function(props) { data: { oids: pks, outputType: 'output' } }); } + +/*xCKRIwbmLno8GBqR+zvmEpestFzWd0Dv7FaqDblpekg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/pageInfoClick.js b/src/so/so/saleinvoice/list/btnClicks/pageInfoClick.js index f5518b9..f2c90bb 100644 --- a/src/so/so/saleinvoice/list/btnClicks/pageInfoClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/pageInfoClick.js @@ -1,3 +1,4 @@ +/*j07c8riwYnz20MYibuDbtPCPJjiv06v2qfX04jxZNNk=*/ /* * @Author: zhangjyp * @PageInfo: 翻页按钮处理方法 @@ -40,7 +41,7 @@ export default function(props, config, pks, totalnum) { let { success, data } = res; if (success) { if (res.formulamsg && res.formulamsg instanceof Array && res.formulamsg.length > 0) { - props.dealFormulamsg( + _this.props.dealFormulamsg( res.formulamsg //参数一:返回的公式对象 ); } @@ -55,3 +56,5 @@ export default function(props, config, pks, totalnum) { } }); } + +/*j07c8riwYnz20MYibuDbtPCPJjiv06v2qfX04jxZNNk=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/printList_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/printList_BtnClick.js index b37baa6..20165c2 100644 --- a/src/so/so/saleinvoice/list/btnClicks/printList_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/printList_BtnClick.js @@ -1,3 +1,4 @@ +/*2TvFirVRtbomvMU/B0saF40Z9GwSxw/AAYmc7KsS3do=*/ import { PAGEAREA, URL } from '../../const'; import { ajax } from 'nc-lightapp-front'; import getSelectedOperaDatas from './listPageData'; @@ -54,3 +55,5 @@ export default function(props) { } }); } + +/*2TvFirVRtbomvMU/B0saF40Z9GwSxw/AAYmc7KsS3do=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/print_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/print_BtnClick.js index 4e0a16c..e3fb46d 100644 --- a/src/so/so/saleinvoice/list/btnClicks/print_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/print_BtnClick.js @@ -1,13 +1,15 @@ +/*9a1eTd5yO0nmu7639LcU5sCoU1HACH/C90odhEYY9MI=*/ import { PAGEAREA, URL } from '../../const'; import { ajax } from 'nc-lightapp-front'; import getSelectedOperaDatas from './listPageData'; import { showWarningInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import poc from 'uap/common/components/printOnClient'; +import { SALEINVOICE_CONST } from '../../const'; const { printPreview } = poc; const { FORMID } = PAGEAREA; const { PRINTURL, PRINTDATAPERMISSION } = URL; -export default function(props) { +export default function (props) { let seldatas = getSelectedOperaDatas(props); if (seldatas == null || seldatas.index == undefined) { showWarningInfo( @@ -16,10 +18,11 @@ export default function(props) { ); /* 国际化处理: 提示,请选择要操作的发票!*/ return; } - + let pk_orgs = new Set(); let checkedRows = props.table.getCheckedRows(FORMID); let pks = []; for (let row of checkedRows) { + pk_orgs.add(row.data.values.pk_org.value); pks.push(row.data.values.csaleinvoiceid.value); } ajax({ @@ -49,9 +52,13 @@ export default function(props) { printType: true, realData: true, controlPrintNum: true, - userjson: JSON.stringify({ bcombinflag: this.state.combineflag }) + userjson: JSON.stringify({ bcombinflag: this.state.combineflag }), + pk_org: pk_orgs, + billtype: SALEINVOICE_CONST.billtype }); } } }); } + +/*9a1eTd5yO0nmu7639LcU5sCoU1HACH/C90odhEYY9MI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/redInvoice_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/redInvoice_BtnClick.js index 3c6b5c7..f46f6c4 100644 --- a/src/so/so/saleinvoice/list/btnClicks/redInvoice_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/redInvoice_BtnClick.js @@ -1,3 +1,4 @@ +/*0z+Sj7+btWpd7tXPGieIf64B6v1BnK9Sop4R8Sjljtc=*/ /* * @Author: wangceb * @PageInfo: 红字发票 @@ -9,7 +10,7 @@ import { ajax } from 'nc-lightapp-front'; import { URL, PAGEID, PAGEAREA, SaleInvoiceHeadItem } from '../../const'; import { showErrorInfo } from '../../../../../scmpub/scmpub/pub/tool/messageUtil'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; -import InvoiceComponent from 'src/sscivm/invoiceComponent/compoundComponent/component'; +import InvoiceComponent from 'sscivm/invoiceComponent/compoundComponent/component'; export default function buttonClick(props) { let checkdata = this.props.table.getCheckedRows(this.head); @@ -80,3 +81,5 @@ export default function buttonClick(props) { }); }); } + +/*0z+Sj7+btWpd7tXPGieIf64B6v1BnK9Sop4R8Sjljtc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/refresh_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/refresh_BtnClick.js index aab2c1a..b7af711 100644 --- a/src/so/so/saleinvoice/list/btnClicks/refresh_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/refresh_BtnClick.js @@ -1,3 +1,4 @@ +/*iGEr7jsLTpd/n+WcDubKzWtkQHJAAXSCEdkxYu5MvWc=*/ /* * @Author: zhangjyp * @PageInfo: 刷新按钮 @@ -15,3 +16,5 @@ export default function(props) { commonSearchBtnClick.call(this, this.state.currentTab, serchVal, null, null, true); // showSuccessInfo(getLangByResId(this, '4006SALEINVOICE-000063')); /* 国际化处理: 刷新成功!*/ } + +/*iGEr7jsLTpd/n+WcDubKzWtkQHJAAXSCEdkxYu5MvWc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/saleProfit_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/saleProfit_BtnClick.js index def94a8..e50cbb7 100644 --- a/src/so/so/saleinvoice/list/btnClicks/saleProfit_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/saleProfit_BtnClick.js @@ -1,9 +1,10 @@ +/*jHHX4BZGJ+c3sSWFwRgTrTI+6jf9pltQ8Q2eZ2BMz/E=*/ /* * @Author: 刘奇 * @PageInfo: 毛利预估 * @Date: 2019-05-17 10:14:05 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:48:04 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-01 12:36:45 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA } from '../../const'; @@ -38,10 +39,8 @@ export default function saleProfit_BtnClick(props) { title: getLangByResId(this, '4006SALEINVOICE-000077') /* 国际化处理:毛利预估 */, noFooter: true, content: ( -
-
+
-
) }); @@ -50,3 +49,5 @@ export default function saleProfit_BtnClick(props) { } }); } + +/*jHHX4BZGJ+c3sSWFwRgTrTI+6jf9pltQ8Q2eZ2BMz/E=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/searchBtnClick.js b/src/so/so/saleinvoice/list/btnClicks/searchBtnClick.js index 7510b34..24ad0a6 100644 --- a/src/so/so/saleinvoice/list/btnClicks/searchBtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/searchBtnClick.js @@ -1,3 +1,4 @@ +/*YuO8szH0cVixePu/Bt+mGzbz32XgzuRwOJauCnGtY6c=*/ /* * @Author: zhangjyp * @PageInfo: 查询按钮处理方法 @@ -20,3 +21,5 @@ export default function clickSerachBtn(tabCode, props, serchVal) { setDefData(SaleInvoiceCacheKey, this.searchId, queryInfo); commonSearchBtnClick.call(this, tabCode, queryInfo); } + +/*YuO8szH0cVixePu/Bt+mGzbz32XgzuRwOJauCnGtY6c=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/showCombine_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/showCombine_BtnClick.js index b63e866..a62972f 100644 --- a/src/so/so/saleinvoice/list/btnClicks/showCombine_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/showCombine_BtnClick.js @@ -1,3 +1,4 @@ +/*Q85yItnMKM87n/jHGFVBH3M2SMmyRfIjRhJe/UPRWvc=*/ import buttonController from '../viewController/buttonController'; export default function() { this.setState( @@ -9,3 +10,5 @@ export default function() { } ); } + +/*Q85yItnMKM87n/jHGFVBH3M2SMmyRfIjRhJe/UPRWvc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/showDetail_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/showDetail_BtnClick.js index 0b68cca..b1ac092 100644 --- a/src/so/so/saleinvoice/list/btnClicks/showDetail_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/showDetail_BtnClick.js @@ -1,3 +1,4 @@ +/*2aC8zyYcLsaizFrgBRFZXXSv1oagyrkiZK9gpKQ4bWg=*/ import buttonController from '../viewController/buttonController'; export default function() { this.setState( @@ -9,3 +10,5 @@ export default function() { } ); } + +/*2aC8zyYcLsaizFrgBRFZXXSv1oagyrkiZK9gpKQ4bWg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/uncommit_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/uncommit_BtnClick.js index 6607181..27429a0 100644 --- a/src/so/so/saleinvoice/list/btnClicks/uncommit_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/uncommit_BtnClick.js @@ -1,3 +1,4 @@ +/*6DFMdPR/AflacXrwUkwptgoVWH5BCJE2uMUQ75viLjI=*/ /* * @Author: zhangjyp * @PageInfo: 列表收回按钮处理方法 @@ -62,3 +63,5 @@ export default function clickUnCommitBtn(props, skipCodes) { } }); } + +/*6DFMdPR/AflacXrwUkwptgoVWH5BCJE2uMUQ75viLjI=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/btnClicks/vatsub_BtnClick.js b/src/so/so/saleinvoice/list/btnClicks/vatsub_BtnClick.js index cb8739a..baacbd7 100644 --- a/src/so/so/saleinvoice/list/btnClicks/vatsub_BtnClick.js +++ b/src/so/so/saleinvoice/list/btnClicks/vatsub_BtnClick.js @@ -1,9 +1,10 @@ +/*sFmmDN6ioEg4gEeJGVA0jZuxOEFOKtEFYPe2Udi1CFg=*/ /* * @Author: 刘奇 * @PageInfo: 税额小计 * @Date: 2019-05-17 10:15:23 - * @Last Modified by: wangpju - * @Last Modified time: 2022-04-06 15:48:14 + * @Last Modified by: liulux + * @Last Modified time: 2022-11-01 12:37:59 */ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA } from '../../const'; @@ -38,10 +39,8 @@ export default function vatsub_BtnClick(props) { title: getLangByResId(this, '4006SALEINVOICE-000076') /* 国际化处理:税额小计 */, noFooter: true, content: ( -
-
+
-
) }); @@ -50,3 +49,5 @@ export default function vatsub_BtnClick(props) { } }); } + +/*sFmmDN6ioEg4gEeJGVA0jZuxOEFOKtEFYPe2Udi1CFg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/index.js b/src/so/so/saleinvoice/list/index.js index 9d3c7db..5a8ef6d 100644 --- a/src/so/so/saleinvoice/list/index.js +++ b/src/so/so/saleinvoice/list/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: zhangjyp * @PageInfo: 销售发票列表页面 @@ -43,6 +44,7 @@ const { TOCOMMIT, APPROVING, ALL } = TAB; import { getDefData } from '../../../../scmpub/scmpub/pub/cache'; import isAbleFinancial from '../util/isAbleFinancial'; const { NCTabsControl, NCAffix, NCDiv } = base; +import { dateFormat } from '../../../../scmpub/scmpub/pub/tool'; class SaleInvoiceList extends Component { constructor(props) { @@ -108,6 +110,7 @@ class SaleInvoiceList extends Component { } else { getSO27.call(this); } + dateFormat(); } getGoldTaxPara = (payer, checker) => { this.payer = payer; @@ -246,7 +249,8 @@ class SaleInvoiceList extends Component { onRowDoubleClick: doubleBtnClick.bind(this), dataSource: SaleInvoiceCacheKey, pkname: SaleInvoiceHeadItem.CSALEINVOICEID, - componentInitFinished: buttonController.bind(this) + componentInitFinished: buttonController.bind(this), + onBatchSelected: buttonController.bind(this) })}
@@ -331,3 +335,5 @@ SaleInvoiceList = createPage({ } })(SaleInvoiceList); export default SaleInvoiceList; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/approveInfo_BtnClick.js b/src/so/so/saleinvoice/list/init/approveInfo_BtnClick.js index 1c2b19e..f482c3c 100644 --- a/src/so/so/saleinvoice/list/init/approveInfo_BtnClick.js +++ b/src/so/so/saleinvoice/list/init/approveInfo_BtnClick.js @@ -1,3 +1,4 @@ +/*+q8X/E+A5I3aW/kLS07ziOeFGgb551fJRsobAe7DKFY=*/ /* * @Author: zhangjyp * @PageInfo: 审批详情按钮 @@ -12,3 +13,5 @@ export default function(record) { transtype: record.vtrantypecode.value }); } + +/*+q8X/E+A5I3aW/kLS07ziOeFGgb551fJRsobAe7DKFY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/getPara.js b/src/so/so/saleinvoice/list/init/getPara.js index 02c0ec0..a66b96e 100644 --- a/src/so/so/saleinvoice/list/init/getPara.js +++ b/src/so/so/saleinvoice/list/init/getPara.js @@ -1,3 +1,4 @@ +/*aVbCbagnMVnqMjmlEKKEedsNTR9m+Scd1ZofjW+tvMg=*/ import { ajax } from 'nc-lightapp-front'; import { URL } from '../../const'; import { getLangByResId } from '../../../../../scmpub/scmpub/pub/tool/multiLangUtil'; @@ -19,3 +20,5 @@ export function getSO27() { } }); } + +/*aVbCbagnMVnqMjmlEKKEedsNTR9m+Scd1ZofjW+tvMg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/index.js b/src/so/so/saleinvoice/list/init/index.js index de81ec9..98c8371 100644 --- a/src/so/so/saleinvoice/list/init/index.js +++ b/src/so/so/saleinvoice/list/init/index.js @@ -1,5 +1,8 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import initTemplate from './initTemplate'; import rowCommit_BtnClick from './rowCommit_BtnClick'; import { getSO27 } from './getPara'; export { initTemplate, getSO27, rowCommit_BtnClick }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/initTemplate.js b/src/so/so/saleinvoice/list/init/initTemplate.js index ae041f5..48025d2 100644 --- a/src/so/so/saleinvoice/list/init/initTemplate.js +++ b/src/so/so/saleinvoice/list/init/initTemplate.js @@ -1,9 +1,10 @@ +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ /* * @Author: zhangjyp * @PageInfo: 列表初始化模板 * @Date: 2018-04-19 10:32:11 * @Last Modified by: zhangllb - * @Last Modified time: 2022-01-07 16:55:22 + * @Last Modified time: 2023-07-10 10:18:24 */ import serachRefFilter from '../../refFilter/serachRefFilter'; @@ -56,22 +57,10 @@ export default function(props) { let button = data.button; let pageMsgType = this.props.getUrlParam('scene'); - // approvesce 审批中心 审批中心的时候不去循环开票按钮注册名称 + // approvesce 审批中心 审批中心的时候不去循环开票按钮注册编码 if ((pageMsgType && !pageMsgType == 'approvesce') || !pageMsgType) { - let assitGroup = button.filter((assitgroupitem) => { - return assitgroupitem.key == 'AstActionGroup'; - }); - let astActionGroup_invoice = assitGroup[0].children; - let invoicebtn = astActionGroup_invoice.filter((invoicebtns) => { - return invoicebtns.key == 'AstActionGroup_invoice'; - }); - let invoicebtnchild = invoicebtn[0].children; - let makeInvinvoices = invoicebtnchild.filter((makeInv_invoice) => { - return makeInv_invoice.key.startsWith('MakeInv_'); - }); - for (let item of makeInvinvoices) { - this.makeInvInvoice.push(item.key); - } + //循环取开票按钮放到makeInvInvoice中 + createMakeInvArray.call(this, button); } mofifierBtn.call(this, props, button); @@ -79,6 +68,19 @@ export default function(props) { } } } + +//客户可以任意位置配置开票按钮,开票按钮都以MakeInv_开头 +function createMakeInvArray(button) { + for (let i = 0; i < button.length; i++) { + if (button[i].key.startsWith('MakeInv_')) { + this.makeInvInvoice.push(button[i].key); + } + if (button[i].children) { + createMakeInvArray.call(this, button[i].children); + } + } +} + function initQueryData(props) { let src = props.getUrlParam('scene'); if (src && 'fip' == src) { @@ -117,8 +119,6 @@ function mofifierBtn(props, button) { authorization: 'authorization-text' }, onChange: (info) => { - if (info.file.status !== 'uploading') { - } if (info.file.status === 'done') { if (info.file.response.error) { showErrorInfo( @@ -130,7 +130,6 @@ function mofifierBtn(props, button) { showSuccessInfo(getLangByResId(this, '4006SALEINVOICE-000041')); /* 国际化处理: 导入成功!*/ let serchVal = getDefData(SaleInvoiceCacheKey, this.searchId); commonSearchBtnClick.call(this, this.state.currentTab, serchVal, 'importGoldTax'); - } else if (info.file.status === 'error') { } } }; /* 这里的config只是示例,具体的参数说明详见tinper-bee中Upload组件文档 */ @@ -229,3 +228,5 @@ function modifierMeta(props, meta) { columnSortUtils.numberSort(meta, FORMID, SaleInvoiceBodyItem.CROWNO); return meta; } + +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/rowButtonClick.js b/src/so/so/saleinvoice/list/init/rowButtonClick.js index ad21e08..35d741b 100644 --- a/src/so/so/saleinvoice/list/init/rowButtonClick.js +++ b/src/so/so/saleinvoice/list/init/rowButtonClick.js @@ -1,3 +1,4 @@ +/*roZ3/j0EXAzsRZFlHU8MFhfWr7sC025wartiJoHRHNM=*/ /* * @Author: zhangjyp * @PageInfo: 列表操作列按钮事件 @@ -34,3 +35,5 @@ export default function clickBtn(props, key, record, index, assign) { break; } } + +/*roZ3/j0EXAzsRZFlHU8MFhfWr7sC025wartiJoHRHNM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/rowCommit_BtnClick.js b/src/so/so/saleinvoice/list/init/rowCommit_BtnClick.js index 907a8a5..a074087 100644 --- a/src/so/so/saleinvoice/list/init/rowCommit_BtnClick.js +++ b/src/so/so/saleinvoice/list/init/rowCommit_BtnClick.js @@ -1,3 +1,4 @@ +/*UyIRU5ab6EHZP1HgsAGXSDmmc6uj930Ap83pnGbeB4Y=*/ /* * @Author: zhangjyp * @PageInfo: 列表行提交按钮处理方法 @@ -80,3 +81,5 @@ export default function clickRowCommit(props, record, index, callback, assign, s } }); } + +/*UyIRU5ab6EHZP1HgsAGXSDmmc6uj930Ap83pnGbeB4Y=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/rowDelete_BtnClick.js b/src/so/so/saleinvoice/list/init/rowDelete_BtnClick.js index 9f2ec68..377b6a6 100644 --- a/src/so/so/saleinvoice/list/init/rowDelete_BtnClick.js +++ b/src/so/so/saleinvoice/list/init/rowDelete_BtnClick.js @@ -1,3 +1,4 @@ +/*0n6TtvsdbKpRcPAPH1a+poUUi64s8D6tUReOcKEhw0U=*/ /* * @Author: zhangjyp * @PageInfo: 列表行删除按钮处理方法 @@ -45,3 +46,5 @@ function deleteRow(props, record, index) { } }); } + +/*0n6TtvsdbKpRcPAPH1a+poUUi64s8D6tUReOcKEhw0U=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/init/rowEdit_BtnClick.js b/src/so/so/saleinvoice/list/init/rowEdit_BtnClick.js index 2bf6d2c..28d1d18 100644 --- a/src/so/so/saleinvoice/list/init/rowEdit_BtnClick.js +++ b/src/so/so/saleinvoice/list/init/rowEdit_BtnClick.js @@ -1,9 +1,10 @@ +/*JMmVn5wHf5YqfwfY9kUJpMIqEuiK15lDms/y0kuz4cw=*/ /* * @Author: zhangjyp * @PageInfo: 列表行修改按钮处理方法 * @Date: 2018-04-19 10:33:37 - * @Last Modified by: wangpju - * @Last Modified time: 2021-09-02 10:24:15 + * @Last Modified by: liulux + * @Last Modified time: 2023-03-31 11:00:56 */ import { ajax } from 'nc-lightapp-front'; @@ -14,7 +15,8 @@ export default function clickRowEdit(props, record) { let pk = record.csaleinvoiceid.value; let data = { - pks: [ pk ] + pks: [pk], + ts: record.ts.value }; ajax({ url: EDITURL, @@ -31,3 +33,5 @@ export default function clickRowEdit(props, record) { } }); } + +/*JMmVn5wHf5YqfwfY9kUJpMIqEuiK15lDms/y0kuz4cw=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/list/viewController/buttonController.js b/src/so/so/saleinvoice/list/viewController/buttonController.js index 1265f31..efed395 100644 --- a/src/so/so/saleinvoice/list/viewController/buttonController.js +++ b/src/so/so/saleinvoice/list/viewController/buttonController.js @@ -1,3 +1,4 @@ +/*kmMeNHXPpdljPj98yiqeQfdPJV3PYPMsvMdu1tik4Qw=*/ import { BTNCODE } from '../../const'; const { @@ -14,7 +15,7 @@ const { IMPORTTAXCODE, EXPORTGOLDTAX, FILE, - + FileBatch, PRINT, PRINT_LIST, BILLLINKQUERY, @@ -67,6 +68,7 @@ function setButtonDisableByChecked(len) { [EXPORTGOLDTAX]: flag, [FILE]: flag, + [FileBatch]: flag, [BILLLINKQUERY]: flag, [OUTPUT]: flag, @@ -90,7 +92,7 @@ function setButtonDisabledByBillStatus(checked) { [LINKINVOICE]: false }); let ntotalorigmny = checked[0].data.values.ntotalorigmny.value; - if (ntotalorigmny > 0) { + if (ntotalorigmny > 0 || ntotalorigmny == 0 ) { this.props.button.setButtonDisabled(REDINVOICE, true); this.props.button.setButtonDisabled(this.makeInvInvoice, false); } else { @@ -107,7 +109,7 @@ function setButtonDisabledByBillStatus(checked) { [LINKINVOICE]: false }); let ntotalorigmny = checked[0].data.values.ntotalorigmny.value; - if (ntotalorigmny > 0) { + if (ntotalorigmny > 0 || ntotalorigmny == 0 ) { this.props.button.setButtonDisabled({ [REDINVOICE]: true }); @@ -129,7 +131,7 @@ function setButtonDisabledByBillStatus(checked) { [LINKINVOICE]: false }); let ntotalorigmny = checked[0].data.values.ntotalorigmny.value; - if (ntotalorigmny > 0) { + if (ntotalorigmny > 0 || ntotalorigmny == 0 ) { this.props.button.setButtonDisabled({ [REDINVOICE]: true }); @@ -143,6 +145,9 @@ function setButtonDisabledByBillStatus(checked) { } else if (fstatusflag == 8) { // 审批不通过 this.props.button.setButtonDisabled({ + [DELETE]: true, + [COMMIT]: true, + [UNCOMMIT]: true, [IMPORTTAXCODE]: true, [OPPOSEADD]: true, [REDINVOICE]: true, @@ -152,3 +157,5 @@ function setButtonDisabledByBillStatus(checked) { this.props.button.setButtonDisabled(this.makeInvInvoice, true); } } + +/*kmMeNHXPpdljPj98yiqeQfdPJV3PYPMsvMdu1tik4Qw=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/main/config.json b/src/so/so/saleinvoice/main/config.json index b48b0ba..c6fdbcb 100644 --- a/src/so/so/saleinvoice/main/config.json +++ b/src/so/so/saleinvoice/main/config.json @@ -15,7 +15,8 @@ "../../../../so/so/components/casharsubdetail/index.js", "../../../../so/so/components/custcreditquery/index.js", "../../../../so/so/components/offset/index.js", - "../../../../so/so/components/saleprofit/index.js" + "../../../../so/so/components/saleprofit/index.js", + "../../../../uap/common/components/getAttachmentInfo/index.js" ], "dependModuleName": [ "sscivm/invoiceComponent/compoundComponent/component", @@ -33,6 +34,7 @@ "so/so/components/casharsubdetail", "so/so/components/custcreditquery", "so/so/components/offset", - "so/so/components/saleprofit" + "so/so/components/saleprofit", + "uap/common/components/getAttachmentInfo" ] -} \ No newline at end of file +} diff --git a/src/so/so/saleinvoice/main/index.js b/src/so/so/saleinvoice/main/index.js index 0265aa6..7fa1168 100644 --- a/src/so/so/saleinvoice/main/index.js +++ b/src/so/so/saleinvoice/main/index.js @@ -1,5 +1,8 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import { RenderRouter } from 'nc-lightapp-front'; import routes from './router'; (function main(routers, htmlTagid) { RenderRouter(routers, htmlTagid); })(routes, 'app'); + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/main/router.js b/src/so/so/saleinvoice/main/router.js index c744f08..6bbce64 100644 --- a/src/so/so/saleinvoice/main/router.js +++ b/src/so/so/saleinvoice/main/router.js @@ -1,3 +1,4 @@ +/*xkHV95WNVU0F2jf68qFtfFfjLnUugUct7xsGawBQMCs=*/ import { asyncComponent } from 'nc-lightapp-front'; const list = asyncComponent(() => @@ -17,3 +18,5 @@ const routes = [ { path: '/addinvoice', component: addInvoice } ]; export default routes; + +/*xkHV95WNVU0F2jf68qFtfFfjLnUugUct7xsGawBQMCs=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/refFilter/bodyRefFilter.js b/src/so/so/saleinvoice/refFilter/bodyRefFilter.js index 2f6133e..2399d0d 100644 --- a/src/so/so/saleinvoice/refFilter/bodyRefFilter.js +++ b/src/so/so/saleinvoice/refFilter/bodyRefFilter.js @@ -1,3 +1,4 @@ +/*fSe3z73Oj1dIh2qw7yULfC6ECnFOcm+L1Mjela6bTxQ=*/ import { ajax, base } from 'nc-lightapp-front'; import { PAGEAREA } from '../const'; const { TABLEID, FORMID } = PAGEAREA; @@ -120,3 +121,5 @@ export default function bodyReferEvent(props, meta) { } }); } + +/*fSe3z73Oj1dIh2qw7yULfC6ECnFOcm+L1Mjela6bTxQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/refFilter/headRefFilter.js b/src/so/so/saleinvoice/refFilter/headRefFilter.js index 0f34856..26c5129 100644 --- a/src/so/so/saleinvoice/refFilter/headRefFilter.js +++ b/src/so/so/saleinvoice/refFilter/headRefFilter.js @@ -1,3 +1,4 @@ +/*f8HEp7cDqyiJ9LW72+PivN5k7DeRiQ0tOPdNVKqGHds=*/ import { ajax, base } from 'nc-lightapp-front'; import { PAGEAREA } from '../const'; import { rateTypeBuyFilter } from '../../../../scmpub/scmpub/pub/tool/currencyRateUtil'; @@ -96,3 +97,5 @@ export default function headReferEvent(props, meta) { } }); } + +/*f8HEp7cDqyiJ9LW72+PivN5k7DeRiQ0tOPdNVKqGHds=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/refFilter/index.js b/src/so/so/saleinvoice/refFilter/index.js index 6e341e3..8ea4f06 100644 --- a/src/so/so/saleinvoice/refFilter/index.js +++ b/src/so/so/saleinvoice/refFilter/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: zhangjyp * @PageInfo: 参照过滤 @@ -14,3 +15,5 @@ export default function referEvent(props, meta) { // 表体参照过滤 bodyReferEvent(props, meta); } + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/refFilter/serachRefFilter.js b/src/so/so/saleinvoice/refFilter/serachRefFilter.js index 74b8ae8..bcc3c2d 100644 --- a/src/so/so/saleinvoice/refFilter/serachRefFilter.js +++ b/src/so/so/saleinvoice/refFilter/serachRefFilter.js @@ -1,3 +1,4 @@ +/*X4thQCmyM3auD60C810K6670pUOHXr0Vrm4fht5GM+Y=*/ import { PAGEAREA } from '../const'; const { SEARCHID } = PAGEAREA; import { getSearchValByField } from '../../pub/tool/SearchTool'; @@ -201,6 +202,17 @@ export default function serachReferEvent(props, meta) { let data = getSearchValByField(props, SEARCHID, 'pk_org'); return { pk_org: data }; }; + } else if (item.attrcode == 'csaleinvoicebid.cmffileid') { + // 配置码参照过滤 + item.queryCondition = () => { + let cmaterialid = props.search.getSearchValByField(SEARCHID, 'csaleinvoicebid.cmaterialid'); + cmaterialid = cmaterialid ? (cmaterialid.value || {}).firstvalue : null; + if (cmaterialid && cmaterialid != '') { + return { cmaterialid: cmaterialid }; + } + }; } }); } + +/*X4thQCmyM3auD60C810K6670pUOHXr0Vrm4fht5GM+Y=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/refFilter/serach_afterEvent.js b/src/so/so/saleinvoice/refFilter/serach_afterEvent.js index 0d4a829..4f82a2d 100644 --- a/src/so/so/saleinvoice/refFilter/serach_afterEvent.js +++ b/src/so/so/saleinvoice/refFilter/serach_afterEvent.js @@ -1,3 +1,4 @@ +/*0TRc3CutVIRcCNdmkMMbbtXjqnFqC5xOENmHa8iEXJk=*/ import { PAGEAREA } from '../const'; const { SEARCHID } = PAGEAREA; @@ -129,3 +130,5 @@ export default function afterEvent(field, value) { multiCorpRefHandler.call(this, this.props, value, SEARCHID, [ 'csaleinvoicebid.csendstordocid' ]); } } + +/*0TRc3CutVIRcCNdmkMMbbtXjqnFqC5xOENmHa8iEXJk=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/singletransfer/index.js b/src/so/so/saleinvoice/singletransfer/index.js index e944b3c..841a86d 100644 --- a/src/so/so/saleinvoice/singletransfer/index.js +++ b/src/so/so/saleinvoice/singletransfer/index.js @@ -1,9 +1,10 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import React, { Component } from 'react'; import { base, createPage } from 'nc-lightapp-front'; import { PAGEAREA } from '../transfer/const'; import { initLang, getLangByResId } from '../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import { URL, TRANSFERCACAHEKEY, PAGEID } from '../const'; -const { TOCARDURL } = URL; +const { TOCARDURL, TOLISTURL } = URL; const { CARD, LIST } = PAGEID; import { init30Template } from '../transfer/init'; import { serach30_btnClick, refresh_BtnClick } from '../transfer/btnClicks'; @@ -99,7 +100,7 @@ class TransferTable extends Component { {createBillHeadInfo({ title: getLangByResId(this, '4006SALEINVOICE-000060') /*国际化处理: 选择订单*/, backBtnClick: this.backClick.bind(), - initShowBackBtn: this.isRefAddLine == undefined ? false : !this.isRefAddLine + initShowBackBtn: this.isRefAddLine == undefined ? true : !this.isRefAddLine })}
@@ -210,3 +211,5 @@ class TransferTable extends Component { TransferTable = createPage({})(TransferTable); export default TransferTable; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/singletransfer/refline/4330index.js b/src/so/so/saleinvoice/singletransfer/refline/4330index.js index fd67c3a..a78b3f2 100644 --- a/src/so/so/saleinvoice/singletransfer/refline/4330index.js +++ b/src/so/so/saleinvoice/singletransfer/refline/4330index.js @@ -1,3 +1,4 @@ +/*nIktMqzKvgf/PVTWJzKBBc2RwlpkMlCd15mHKRJCF8Q=*/ import React, { Component } from 'react'; import { base, createPage } from 'nc-lightapp-front'; import { PAGEAREA } from '../../transfer/const'; @@ -213,3 +214,5 @@ class TransferTable extends Component { TransferTable = createPage({})(TransferTable); export default TransferTable; + +/*nIktMqzKvgf/PVTWJzKBBc2RwlpkMlCd15mHKRJCF8Q=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/singletransfer/refline/index.js b/src/so/so/saleinvoice/singletransfer/refline/index.js index a95bd39..827e3cf 100644 --- a/src/so/so/saleinvoice/singletransfer/refline/index.js +++ b/src/so/so/saleinvoice/singletransfer/refline/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import React, { Component } from 'react'; import { base, createPage } from 'nc-lightapp-front'; import { PAGEAREA } from '../../transfer/const'; @@ -214,3 +215,5 @@ class TransferTable extends Component { TransferTable = createPage({})(TransferTable); export default TransferTable; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/btn_Controller.js b/src/so/so/saleinvoice/transfer/btnClicks/btn_Controller.js index c2e6438..af196fd 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/btn_Controller.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/btn_Controller.js @@ -1,3 +1,4 @@ +/*rqgAB70FiVv8RWSJRd7YxsS7oC8O8vw4sMjPBkmUSvY=*/ /* * @Author: wangceb * @PageInfo: 销售出库退货界面,按钮控制 @@ -26,3 +27,5 @@ export default function() { this.props.button.setButtonDisabled('Refresh', false); } } + +/*rqgAB70FiVv8RWSJRd7YxsS7oC8O8vw4sMjPBkmUSvY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/fillAllHeadData.js b/src/so/so/saleinvoice/transfer/btnClicks/fillAllHeadData.js index 24d8a99..d8bbf6d 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/fillAllHeadData.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/fillAllHeadData.js @@ -1,9 +1,10 @@ +/*emuJ4cR2w20bKx5DRaQ/CQBSYY8CJksX/l0qxomgl7Y=*/ /* * @Author: zhangjyp * @PageInfo: 转单界面全部模板里填充表头结算财务组织。开票客户 * @Date: 2018-06-22 12:40:51 - * @Last Modified by: songyt13 - * @Last Modified time: 2022-05-11 15:04:40 + * @Last Modified by: liulux + * @Last Modified time: 2022-10-26 20:35:39 */ import { PK } from '../const'; const { HEAD30PK, HEAD4CPK, HEAD4330PK } = PK; @@ -11,26 +12,35 @@ export default function(destdatas, head, body) { let financeorg = new Map(); let initfinanceorg = new Map(); let invoicecust = new Map(); + let invoicecustvid = new Map(); let initinvoicecust = new Map(); + let initinvoicecustvid = new Map(); + let headinvoicecustvid = new Map(); let headinvoicecust = new Map(); let headcurr = new Map(); let initheadcurr = new Map(); let headsaleorg = new Map(); let initheadsaleorg = new Map(); + let headcustvid = new Map(); let headcust = new Map(); + let initheadcustvid = new Map(); let initheadcust = new Map(); + let head4Ccustvid = new Map(); + let head4Ccustid = new Map(); for (let destdata of destdatas) { for (let headrow of destdata.head[head].rows) { // 开票客户 - if (!headinvoicecust.has(headrow.values[HEAD30PK])) { + if (!headinvoicecustvid.has(headrow.values[HEAD30PK])) { if (headrow.values[HEAD30PK]) { - headinvoicecust.set(headrow.values[HEAD30PK].value, headrow.values.cinvoicecustvid); + headinvoicecustvid.set(headrow.values[HEAD30PK].value, headrow.values.cinvoicecustvid); + headinvoicecust.set(headrow.values[HEAD30PK].value, headrow.values.cinvoicecustid); } } // 开票客户 - if (!initinvoicecust.has(headrow.values[HEAD4330PK])) { + if (!initinvoicecustvid.has(headrow.values[HEAD4330PK])) { if (headrow.values[HEAD4330PK]) { - initinvoicecust.set(headrow.values[HEAD4330PK].value, headrow.values.cinvoicecustvid); + initinvoicecustvid.set(headrow.values[HEAD4330PK].value, headrow.values.cinvoicecustvid); + initinvoicecust.set(headrow.values[HEAD4330PK].value, headrow.values.cinvoicecustid); } } // 币种 @@ -64,8 +74,9 @@ export default function(destdatas, head, body) { } } //客户 - if (!headcust.has(headrow.values[HEAD30PK])) { + if (!headcustvid.has(headrow.values[HEAD30PK])) { if (headrow.values[HEAD30PK]) { + headcustvid.set(headrow.values[HEAD30PK].value, headrow.values.ccustomervid); headcust.set(headrow.values[HEAD30PK].value, headrow.values.ccustomerid); } } @@ -75,6 +86,11 @@ export default function(destdatas, head, body) { initheadcust.set(headrow.values[HEAD4330PK].value, headrow.values.ccustomerid); } } + if (!initheadcustvid.has(headrow.values[HEAD4330PK])) { + if (headrow.values[HEAD4330PK]) { + initheadcustvid.set(headrow.values[HEAD4330PK].value, headrow.values.ccustomervid); + } + } } for (let bodyrow of destdata.body[body].rows) { @@ -88,30 +104,40 @@ export default function(destdatas, head, body) { // 表体开票客户 if (!invoicecust.has(bodyrow.values[HEAD4CPK])) { if (bodyrow.values[HEAD4CPK]) { - invoicecust.set(bodyrow.values[HEAD4CPK].value, bodyrow.values.cinvoicecustvid); + invoicecustvid.set(bodyrow.values[HEAD4CPK].value, bodyrow.values.cinvoicecustvid); + invoicecust.set(bodyrow.values[HEAD4CPK].value, bodyrow.values.cinvoicecustid); } } + } } for (let destdata of destdatas) { for (let bodyrow of destdata.body[body].rows) { - if (headinvoicecust.size > 0) { + if (headinvoicecustvid.size > 0) { if (bodyrow.values.cinvoicecustvid == undefined && bodyrow.values[HEAD30PK] != undefined) { bodyrow.values.cinvoicecustvid = {}; - bodyrow.values.cinvoicecustvid = headinvoicecust.get(bodyrow.values[HEAD30PK].value); + bodyrow.values.cinvoicecustvid = headinvoicecustvid.get(bodyrow.values[HEAD30PK].value); } } - if (initinvoicecust.size > 0) { + if (headinvoicecust.size > 0) { + if (bodyrow.values.cinvoicecustid == undefined && bodyrow.values[HEAD30PK] != undefined) { + bodyrow.values.cinvoicecustid = {}; + bodyrow.values.cinvoicecustid = headinvoicecust.get(bodyrow.values[HEAD30PK].value); + } + } + if (initinvoicecustvid.size > 0) { if (bodyrow.values.cinvoicecustvid == undefined && bodyrow.values[HEAD4330PK] != undefined) { bodyrow.values.cinvoicecustvid = {}; - bodyrow.values.cinvoicecustvid = initinvoicecust.get(bodyrow.values[HEAD4330PK].value); + bodyrow.values.cinvoicecustvid = initinvoicecustvid.get(bodyrow.values[HEAD4330PK].value); + bodyrow.values.cinvoicecustid = initinvoicecust.get(bodyrow.values[HEAD4330PK].value); } } - if (headcust.size > 0) { + if (headcustvid.size > 0) { if (bodyrow.values.ccustomerid == undefined && bodyrow.values[HEAD30PK] != undefined) { bodyrow.values.ccustomerid = {}; bodyrow.values.ccustomerid = headcust.get(bodyrow.values[HEAD30PK].value); + bodyrow.values.ccustomervid = headcustvid.get(bodyrow.values[HEAD30PK].value); } } if (initheadcust.size > 0) { @@ -119,6 +145,7 @@ export default function(destdatas, head, body) { bodyrow.values.ccustomerid = {}; bodyrow.values.ccustomerid = initheadcust.get(bodyrow.values[HEAD4330PK].value); + bodyrow.values.ccustomervid = initheadcustvid.get(bodyrow.values[HEAD4330PK].value); } } if (headcurr.size > 0) { @@ -153,10 +180,16 @@ export default function(destdatas, head, body) { } } for (let headrow of destdata.head[head].rows) { - if (invoicecust.size > 0) { + if (invoicecustvid.size > 0) { if (headrow.values.cinvoicecustvid == undefined && headrow.values[HEAD4CPK] != undefined) { headrow.values.cinvoicecustvid = {}; - headrow.values.cinvoicecustvid = invoicecust.get(headrow.values[HEAD4CPK].value); + headrow.values.cinvoicecustvid = invoicecustvid.get(headrow.values[HEAD4CPK].value); + } + } + if (invoicecust.size > 0) { + if (headrow.values.cinvoicecustid == undefined && headrow.values[HEAD4CPK] != undefined) { + headrow.values.cinvoicecustid = {}; + headrow.values.cinvoicecustid = invoicecust.get(headrow.values[HEAD4CPK].value); } } if (financeorg.size > 0) { @@ -170,3 +203,5 @@ export default function(destdatas, head, body) { } return destdatas; } + +/*emuJ4cR2w20bKx5DRaQ/CQBSYY8CJksX/l0qxomgl7Y=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/index.js b/src/so/so/saleinvoice/transfer/btnClicks/index.js index 0ba416f..c2cf590 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/index.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import serach30_btnClick from './serach30_btnClick'; import search4330_btnClick from './serach4330_btnClick'; import serach4c_btnClick from './serach4c_btnClick'; @@ -17,3 +18,5 @@ export { refresh_BtnClick, btn_Controller }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/outRush_BtnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/outRush_BtnClick.js index 1f19516..9f32ba3 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/outRush_BtnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/outRush_BtnClick.js @@ -1,3 +1,4 @@ +/*4mxCviSqr7rT9FRaaSKs2b2eogV1cb33nw/lWurfb9M=*/ import { ajax } from 'nc-lightapp-front'; import { PAGEAREA, URL } from '../const'; const { OUTRUSHURL } = URL; @@ -31,3 +32,5 @@ export default function() { } }); } + +/*4mxCviSqr7rT9FRaaSKs2b2eogV1cb33nw/lWurfb9M=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/refresh_BtnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/refresh_BtnClick.js index 7b95478..03c00c4 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/refresh_BtnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/refresh_BtnClick.js @@ -1,3 +1,4 @@ +/*iGEr7jsLTpd/n+WcDubKzWtkQHJAAXSCEdkxYu5MvWc=*/ /* * @Author: zhangjyp * @PageInfo: 刷新处理方法 @@ -41,3 +42,5 @@ export default function buttonClick(headTableId) { serachall_btnClick.call(this, this.isRefAddLine, this.billvo, queryInfo, true); } } + +/*iGEr7jsLTpd/n+WcDubKzWtkQHJAAXSCEdkxYu5MvWc=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/selected_BtnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/selected_BtnClick.js index 8f561e1..6f1e22a 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/selected_BtnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/selected_BtnClick.js @@ -1,3 +1,4 @@ +/*ERQDkLfZzyqpcsTRaRxgiOFYSHwnW6pn2XyQO8wPjw8=*/ import translateData from '../utils/translateData'; import { PAGEAREA, PK, KEYMAP } from '../const'; const { HEADALL, BODYALL, HEAD30, BODY30, HEAD4C, BODY4C, HEAD4330, BODY4330 } = PAGEAREA; @@ -59,3 +60,5 @@ export default function select() { [ BODY30PK, BODY4CPK, BODY4330PK ] ); } + +/*ERQDkLfZzyqpcsTRaRxgiOFYSHwnW6pn2XyQO8wPjw8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/serach30_btnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/serach30_btnClick.js index fa8b068..8c1d313 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/serach30_btnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/serach30_btnClick.js @@ -1,9 +1,10 @@ +/*ArbjN8YTJ3kRp8UMAQbHBLGWxK//ZzZLQaUaL310shM=*/ /* * @Author: zhangjyp * @PageInfo: 查询按钮处理方法 * @Date: 2018-04-19 10:33:09 - * @Last Modified by: liangzhyf - * @Last Modified time: 2020-12-22 15:38:30 + * @Last Modified by: zhangllb + * @Last Modified time: 2022-11-29 22:12:19 */ import { PAGECODE, PAGEAREA, PK, URL, CACHEKEY } from '../const'; @@ -70,13 +71,12 @@ export default function clickSerachBtn(isRefAddLine, billvo, queryInfo, isRefres if (isRefresh) { showRefreshInfo(); } else { - showWarningInfo( - null, - getLangByResId(this, '4006SALEINVOICE-000050') - ); /* 国际化处理: 请注意,无符合条件数据*/ + showWarningInfo(null, getLangByResId(this, '4006SALEINVOICE-000050')); /* 国际化处理: 请注意,无符合条件数据*/ } } } } }); } + +/*ArbjN8YTJ3kRp8UMAQbHBLGWxK//ZzZLQaUaL310shM=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/serach4330_btnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/serach4330_btnClick.js index 031cd91..de6a27a 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/serach4330_btnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/serach4330_btnClick.js @@ -1,3 +1,4 @@ +/*4PZpumy5sBZ9/ZmQEboU2oP5rVU5dzqE6XrAQDIs8Ko=*/ /* * @Author: songyt13 * @PageInfo: 查询按钮处理方法 @@ -77,3 +78,5 @@ export default function clickSerachBtn(isRefAddLine, billvo, queryInfo, isRefres } }); } + +/*4PZpumy5sBZ9/ZmQEboU2oP5rVU5dzqE6XrAQDIs8Ko=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/serach4c_btnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/serach4c_btnClick.js index c31be7f..104431a 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/serach4c_btnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/serach4c_btnClick.js @@ -1,9 +1,10 @@ +/*XVxn3NUk6lQFpa2bfK7LG/mjxacIhLsJV+pXTfWmPLg=*/ /* * @Author: zhangjyp * @PageInfo: 查询按钮处理方法 * @Date: 2018-04-19 10:33:09 - * @Last Modified by: wangpju - * @Last Modified time: 2022-03-07 17:05:32 + * @Last Modified by: zhangllb + * @Last Modified time: 2022-11-29 22:09:11 */ import { PAGECODE, PAGEAREA, PK, URL, CACHEKEY } from '../const'; @@ -105,3 +106,5 @@ export default function clickSerachBtn(isRefAddLine, billvo, isoutrush, queryInf } }); } + +/*XVxn3NUk6lQFpa2bfK7LG/mjxacIhLsJV+pXTfWmPLg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/btnClicks/serachAll_btnClick.js b/src/so/so/saleinvoice/transfer/btnClicks/serachAll_btnClick.js index 008aabe..8e33f68 100644 --- a/src/so/so/saleinvoice/transfer/btnClicks/serachAll_btnClick.js +++ b/src/so/so/saleinvoice/transfer/btnClicks/serachAll_btnClick.js @@ -1,9 +1,10 @@ +/*982GKr9qtqabI67S6sEBTpC7VRzWPIEWI06ftsm99sQ=*/ /* * @Author: zhangjyp * @PageInfo: 查询按钮处理方法 * @Date: 2018-04-19 10:33:09 - * @Last Modified by: songyt13 - * @Last Modified time: 2022-04-01 13:58:47 + * @Last Modified by: zhangllb + * @Last Modified time: 2022-11-29 20:27:38 */ import { PAGECODE, PAGEAREA, PK, URL, KEYMAP, CACHEKEY, COMMON } from '../const'; @@ -11,7 +12,7 @@ import translateData from '../utils/translateData'; const { PAGEMASTER30, PAGEMASTER4C, PAGEMASTER4330 } = PAGECODE; const { HEADALL, BODYALL, SERACHALL, HEAD30, HEAD4C, HEAD4330, BODY30, BODY4C, BODY4330 } = PAGEAREA; const { HEAD30PK, BODY30PK, HEAD4CPK, BODY4CPK, HEAD4330PK, BODY4330PK } = PK; -const { SERACHALLURL, LINKSERACHALLURL } = URL; +const { SERACHALLURL, LINKSERACHALLURL, WIDGETSERACHALLURL } = URL; const { KEYMAP30TO32, KEYMAP4CTO32, KEYMAP4330TO32 } = KEYMAP; const { RefALLDataSource } = CACHEKEY; import { transtypeUtils } from '../../../../../scmpub/scmpub/pub/tool'; @@ -22,6 +23,7 @@ import { ajax, cacheTools } from 'nc-lightapp-front'; import fillAllHeadData from './fillAllHeadData'; export default function clickSerachBtn(isRefAddLine, billvo, queryInfo, isRefresh) { let url = SERACHALLURL; + let scene = this.props.getUrlParam('scene'); if (this.props.getUrlParam(COMMON.LINK_KEY)) { // 供应链控制塔联查转单页面 let linkkey = this.props.getUrlParam(COMMON.LINK_KEY); @@ -44,6 +46,10 @@ export default function clickSerachBtn(isRefAddLine, billvo, queryInfo, isRefres } else { return; } + } else if (typeof scene == 'string' && scene == 'workbench') { + queryInfo = this.props.search.getQueryInfo(SERACHALL, false); + queryInfo.userdefObj = { transtype: '', ids: '' }; + url = WIDGETSERACHALLURL; } else if (!queryInfo) { let searchVal = this.props.search.getAllSearchData(SERACHALL); if (searchVal == false) { @@ -208,3 +214,5 @@ function clear(props, linkkey) { }); cacheTools.remove(linkkey); } + +/*982GKr9qtqabI67S6sEBTpC7VRzWPIEWI06ftsm99sQ=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/const/index.js b/src/so/so/saleinvoice/transfer/const/index.js index 8affe6d..b9634a3 100644 --- a/src/so/so/saleinvoice/transfer/const/index.js +++ b/src/so/so/saleinvoice/transfer/const/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ const APPCODE = { SALEORDERAPPCODE: '400600400', SALEOUTAPPCODE: '400801206', @@ -51,7 +52,8 @@ const URL = { SEARCH4330URL: '/nccloud/so/saleinvoice/query4330for32.do', SERACHALLURL: '/nccloud/so/saleinvoice/queryallfor32.do', OUTRUSHURL: '/nccloud/so/saleinvoice/outrush.do', - LINKSERACHALLURL: '/nccloud/so/saleinvoice/linkqueryallfor32.do' + LINKSERACHALLURL: '/nccloud/so/saleinvoice/linkqueryallfor32.do', + WIDGETSERACHALLURL: '/nccloud/so/workbench/widgetqueryAllfor32.do' //查询待开票的销售订单、销售出库单、期初发出商品数据 }; const KEYMAP = { KEYMAP30TO32: { @@ -61,6 +63,7 @@ const KEYMAP = { vtrantypecode: 'vtrantypecode', // 客户 ccustomerid: 'ccustomerid', + ccustomervid: 'ccustomervid', // 币种 corigcurrencyid: 'corigcurrencyid', vbillcode: 'vbillcode', @@ -126,6 +129,7 @@ const KEYMAP = { ts: 'ts' }, bodyall: { + cmffileid: 'cmffileid', crowno: 'crowno', csaleorderbid: 'csaleorderbid', csaleorderid: 'csaleorderid', @@ -277,6 +281,10 @@ const KEYMAP = { }, KEYMAP4CTO32: { headall: { + cinvoicecustvid: 'cinvoicecustvid', + cinvoicecustid: 'cinvoicecustid', + ccustomervid: 'ccustomervid', + ccustomerid: 'ccustomerid', csettleorgid: 'cfanaceorgoid', csettleorgvid: 'cfanaceorgvid', cdeptvid: 'cdptvid', @@ -343,6 +351,7 @@ const KEYMAP = { ts: 'ts' }, bodyall: { + cmffileid: 'cmffileid', crowno: 'crowno', cgeneralbid: 'cgeneralbid', cgeneralhid: 'cgeneralhid', @@ -367,6 +376,7 @@ const KEYMAP = { nuninvoicemny: 'ninvoicemny', // 客户 ccustomerid: 'casscustid', + ccustomervid: 'casscustvid', // 销售组织 csaleorgvid: 'csaleorgvid', // 客户物料码 @@ -426,7 +436,7 @@ const KEYMAP = { // 含税净价 nqtorigtaxnetprc: 'nqtorigtaxnetprice', // 赠品 - blargessflag: 'blargessflag', + blargessflag: 'flargess', // 备注 vrownote: 'vnotebody', //含税单价 @@ -506,6 +516,7 @@ const KEYMAP = { vtrantypecode: 'vtrantypecode', // 客户 ccustomerid: 'cinvoicecustid', + ccustomervid: 'cinvoicecustvid', dbilldate: 'doutdate', // 币种 corigcurrencyid: 'corigcurrencyid', @@ -569,6 +580,7 @@ const KEYMAP = { ts: 'ts' }, bodyall: { + cmffileid: 'cmffileid', crowno: 'crowno', initoutregbid: 'initoutregbid', initoutregid: 'initoutregid', @@ -653,6 +665,8 @@ const KEYMAP = { ctaxcodeid: 'ctaxcodeid', // 扣税类别 ftaxtypeflag: 'ftaxtypeflag', + // 赠品 + blargessflag: 'blargessflag', vbdef1: 'vbdef1', vbdef2: 'vbdef2', @@ -712,3 +726,5 @@ const COMMON = { LINK_KEY: 'solinkkey' //共享联查key }; export { PAGECODE, PAGEAREA, PK, URL, KEYMAP, APPCODE, CACHEKEY, COMMON }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/index.js b/src/so/so/saleinvoice/transfer/index.js index be8e9f0..241892d 100644 --- a/src/so/so/saleinvoice/transfer/index.js +++ b/src/so/so/saleinvoice/transfer/index.js @@ -1,536 +1,602 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import React, { Component } from 'react'; -import { createPage, base } from 'nc-lightapp-front'; +import { createPage, ajax, base } from 'nc-lightapp-front'; import { PAGEAREA } from './const'; import { URL, TRANSFERCACAHEKEY, PAGEID } from '../const'; import { - serach30afterEvent, - search4330afterEvent, - serachallafterEvent, - serach4cafterEvent + serach30afterEvent, + search4330afterEvent, + serachallafterEvent, + serach4cafterEvent, } from './init/serach_afterEvent'; const { TOCARDURL, TOLISTURL } = URL; const { CARD, LIST } = PAGEID; import { renderCompleteEvent } from '../../pub/queryarea/queryAreaInit'; -import { init30Template, init4cTemplate, init4330Template, initAllTemplate } from './init'; +import { + init30Template, + init4cTemplate, + init4330Template, + initAllTemplate, +} from './init'; import { btn_Controller } from './btnClicks'; import { - serach30_btnClick, - search4330_btnClick, - serach4c_btnClick, - serachAll_btnClick, - selected_BtnClick, - outRush_BtnClick, - refresh_BtnClick + serach30_btnClick, + search4330_btnClick, + serach4c_btnClick, + serachAll_btnClick, + selected_BtnClick, + outRush_BtnClick, + refresh_BtnClick, } from './btnClicks'; import './index.less'; import { calTotalForTransfer } from '../../pub/tool/TransferTool'; -import { initLang, getLangByResId } from '../../../../scmpub/scmpub/pub/tool/multiLangUtil'; +import { + initLang, + getLangByResId, +} from '../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import { getDefData, setDefData } from '../../../../scmpub/scmpub/pub/cache'; -import { createCardTitle, createBillHeadInfo } from '../../../../scmpub/scmpub/pub/tool/titleUtil'; +import { + createCardTitle, + createBillHeadInfo, +} from '../../../../scmpub/scmpub/pub/tool/titleUtil'; const { NCToggleViewBtn, NCButton, NCDiv } = base; const { - HEAD4C, - BODY4C, - VIEW4C, - HEAD30, - BODY30, - HEAD4330, - BODY4330, - VIEW4330, - VIEW30, - HEADALL, - BODYALL, - VIEWALL, - SERACH30, - SERACH4C, - SEARCH4330, - SERACHALL + HEAD4C, + BODY4C, + VIEW4C, + HEAD30, + BODY30, + HEAD4330, + BODY4330, + VIEW4330, + VIEW30, + HEADALL, + BODYALL, + VIEWALL, + SERACH30, + SERACH4C, + SEARCH4330, + SERACHALL, } = PAGEAREA; class MultiTransferTable extends Component { - constructor(props) { - super(props); - this.curheadTableId = HEADALL; //当前页签的主表id - this.state = { - ntotalnum: 0, - ntotalmny: 0, - initShow: true, //期初单页签显示 - show: false, - disabled: true, - json: {}, - inlt: null, - toggleViewStatus: false // 默认是否为主子拉平 - }; + constructor(props) { + super(props); + this.curheadTableId = HEADALL; //当前页签的主表id + this.state = { + ntotalnum: 0, + ntotalmny: 0, + orderShow: true, //销售订单页签显示 + saleoutShow: true, //销售出库页签显示 + initoutregShow: true, //期初单页签显示 + show: false, + disabled: true, + json: {}, + inlt: null, + toggleViewStatus: false, // 默认是否为主子拉平 + }; - // 汇总标志 - this.combineflag = props.combineflag; - // 是否参照增行 - this.isRefAddLine = props.isRefAddLine; - this.combineCache = props.combineCache; - // 发票vo - this.billvo = props.billvo; - this.refAddLineComfirm_Btn_Click = props.refAddLineComfirm_Btn_Click; - this.ctranstype = props.ctranstype; - } + // 汇总标志 + this.combineflag = props.combineflag; + // 是否参照增行 + this.isRefAddLine = props.isRefAddLine; + this.combineCache = props.combineCache; + // 发票vo + this.billvo = props.billvo; + this.refAddLineComfirm_Btn_Click = props.refAddLineComfirm_Btn_Click; + this.ctranstype = props.ctranstype; + } - componentWillMount() { - initLang(this, [ '4006saleinvoice' ], 'so', initAllTemplate.bind(this, this.props)); - // ajax({ - // url: URL.queryAddTab, - // data: '32', - // success: (res) => { - // let { success, data } = res; - // if (success) { - // let srcbilltype = []; - // if (data) { - // if (data.length > 0) { - // for (let row of data) { - // srcbilltype.push(row.src_billtype); - // } - // } - // if (srcbilltype.indexOf('4330') == -1) { - // //没有期初单 - // this.setState({ initShow: false }); - // } - // } - // } - // } - // }); - } + componentWillMount() { + initLang( + this, + ['4006saleinvoice'], + 'so', + initAllTemplate.bind(this, this.props) + ); + ajax({ + url: URL.QUERYADDTABURL, + data: '32', + success: (res) => { + let { success, data } = res; + if (success) { + let srcbilltype = []; + if (data) { + if (data.length > 0) { + for (let row of data) { + srcbilltype.push(row.src_billtype); + } + } + if (srcbilltype.indexOf('30') == -1) { + //没有销售订单 + this.setState({ orderShow: false }); + } + if (srcbilltype.indexOf('4C') == -1) { + //没有销售出库单 + this.setState({ saleoutShow: false }); + } + if (srcbilltype.indexOf('4330') == -1) { + //没有期初单 + this.setState({ initoutregShow: false }); + } + } + } + }, + }); + } - componentDidMount() { - let transtypecode = this.props.getUrlParam('transtypecode'); - let billtypeid = this.props.getUrlParam('billtypeid'); - let billtypename = this.props.getUrlParam('billtypename'); - setDefData(TRANSFERCACAHEKEY, 'transtypecode', transtypecode); - setDefData(TRANSFERCACAHEKEY, 'billtypeid', billtypeid); - setDefData(TRANSFERCACAHEKEY, 'billtypename', billtypename); - } - // 计算合计 - calTotal = (flag, record, bodys, index, numkey, mnykey) => { - let totalValues = calTotalForTransfer.call( - this, - flag, - record, - bodys, - index, - [ numkey, mnykey ], - [ this.state.ntotalnum, this.state.ntotalmny ] - ); - this.setState({ - ntotalnum: totalValues[0], - ntotalmny: totalValues[1] - }); - }; + componentDidMount() { + let transtypecode = this.props.getUrlParam('transtypecode'); + let billtypeid = this.props.getUrlParam('billtypeid'); + let billtypename = this.props.getUrlParam('billtypename'); + setDefData(TRANSFERCACAHEKEY, 'transtypecode', transtypecode); + setDefData(TRANSFERCACAHEKEY, 'billtypeid', billtypeid); + setDefData(TRANSFERCACAHEKEY, 'billtypename', billtypename); + } + // 计算合计 + calTotal = (flag, record, bodys, index, numkey, mnykey) => { + let totalValues = calTotalForTransfer.call( + this, + flag, + record, + bodys, + index, + [numkey, mnykey], + [this.state.ntotalnum, this.state.ntotalmny] + ); + this.setState({ + ntotalnum: totalValues[0], + ntotalmny: totalValues[1], + }); + }; - backClick = () => { - let from = this.props.getUrlParam('from'); - let combineflag = this.props.getUrlParam('combineflag'); - if (from == 'card' || from == 'list' || from == undefined) { - this.props.pushTo(TOLISTURL, { - pagecode: LIST, - combineflag: combineflag - }); - } - }; + backClick = () => { + let from = this.props.getUrlParam('from'); + let combineflag = this.props.getUrlParam('combineflag'); + if (from == 'card' || from == 'list' || from == undefined) { + this.props.pushTo(TOLISTURL, { + pagecode: LIST, + combineflag: combineflag, + }); + } + }; - componentWillUnmount() {} - // react:界面渲染函数 - render() { - const { transferTable, BillHeadInfo, search, button } = this.props; - const { createBillHeadInfo } = BillHeadInfo; - const { NCCreateSearch } = search; - const { createButtonApp } = button; - const { createMultiTransferTable } = transferTable; - let selectedShow = transferTable.getSelectedListDisplay('all'); - let _this = this; - // let initShowBackBtn = - // !this.isRefAddLine && this.props.getUrlParam('from') == undefined - // ? false - // : !this.isRefAddLine && this.props.getUrlParam('from'); - let initShowBackBtn = this.props.getUrlParam('from') || (this.props.getUrlParam('from') == undefined && this.props.getAppCode() == '400601200')? true: false; - let totalstr = `${getLangByResId(this, '4006SALEINVOICE-000058')}:${this.state.ntotalnum} , ${getLangByResId( - this, - '4006SALEINVOICE-000059' - )}:${this.state.ntotalmny}`; /* 国际化处理: 本次开票总数量,本次开票总金额*/ - return ( -
- {!selectedShow ? ( - -
- {createBillHeadInfo({ - backBtnClick: this.backClick.bind(), - title: - getLangByResId(this, '4006SALEINVOICE-000060') + - '/' + - getLangByResId(this, '4006SALEINVOICE-000066') /* 国际化处理: 选择订单,出库单*/ + - '/' + - getLangByResId(this, '4006SALEINVOICE-000095') /* 国际化处理: 选择订单,出库单,期初单*/, - initShowBackBtn: initShowBackBtn - })} -
-
- {createButtonApp({ - area: 'list_head', - buttonLimit: 8, - onButtonClick: refresh_BtnClick.bind(this, this.curheadTableId), - popContainer: document.querySelector('.header-button-area') - })} + componentWillUnmount() {} + // react:界面渲染函数 + render() { + const { transferTable, BillHeadInfo, search, button } = this.props; + const { createBillHeadInfo } = BillHeadInfo; + const { NCCreateSearch } = search; + const { createButtonApp } = button; + const { createMultiTransferTable } = transferTable; + let selectedShow = transferTable.getSelectedListDisplay('all'); + let _this = this; + // let initShowBackBtn = + // !this.isRefAddLine && this.props.getUrlParam('from') == undefined + // ? false + // : !this.isRefAddLine && this.props.getUrlParam('from'); + let initShowBackBtn = + this.props.getUrlParam('from') || + (this.props.getUrlParam('from') == undefined && + this.props.getAppCode() == '400601200') + ? true + : false; + let totalstr = `${getLangByResId(this, '4006SALEINVOICE-000058')}:${ + this.state.ntotalnum + } , ${getLangByResId(this, '4006SALEINVOICE-000059')}:${ + this.state.ntotalmny + }`; /* 国际化处理: 本次开票总数量,本次开票总金额*/ + return ( +
+ {!selectedShow ? ( + +
+ {createBillHeadInfo({ + backBtnClick: this.backClick.bind(), + title: + getLangByResId(this, '4006SALEINVOICE-000060') + + '/' + + getLangByResId( + this, + '4006SALEINVOICE-000066' + ) /* 国际化处理: 选择订单,出库单*/ + + '/' + + getLangByResId( + this, + '4006SALEINVOICE-000095' + ) /* 国际化处理: 选择订单,出库单,期初单*/, + initShowBackBtn: initShowBackBtn, + })} +
+
+ {createButtonApp({ + area: 'list_head', + buttonLimit: 8, + onButtonClick: refresh_BtnClick.bind(this, this.curheadTableId), + popContainer: document.querySelector('.header-button-area'), + })} - { - if (this.curheadTableId == HEADALL && !this.props.meta.getMeta()[VIEWALL]) { - initAllTemplate.call(this, this.props); //加载主子拉平模板 - } - if (this.curheadTableId == HEAD30 && !this.props.meta.getMeta()[VIEW30]) { - init30Template.call(this, this.props); //加载主子拉平模板 - } - if (this.curheadTableId == HEAD4C && !this.props.meta.getMeta()[VIEW4C]) { - init4cTemplate.call(this, this.props); //加载主子拉平模板 - } - if (this.curheadTableId == HEAD4330 && !this.props.meta.getMeta()[VIEW4330]) { - init4330Template.call(this, this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - }} - /> -
-
- ) : ( - '' - )} + { + if ( + this.curheadTableId == HEADALL && + !this.props.meta.getMeta()[VIEWALL] + ) { + initAllTemplate.call(this, this.props); //加载主子拉平模板 + } + if ( + this.curheadTableId == HEAD30 && + !this.props.meta.getMeta()[VIEW30] + ) { + init30Template.call(this, this.props); //加载主子拉平模板 + } + if ( + this.curheadTableId == HEAD4C && + !this.props.meta.getMeta()[VIEW4C] + ) { + init4cTemplate.call(this, this.props); //加载主子拉平模板 + } + if ( + this.curheadTableId == HEAD4330 && + !this.props.meta.getMeta()[VIEW4330] + ) { + init4330Template.call(this, this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }} + /> +
+ + ) : ( + '' + )} -
- {/* 创建多来源转单 */} - {createMultiTransferTable( - { - dataSource: TRANSFERCACAHEKEY, - onTabClick: (key) => { - //点击页签的钩子函数 +
+ {/* 创建多来源转单 */} + {createMultiTransferTable( + { + dataSource: TRANSFERCACAHEKEY, + onTabClick: (key) => { + //点击页签的钩子函数 - //拿到当前页签的headTableId给转单页面使用 - switch (key) { - case '1': - this.curheadTableId = HEAD30; //记录主表id,供下游转单使用 - if (!this.props.meta.getMeta()[HEAD30]) { - init30Template.call(this, this.props); - } - btn_Controller.call(this, this.props); - this.setState({ - show: false - }); - break; - case '2': - this.curheadTableId = HEAD4C; //记录主表id,供下游转单使用 - if (!this.props.meta.getMeta()[HEAD4C]) { - init4cTemplate.call(this, this.props); - } - btn_Controller.call(this, this.props); - this.setState({ - show: true - }); - break; - case '3': - this.curheadTableId = HEAD4330; //记录主表id,供下游转单使用 - if (!this.props.meta.getMeta()[HEAD4330]) { - init4330Template.call(this, this.props); - } - btn_Controller.call(this, this.props); - this.setState({ - show: false - }); - break; - default: - this.curheadTableId = HEADALL; - btn_Controller.call(this, this.props); - this.setState({ - show: false - }); - break; - } - }, - showAll: true, //是否显示全部页签,不显示全部页签时不需要设置 默认为false - //==========以下参数必须设置showAll为true时才生效========== - allHeadId: HEADALL, //全部页签的主表id - allBodyId: BODYALL, //全部页签的子表id - allFullTableId: VIEWALL, - totalKey: [ [ 'nunvoicenum', 'ninvoicenum' ], [ 'nuninvoicemny', 'ninvoicemny' ] ], - totalTitle: [ - getLangByResId(this, '4006SALEINVOICE-000058'), - getLangByResId(this, '4006SALEINVOICE-000059') - ], - headPkIds: [ 'csaleorderid', 'cgeneralhid', 'initoutregid' ], - bodyPkIds: [ 'csaleorderbid', 'cgeneralbid', 'initoutregbid' ], - transferBtnText: getLangByResId(this, '4006SALEINVOICE-000057'), //转单按钮显示文字/* 国际化处理: 生成销售发票*/ - containerSelector: '#transferList', //容器的选择器 必须唯一,用于设置底部已选区域宽度 + //拿到当前页签的headTableId给转单页面使用 + switch (key) { + case '1': + this.curheadTableId = HEAD30; //记录主表id,供下游转单使用 + if (!this.props.meta.getMeta()[HEAD30]) { + init30Template.call(this, this.props); + } + btn_Controller.call(this, this.props); + this.setState({ + show: false, + }); + break; + case '2': + this.curheadTableId = HEAD4C; //记录主表id,供下游转单使用 + if (!this.props.meta.getMeta()[HEAD4C]) { + init4cTemplate.call(this, this.props); + } + btn_Controller.call(this, this.props); + this.setState({ + show: true, + }); + break; + case '3': + this.curheadTableId = HEAD4330; //记录主表id,供下游转单使用 + if (!this.props.meta.getMeta()[HEAD4330]) { + init4330Template.call(this, this.props); + } + btn_Controller.call(this, this.props); + this.setState({ + show: false, + }); + break; + default: + this.curheadTableId = HEADALL; + btn_Controller.call(this, this.props); + this.setState({ + show: false, + }); + break; + } + }, + showAll: true, //是否显示全部页签,不显示全部页签时不需要设置 默认为false + //==========以下参数必须设置showAll为true时才生效========== + allHeadId: HEADALL, //全部页签的主表id + allBodyId: BODYALL, //全部页签的子表id + allFullTableId: VIEWALL, + totalKey: [ + ['nunvoicenum', 'ninvoicenum'], + ['nuninvoicemny', 'ninvoicemny'], + ], + totalTitle: [ + getLangByResId(this, '4006SALEINVOICE-000058'), + getLangByResId(this, '4006SALEINVOICE-000059'), + ], + headPkIds: ['csaleorderid', 'cgeneralhid', 'initoutregid'], + bodyPkIds: ['csaleorderbid', 'cgeneralbid', 'initoutregbid'], + transferBtnText: getLangByResId(this, '4006SALEINVOICE-000057'), //转单按钮显示文字/* 国际化处理: 生成销售发票*/ + containerSelector: '#transferList', //容器的选择器 必须唯一,用于设置底部已选区域宽度 - onTransferBtnClick: () => { - //点击转单按钮钩子函数 - let _this = this; - if (_this.isRefAddLine == true) { - _this.refAddLineComfirm_Btn_Click('transfer', this.combineflag, this.isRefAddLine); - } else { - let from = _this.props.getUrlParam('from'); - let sourceid = _this.props.getUrlParam('sourceid'); - _this.props.pushTo(TOCARDURL, { - pagecode: CARD, - pagecode: '400601200_card', - type: 'transfer', - from: from, - sourceid: sourceid - }); - } - }, - // () => {} - onSelectedBtnClick: selected_BtnClick.bind(this), - selectArea: () => { - //已选列表个性化区域 - return ( - - {/* {totalstr} */} - {this.state.show && ( - - {getLangByResId(this, '4006SALEINVOICE-000067') /* 国际化处理: 出库对冲*/} - - )} - - ); - }, - onClearAll: () => {}, - onSelectedItemRemove: (record, bodys) => {}, - onChangeViewClick: () => { - //点击切换视图钩子函数 - if (!this.props.meta.getMeta()[VIEWALL]) { - initAllTemplate(this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(HEADALL); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - } - }, - [ - { - tabName: getLangByResId(this, '4006SALEINVOICE-000054'), //tab页签显示文字/* 国际化处理: 全部*/ - headTableId: HEADALL, //表格组件id - bodyTableId: BODYALL, //子表模板id - fullTableId: VIEWALL, //主子拉平模板id - showChildIndex: false, - searchAreaCode: SERACHALL, - searchArea: () => { - //查询区域render - return NCCreateSearch(SERACHALL, { - fieldid: '32transferforall', - clickSearchBtn: serachAll_btnClick.bind( - this, - this.isRefAddLine, - this.billvo, - false, - false - ), - onAfterEvent: serachallafterEvent.bind(this), - renderCompleteEvent: renderCompleteEvent.bind( - this, - SERACHALL, - 'pk_org', - serachallafterEvent - ), - statusChangeEvent: renderCompleteEvent.bind( - this, - SERACHALL, - 'pk_org', - serachallafterEvent - ), - currentSearch: this.curheadTableId == HEADALL ? true : false - }); - }, - onCheckedChange: (flag, record, index, bodys) => {}, - onClearAll: () => {}, - onChangeViewClick: () => { - //点击切换视图钩子函数 - if (!this.props.meta.getMeta()[VIEWALL]) { - initAllTemplate.call(this, this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(HEADALL); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - } - }, - { - tabName: getLangByResId(this, '4006SALEINVOICE-000061'), //tab页签显示文字/* 国际化处理: 销售订单*/ - searchArea: () => { - //查询区域render - return NCCreateSearch(SERACH30, { - fieldid: '32transferfor30', - clickSearchBtn: serach30_btnClick.bind( - this, - this.isRefAddLine, - this.billvo, - false, - false - ), - onAfterEvent: serach30afterEvent.bind(this), - renderCompleteEvent: renderCompleteEvent.bind( - this, - SERACH30, - 'pk_org', - serach30afterEvent - ), - statusChangeEvent: renderCompleteEvent.bind( - this, - SERACH30, - 'pk_org', - serach30afterEvent - ), - currentSearch: this.curheadTableId == HEAD30 ? true : false - }); - }, - headTableId: HEAD30, //表格组件id - bodyTableId: BODY30, //子表模板id - fullTableId: VIEW30, - showChildIndex: false, - searchAreaCode: SERACH30, - onCheckedChange: (flag, record, index, bodys) => {}, - onClearAll: () => {}, - onChangeViewClick: () => { - //点击切换视图钩子函数 - if (!this.props.meta.getMeta()[VIEW30]) { - init30Template.call(this, this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(HEAD30); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - } - }, - { - tabName: getLangByResId(this, '4006SALEINVOICE-000062'), //tab页签显示文字/* 国际化处理: 销售出库*/ - headTableId: HEAD4C, //表格组件id - bodyTableId: BODY4C, //子表模板id - fullTableId: VIEW4C, //主子拉平模板id - showChildIndex: false, - searchAreaCode: SERACH4C, - searchArea: () => { - //查询区域render - return NCCreateSearch(SERACH4C, { - fieldid: '32transferfor4C', - clickSearchBtn: serach4c_btnClick.bind( - this, - this.isRefAddLine, - this.billvo, - false, - false, - false - ), - onAfterEvent: serach4cafterEvent.bind(this), - renderCompleteEvent: renderCompleteEvent.bind( - this, - SERACH4C, - 'cfanaceorgoid', - serach4cafterEvent - ), - statusChangeEvent: renderCompleteEvent.bind( - this, - SERACH4C, - 'cfanaceorgoid', - serach4cafterEvent - ), - currentSearch: this.curheadTableId == HEAD4C ? true : false - }); - }, + onTransferBtnClick: () => { + //点击转单按钮钩子函数 + let _this = this; + if (_this.isRefAddLine == true) { + _this.refAddLineComfirm_Btn_Click( + 'transfer', + this.combineflag, + this.isRefAddLine + ); + } else { + let from = _this.props.getUrlParam('from'); + let sourceid = _this.props.getUrlParam('sourceid'); + _this.props.pushTo(TOCARDURL, { + pagecode: CARD, + pagecode: '400601200_card', + type: 'transfer', + from: from, + sourceid: sourceid, + }); + } + }, + // () => {} + onSelectedBtnClick: selected_BtnClick.bind(this), + selectArea: () => { + //已选列表个性化区域 + return ( + + {/* {totalstr} */} + {this.state.show && ( + + { + getLangByResId( + this, + '4006SALEINVOICE-000067' + ) /* 国际化处理: 出库对冲*/ + } + + )} + + ); + }, + onClearAll: () => {}, + onSelectedItemRemove: (record, bodys) => {}, + onChangeViewClick: () => { + //点击切换视图钩子函数 + if (!this.props.meta.getMeta()[VIEWALL]) { + initAllTemplate(this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(HEADALL); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }, + }, + [ + { + tabName: getLangByResId(this, '4006SALEINVOICE-000054'), //tab页签显示文字/* 国际化处理: 全部*/ + headTableId: HEADALL, //表格组件id + bodyTableId: BODYALL, //子表模板id + fullTableId: VIEWALL, //主子拉平模板id + showChildIndex: false, + searchAreaCode: SERACHALL, + searchArea: () => { + //查询区域render + return NCCreateSearch(SERACHALL, { + fieldid: '32transferforall', + clickSearchBtn: serachAll_btnClick.bind( + this, + this.isRefAddLine, + this.billvo, + false, + false + ), + onAfterEvent: serachallafterEvent.bind(this), + renderCompleteEvent: renderCompleteEvent.bind( + this, + SERACHALL, + 'pk_org', + serachallafterEvent + ), + statusChangeEvent: renderCompleteEvent.bind( + this, + SERACHALL, + 'pk_org', + serachallafterEvent + ), + currentSearch: + this.curheadTableId == HEADALL ? true : false, + }); + }, + onCheckedChange: (flag, record, index, bodys) => {}, + onClearAll: () => {}, + onChangeViewClick: () => { + //点击切换视图钩子函数 + if (!this.props.meta.getMeta()[VIEWALL]) { + initAllTemplate.call(this, this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(HEADALL); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }, + }, + { + tabName: getLangByResId(this, '4006SALEINVOICE-000061'), //tab页签显示文字/* 国际化处理: 销售订单*/ + searchArea: () => { + //查询区域render + return NCCreateSearch(SERACH30, { + fieldid: '32transferfor30', + clickSearchBtn: serach30_btnClick.bind( + this, + this.isRefAddLine, + this.billvo, + false, + false + ), + onAfterEvent: serach30afterEvent.bind(this), + renderCompleteEvent: renderCompleteEvent.bind( + this, + SERACH30, + 'pk_org', + serach30afterEvent + ), + statusChangeEvent: renderCompleteEvent.bind( + this, + SERACH30, + 'pk_org', + serach30afterEvent + ), + currentSearch: this.curheadTableId == HEAD30 ? true : false, + }); + }, + headTableId: HEAD30, //表格组件id + bodyTableId: BODY30, //子表模板id + fullTableId: VIEW30, + showChildIndex: false, + searchAreaCode: SERACH30, + onCheckedChange: (flag, record, index, bodys) => {}, + onClearAll: () => {}, + onChangeViewClick: () => { + //点击切换视图钩子函数 + if (!this.props.meta.getMeta()[VIEW30]) { + init30Template.call(this, this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(HEAD30); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }, + }, + { + tabName: getLangByResId(this, '4006SALEINVOICE-000062'), //tab页签显示文字/* 国际化处理: 销售出库*/ + headTableId: HEAD4C, //表格组件id + bodyTableId: BODY4C, //子表模板id + fullTableId: VIEW4C, //主子拉平模板id + showChildIndex: false, + searchAreaCode: SERACH4C, + searchArea: () => { + //查询区域render + return NCCreateSearch(SERACH4C, { + fieldid: '32transferfor4C', + clickSearchBtn: serach4c_btnClick.bind( + this, + this.isRefAddLine, + this.billvo, + false, + false, + false + ), + onAfterEvent: serach4cafterEvent.bind(this), + renderCompleteEvent: renderCompleteEvent.bind( + this, + SERACH4C, + 'cfanaceorgoid', + serach4cafterEvent + ), + statusChangeEvent: renderCompleteEvent.bind( + this, + SERACH4C, + 'cfanaceorgoid', + serach4cafterEvent + ), + currentSearch: this.curheadTableId == HEAD4C ? true : false, + }); + }, - onCheckedChange: (flag, record, index, bodys) => { - let selectedRows = this.props.transferTable.getTransferTableSelectedValue(); - if (selectedRows.head4c.length > 0) { - this.setState({ disabled: false }); - } else { - this.setState({ disabled: true }); - } - }, - onClearAll: () => { - this.setState({ - disabled: true - }); - }, - onChangeViewClick: () => { - //点击切换视图钩子函数 - if (!this.props.meta.getMeta()[VIEW4C]) { - init4cTemplate.call(this, this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(HEAD4C); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - } - }, - { - tabName: getLangByResId(this, '4006SALEINVOICE-000095'), //tab页签显示文字/* 国际化处理: 销售发出商品期初*/ - searchArea: () => { - //查询区域render - return NCCreateSearch(SEARCH4330, { - fieldid: '32transferfor4330', - clickSearchBtn: search4330_btnClick.bind( - this, - this.isRefAddLine, - this.billvo, - false, - false - ), - onAfterEvent: search4330afterEvent.bind(this), - renderCompleteEvent: renderCompleteEvent.bind( - this, - SEARCH4330, - 'pk_org', - search4330afterEvent - ), - statusChangeEvent: renderCompleteEvent.bind( - this, - SEARCH4330, - 'pk_org', - search4330afterEvent - ), - currentSearch: this.curheadTableId == HEAD4330 ? true : false - }); - }, - headTableId: HEAD4330, //表格组件id - bodyTableId: BODY4330, //子表模板id - fullTableId: VIEW4330, - showChildIndex: false, - searchAreaCode: SEARCH4330, - onCheckedChange: (flag, record, index, bodys) => {}, - onClearAll: () => {}, - onChangeViewClick: () => { - //点击切换视图钩子函数 - if (!this.props.meta.getMeta()[VIEW4330]) { - init4330Template.call(this, this.props); //加载主子拉平模板 - } - this.props.transferTable.changeViewType(HEAD4330); - this.setState({ - toggleViewStatus: !this.state.toggleViewStatus - }); - } - } - ] - )} -
-
- ); - } + onCheckedChange: (flag, record, index, bodys) => { + let selectedRows = + this.props.transferTable.getTransferTableSelectedValue(); + if (selectedRows.head4c.length > 0) { + this.setState({ disabled: false }); + } else { + this.setState({ disabled: true }); + } + }, + onClearAll: () => { + this.setState({ + disabled: true, + }); + }, + onChangeViewClick: () => { + //点击切换视图钩子函数 + if (!this.props.meta.getMeta()[VIEW4C]) { + init4cTemplate.call(this, this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(HEAD4C); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }, + }, + { + tabName: getLangByResId(this, '4006SALEINVOICE-000095'), //tab页签显示文字/* 国际化处理: 销售发出商品期初*/ + searchArea: () => { + //查询区域render + return NCCreateSearch(SEARCH4330, { + fieldid: '32transferfor4330', + clickSearchBtn: search4330_btnClick.bind( + this, + this.isRefAddLine, + this.billvo, + false, + false + ), + onAfterEvent: search4330afterEvent.bind(this), + renderCompleteEvent: renderCompleteEvent.bind( + this, + SEARCH4330, + 'pk_org', + search4330afterEvent + ), + statusChangeEvent: renderCompleteEvent.bind( + this, + SEARCH4330, + 'pk_org', + search4330afterEvent + ), + currentSearch: + this.curheadTableId == HEAD4330 ? true : false, + }); + }, + headTableId: HEAD4330, //表格组件id + bodyTableId: BODY4330, //子表模板id + fullTableId: VIEW4330, + showChildIndex: false, + searchAreaCode: SEARCH4330, + onCheckedChange: (flag, record, index, bodys) => {}, + onClearAll: () => {}, + onChangeViewClick: () => { + //点击切换视图钩子函数 + if (!this.props.meta.getMeta()[VIEW4330]) { + init4330Template.call(this, this.props); //加载主子拉平模板 + } + this.props.transferTable.changeViewType(HEAD4330); + this.setState({ + toggleViewStatus: !this.state.toggleViewStatus, + }); + }, + }, + ] + )} +
+
+ ); + } } -MultiTransferTable = createPage( - { - // initTemplate: initAllTemplate - } -)(MultiTransferTable); +MultiTransferTable = createPage({ + // initTemplate: initAllTemplate +})(MultiTransferTable); export default MultiTransferTable; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/index.js b/src/so/so/saleinvoice/transfer/init/index.js index 1e4fcb5..eaffd18 100644 --- a/src/so/so/saleinvoice/transfer/init/index.js +++ b/src/so/so/saleinvoice/transfer/init/index.js @@ -1,5 +1,8 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import init30Template from './init30Template'; import init4cTemplate from './init4cTemplate'; import init4330Template from './init4330Template'; import initAllTemplate from './initAllTemplate'; export { init30Template, init4cTemplate, init4330Template, initAllTemplate }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/init30Template.js b/src/so/so/saleinvoice/transfer/init/init30Template.js index da3d050..d567680 100644 --- a/src/so/so/saleinvoice/transfer/init/init30Template.js +++ b/src/so/so/saleinvoice/transfer/init/init30Template.js @@ -1,9 +1,10 @@ +/*IJslBcaFeSDTcY6tG2iz/Dvqw85lPeCtmmG1fxrgU38=*/ /* * @Author: zhangjyp * @PageInfo: 初始化销售订单模板 * @Date: 2018-04-19 10:32:11 - * @Last Modified by: zhaoypm - * @Last Modified time: 2020-03-26 16:35:36 + * @Last Modified by: zhangllb + * @Last Modified time: 2022-11-29 22:12:58 */ import { btn_Controller } from '../btnClicks'; @@ -96,3 +97,5 @@ function modifierMeta(props, meta) { transferSkipToSrcBillUtil.call(this, props, item, billcodeData); }); } + +/*IJslBcaFeSDTcY6tG2iz/Dvqw85lPeCtmmG1fxrgU38=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/init4330Template.js b/src/so/so/saleinvoice/transfer/init/init4330Template.js index 6ea9833..a82df1a 100644 --- a/src/so/so/saleinvoice/transfer/init/init4330Template.js +++ b/src/so/so/saleinvoice/transfer/init/init4330Template.js @@ -1,3 +1,4 @@ +/*bhxxo4/gerjBwij5Vd0ShKQ5sLaNJTr8DYWL2Hqw/pA=*/ /* * @Author: songyt13 * @PageInfo: 初始化销售期初发出商品模板 @@ -92,3 +93,5 @@ function modifierMeta(props, meta) { transferSkipToSrcBillUtil.call(this, props, item, billcodeData); }); } + +/*bhxxo4/gerjBwij5Vd0ShKQ5sLaNJTr8DYWL2Hqw/pA=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/init4cTemplate.js b/src/so/so/saleinvoice/transfer/init/init4cTemplate.js index 5a546ac..6748885 100644 --- a/src/so/so/saleinvoice/transfer/init/init4cTemplate.js +++ b/src/so/so/saleinvoice/transfer/init/init4cTemplate.js @@ -1,9 +1,10 @@ +/*QHc1/UYYH30Kc+OK+AEvg2ou/zeBfxfUQlZ2nbUeJsg=*/ /* * @Author: zhangjyp * @PageInfo: 初始化销售出库单模板 * @Date: 2018-04-19 10:32:11 - * @Last Modified by: songyt13 - * @Last Modified time: 2021-11-25 16:41:37 + * @Last Modified by: zhaoqiangq + * @Last Modified time: 2022-09-29 16:28:37 */ import { transtypeUtils } from '../../../../../scmpub/scmpub/pub/tool'; @@ -11,6 +12,7 @@ import { PAGECODE, APPCODE, PAGEAREA, PK } from '../const'; import { serach4cReferEvent } from './serachRefFilter'; import { btn_Controller } from '../btnClicks'; import { transferSkipToSrcBillUtil } from '../../../../../scmpub/scmpub/pub/tool/transferSkipToSrcBillUtil'; +import { batchSetHyperlinkForTableFields } from '../../../../../scmpub/scmpub/pub/tool/hyperlinkUtil'; const { PAGEMASTER4C } = PAGECODE; const { SALEOUTAPPCODE } = APPCODE; export default function(props, type) { @@ -86,10 +88,60 @@ export default function(props, type) { } function modifierMeta(props, meta) { + // 单据号超链接 + let linkmap = new Map([ + [ + 'vsourcebillcode',{ + billtypeField: 'csourcetype', + pkField: 'csourcebillhid' + }],[ + 'vfirstbillcode',{ + billtypeField: 'cfirsttype', + pkField: 'cfirstbillhid' + }],[ + 'ccorrespondcode',{ + billtypeField: 'ccorrespondtype', + pkField: 'ccorrespondhid' + }], + [ + 'vsrc2billcode',{ + billtypeField: 'csrc2billtype', + pkField: 'csrc2billhid' + }], + [ + 'vsignwastcode',{ + billtypeField: 'csignwasttype', + pkField: 'csignwasthid' + }], + [ + 'vsourcewastcode',{ + billtypeField: 'csourcewasttype', + pkField: 'csourcewasthid' + }] + , + [ + 'vexigencycode',{ + billtype: 'C005', + pkField: 'vexigencyhid' + }] + ]); + let linkConfig = { + moduleId: PAGEAREA.BODY4C, + linkmap: linkmap + }; + batchSetHyperlinkForTableFields.call(this, props, meta, linkConfig); + + let linkConfigView = { + moduleId: PAGEAREA.VIEW4C, + linkmap: linkmap + }; + batchSetHyperlinkForTableFields.call(this, props, meta, linkConfigView); + let billcodeData = { pkfield: PK.HEAD4CPK, billtype: '4C' }; + meta[PAGEAREA.HEAD4C].items.map((item, key) => { transferSkipToSrcBillUtil.call(this, props, item, billcodeData); }); @@ -97,3 +149,4 @@ function modifierMeta(props, meta) { transferSkipToSrcBillUtil.call(this, props, item, billcodeData); }); } +/*QHc1/UYYH30Kc+OK+AEvg2ou/zeBfxfUQlZ2nbUeJsg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/initAllTemplate.js b/src/so/so/saleinvoice/transfer/init/initAllTemplate.js index 2297760..9962d2d 100644 --- a/src/so/so/saleinvoice/transfer/init/initAllTemplate.js +++ b/src/so/so/saleinvoice/transfer/init/initAllTemplate.js @@ -1,12 +1,13 @@ +/*sNCPoGBR/r2IMB3zBzxxVMf9l8Q26pQ2mMmihkl+5cU=*/ /* * @Author: zhangjyp * @PageInfo: 初始化销售订单模板 * @Date: 2018-04-19 10:32:11 - * @Last Modified by: 刘奇 - * @Last Modified time: 2019-08-21 14:00:54 + * @Last Modified by: zhangllb + * @Last Modified time: 2022-11-29 10:42:36 */ -import { btn_Controller } from '../btnClicks'; +import { btn_Controller, serachAll_btnClick } from '../btnClicks'; import { PAGECODE, APPCODE, PAGEAREA } from '../const'; import { serachallReferEvent } from './serachRefFilter'; import { transtypeUtils } from '../../../../../scmpub/scmpub/pub/tool'; @@ -31,7 +32,14 @@ export default function(props) { let meta = data.template; modifierMeta.call(this, props, meta); serachallReferEvent(props, meta); - props.meta.addMeta(meta); + props.meta.setMeta(meta, () => { + setTimeout(() => { + let scene = props.getUrlParam('scene'); + if (scene) { + serachAll_btnClick.call(this, false, null, false, false); + } + }, 0); + }); } if (data.button) { let button = data.button; @@ -76,3 +84,5 @@ function modifierMeta(props, meta) { transferSkipToSrcBillUtil.call(this, props, item, billcodeData, true); }); } + +/*sNCPoGBR/r2IMB3zBzxxVMf9l8Q26pQ2mMmihkl+5cU=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/serachRefFilter.js b/src/so/so/saleinvoice/transfer/init/serachRefFilter.js index 781048d..052d440 100644 --- a/src/so/so/saleinvoice/transfer/init/serachRefFilter.js +++ b/src/so/so/saleinvoice/transfer/init/serachRefFilter.js @@ -1,3 +1,4 @@ +/*X4thQCmyM3auD60C810K6670pUOHXr0Vrm4fht5GM+Y=*/ import { PAGEAREA } from '../const'; const { SERACH30, SERACH4C, SEARCH4330, SERACHALL } = PAGEAREA; import { getSearchValByField } from '../../../pub/tool/SearchTool'; @@ -248,7 +249,7 @@ const fina_org_filter_Fields4c = [ 'ccustomerid.sales.pk_custsaleclass', 'cgeneralbid.cmaterialoid', 'cgeneralbid.cmaterialoid.pk_marbasclass', - 'cwarehouseid', + // 'cwarehouseid', 'cwhsmanagerid' ]; const pk_org_filter_Fields4c = [ @@ -423,6 +424,15 @@ export function serach30ReferEvent(props, meta) { let data = getSearchValByField(props, SERACH30, 'so_saleorder_b.csendstockorgid'); return { pk_org: data }; }; + } else if (item.attrcode == 'so_saleorder_b.cmffileid') { + // 配置码参照过滤 + item.queryCondition = () => { + let cmaterialid = props.search.getSearchValByField(SERACH30, 'so_saleorder_b.cmaterialid'); + cmaterialid = cmaterialid ? (cmaterialid.value || {}).firstvalue : null; + if (cmaterialid && cmaterialid != '') { + return { cmaterialid: cmaterialid }; + } + }; } }); } @@ -454,6 +464,13 @@ export function serach4cReferEvent(props, meta) { let pk_org = getSearchValByField(props, SERACH4C, 'cfanaceorgoid'); return { pk_org: pk_org }; }; + } else if (item.attrcode == 'cwarehouseid') { + item.isShowUnit = true; + // 仓库 + item.queryCondition = () => { + let data = getSearchValByField(props, SERACH4C, 'pk_org'); + return { pk_org: data }; + }; } else if (pk_org_filter_Fields4c.includes(item.attrcode)) { item.isShowUnit = true; @@ -473,6 +490,21 @@ export function serach4cReferEvent(props, meta) { let data = getSearchValByField(props, SERACH4C, 'cfanaceorgoid'); return { pk_org: data }; }; + } else if (item.attrcode == 'cgeneralbid.cprojectid') { + //项目 + item.queryCondition = () => { + let data = getSearchValByField(props, SERACH4C, 'csaleorgoid'); + return { pk_org: data }; + }; + } else if (item.attrcode == 'cgeneralbid.cffileid') { + //配置码 + item.queryCondition = () => { + let cmaterialid = props.search.getSearchValByField(SERACH4C, 'cgeneralbid.cmaterialoid'); + cmaterialid = cmaterialid ? (cmaterialid.value || {}).firstvalue : null; + if(cmaterialid && cmaterialid != ''){ + return { cmaterialid: cmaterialid }; + } + }; } else if (item.attrcode == 'cdptid') { item.isShowUnit = true; // 显示停用 @@ -620,6 +652,15 @@ export function serach4330ReferEvent(props, meta) { let data = getSearchValByField(props, SEARCH4330, 'csaleorgid'); return { pk_org: data, busifuncode: 'sa' }; }; + } else if (item.attrcode == 'initoutregbid.cmffileid') { + // 配置码参照过滤 + item.queryCondition = () => { + let cmaterialid = props.search.getSearchValByField(SEARCH4330, 'initoutregbid.cmaterialid'); + cmaterialid = cmaterialid ? (cmaterialid.value || {}).firstvalue : null; + if (cmaterialid && cmaterialid != '') { + return { cmaterialid: cmaterialid }; + } + }; } }); } @@ -704,3 +745,5 @@ export function serachallReferEvent(props, meta) { } }); } + +/*X4thQCmyM3auD60C810K6670pUOHXr0Vrm4fht5GM+Y=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/init/serach_afterEvent.js b/src/so/so/saleinvoice/transfer/init/serach_afterEvent.js index a8babcf..4587100 100644 --- a/src/so/so/saleinvoice/transfer/init/serach_afterEvent.js +++ b/src/so/so/saleinvoice/transfer/init/serach_afterEvent.js @@ -1,3 +1,4 @@ +/*0TRc3CutVIRcCNdmkMMbbtXjqnFqC5xOENmHa8iEXJk=*/ import { PAGEAREA, COMMON } from '../const'; const { SERACH30, SERACH4C, SEARCH4330, SERACHALL } = PAGEAREA; @@ -97,3 +98,5 @@ export function serach4cafterEvent(field, value) { multiCorpRefHandler.call(this, this.props, value, SERACH4C, [ 'cwhsmanagerid', 'cwarehouseid' ]); } } + +/*0TRc3CutVIRcCNdmkMMbbtXjqnFqC5xOENmHa8iEXJk=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/refline/index.js b/src/so/so/saleinvoice/transfer/refline/index.js index cfd7f21..ffe986d 100644 --- a/src/so/so/saleinvoice/transfer/refline/index.js +++ b/src/so/so/saleinvoice/transfer/refline/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import React, { Component } from 'react'; import { createPage, base } from 'nc-lightapp-front'; import { PAGEAREA } from '../const'; @@ -462,3 +463,5 @@ MultiTransferTable = createPage( } )(MultiTransferTable); export default MultiTransferTable; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/transfer/utils/translateData.js b/src/so/so/saleinvoice/transfer/utils/translateData.js index f957336..cd22581 100644 --- a/src/so/so/saleinvoice/transfer/utils/translateData.js +++ b/src/so/so/saleinvoice/transfer/utils/translateData.js @@ -1,3 +1,4 @@ +/*nCFzbA2KIKM3FmjcFQABRk7DODSUMgDvRlrKZSOhYZ0=*/ export default function(datas, srchead, srcbody, head, body, itemmap, extatt) { let destdatas = []; for (let data of datas) { @@ -40,3 +41,5 @@ export function translate(tab, tabrows, tabmap, extatt) { }; return desttabdata; } + +/*nCFzbA2KIKM3FmjcFQABRk7DODSUMgDvRlrKZSOhYZ0=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/util/getPara.js b/src/so/so/saleinvoice/util/getPara.js index be0b11b..f505658 100644 --- a/src/so/so/saleinvoice/util/getPara.js +++ b/src/so/so/saleinvoice/util/getPara.js @@ -1,3 +1,4 @@ +/*aVbCbagnMVnqMjmlEKKEedsNTR9m+Scd1ZofjW+tvMg=*/ import { ajax, getBusinessInfo } from 'nc-lightapp-front'; import { getLangByResId } from '../../../../scmpub/scmpub/pub/tool/multiLangUtil'; import { URL } from '../const'; @@ -23,3 +24,5 @@ export function getSO27(callback) { }); }, 10); } + +/*aVbCbagnMVnqMjmlEKKEedsNTR9m+Scd1ZofjW+tvMg=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/util/isAbleFinancial.js b/src/so/so/saleinvoice/util/isAbleFinancial.js index 61b0220..af6589d 100644 --- a/src/so/so/saleinvoice/util/isAbleFinancial.js +++ b/src/so/so/saleinvoice/util/isAbleFinancial.js @@ -1,3 +1,4 @@ +/*GCSBQ9hmTIACCu+tjaxztOhsm5S+lRb1jTxsDZ2aspY=*/ import { ajax } from 'nc-lightapp-front'; @@ -13,4 +14,5 @@ export default function isAbleFinancial(props){ } } }); -} \ No newline at end of file +} +/*GCSBQ9hmTIACCu+tjaxztOhsm5S+lRb1jTxsDZ2aspY=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/vatsub/index.js b/src/so/so/saleinvoice/vatsub/index.js index c2bc0f6..359129f 100644 --- a/src/so/so/saleinvoice/vatsub/index.js +++ b/src/so/so/saleinvoice/vatsub/index.js @@ -1,3 +1,4 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ /* * @Author: wangshrc * @PageInfo: 执行情况查询 @@ -42,3 +43,5 @@ VatSub = createPage({ initTemplate: initTemplate })(VatSub); export default VatSub; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/vatsub/init/index.js b/src/so/so/saleinvoice/vatsub/init/index.js index 8d22888..44df524 100644 --- a/src/so/so/saleinvoice/vatsub/init/index.js +++ b/src/so/so/saleinvoice/vatsub/init/index.js @@ -1,3 +1,6 @@ +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ import initTemplate from './initTemplate'; export { initTemplate }; + +/*YInZLc9/kvMC1mGq3o4LwAszAXwVlsNyvp/9X8WPLW8=*/ \ No newline at end of file diff --git a/src/so/so/saleinvoice/vatsub/init/initTemplate.js b/src/so/so/saleinvoice/vatsub/init/initTemplate.js index 129637f..be951cc 100644 --- a/src/so/so/saleinvoice/vatsub/init/initTemplate.js +++ b/src/so/so/saleinvoice/vatsub/init/initTemplate.js @@ -1,3 +1,4 @@ +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ /* * @Author: wangshrc * @PageInfo: 单据执行信息 @@ -23,3 +24,5 @@ export default function(props) { } ); } + +/*pmFWCFu5nhKkBzYmrkBakWzip2hzDP7N/Dymq7crENo=*/ \ No newline at end of file