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

erp/src/main/resources/template/js/purchaseOrder/chooseList.js

+
+layui.config({
+	base: basePath,
+	version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
+	winui.renderColor();
+	var index = parent.layer.getFrameIndex(window.name);
+	var $ = layui.$,
+		form = layui.form,
+		table = layui.table;
+
+	var holderId = GetUrlParam("holderId");
+	if (isNull(holderId)) {
+		winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+		return false;
+	}
+
+	table.render({
+		id: 'messageTable',
+		elem: '#messageTable',
+		method: 'post',
+        url: sysMainMation.erpBasePath + 'purchaseorder001',
+		where: getTableParams(),
+		even: true,
+		page: true,
+		limits: getLimits(),
+		limit: getLimit(),
+		cols: [[
+			{ type: 'radio', fixed: 'left', rowspan: '2' },
+			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
+			{ field: 'oddNumber', title: '单号', rowspan: '2', width: 200, align: 'center', templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.oddNumber + '</a>';
+			}},
+			{ field: 'holderMation', title: '供应商', rowspan: '2', align: 'left', width: 150, templet: function (d) {
+				return getNotUndefinedVal(d.holderMation?.name);
+			}},
+			{ field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'left', width: 120 },
+			{ field: 'operTime', title: '单据日期', rowspan: '2', align: 'center', width: 140 },
+			{ colspan: '2', title: '来源单据信息', align: 'center' },
+			{ 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], 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("purchaseOrderFromType", 'id', d.fromTypeId, 'name');
+			}},
+			{ field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
+				return getNotUndefinedVal(d.fromMation?.oddNumber);
+			}}
+		]],
+		done: function(json) {
+			matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入单号", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
+
+			for (var i = 0; i < json.rows.length; i++) {
+				// 只有审批通过、执行中的项目才可以进行选中
+				let state = json.rows[i].state;
+				let inquiryState = json.rows[i].inquiryState;
+				if ((state == 'pass' && (inquiryState == 1 || inquiryState == 4)) ||
+					(state == 'partialProcurement' && (inquiryState == 1 || inquiryState == 4))) {
+					systemCommonUtil.disabledRow(json.rows[i].LAY_TABLE_INDEX, 'radio');
+				}
+			}
+			$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function(){
+				var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
+				if (!dubClick.find("input[type='radio']").prop("disabled")) {
+					dubClick.find("input[type='radio']").prop("checked", true);
+					form.render();
+					var chooseIndex = JSON.stringify(dubClick.data('index'));
+					var obj = json.rows[chooseIndex];
+					parent.purchaseOrderMation = obj;
+
+					parent.refreshCode = '0';
+					parent.layer.close(index);
+				}
+			});
+
+			$('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function(){
+				var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
+				if (!click.find("input[type='radio']").prop("disabled")) {
+					click.find("input[type='radio']").prop("checked", true);
+					form.render();
+				}
+			})
+		}
+	});
+
+	form.render();
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	function loadTable() {
+		table.reloadData("messageTable", {where: getTableParams()});
+	}
+
+	function getTableParams() {
+		return $.extend(true, {holderId: holderId}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
+
+    exports('purchaseOrderChooseList', {});
+});
\ No newline at end of file

erp/src/main/resources/template/js/supplierContract/chooseList.js

@@ -28,20 +28,32 @@ layui.config({
 		limits: getLimits(),
 		limit: getLimit(),
 		cols: [[
-			{ type: 'radio', fixed: 'left'},
-			{ title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers', rowspan: 2},
-            { field: 'title', title: '合同名称', align: 'left', width: 300 },
-            { field: 'oddNumber', title: '合同编号', align: 'left', width: 120 },
-            { field: 'price', title: '合同金额（元）', align: 'left', width: 120 },
-            { field: 'signingTime', title: '签约日期', align: 'center', width: 100 },
-            { field: 'state', title: '状态', width: 90, templet: function (d) {
-                return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name');
-            }},
-            { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], align: 'left', 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.serialNumber"][languageType], type: 'numbers', rowspan: '2' },
+			{ field: 'title', title: '合同名称', rowspan: '2', align: 'left', width: 200, templet: function (d) {
+				return '<a lay-event="details" class="notice-title-click">' + d.title + '</a>';
+			}},
+			{ field: 'oddNumber', title: '合同编号', rowspan: '2', align: 'left', width: 150 },
+			{ field: 'price', title: '合同金额（元）', rowspan: '2', align: 'left', width: 120 },
+			{ field: 'signingTime', title: '签约日期', rowspan: '2', align: 'center', width: 100 },
+			{ colspan: '2', title: '来源单据信息', align: 'center' },
+			{ field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractStateEnum", 'id', d.state, 'name');
+			}},
+			{ field: 'childState', title: '合同产品状态', rowspan: '2', width: 150, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractChildStateEnum", 'id',d.childState, 'name');
+			}},
+			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], rowspan: '2', align: 'left', 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 },
+		], [
+			{ field: 'fromTypeId', title: '来源类型', width: 150, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("supplierContractFromType", 'id', d.fromTypeId, 'name');
+			}},
+			{ field: 'fromId', title: '单据编号', width: 200, templet: function (d) {
+				return getNotUndefinedVal(d.fromMation?.oddNumber);
+			}}
+		]],
 		done: function(json) {
 			matchingLanguage();
 			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入合同名称", function () {

erp/src/main/resources/template/tpl/purchaseOrder/chooseList.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+    <div class="winui-tip alert-info">
+        注意事项：<br/>
+        1. 双击指定行可选中数据<br/>
+        2. 只有状态为：【审核通过、部分转采购订单】或者状态为：【审核通过】到货状态为：【待到货、部分到货】的采购订单可以选择
+    </div>
+	<div class="winui-toolbar">
+		<div class="winui-tool">
+			<button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+		</div>
+	</div>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/purchaseOrder/'}).use('chooseList');
+    </script>
+</body>
+</html>
\ No newline at end of file

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -192,6 +192,11 @@
     "purchaseRequestChildInquiry": {"name": "ERP-申请单子单据明细是否询价", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestChildInquiry"},
     "purchaseRequestInquiryState": {"name": "ERP-采购申请单询价状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestInquiryState"},
     "purchaseRequestStateEnum": {"name": "ERP-采购申请状态", "className": "skyeye-erp#com.skyeye.request.classenum.PurchaseRequestStateEnum"},
+
+    "carAttribute": {"name": "TMS-车辆属性", "className": "skyeye-tms#com.skyeye.tms.car.classenum.CarAttribute"},
+    "carState": {"name": "TMS-车辆当前状态", "className": "skyeye-tms#com.skyeye.tms.car.classenum.CarState"},
+
     "supplierContractChildStateEnum": {"name": "ERP-采购合同是否转采购订单状态", "className": "skyeye-erp#com.skyeye.contract.classenum.SupplierContractChildStateEnum"},
     "orderQualityInspectionType": {"name": "ERP-采购订单质检状态", "className": "skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"}
+
 }
\ No newline at end of file