Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

erp/src/main/resources/template/js/salesOrder/salesOrderToReturns.js

@@ -30,24 +30,6 @@ layui.config({
                             parent.refreshCode = '0';
                         }});
                 },
-
-                // // 组件加载完成后的回调函数
-                // loadComponentCallback: function () {
-                //     $("div[controlType='customer']").remove();
-                // },
-                //
-                // // 新增行的回调函数
-                // tableAddRowCallback: function (tableId) {
-                //     $("#addRow" + tableId).remove();
-                //     $("div[controlType='simpleTable']").find(".chooseProductBtn").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".unitPrice").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".amountOfMoney").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".taxRate").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".taxMoney").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".taxUnitPrice").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".taxLastMoney").prop('disabled', true);
-                //     $("div[controlType='simpleTable']").find(".specifications").prop('disabled', true);
-                // }
             });
         }});
 });
\ No newline at end of file

erp/src/main/resources/template/js/salesReturns/salesReturnsList.js

@@ -23,30 +23,38 @@ layui.config({
         limits: getLimits(),
 	    limit: getLimit(),
         cols: [[
-            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-            { field: 'oddNumber', title: '单据编号', align: 'left', width: 250, templet: function (d) {
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2'},
+            { field: 'oddNumber', title: '单据编号', rowspan: '2', align: 'left', width: 250, templet: function (d) {
 		        var str = '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
 		        if (!isNull(d.fromId)) {
 		        	str += '<span class="state-new">[转]</span>';
 		        }
 		        return str;
 		    }},
-            { field: 'holderMation', title: '客户', align: 'left', width: 150, templet: function (d) {
+            { field: 'holderMation', title: '客户', rowspan: '2', align: 'left', width: 150, templet: function (d) {
                 return getNotUndefinedVal(d.holderMation?.name);
             }},
-            { field: 'totalPrice', title: '合计金额', align: 'left', width: 120 },
-            { field: 'operTime', title: '单据日期', align: 'center', width: 140 },
-            { field: 'processInstanceId', title: '流程ID', width: 100, templet: function (d) {
+            { field: 'totalPrice', title: '合计金额', rowspan: '2',align: 'left', width: 120 },
+            { field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
+            { colspan: '2', title: '来源单据信息', align: 'center' },
+            { field: 'processInstanceId', title: '流程ID', rowspan: '2', width: 100, templet: function (d) {
                 return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
             }},
-            { field: 'state', title: '状态', width: 90, templet: function (d) {
+            { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
                 return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
             }},
-            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
-            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
-            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
-            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150 },
-            { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', width: 120 },
+            { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], rowspan: '2', align: 'center', width: 150 },
+            { field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], rowspan: '2', align: 'left', width: 120 },
+            { field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], rowspan: '2', align: 'center', width: 150 },
+            { title: systemLanguage["com.skyeye.operation"][languageType], rowspan: '2', fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
+        ],[
+            { field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sealReturnFromType", 'id', d.fromTypeId, 'name');
+                }},
+            { field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
+                    return getNotUndefinedVal(d.fromMation?.oddNumber);
+                }}
         ]],
 	    done: function(json) {
 	    	matchingLanguage();

erp/src/main/resources/template/tpl/salesOrder/salesOrderList.html

@@ -44,12 +44,12 @@
 			{{# } }}
 			{{# if(d.state == 'pass') { }}
 				{{# if(auth('1720343655250')){ }}
-					<a class="layui-btn layui-btn-xs" lay-event="turnSales">转销售退货</a>
+					<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转销售退货</a>
 				{{# } }}
 			{{# } }}
 			{{# if(d.state == 'partiallyCompleted') { }}
 				{{# if(auth('1720343655250')){ }}
-					<a class="layui-btn layui-btn-xs" lay-event="turnSales">转销售退货</a>
+					<a class="layui-btn layui-btn-xs" lay-event="turnReturns">转销售退货</a>
 				{{# } }}
 			{{# } }}
 		</script>