diff --git a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java
index 3948c4e..c3d2910 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-fs/src/main/java/zcgj/zcdev/zcdev/fs/plugin/form/PublicreimbursebillNoContractPlugin.java
@@ -234,13 +234,14 @@ public class PublicreimbursebillNoContractPlugin extends AbstractBillPlugIn impl
                 }
                 qFilter.add(new QFilter("billstatus", QCP.equals, "C"));
                 formShowParameter.getListFilterParameter().setQFilters(qFilter);
-            }else if("zcgj_maintenanceack".equals(propertyName)){
+            }else if("zcgj_maintenanceack".equals(propertyName)){//维修确认单
                 DynamicObject billpayerid = (DynamicObject)this.getModel().getValue("billpayerid");
                 DynamicObject costcompany = (DynamicObject)this.getModel().getValue("costcompany");
                 List<QFilter> qFilter = new ArrayList<>();
                 if(billpayerid!=null){
                     Long payerid = billpayerid.getLong("id");
-                    qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid));
+                    //qFilter.add(new QFilter("entryentity.zcgj_supplier", QCP.equals, payerid));
+                    qFilter.add(new QFilter("zcgj_partb", QCP.equals, payerid));//供应商
 
                 }
                 if(costcompany!=null){
diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
index 272f04a..182ea95 100644
--- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
+++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/OutContractFromPlugin.java
@@ -50,7 +50,8 @@ public class OutContractFromPlugin extends AbstractBillPlugIn implements Plugin
             } else if (number.equals("ZCHLX02") ||number.equals("wzcg01")) {
                 //合同类型-物资采购 或物资采购类（已禁用
                 comboList1.add(new ComboItem(new LocaleString("综合单价"), "gddj"));
-                comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
+                //comboList1.add(new ComboItem(new LocaleString("总价包干"), "zjbg"));
+                comboList1.add(new ComboItem(new LocaleString("不定量不定价"), "bdlbdj"));
                 comboList.add(new ComboItem(new LocaleString("全面合作"), "A"));
                 comboList.add(new ComboItem(new LocaleString("局部合作"), "B"));
                 Object pricetype = this.getModel().getValue("zcgj_pricetype");//计价方式