PC接单功能

sp-admin/sa-view/tb-partner/tb-business-pick-list.html

@@ -28,8 +28,7 @@
 					<div class="c-item">
 						<label class="c-label">业务项：</label>
 						<el-select v-model="p.goodsId" placeholder="请选择" filterable>
-							<el-option v-for="item in goodsList" :key="item.id"
-									   :label="item.name" :value="item.id">
+							<el-option v-for="item in goodsList" :key="item.id" :label="item.name" :value="item.id">
 							</el-option>
 						</el-select>
 					</div>
@@ -46,7 +45,8 @@
 				<el-table class="data-table" ref="data-table" :data="dataList">
 					<sa-td name="单号" prop="no" width="160"></sa-td>
 					<sa-td name="业务项" prop="goodsName" width="120"></sa-td>
-					<sa-td name="收费项" prop="itemName" width="120"></sa-td>
+					<sa-td name="收费类型" prop="itemTypeName" width="120"></sa-td>
+					<sa-td name="收费项" prop="itemName" width="140"></sa-td>
 					<sa-td name="越南车" prop="cardNo"></sa-td>
 					<sa-td name="中国车" prop="chinaCarNo"></sa-td>
 					<sa-td name="计费标准" prop="unit">
@@ -98,7 +98,7 @@
 					dataCount: 0,
 					dataList: [], // 数据集合 
 					currentCustomerId: '1',
-					goodsList:[],
+					goodsList: [],
 					confirm: {
 						visible: false,
 						form: {
@@ -151,9 +151,12 @@
 					},
 					getGoods: function() {
 						sa.ajax('/TbGoods/all', sa.removeNull(this.p), function(res) {
-							let list=[{id:'',name:'全部'}];
-							list=list.concat(res.data)
-							this.goodsList =list ; // 数据
+							let list = [{
+								id: '',
+								name: '全部'
+							}];
+							list = list.concat(res.data)
+							this.goodsList = list; // 数据
 						}.bind(this));
 					},
 					getCustomer() {

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemController.java

@@ -95,7 +95,7 @@ public class TbBusinessItemController {
             TbCostomer tbCostomer = tbCostomerService.getById(customerId);
             List<String> typeList = StrUtil.splitTrim(tbCostomer.getType(), ",");
             so.put("typeList", typeList);
-            so.put("sortType", 11);
+            so.put("sortType", 10);
         }
         List<TbBusinessItem> list = tbBusinessItemService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);