显示分类

ghs/src/service/item-class/index.js

@@ -23,6 +23,7 @@ export class ItemClassService extends BaseService {
 			params: data
 		});
 	}
+
 	getAllClass(data) {
 		return this.request({
 			url: '/get-all-class',
@@ -30,6 +31,13 @@ export class ItemClassService extends BaseService {
 		});
 	}
 
+	getAllClassIndex(data) {
+		return this.request({
+			url: '/get-all-class-index',
+			params: data
+		});
+	}
+
 	changeInTurn(data) {
 		return this.request({
 			url: '/change-in-turn',

ghs/src/views/order/add.vue

@@ -1,7 +1,8 @@
 <template>
-  <div v-if="form.customId == 0" style="text-align:center;">
+  <div v-if="form.customId == 0" style="text-align:center;margin-top:30px;">
+    <span style="font-size:20px;">搜索客户：</span>
     <el-select @change="searchSelectCustom" v-model="selectCustomName" filterable remote reserve-keyword placeholder="搜索客户，光标插入 Ctrl + C" clearable ref="customref"
-				:remote-method="searchCustomInfo" :loading="loading" style="width:500px;margin-left:20px;" size="big">
+				:remote-method="searchCustomInfo" :loading="loading" style="width:400px;margin-left:20px;" size="big">
     				<el-option v-for="item in customInfoList" :key="item.id" :label="`${item.name}`" :value="item"></el-option>
   				</el-select>
   </div>
@@ -41,8 +42,9 @@
       </el-table>
     </div>
     <div class="seek-list-box" v-if="!$util.isEmpty(getItemList) && showGetItemList == true">
-      <el-table ref="showItemRef" :data="getItemList" highlight-current-row style="width:65%" border :header-cell-style="{background:'#fdfdfd', color: '#666'}" 
+      <el-table ref="showItemRef" :data="getItemList" highlight-current-row style="width:72%" border :header-cell-style="{background:'#fdfdfd', color: '#666'}" 
       class="tableBox active" height="740" @row-click="pickItem">
+        <el-table-column prop="className" label="分类" align="center" width="180"></el-table-column>
         <el-table-column prop="cover" label="图片" align="center" width="120">
           <template slot-scope="scope">
             <img :src="scope.row.cover" style="width:26px;margin:0 auto;" />
@@ -51,7 +53,16 @@
         <el-table-column prop="name" label="名称" align="center"></el-table-column>
         <el-table-column prop="price" label="价格" width="100" align="center"></el-table-column>
         <el-table-column prop="stock" label="库存" width="100" align="center"></el-table-column>
-        <el-table-column prop="bigUnit" label="单位" width="100" height="10" align="center"></el-table-column>
+
+
+        <el-table-column prop="ratioType" label="单位比" align="center" width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.ratioType == 0">{{ scope.row.ratio }}{{ scope.row.smallUnit }}/{{ scope.row.bigUnit }}</span>
+            <span v-else>若干{{ scope.row.smallUnit }}/{{ scope.row.bigUnit }}</span>
+          </template>
+        </el-table-column>
+
+
       </el-table>
     </div>
     <div class="bottom_input">
@@ -259,7 +270,8 @@ export default {
       currentShop:{default:0,pfLevel:0},
       diffList:[],
       showGetItemList:false,
-      currentItem:{}
+      currentItem:{},
+      classList:[]
     };
   },
 	mixins: [productMins],
@@ -383,6 +395,11 @@ export default {
           }
         })
 		})
+
+    this.$service.itemClass.getAllClassIndex().then(data => {
+      this.classList = data
+    })
+
   },
   methods: {
     changeKdStaff(info){
@@ -549,6 +566,13 @@ export default {
         that.searchItemFn()
       },250)
     },
+    sorts_fun(arr) {
+      return function(a, b) {
+          var v1 = a[arr];
+          var v2 = b[arr];
+          return v1 - v2;
+      }
+    },
     async searchItemFn(){
       if(this.searchVal==''){
         this.getItemList = [];
@@ -561,11 +585,24 @@ export default {
       this.getIndex = 0;
       this.searchOldVal = this.searchVal;
       this.isSeek = true;
+      let hasExists = []
       await this.$service.item.getItemList({search:this.searchVal,requestType:'kd',pageSize:20}).then(res=>{
         let list = this.$util.copyObject(res.list)
         if(!that.$util.isEmpty(list)){
+          list = list.sort(this.sorts_fun('classId'))
+          const newList = list.map(ele => {
+            let cName = '-'
+            if(hasExists[ele.classId]){
+              //无操作
+            }else{
+              let currentClass = this.classList[ele.classId] ? this.classList[ele.classId] : null
+              cName = currentClass.name ? currentClass.name : ''
+              hasExists[ele.classId] = 1
+            }
+	          return {...ele,className:cName}
+          })
           that.showGetItemList = true
-          that.getItemList = list
+          that.getItemList = newList                
         }
       })
       if(!that.$util.isEmpty(that.getItemList)){
@@ -752,7 +789,7 @@ export default {
     position: absolute;
     bottom: 70px;
     right: 5%;
-    width: 66%;
+    width: 75%;
     min-height: 310px;
     overflow: hidden;
     z-index:9999;