瀏覽代碼

1、对照旧系统调整个表单下拉框选项

fuwb 3 月之前
父節點
當前提交
b611fa875b

+ 0 - 5
zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/constants/DictConstants.java

@@ -79,11 +79,6 @@ public class DictConstants {
      */
     public static final String APPLICATION_INFO_PICK_TYPE = "application_info_pick_type";
 
-    /**
-     * 预算类型
-     */
-    public static final String BUDGET_TYPE = "budget_type";
-
     /**
      * 项目属性
      */

+ 2 - 2
zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/applicationinfo/service/impl/ApplicationInfoServiceImpl.java

@@ -98,8 +98,8 @@ public class ApplicationInfoServiceImpl implements IApplicationInfoService {
         map.put("formEntity", entity);
         List<Select> sourceList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.APPLICATION_INFO_SOURCE).getCheckedData());
         map.put("sourceList", JSON.toJSONString(sourceList));
-        List<Select> pickList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.APPLICATION_INFO_PICK_TYPE).getCheckedData());
-        map.put("pickList", JSON.toJSONString(pickList));
+//        List<Select> pickList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.APPLICATION_INFO_PICK_TYPE).getCheckedData());
+//        map.put("pickList", JSON.toJSONString(pickList));
         return map;
     }
 

+ 2 - 2
zjugis-module-business/zjugis-module-business-biz/src/main/java/com/zjugis/module/business/flow/budgetreport/service/impl/BudgetReportServiceImpl.java

@@ -95,8 +95,8 @@ public class BudgetReportServiceImpl implements IBudgetReportService {
     private Map<String, Object> createMap(String flowInstanceId, BudgetReport entity, String userId) {
         Map<String, Object> map = new HashMap<>();
         map.put("formEntity", entity);
-        List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.BUDGET_TYPE).getCheckedData());
-        map.put("budgetTypeList", JSON.toJSONString(sealTypeList));
+//        List<Select> sealTypeList = SelectConvert.INSTANCE.convertList(dictDataApi.getDictDataList(DictConstants.BUDGET_TYPE).getCheckedData());
+//        map.put("budgetTypeList", JSON.toJSONString(sealTypeList));
         return map;
     }
 

+ 2 - 5
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ApplicationInfo/index.ftl

@@ -153,11 +153,8 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$pickupMethod"
-                                             data='${pickList!}' value="${formEntity.pickupMethod!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
+                                        <div class="z-comp-input" name="createReqVO$pickupMethod">
+                                             <input type="text" value="${formEntity.pickupMethod!}">
                                         </div>
                                     </div>
                                 </div>

+ 2 - 5
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/BudgetReport/index.ftl

@@ -88,11 +88,8 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                         <div class="z-comp-select" name="createReqVO$budgetType"
-                                             data='${budgetTypeList!}' value="${formEntity.budgetType!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
+                                         <div class="z-comp-input" name="createReqVO$budgetType">
+                                             <input type="text" value="${formEntity.budgetType!}">
                                         </div>
                                     </div>
                                 </div>

+ 1 - 1
zjugis-module-business/zjugis-module-business-biz/src/main/resources/templates/ProjectInfo/js/index.js

@@ -268,7 +268,7 @@
             invoiceDate: z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$invoiceDate']").getValue(),
             paymentCode: z.ui.input("[name='InstallmentPaymentDTO[" + i + "]$paymentCode']").getValue()
         }
-        paymentList[i] = obj
+        paymentList.splice(i, 1, obj)
     }
 
 }());