5 年之前 · 9de0a3d020
--- a/modules/ration_repository/models/ration_item.js
+++ b/modules/ration_repository/models/ration_item.js
@@ -732,6 +732,7 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
 
				         if (tmp.length <= 0) {
			
 
				             continue;
			
 
				         }
			
 
				+        console.log(typeof tmp[0], tmp[0]);
			
 
				         // 如果第一个字段为null则是工料机数据，放入上一个数据的工料机字段
			
 
				         if (tmp[0] === undefined && Object.keys(lastData).length > 0) {
			
 
				             // 如果不存在对应的工料机库数据则跳过
			
--- a/package-lock.json
+++ b/package-lock.json
--- a/web/maintain/billsGuidance_lib/html/main.html
+++ b/web/maintain/billsGuidance_lib/html/main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
			
--- a/web/maintain/billsGuidance_lib/html/zhiyin.html
+++ b/web/maintain/billsGuidance_lib/html/zhiyin.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/bills_lib/html/main.html
+++ b/web/maintain/bills_lib/html/main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/bills_lib/html/neirong.html
+++ b/web/maintain/bills_lib/html/neirong.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/bills_lib/html/qingdan.html
+++ b/web/maintain/bills_lib/html/qingdan.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/bills_lib/html/tezheng.html
+++ b/web/maintain/bills_lib/html/tezheng.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/common/html/edit_layout.html
+++ b/web/maintain/common/html/edit_layout.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/common/html/layout.html
+++ b/web/maintain/common/html/layout.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/ration_repository/anzhuang.html
+++ b/web/maintain/ration_repository/anzhuang.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/ration_repository/dinge.html
+++ b/web/maintain/ration_repository/dinge.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/ration_repository/fuzhu.html
+++ b/web/maintain/ration_repository/fuzhu.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/ration_repository/gongliao.html
+++ b/web/maintain/ration_repository/gongliao.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/ration_repository/js/ration.js
+++ b/web/maintain/ration_repository/js/ration.js
@@ -769,6 +769,9 @@ let rationOprObj = {
 
				             return 0;
			
 
				         }
			
 
				         arr.sort(function (a, b) {
			
 
				+            if (!commonUtil.isDef(a.code) || !commonUtil.isDef(b.code)) {
			
 
				+                return 0;
			
 
				+            }
			
 
				             let aArr = a.code.split('-'),
			
 
				                 bArr = b.code.split('-');
			
 
				             return recurCompare(aArr, bArr, 0);
			
--- a/web/maintain/ration_repository/main.html
+++ b/web/maintain/ration_repository/main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/report/html/rpt_tpl_main.html
+++ b/web/maintain/report/html/rpt_tpl_main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/std_glj_lib/html/gongliao.html
+++ b/web/maintain/std_glj_lib/html/gongliao.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
--- a/web/maintain/std_glj_lib/html/main.html
+++ b/web/maintain/std_glj_lib/html/main.html
@@ -1,5 +1,5 @@
 
				 <!DOCTYPE html>
			
 
				-<html lang="en">
			
 
				+<html lang="zh-CN">
			
 
				 <head>
			
 
				     <meta charset="utf-8">
			
 
				     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">