物资字段添加

CallCenterWeb.UI/.project

@@ -123,5 +123,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1625706589579</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

CallCenterWeb.UI/commonTpl/companyNameOrderDetails.html

@@ -39,6 +39,7 @@
 						<tr>
 							<th data-field="Operator" data-align="center">操作人</th>
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
+							<th data-field="Warehousing" data-align="center">操作内容</th>
 							<th data-field="remark" data-align="center">备注</th>
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
 						</tr>
@@ -51,6 +52,7 @@
 						<tr>
 							<th data-field="Operator" data-align="center">操作人</th>
 							<th data-field="WarehousingDate" data-align="center">操作时间</th>
+							<th data-field="Warehousing" data-align="center">操作内容</th>
 							<th data-field="remark" data-align="center">备注</th>
 							<th data-field="fieldId" data-align="center" data-formatter="formatterPhoto">照片</th>
 						</tr>

WeChat/Script/Common/huayi.config.js

@@ -2,7 +2,9 @@
     var huayi = {};
 }
 huayi.config = {
-    callcenter_url: "http://117.160.143.195:4669/",//生产环境 前端Web站IP和端口
+   
+    //callcenter_url: "http://117.160.143.195:4669/",//生产环境 前端Web站IP和端口
+    callcenter_url: "http://192.168.8.9:1031/",//生产环境 前端Web站IP和端口
     //callcenter_url: "http://117.158.196.116:4617/",//生产环境 前端Web站IP和端口
 
 };

WeChat/content/js/borrowDetail.js

@@ -33,7 +33,8 @@ $(".allot").click(function(){
 })
 function Ajax() {
 	$.ajax({
-		url: huayi.config.callcenter_url + 'archives/GetModelarchives',
+		// url: huayi.config.callcenter_url + 'archives/GetModelarchives',
+		url: huayi.config.callcenter_url + 'archives/GetModelarchivesNew',
 		data: {
 			id: id, //工单编号
 			openid: openid, //微信openid,

WeChat/content/js/borrowList.js

@@ -55,7 +55,8 @@ $(function () {
 function Ajax() {
 	//$(".order").remove();
 	$.ajax({
-		url: huayi.config.callcenter_url + 'archives/GetList',
+		// url: huayi.config.callcenter_url + 'archives/GetList',
+		url: huayi.config.callcenter_url + 'archives/GetListByCompany',
 		data: {
 			openid: openid, //微信openid,
 //			openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE',
@@ -71,6 +72,7 @@ function Ajax() {
 			if(data.data.rows && data.data.rows.length > 0) {
 				$(".noinfor").text("");
 				$(data.data.rows).each(function(i, n) {
+					console.log(n);
 					$('<li class="mui-table-view-cell">' +
 						'<div class="mui-input-row mui-checkbox mui-left">'+
 						'<input name="checkbox1" data-item="' + n.id + '" value="'+n.stateName+'" type="checkbox" class="selected"></div>'+
@@ -80,7 +82,7 @@ function Ajax() {
 						'</h4><h5>' + n.OperationDate +
 						'</h5></div>'+
 						'<div class="mui-table-cell mui-col-xs-4 mui-text-right">'+
-						'<span class="mui-h5">'+n.stateName+
+						'<span class="mui-h5">'+n.statename+
 						'</span></div></div></li>').appendTo('#OA_task');
 				});
 				//工单跳转

WeChat/login.html

@@ -42,8 +42,8 @@
 			//var openid = helper.cookies.get("openid");
 			var menucode = helper.request.queryString("menuCode");
 			var code = helper.request.queryString("code");
-			var openid = helper.request.queryString("openid");
-			//var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
+			//var openid = helper.request.queryString("openid");
+			var openid = "oXF5e1mWpX5DajW5_yjNLPKb8ThE";
 			var typeUser = helper.cookies.get("typeUser");
 			if (typeUser) {
 				typeUser = helper.cookies.get("typeUser");
@@ -80,6 +80,7 @@
 				login();
 			})
 			function login () {
+				debugger
 				//请求
 				$.ajax({
 					type: "post",
@@ -91,20 +92,20 @@
 						Password: $("#password").val(),
 						UserType:typeUser, 
 						openid: openid,
-						//openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE', //微信openid 测试用
+						openid: 'oXF5e1mWpX5DajW5_yjNLPKb8ThE', //微信openid 测试用
 					},
 					success: function(data) {
 						if(data.state == "success") {
 							var UserWord=$("#password").val();
 							helper.cookies.set("typeUser", typeUser, 365);
 							helper.cookies.set("UserWord", UserWord, 365);
-							debugger
+							// debugger
 							if (openid) {
 								helper.cookies.set("openid", openid, 365);
-								debugger
+								// debugger
 								if (typeUser=="5") {
 									if(data.data.usertype==2){
-										debugger
+										// debugger
 										window.location.replace('content/AdminList.html');
 										helper.cookies.set("username", data.data.username, 7);
 									}else{