Explorar o código

开单和采购

shish %!s(int64=2) %!d(string=hai) anos
pai
achega
89297d592c
Modificáronse 2 ficheiros con 10 adicións e 14 borrados
  1. 1 1
      ghs/src/views/in/add.vue
  2. 9 13
      ghs/src/views/order/add.vue

+ 1 - 1
ghs/src/views/in/add.vue

@@ -101,7 +101,7 @@
         <el-table-column prop="selectedNum" label="已选数量" align="center" width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.selectedNum && Number(scope.row.selectedNum)>0" style="color:blue;font-weight:bold;font-size:15px;">
-            已选{{ scope.row.selectedNum }}{{ cgUnitType == 0 ? scope.row.bigUnit : scope.row.smallUnit }}
+            {{ scope.row.selectedNum }}{{ cgUnitType == 0 ? scope.row.bigUnit : scope.row.smallUnit }}
             </span>
           </template>
         </el-table-column>

+ 9 - 13
ghs/src/views/order/add.vue

@@ -61,7 +61,14 @@
             <img :src="scope.row.cover" style="width:26px;margin:0 auto;" />
           </template>
         </el-table-column>
-        <el-table-column prop="name" label="名称" align="center"></el-table-column>
+        <el-table-column prop="name" label="名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.name }}
+            <span v-if="scope.row.selectedNum && Number(scope.row.selectedNum)>0" style="color:blue;font-weight:bold;">
+              (已选{{ scope.row.selectedNum }}{{ cgUnitType == 0 ? scope.row.bigUnit : scope.row.smallUnit }})
+            </span>
+          </template>
+        </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>
@@ -80,7 +87,7 @@
         </el-table-column>
         <el-table-column prop="selectedNum" label="已选数量" align="center" width="120">
           <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>
+            <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>
@@ -697,17 +704,6 @@ export default {
         this.$message({message: '请填写数量',type: 'warning'});
         return;
       }
-      for (let i=0;i<this.selectList.length;i++){
-        if(this.selectList[i].id == currentItem.id){
-          if(this.changeType == 'add'){
-            this.customData.bigCount = Number(this.customData.bigCount)+Number(this.selectList[i].bigCount)
-          }else{
-            this.customData.bigCount = Number(this.customData.bigCount)
-          }
-          this.customData.bigCount = this.customData.bigCount.toFixed(2)
-          this.customData.bigCount = parseFloat(this.customData.bigCount)
-        }
-      }
       currentItem = {...currentItem,bigCount:this.customData.bigCount,userPrice:this.customData.userPrice,smallCount:this.customData.smallCount}
       this.replaceItemFn(currentItem,1,'add')
       this.backToSearchItem();