Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r28266 -r31187
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 28266)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 31187)
@@ -357,7 +357,24 @@
 		openMode = param_openMode;
 	}
 	function renderCallModifyFunction(v, p, record){
-		return "<a id='" + v + "' href=\"javascript:callModifyFunction();\" onclick=\"callModifyFunction();\">" + v + "</a>";
+		var rowColor = 'my_row_blue';
+		if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
+				&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor
+				&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className
+				){
+			rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className;
+		}
+		var remark = record.get('remark');
+		if (sstsConfig.colorChangeRuleOfInvoicPlanToSendGoodsList == '2' && remark.indexOf("借物单") != -1){
+			var result = "";
+			result += "<div class='"+rowColor+"'><div>";
+			result += "<a id='" + v + "' style='color: #fff !important;'  href=\"javascript:callModifyFunction();\" onclick=\"callModifyFunction();\">" + v + "</a>";
+			result += "</div></div>";
+		}else {
+			var result = "";
+			result += "<a id='" + v + "' href=\"javascript:callModifyFunction();\" onclick=\"callModifyFunction();\">" + v + "</a>";
+		}
+		return result;
 	}
 	//加急--发货计划列表
 	function renderCallMainFunction(v, p, record){
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r31077 -r31187
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 31077)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 31187)
@@ -2722,28 +2722,45 @@
 						}else{
 							//未扫码的背景色
 							//加急
-							if(record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode !== ''){
-								rowColor = 'my_row_red';
-								rowColor = getClassNameForColor(record.json.maxUrgentLevel.colorCode,'_info');
-								return rowColor;
-							}
-							
-							if(record.json.status == '已灭菌'){
-								rowColor = 'my_row_blue';
-								if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
-										&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor
-										&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className
-										){
-									rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className;
+							if(sstsConfig.colorChangeRuleOfInvoicPlanToSendGoodsList == '2'){
+								if(record.json.maxUrgentLevel && record.json.maxUrgentLevel.colorCode !== ''){
+									rowColor = 'my_row_red';
+									rowColor = getClassNameForColor(record.json.maxUrgentLevel.colorCode,'_info');
+									return rowColor;
 								}
+								
+								if(record.json.status == '已灭菌'){
+									rowColor = 'my_row_blue';
+									if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className
+											){
+										rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.sterilizedColor.className;
+									}
+								}else {
+									rowColor = 'my_row_yellow';
+									if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className
+											){
+										rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className;
+									}
+								}
 							}else {
-								rowColor = 'my_row_yellow';
-								if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
-										&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor
-										&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className
-										){
-									rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.unsterilizedColor.className;
+								//判断是否全是今天申请的；如果同一种物品，内含今天申请的和非今天申请的，则为黄色，不然为白色（无底色）
+								if(record.json.beforeToday == true){
+									rowColor = 'my_row_yellow';
+									if(sstsConfig.backgroudColorConfigOfInvoiceGoodsList 
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday
+											&& sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className
+											){
+										//由配置项自定义颜色
+										rowColor = sstsConfig.backgroudColorConfigOfInvoiceGoodsList.beforeToday.className;
+									}
 								}
+								if(record.json.beforeToday == false){
+									rowColor = 'my_row_white';
+								}
 							}
 						}
 
Index: ssts-web/src/main/webapp/common/common.css
===================================================================
diff -u -r31109 -r31187
--- ssts-web/src/main/webapp/common/common.css	(.../common.css)	(revision 31109)
+++ ssts-web/src/main/webapp/common/common.css	(.../common.css)	(revision 31187)
@@ -77,31 +77,32 @@
 }
 /* 加急级别颜色 */
 /* 红*/
-.urgent_red_color, .urgent_red_color div, .urgent_red_color_info div{background-color: #ff0000;}
+.urgent_red_color, .urgent_red_color div, .urgent_red_color_info div{background-color: #ff0000 !important;}
 /* 橙红 */
-.urgent_orange_red_color, .urgent_orange_red_color div, .urgent_orange_red_color_info div{background-color: #ff3300;}
+.urgent_orange_red_color, .urgent_orange_red_color div, .urgent_orange_red_color_info div{background-color: #ff3300 !important;}
 /* 橙 */
-.urgent_orange_color, .urgent_orange_color div, .urgent_orange_color_info div{background-color: #ff6600;}
+.urgent_orange_color, .urgent_orange_color div, .urgent_orange_color_info div{background-color: #ff6600 !important;}
 /* 橙黄 */
-.urgent_orange_yellow_color, .urgent_orange_yellow_color div, .urgent_orange_yellow_color_info div{background-color: #ff9900;} 
+.urgent_orange_yellow_color, .urgent_orange_yellow_color div, .urgent_orange_yellow_color_info div{background-color: #ff9900 !important;} 
 /* 黄 */
-.urgent_yellow_color, .urgent_yellow_color div, .urgent_yellow_color_info div{background-color: #ffff00;} 
+.urgent_yellow_color, .urgent_yellow_color div, .urgent_yellow_color_info div{background-color: #ffff00 !important;} 
 /* 黄绿 */
-.urgent_yellow_green_color, .urgent_yellow_green_color div, .urgent_yellow_green_color_info div{background-color: #99ff00;} 
+.urgent_yellow_green_color, .urgent_yellow_green_color div, .urgent_yellow_green_color_info div{background-color: #99ff00 !important;} 
 /* 绿 */
-.urgent_green_color, .urgent_green_color div, .urgent_green_color_info div{background-color: #00ff00;}
+.urgent_green_color, .urgent_green_color div, .urgent_green_color_info div{background-color: #00ff00 !important;}
 /*蓝绿 */
-.urgent_blue_green_color, .urgent_blue_green_color div, .urgent_blue_green_color_info div{background-color: #00ffff;}
+.urgent_blue_green_color, .urgent_blue_green_color div, .urgent_blue_green_color_info div{background-color: #00ffff !important;}
 /*蓝 */
-.urgent_blue_color, .urgent_blue_color div, .urgent_blue_color_info div{background-color: #0000ff;}
+.urgent_blue_color, .urgent_blue_color div, .urgent_blue_color_info div{background-color: #0000ff !important;}
 /*蓝紫 */
-.urgent_blue_purple_color, .urgent_blue_purple_color div, .urgent_blue_purple_color_info div{background-color: #6600ff;}
+.urgent_blue_purple_color, .urgent_blue_purple_color div, .urgent_blue_purple_color_info div{background-color: #6600ff !important;}
 /*紫 */
-.urgent_purple_color, .urgent_purple_color div, .urgent_purple_color_info div{background-color: #ff00ff;}
+.urgent_purple_color, .urgent_purple_color div, .urgent_purple_color_info div{background-color: #ff00ff !important;}
 /*紫红 */
-.urgent_purple_red_color, .urgent_purple_red_color div, .urgent_purple_red_color_info div{background-color: #ff0066;}
+.urgent_purple_red_color, .urgent_purple_red_color div, .urgent_purple_red_color_info div{background-color: #ff0066 !important;}
 /*鼠标移动到行上的时候变色 */
 .x-grid3-row-over div{background-color:#efefef;}
+.x-grid3-row-over .x-grid3-col-1{background-color:transparent;}
 /*加急的图片*/
 .serialNumberHrefUrgImg{
 	width: 18px;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r29513 -r31187
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 31187)
@@ -18,8 +18,15 @@
 <title>发货计划单管理</title>
 <style>
 	.BorrowList table{
-		background-color:yellow;
+		background-color:yellow !important;
 	}
+	.BorrowList table .my_row_blue{
+		line-height: 31px;
+	}
+	.BorrowList table .my_row_blue div{
+		height: 31px;
+    	margin-top: -4px;
+	}
 	.invoicePlanList_notice_auxiliaryInvoice_history {
 		background-color: #80ff80;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r30864 -r31187
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 30864)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js	(.../config.js)	(revision 31187)
@@ -266,6 +266,8 @@
   showDeviceMaintenanceDesktopIcon:true,
   //是是否启用设备维护功能自定义功能。启用后，设备维护的表单的登记项可以由用户自行定义；不启用，则使用固定的表单登记项。
   isDeviceMaintenanceCus:true,
+  //发货计划待发货物品变色规则
+  colorChangeRuleOfInvoicPlanToSendGoodsList:'2',
   //是否启用急用物品处理周期统计报表
   enableUrgentNeedGoodsProcessingCycleReport:true
 }
\ No newline at end of file