明细账测试完成

3bc761c3 · Skyeye云 · 4ac0f1f7 · 3bc761c3 · 3bc761c3 · 3bc761c3
8 changed file
--- a/activiti/src/main/resources/template/js/activiticommon/myactivitidetails.js
+++ b/activiti/src/main/resources/template/js/activiticommon/myactivitidetails.js
@@ -24,7 +24,8 @@ layui.config({
    	enclosureTemplate = $("#enclosureTemplate").html(),//附件展示
    	eichTextTemplate = $("#eichTextTemplate").html(),//富文本展示
    	picTemplate = $("#picTemplate").html(),//图片展示
-    	tableTemplate = $("#tableTemplate").html();//表格展示
+    	tableTemplate = $("#tableTemplate").html(),//表格展示
+		voucherTemplate = $("#voucherTemplate").html();//凭证展示

    AjaxPostUtil.request({url:reqBasePath + "activitimode025", params: {processInstanceId: processInstanceId}, type:'json', callback:function(j){
 		if(j.returnCode == 0){
@@ -71,6 +72,13 @@ layui.config({
 					    cols: getValJson(item.headerTitle, '[', ']')
 					});
 					str = "";
+				}else if(item.showType == 6){//凭证展示
+					str = getDataUseHandlebars(voucherTemplate, jsonStr);
+					$("#showForm").append(str);
+					var boxId = "showVoucher" + item.orderBy;
+					// 初始化凭证
+					voucherUtil.initDataDetails(boxId, item.value);
+					str = "";
 				}else {
 					str = "";
 				}

--- a/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
+++ b/activiti/src/main/resources/template/js/approvalActiviti/approvalProcess.js
@@ -33,7 +33,8 @@ layui.config({
    	enclosureTemplate = $("#enclosureTemplate").html(),//附件展示
    	eichTextTemplate = $("#eichTextTemplate").html(),//富文本展示
    	picTemplate = $("#picTemplate").html(),//图片展示
-    	tableTemplate = $("#tableTemplate").html();//表格展示
+    	tableTemplate = $("#tableTemplate").html(),//表格展示
+		voucherTemplate = $("#voucherTemplate").html();//凭证展示

    AjaxPostUtil.request({url:reqBasePath + "activitimode016", params: {taskId: taskId, processInstanceId: processInstanceId}, type:'json', callback:function(j){
 		if(j.returnCode == 0){
@@ -151,6 +152,13 @@ layui.config({
 							    cols: [getHeaderTitle(item.headerTitle)]
 							});
 							str = "";
+						}else if(item.showType == 6){//凭证展示
+							str = getDataUseHandlebars(voucherTemplate, jsonStr);
+							$("#showForm").append(str);
+							var boxId = "showVoucher" + item.orderBy;
+							// 初始化凭证
+							voucherUtil.initDataDetails(boxId, item.value);
+							str = "";
 						}
 					}
 				}else{
@@ -185,6 +193,13 @@ layui.config({
 						    cols: [getHeaderTitle(item.headerTitle)]
 						});
 						str = "";
+					}else if(item.showType == 6){//凭证展示
+						str = getDataUseHandlebars(voucherTemplate, jsonStr);
+						$("#showForm").append(str);
+						var boxId = "showVoucher" + item.orderBy;
+						// 初始化凭证
+						voucherUtil.initDataDetails(boxId, item.value);
+						str = "";
 					}
 				}
 				$("#showForm").append(str);

--- a/activiti/src/main/resources/template/tpl/activiticommon/myactivitidetails.html
+++ b/activiti/src/main/resources/template/tpl/activiticommon/myactivitidetails.html
@@ -6,6 +6,7 @@
    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
    <link href="../../assets/lib/layui/lay/modules/timeaxis/timeaxis.css" rel="stylesheet" />
+	<link href="../../assets/lib/winui/css/customer/voucherUtil.css" rel="stylesheet" />
    <style type="text/css">
    	.history-date h2{
    		margin-bottom: 0px;
@@ -110,6 +111,17 @@
 	        </div>
        {{/bean}}
    </script>
+
+	<!-- 凭证展示 -->
+	<script type="text/x-handlebars-template" id="voucherTemplate">
+		{{#bean}}
+		<div class="layui-form-item layui-col-xs{{proportion}}">
+			<label class="layui-form-label">{{name}}：</label>
+			<div class="layui-input-block ver-center" id="showVoucher{{orderBy}}" style="overflow-x: auto;">
+			</div>
+		</div>
+		{{/bean}}
+	</script>
    
    <!-- 时间线审批历史列表模板 -->
    <script type="text/x-handlebars-template" id="timeTreeApprovalHistory">
@@ -128,6 +140,8 @@
 	
 	<script src="../../assets/lib/layui/layui.js"></script>
   	<script src="../../assets/lib/layui/custom.js"></script>
+	<script src="../../assets/lib/layui/customer/voucher/spinbox.js"></script>
+	<script src="../../assets/lib/layui/customer/voucher/voucherUtil.js"></script>
   	<script type="text/javascript">
        layui.config({base: '../../js/activiticommon/'}).use('myactivitidetails');
    </script>

--- a/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html
+++ b/activiti/src/main/resources/template/tpl/approvalActiviti/approvalProcess.html
@@ -6,6 +6,7 @@
    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
    <link href="../../assets/lib/layui/lay/modules/timeaxis/timeaxis.css" rel="stylesheet" />
+	<link href="../../assets/lib/winui/css/customer/voucherUtil.css" rel="stylesheet" />
    <style type="text/css">
    	.history-date h2{
    		margin-bottom: 0px;
@@ -146,6 +147,17 @@
 	        </div>
        {{/bean}}
    </script>
+
+	<!-- 凭证展示 -->
+	<script type="text/x-handlebars-template" id="voucherTemplate">
+		{{#bean}}
+		<div class="layui-form-item layui-col-xs{{proportion}}">
+			<label class="layui-form-label">{{name}}：</label>
+			<div class="layui-input-block ver-center" id="showVoucher{{orderBy}}" style="overflow-x: auto;">
+			</div>
+		</div>
+		{{/bean}}
+	</script>
    
    <!-- 时间线审批历史列表模板 -->
    <script type="text/x-handlebars-template" id="timeTreeApprovalHistory">
@@ -200,6 +212,8 @@
 	
 	<script src="../../assets/lib/layui/layui.js"></script>
   	<script src="../../assets/lib/layui/custom.js"></script>
+	<script src="../../assets/lib/layui/customer/voucher/spinbox.js"></script>
+	<script src="../../assets/lib/layui/customer/voucher/voucherUtil.js"></script>
   	<script type="text/javascript">
        layui.config({base: '../../js/approvalActiviti/'}).use('approvalProcess');
    </script>

--- a/common/src/main/resources/template/js/sysfdsettings/sysfdsettingslist.js
+++ b/common/src/main/resources/template/js/sysfdsettings/sysfdsettingslist.js
@@ -225,7 +225,7 @@ layui.config({

 					// 获取异常考勤制度信息
 					params.abnormalMation = getAbnormalMation();
-					// 获取ERP(生产)审核标识信息
+					// 获取订单审核标识信息
 					params.erpExamineBasicDesign = getErpExamineBasicDesign();

 					AjaxPostUtil.request({url: reqBasePath + "sysfdsettings002", params: params, type: 'json', method: "PUT", callback: function (json) {
@@ -262,7 +262,7 @@ layui.config({
 		}

 		/**
-		 * 获取ERP(生产)审核标识信息
+		 * 获取订单审核标识信息
 		 *
 		 * @returns {any[]}
 		 */

--- a/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingsTemplate.tpl
+++ b/common/src/main/resources/template/tpl/sysfdsettings/sysfdsettingsTemplate.tpl
@@ -5,7 +5,7 @@
            <li>论坛数据</li>
            <li>CRM</li>
            <li>考勤制度</li>
-            <li>ERP(生产)审核制度</li>
+            <li>订单审核制度</li>
        </ul>
        <div class="layui-tab-content">


--- a/ifs/src/main/resources/template/js/income/incomeList.js
+++ b/ifs/src/main/resources/template/js/income/incomeList.js
@@ -156,14 +156,14 @@ layui.config({
            }});
    }

-    // 撤销用品采购
+    // 撤销申请
    function revorke(data){
        layer.confirm('确认撤销该申请吗？', { icon: 3, title: '撤销操作' }, function (index) {
            layer.close(index);
-            AjaxPostUtil.request({url: reqBasePath + "", params: {processInstanceId: data.processInstanceId}, type: 'json', callback: function(json){
+            AjaxPostUtil.request({url: reqBasePath + "income009", params: {processInstanceId: data.processInstanceId}, type: 'json', callback: function(json){
                if(json.returnCode == 0){
                    winui.window.msg("提交成功", {icon: 1, time: 2000});
-                    loadCaigouTable();
+                    loadTable();
                }else{
                    winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
                }
@@ -195,10 +195,10 @@ layui.config({
        });
    }
    function subToData(params){
-        AjaxPostUtil.request({url: reqBasePath + "", params: params, type: 'json', callback: function(json){
+        AjaxPostUtil.request({url: reqBasePath + "income008", params: params, type: 'json', callback: function(json){
            if(json.returnCode == 0){
                winui.window.msg("提交成功", {icon: 1, time: 2000});
-                loadCaigouTable();
+                loadTable();
            }else{
                winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
            }
@@ -225,7 +225,7 @@ layui.config({
    form.render();
    form.on('submit(formSearch)', function (data) {
        if (winui.verifyForm(data.elem)) {
-            refreshTable();
+            table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
        }
        return false;
    });
@@ -239,11 +239,6 @@ layui.config({
        table.reload("messageTable", {where: getTableParams()});
    }

-    // 搜索
-    function refreshTable(){
-        table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
-    }
-    
    // 导出excel
    $("body").on("click", "#downloadExcel", function () {
    	postDownLoadFile({

--- a/ifs/src/main/resources/template/tpl/income/incomeList.html
+++ b/ifs/src/main/resources/template/tpl/income/incomeList.html
@@ -49,7 +49,7 @@
 		<!-- 单据提交类型  1.走工作流提交  2.直接提交-->
 		{{# if(d.submitType == 1){ }}
 			{{# if(d.editRow == '1'){ }}
-				{{# if(auth('')){ }}
+				{{# if(auth('1642323133958')){ }}
 					<a class="layui-btn layui-btn-xs" lay-event="subExamine">提交审核</a>
 				{{# } }}
 				{{# if(auth('1571638039187')){ }}
@@ -62,7 +62,7 @@
 				{{# } }}
 			{{# } }}
 			{{# if(d.editRow == '2'){ }}
-				{{# if(auth('')){ }}
+				{{# if(auth('1642323144571')){ }}
 					<a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
 				{{# } }}
 			{{# } }}
@@ -74,7 +74,7 @@
 				{{# if(auth('1571638039187')){ }}
 					<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
 				{{# } }}
-				{{# if(auth('')){ }}
+				{{# if(auth('1642323133958')){ }}
 					<a class="layui-btn layui-btn-xs" lay-event="submitToSave">提交</a>
 				{{# } }}
 			{{# } }}