erp单据信息修改

c05cebdf · doc_wei · f486730b · c05cebdf · c05cebdf · c05cebdf
19 changed file
--- a/common/src/main/resources/template/js/sysfdsettings/sysfdsettingslist.js
+++ b/common/src/main/resources/template/js/sysfdsettings/sysfdsettingslist.js
@@ -51,9 +51,6 @@ layui.config({
 				// 加载ERP以及生产订单的审核设置
 				loadErpExamineBasicDesign(json);

-				// 加载动态表单关联信息
-				loadCustomWithDsFormList(json);
-
 				// 加载事件
 				loadEvent();

@@ -138,23 +135,6 @@ layui.config({
 			}
 		}

-		/**
-		 * 加载动态表单关联信息
-		 *
-		 * @param json
-		 */
-		function loadCustomWithDsFormList(json) {
-			if (!isNull(json.bean.customWithDsFormList)) {
-				var customWithDsFormList = JSON.parse(json.bean.customWithDsFormList);
-				$("#customWithDsFormListBox").append(getDataUseHandlebars($("#customWithDsFormListTemplate").html(), {bean: customWithDsFormList}));
-				$.each(customWithDsFormList, function(key, values){
-					$.each(values, function(i, item){
-						dsFormUtil.initDsFormChooseBtn("daFormChoose" + item.code, item.dsFormList);
-					});
-				});
-			}
-		}
-
 		function loadEvent() {
 			form.on('select(abnormal)', function (data) {
 				var id = data.elem.id;
@@ -247,8 +227,6 @@ layui.config({
 					params.abnormalMation = getAbnormalMation();
 					// 获取ERP(生产)审核标识信息
 					params.erpExamineBasicDesign = getErpExamineBasicDesign();
-					// 获取动态表单关联项
-					params.customWithDsFormList = getCustomWithDsFormList();

 					AjaxPostUtil.request({url: reqBasePath + "sysfdsettings002", params: params, type: 'json', method: "PUT", callback: function (json) {
 						if (json.returnCode == 0) {
@@ -301,29 +279,6 @@ layui.config({
 			return JSON.stringify(tableData);
 		}

-		/**
-		 * 获取动态表单关联项
-		 *
-		 * @returns {any[]}
-		 */
-		function getCustomWithDsFormList(){
-			var tableData = {};
-			$.each($("#customWithDsFormListBox .customWithDsFormBoxItem"), function (i, item) {
-				var key = $(item).find(".hr-title").html();
-				var values = new Array();
-				$.each($(item).find(".customWithDsFormItem"), function (j, bean) {
-					var row = {
-						title: $(bean).attr("title"),
-						code: $(bean).attr("code"),
-						dsFormList: dsFormUtil.getJSONDsFormListByBoxId($(bean).find(".layui-input-block").attr("id"))
-					};
-					values.push(row);
-				});
-				tableData[key] = values;
-			});
-			return JSON.stringify(tableData);
-		}
-
 	    function getAbnormalMoney(rowNum){
 	    	if(isNull($("#abnormalMoney" + rowNum).val())){
 	    		return "0";

--- a/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingsTemplate.tpl
+++ b/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingsTemplate.tpl
@@ -6,7 +6,6 @@
            <li>CRM</li>
            <li>考勤制度</li>
            <li>ERP(生产)审核制度</li>
-            <li>动态表单关联</li>
        </ul>
        <div class="layui-tab-content">

@@ -204,10 +203,6 @@

            </div>

-            <div class="layui-tab-item" id="customWithDsFormListBox">
-
-            </div>
-
        </div>
    </div>


--- a/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingslist.html
+++ b/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingslist.html
@@ -71,25 +71,6 @@
 		{{/each}}
 	</script>

-	<!-- 动态表单关联信息 -->
-	<script type="text/x-handlebars-template" id="customWithDsFormListTemplate">
-		{{#each bean}}
-		<div class="customWithDsFormBoxItem">
-			<div class="layui-form-item layui-col-xs12">
-				<span class="hr-title">{{@key}}</span><hr>
-			</div>
-			{{#each this}}
-			<div class="layui-form-item layui-col-xs6 customWithDsFormItem" title="{{title}}" code="{{code}}">
-				<label class="layui-form-label">{{title}}：</label>
-				<div class="layui-input-block" id="daFormChoose{{code}}">
-
-				</div>
-			</div>
-			{{/each}}
-		</div>
-		{{/each}}
-	</script>
-
 	<script src="../../assets/lib/layui/layui.js"></script>
   	<script src="../../assets/lib/layui/custom.js"></script>
   	<script type="text/javascript">

--- a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html
+++ b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderadd.html
@@ -10,6 +10,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html
+++ b/erp/src/main/resources/template/tpl/purchaseorder/purchaseorderedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html
+++ b/erp/src/main/resources/template/tpl/purchaseput/purchaseputadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
+++ b/erp/src/main/resources/template/tpl/purchaseput/purchaseputedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html
+++ b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html
+++ b/erp/src/main/resources/template/tpl/purchasereturns/purchasereturnsedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">供应商<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/retailoutlet/retailoutletadd.html
+++ b/erp/src/main/resources/template/tpl/retailoutlet/retailoutletadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs3">
 		        <label class="layui-form-label">会员<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/retailoutlet/retailoutletedit.html
+++ b/erp/src/main/resources/template/tpl/retailoutlet/retailoutletedit.html
@@ -33,6 +33,9 @@
 	<!-- beanTemplate -->
 	<script type="text/x-handlebars-template" id="beanTemplate">
 		{{#bean}}
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 			<div class="layui-form-item layui-col-xs3">
 		        <label class="layui-form-label">会员<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/retailreturns/retailreturnsadd.html
+++ b/erp/src/main/resources/template/tpl/retailreturns/retailreturnsadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs3">
 		        <label class="layui-form-label">会员<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/retailreturns/retailreturnsedit.html
+++ b/erp/src/main/resources/template/tpl/retailreturns/retailreturnsedit.html
@@ -33,6 +33,9 @@
 	<!-- beanTemplate -->
 	<script type="text/x-handlebars-template" id="beanTemplate">
 		{{#bean}}
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 			<div class="layui-form-item layui-col-xs3">
 		        <label class="layui-form-label">会员<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesorder/salesorderadd.html
+++ b/erp/src/main/resources/template/tpl/salesorder/salesorderadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesorder/salesorderedit.html
+++ b/erp/src/main/resources/template/tpl/salesorder/salesorderedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesoutlet/salesoutletadd.html
+++ b/erp/src/main/resources/template/tpl/salesoutlet/salesoutletadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesoutlet/salesoutletedit.html
+++ b/erp/src/main/resources/template/tpl/salesoutlet/salesoutletedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesreturns/salesreturnsadd.html
+++ b/erp/src/main/resources/template/tpl/salesreturns/salesreturnsadd.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">

--- a/erp/src/main/resources/template/tpl/salesreturns/salesreturnsedit.html
+++ b/erp/src/main/resources/template/tpl/salesreturns/salesreturnsedit.html
@@ -9,6 +9,9 @@
 <body>
 	<div style="margin: 0 auto; padding: 20px;">
 	    <form class="layui-form" action="" id="showForm">
+			<div class="layui-form-item layui-col-xs12">
+				<span class="hr-title">基本信息</span><hr>
+			</div>
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">客户<i class="red">*</i></label>
 		        <div class="layui-input-block">