Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -6,9 +6,9 @@ define(['app/app'], function(app) {
 		document.title = '订单详情-优软商城';
 		// 保存订单编号信息
 		$scope.orderId = $stateParams.orderid;
-		$scope.acceptGoods = false // 是否是 收货入库进来
-		$scope.CheckId = 'autoMonth0' // 当前发货点选择按钮
-    $scope.ChooseItem = '' // 当前选择发货单
+		$scope.acceptGoods = false; // 是否是 收货入库进来
+		$scope.CheckId = 'autoMonth0'; // 当前发货点选择按钮
+    	$scope.ChooseItem = '';// 当前选择发货单
 		$scope.orderStatus = true
 
     // 获取当前收货单所对应的物品信息
@@ -278,9 +278,9 @@ define(['app/app'], function(app) {
 
 		// 设置当前选择的发货单
 		$scope.ChooseSendGoodsItem = function(item, ind) {
-      $scope.CheckId = `autoMonth${ind}`
-			$scope.ChooseItem = item
-      getReceiveInfo()
+		  $scope.CheckId = 'autoMonth' + ind;
+		  $scope.ChooseItem = item;
+		  getReceiveInfo();
 		}
 
     // 确认收货

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -462,9 +462,12 @@ define([ 'app/app' ], function(app) {
         };
 
         var inSaveOtherCheck = function(type) {
-            console.log(type, 'type')
             Goods.getByEnterpriseId({invoiceId: type.invoiceid}, null, function(data) {
-                console.log('data', data, type.invoiceId)
+                if(data.code === 1) {
+                    toaster.pop("success", "信息保存成功");
+                }
+            }, function(response) {
+                toaster.pop('error', '错误', response.data);
             })
         };
 

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1569,38 +1569,6 @@
 				</div>
 			</div>
 		</div>
-			<!--自定义标签-->
-			<div class="wanted-list02" id="wanted-list02">
-				<div class="title">
-					<div class="fl">
-						<img src="static/img/vendor/images/label.png" alt=""/>
-						<span>自定义标签</span>
-					</div>
-					<div class="fr">
-						<span ng-click="selfTagTaggle(false)" ng-if="$$nonProduct.selfTagNoticeShow">收起 <i class="fa fa-angle-up"></i></span>
-						<span ng-click="selfTagTaggle(true)" ng-if="!$$nonProduct.selfTagNoticeShow">展开 <i class="fa fa-angle-down"></i></span>
-					</div>
-				</div>
-				<div class="content">
-					<h3>什么是自 <span>定义标签</span> <em>?</em></h3>
-					<p>自定义标签是可以让买家快速判断同一个型号品牌产品主要属性区别的标识。
-					</p>
-					<p>未填写的情况下会自动显示为 <span>“类型A”</span>、<span>“类型B"</span>，以此类推。填写后在产品详情页的展示效果如下：</p>
-					<div class="hover-show" ng-if="!$$nonProduct.selfTagNoticeShow"></div>
-					<div class="show-up" ng-if="$$nonProduct.selfTagNoticeShow">
-						<div class="img">
-							<div>
-								<img src="static/img/vendor/images/detail.png" alt=""/>
-								<p>只有一种类型的情况，<span>不显示</span>小标签</p>
-							</div>
-							<div>
-								<img src="static/img/vendor/images/detail.png" alt=""/>
-								<p>存在2种及以上类型的情况，<span>显示</span>小标签</p>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
 		</div>
 		<!--匹配结果列表页-->
 		<div ng-if="standard_tab == 'matchResult'" style="margin-top: -15px;">
@@ -1697,84 +1665,7 @@
 		</div>
 	</div>
 </div>
-<div class="com-modal-wrap" ng-if="setShowActive > -1">
-  <div class="edit-replace-box">
-    <div class="title">
-      <div>型号：<span>{{lookCmp}}</span></div>
-      <div>品牌：<span>{{lookBrand}}</span></div>
-      <i class="fa fa-close" ng-click="lookActiveIndex(-1)"></i>
-    </div>
-    <div class="content content3">
-      <div class="content-line content-line2">
-        <div class="leftline"></div>
-        <p class="toptitle">替代物料：</p>
-        <div class="rightline"></div>
-      </div>
-			<div class="no-resulte" ng-if="resultDatalist.length == 0">暂无替代物料，赶快去<a ng-click="updateIndex()">编辑</a>吧</div>
-      <div class="content_top" ng-if="resultDatalist.length > 0">
-        <div class="content_toptitle">型号</div>
-        <div class="content_toptitle">品牌</div>
-        <div class="line"></div>
-      </div>
-      <ul ng-if="resultDatalist.length > 0">
-        <li ng-repeat="list in resultDatalist">
-          <div class="sort">{{list.detno}}</div>
-          <div class="text">{{list.ptrCmpcode}}</div>
-          <div class="text">{{list.ptrBranden}}</div>
-        </li>
-      </ul>
-    </div>
-
-		<div class="reminfo" style="background: #fff;text-align: right;margin: 0px;padding-right: 20px;padding-top:5px;padding-bottom: 10px" ng-if="resultDatalist.length > 0">共<span style="color: #5078cb">{{resultDatalist.length}}</span>个替代物料</div>
-    <div class="operate">
-			<span ng-if="resultDatalist.length >= 0" ng-click="setActiveIndex(setShowActive, _material)">编辑</span>
-      <span ng-click="lookActiveIndex(-1)" style="background: #5078cb">关闭</span>
-    </div>
-  </div>
-</div>
-<div class="com-modal-wrap"  ng-if="activeIndex > -1">
-	<div class="edit-replace-box">
-		<div class="title">
-			<div>型号：<span>{{editCmp}}</span></div>
-			<div>品牌：<span>{{editBrand}}</span></div>
-			<i class="fa fa-close" ng-click="setActiveIndex(-1)"></i>
-		</div>
-		<div class="content content2">
-			<div class="content-line">
-				<p>替代物料：</p>
-			</div>
-			<div class="content-line" ng-repeat="(key, mate) in replaceMaterialList" on-finish-render="ngRepeatFinished">
-				<div class="form-item form-left">
-					<span><i>{{key + 1}}</i><em>*</em>品牌：</span>
 
-					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrBranden" ng-focus="onFocus($event, 'similar-list1_'+ key, 'brand', key)" ng-change="onBrandChange(mate.ptrBranden, key)" ng-blur="onBrandBlur(key)" ng-class="{'error': errorObj[key].brand == 1}" placeholder="请输入品牌名称">
-					<ul class="similar-list" ng-class="'similar-list1_'+ key" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
-						<li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
-					</ul>
-
-				</div>
-				<div class="form-item form-right">
-					<span><em>*</em>型号：</span>
-					<input type="text" class="form-control" ng-readonly="mate.editable == false" ng-model="mate.ptrCmpcode" ng-focus="onFocus($event, 'similar-list2_'+ key, 'code', key)" ng-change="onCodeChange(mate.ptrCmpcode, key, $event)" ng-blur="onCodeBlur(key)" ng-class="{'error': errorObj[key].code == 1}" placeholder="请输入型号名称">
-					<ul class="similar-list" ng-class="'similar-list2_'+ key" ng-show="mate.showSimilarCodeList && similarCode.length > 0 && mate.ptrCmpcode" ng-mouseenter="setIsInCodeList(true, key)" ng-mouseleave="setIsInCodeList(false, key)">
-						<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}" ng-click="setCode(key, sCode.code)"></li>
-					</ul>
-					<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1 && mate.editable != false" ng-click="setReplies('sub', key)"></i>
-					<i class="fa fa-plus-circle" ng-if="key == linearLength - 1 && mate.editable != false" ng-click="setReplies('add', key)"></i>
-				</div>
-
-			</div>
-		</div>
-
-		<div class="operate">
-			<div class="reminfo">
-				<a>*</a>您无权编辑和删除的替代型号，请联系贵公司管理员进行处理。
-			</div>
-			<span ng-click="setProductReplacesByPerson(replaceMaterialList)">确定</span>
-			<span ng-click="setActiveIndex(-1)">取消</span>
-		</div>
-	</div>
-</div>
 <!--一键匹配弹出框-->
 <div class="matchPop" ng-if="haveRepeat">
 	<div class="title">