shish 2 ani în urmă
părinte
comite
b7781ccdb2
2 a modificat fișierele cu 34 adăugiri și 5 ștergeri
  1. 12 0
      ghs/src/mixins/product2.js
  2. 22 5
      ghs/src/views/order/add.vue

+ 12 - 0
ghs/src/mixins/product2.js

@@ -50,6 +50,18 @@ export default {
 			let selectInfo = this.getSelectInfo;
 			let selectInfo = this.getSelectInfo;
 			return selectInfo[this.selectJobType+'_'+this.selectJobId] || []
 			return selectInfo[this.selectJobType+'_'+this.selectJobId] || []
 		},
 		},
+		selectListIndex(){
+			let selectInfo = this.getSelectInfo;
+			let list = selectInfo[this.selectJobType+'_'+this.selectJobId] || []
+			let newList = []
+			if(!this.$util.isEmpty(list)){
+				list.forEach((item,idx,arr) => {
+					let productId = item.id
+					newList[productId]=item
+				})
+			}
+			return newList
+		},
 		scrollClassId() {
 		scrollClassId() {
 			const curClass = this.productInfoList[this.globalClassIndex];
 			const curClass = this.productInfoList[this.globalClassIndex];
 			if (curClass) {
 			if (curClass) {

+ 22 - 5
ghs/src/views/order/add.vue

@@ -47,7 +47,7 @@
       </el-table>
       </el-table>
     </div>
     </div>
     <div class="seek-list-box" v-if="!$util.isEmpty(getItemList) && showGetItemList == true">
     <div class="seek-list-box" v-if="!$util.isEmpty(getItemList) && showGetItemList == true">
-      <el-table ref="showItemRef" :data="getItemList" highlight-current-row style="width:72%" border :header-cell-style="{background:'#fdfdfd', color: '#666'}" 
+      <el-table ref="showItemRef" :data="getItemList" highlight-current-row style="width:80%" border :header-cell-style="{background:'#fdfdfd', color: '#666'}" 
       class="tableBox active" height="730" @row-click="pickAddItem">
       class="tableBox active" height="730" @row-click="pickAddItem">
         <el-table-column prop="className" label="分类" align="center" width="180"></el-table-column>
         <el-table-column prop="className" label="分类" align="center" width="180"></el-table-column>
         <el-table-column prop="cover" label="图片" align="center" width="120">
         <el-table-column prop="cover" label="图片" align="center" width="120">
@@ -56,14 +56,27 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="name" label="名称" align="center"></el-table-column>
         <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="price" label="价格" width="100" align="center">
+          <template slot-scope="scope">
+            <span>¥{{ scope.row.price?parseFloat(scope.row.price):0 }}</span>
+          </template>          
+        </el-table-column>
+        <el-table-column prop="stock" label="库存" width="100" align="center">
+          <template slot-scope="scope">
+            <span style="color:green;font-weight:bold;">{{ scope.row.stock?parseFloat(scope.row.stock):0 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="ratioType" label="单位比" align="center" width="150">
         <el-table-column prop="ratioType" label="单位比" align="center" width="150">
           <template slot-scope="scope">
           <template slot-scope="scope">
             <span v-if="scope.row.ratioType == 0">{{ scope.row.ratio }}{{ scope.row.smallUnit }}/{{ scope.row.bigUnit }}</span>
             <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>
             <span v-else>若干{{ scope.row.smallUnit }}/{{ scope.row.bigUnit }}</span>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
+        <el-table-column prop="selectedNum" label="已选数量" align="center" width="150">
+          <template slot-scope="scope">
+            <span v-if="scope.row.selectedNum && Number(scope.row.selectedNum)>0" style="color:red;font-weight:bold;font-size:17px;">已选{{ scope.row.selectedNum }}</span>
+          </template>
+        </el-table-column>
       </el-table>
       </el-table>
     </div>
     </div>
     <div class="bottom_input">
     <div class="bottom_input">
@@ -578,7 +591,11 @@ export default {
               cName = currentClass.name ? currentClass.name : ''
               cName = currentClass.name ? currentClass.name : ''
               hasExists[ele.classId] = 1
               hasExists[ele.classId] = 1
             }
             }
-	          return {...ele,className:cName}
+            let selectedNum = 0
+            if(that.selectListIndex[ele.id]){
+              selectedNum = that.selectListIndex[ele.id].bigCount ? Number(that.selectListIndex[ele.id].bigCount) : 0
+            }
+	          return {...ele,className:cName,selectedNum:selectedNum}
           })
           })
           that.showGetItemList = true
           that.showGetItemList = true
           that.getItemList = newList
           that.getItemList = newList
@@ -778,7 +795,7 @@ export default {
     position: absolute;
     position: absolute;
     bottom: 70px;
     bottom: 70px;
     right: 5%;
     right: 5%;
-    width: 75%;
+    width: 81%;
     min-height: 310px;
     min-height: 310px;
     overflow: hidden;
     overflow: hidden;
     z-index:9999;
     z-index:9999;