添加其他业务

sp-admin/sa-frame/index/index.js

@@ -112,7 +112,6 @@ var sa_admin = new Vue({
 		// 显示某个菜单，根据id 
 		showMenuById: function(id) {
 			var menu = this.getMenuById(id);
-			console.log(menu);
 			if(menu) {
 				this.showTab(menu); 
 			}

sp-admin/sa-view/tb-business/tb-car-disincle-add.html

@@ -101,7 +101,7 @@
 									<div class="c-item">
 										<label class="c-label">
 											<span style="color: red;" v-if="goods.needCarSize==1">*</span>
-											境外车规格：</label>
+											车俩规格：</label>
 										<el-autocomplete v-model="m.cardSize" placeholder="请输入车规格"
 											@select="handleSelectCarSize" value-key='unit'
 											:fetch-suggestions="queryCaSizerAsync">
@@ -123,8 +123,8 @@
 							<el-card class="box-card">
 								<div slot="header" class="clearfix">
 									<span>车辆</span>
-									<el-button style="float: right;" icon="el-icon-plus" type="primary" @click="showAddModal"
-										v-if="modal.list.length<modal.num">添加
+									<el-button style="float: right;" icon="el-icon-plus" type="primary"
+										@click="showAddModal" v-if="modal.list.length<modal.num">添加
 									</el-button>
 								</div>
 								<el-table :data="modal.list">
@@ -136,7 +136,8 @@
 										<template slot-scope="s">
 											<!-- <el-button class="c-btn" type="primary" @click="uploadFn(s.row)">上传</el-button> -->
 											<el-button class="c-btn" type="info" @click="editFn(s.row)">修改</el-button>
-											<el-button class="c-btn" type="danger" @click="deleteFn(s.row)">删除</el-button>
+											<el-button class="c-btn" type="danger" @click="deleteFn(s.row)">删除
+											</el-button>
 										</template>
 									</el-table-column>
 								</el-table>
@@ -148,16 +149,12 @@
 									<span>业务项</span>
 								</div>
 								<div>
-									<el-form-item v-for="(type,index) in filterTypeList" style="display: flex;"
-										v-if="filterTypeList.length>0">
-										<label slot="label">
-											<label v-if="needTypeId.indexOf(type.id)!==-1"
-												style="color: red;">*</label>{{type.name}}</label>
+									<el-form-item v-for="(type,index) in itemTypeList" style="display: flex;">
+										<label style="color: red;">*</label>{{type.name}}</label>
 										<el-select v-model="type.itemId" style="width: 120px;" @change="itemChange"
 											placeholder="请选择">
 											<el-option v-for="item in type.items" :key="item.id" :label="item.itemName"
-												:value="item.id" v-if="m.netWeight >= item.minWeight && m.netWeight < item.maxWeight
-												&&m.cardSize<=item.carLength&&m.cardSize>=item.minLength">
+												:value="item.id">
 											</el-option>
 										</el-select>
 										<el-input-number style="margin-left: 60px;" class="item-num" v-model="type.num"
@@ -170,9 +167,6 @@
 										<el-button v-if="type.code=='p09'&&type.itemId"
 											@click="addPeopleFn(type.itemId,type.num)">操作</el-button>
 									</el-form-item>
-									<div v-if="filterTypeList.length==0" style="height: 400px;padding: 30px;">
-										请先选择运输货品
-									</div>
 									<div class="hj" v-if="totalPrice>0">
 										合计费用:{{totalPrice}}<label>元</label>
 									</div>
@@ -387,7 +381,6 @@
 						}
 					},
 					unitList: [],
-					needTypeId: [],
 					china: {
 						visible: false,
 						list: []
@@ -683,7 +676,7 @@
 						sa.ajaxNoLoading('/TbItemType/getTypeByGoodsId', {
 							goodsId: this.m.goodsId
 						}, function(resp) {
-							this.typeList = resp.data;
+							this.itemTypeList = resp.data;
 						}.bind(this))
 					},
 					queryCaSizerAsync(queryStr, cb) {

sp-server/src/main/java/com/pj/project/tb_item_type/TbItemTypeService.java

@@ -112,13 +112,25 @@ public class TbItemTypeService extends ServiceImpl<TbItemTypeMapper, TbItemType>
             return Collections.emptyList();
         }
         List<String> typeIds = relationGoodsTypes.stream().map(RelationGoodsType::getTypeId).collect(Collectors.toList());
-        List<RelationTypeItem> typeItems = relationTypeItemService.findByTypeIds(typeIds);
+        List<RelationTypeItem> relationTypeItems = relationTypeItemService.findByTypeIds(typeIds);
         List<TbItemType>itemTypeList=new ArrayList<>();
-        typeItems.stream().collect(Collectors.groupingBy(RelationTypeItem::getTypeId))
+        relationTypeItems.stream().collect(Collectors.groupingBy(RelationTypeItem::getTypeId))
                 .forEach((typeId, list) -> {
                     TbItemType tbItemType = this.getById(typeId);
                     List<String> itemIds = list.stream().map(RelationTypeItem::getItemId).collect(Collectors.toList());
                     List<TbItem> items = tbItemService.listByIds(itemIds);
+                    for (TbItem item:items){
+                        relationTypeItems.stream()
+                                .filter(relationTypeItem -> relationTypeItem.getItemId().equals(item.getId())&&relationTypeItem.getTypeId().equals(typeId))
+                                .findFirst().ifPresent(relationTypeItem -> {
+                            System.out.println(1111);
+                            item.setInc(relationTypeItem.getInc());
+                        });
+                    }
+                    if (items.size()==1){
+                        TbItem tbItem=items.get(0);
+                        tbItemType.setItemId(tbItem.getId()).setItemName(tbItem.getItemName());
+                    }
                     tbItemType.setItems(items);
                     itemTypeList.add(tbItemType);
                 });