Browse Source

模具询价采纳状态描述修改

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10574 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 8 years ago
parent
commit
f304f07545

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/accept.html

@@ -278,7 +278,7 @@
 						&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="item.orderItem.qty"></span>
 						&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="item.orderItem.qty"></span>
 					</div>
 					</div>
 				</td>
 				</td>
-				<td class="br-l" colspan="2" ng-if="!item.orderItem.order.code">
+				<td class="br-l" colspan="2" ng-if="!item.orderItem">
 					<div>无关联的采购单</div>
 					<div>无关联的采购单</div>
 				</td>
 				</td>
 			</tr>
 			</tr>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -514,10 +514,10 @@ tbody td div.text-mould {
 						<div ng-if="inquiryMould.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
 						<div ng-if="inquiryMould.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
 					</div>
 					</div>
 					<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 1 && inquiryMould.valid != 0" class="block">
 					<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 1 && inquiryMould.valid != 0" class="block">
-						<span class="text-trans success">报价已采纳</span>
+						<span class="text-trans success">已采纳</span>
 					</div>
 					</div>
 					<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 0 && inquiryMould.valid != 0" class="block">
 					<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 0 && inquiryMould.valid != 0" class="block">
-						<span class="text-trans error">报价未采纳</span>
+						<span class="text-trans error">未采纳</span>
 					</div>
 					</div>
 					<div ng-if="inquiryMould.overdue == 1 && inquiryMould.status == 200 && inquiryMould.valid != 0" class="block">
 					<div ng-if="inquiryMould.overdue == 1 && inquiryMould.status == 200 && inquiryMould.valid != 0" class="block">
 						<span class="text-trans text-muted">已过期</span>
 						<span class="text-trans text-muted">已过期</span>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/inquiry_mould_detail.html

@@ -194,11 +194,11 @@ tbody td .text-waiting {
 							</div>
 							</div>
 							<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 1 && inquiryMould.valid != 0"
 							<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 1 && inquiryMould.valid != 0"
 								class="block">
 								class="block">
-								<span class="text-trans success">报价已采纳</span>
+								<span class="text-trans success">已采纳</span>
 							</div>
 							</div>
 							<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 0 && inquiryMould.valid != 0"
 							<div ng-if="inquiryMould.status == 201 && inquiryMould.adoptStatus == 0 && inquiryMould.valid != 0"
 								class="block">
 								class="block">
-								<span class="text-trans error">报价未采纳</span>
+								<span class="text-trans error">未采纳</span>
 							</div>
 							</div>
 							<div ng-if="inquiryMould.overdue == 1 && inquiryMould.status == 200 && inquiryMould.valid != 0" class="block">
 							<div ng-if="inquiryMould.overdue == 1 && inquiryMould.status == 200 && inquiryMould.valid != 0" class="block">
 								<span class="text-trans text-muted">已过期</span>
 								<span class="text-trans text-muted">已过期</span>