zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
哈哈哈丿 2025-07-07 16:51:08 +08:00
parent 234060e0d1 de1f6b299f
commit 44d1f7b1c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
View File

@ -42,10 +42,10 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
comboList.add(new ComboItem(new LocaleString("全部租赁"), "C"));
comboList.add(new ComboItem(new LocaleString("部分租赁"), "D"));
comboList.add(new ComboItem(new LocaleString("零星租赁"), "F"));
comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
} else if (number.equals("ZCHLX02") ||number.equals("wzcg01")) {
comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
@ -57,7 +57,7 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
}
}
} else{
comboList1.add(new ComboItem(new LocaleString("固定单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));

2
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/ContractPublicValidator.java
View File

@ -21,7 +21,7 @@ public class ContractPublicValidator extends AbstractValidator {
for (DynamicObject object : modelEntries) {
DynamicObjectCollection listingEntries = object.getDynamicObjectCollection("sublistentry");
if (listingEntries.size()==0){
this.addErrorMessage(dataEntity, "“计价方式”为“固定单价”时“合同清单”不能为空！");
this.addErrorMessage(dataEntity, "“计价方式”为“综合单价”时“合同清单”不能为空！");
}else{
for (int i = 0; i < listingEntries.size(); i++) {
DynamicObject listingEntrie = listingEntries.get(i);