采购入库

ghs/src/mixins/product2.js

@@ -18,7 +18,7 @@ export default {
 			globalCheckStock:true,// 考虑库存，盘点不需要考虑库存
 			isAddModel:false,
 			isAddInputFocus:false,
-			customData: { bigCount: 0, smallCount: 0, userPrice: 0 },
+			customData: { bigCount: 0, smallCount: 0, userPrice: 0, totalPrice:0, aboutPrice:0},//aboutPrice 0 单价是确定值 1 单价是约等于值
 			globalItemList:[],
 			globalUnitType:0,
 			globalAllProduct:[],
@@ -43,7 +43,6 @@ export default {
 			this.selectJobType = selectJobType;
 		}
 	},
-	onUnload() {},
 	computed: {
 		...mapGetters(["getSelectInfo"]),
 		selectList() {
@@ -286,18 +285,8 @@ export default {
 					}					
 				}
 			}
-
 			const list = this.selectList
-
 			let index = list.findIndex(element => element.id == item.id)
-
-			//扫码数量累加
-			if(index != -1 && scan == 1){
-				item.bigCount = parseInt(Number(item.bigCount)+Number(list[index].bigCount))
-				item.smallCount = parseInt(Number(item.smallCount)+Number(list[index].smallCount))
-			}
-
-			//扫码会出现负数
 			if(Number(item.bigCount)<0 || Number(item.smallCount)<0){
 				return false
 			}
@@ -313,31 +302,24 @@ export default {
 					return
 				}
 			}
-
 			if(index == -1){
 				if(this.$util.isEmpty(item.userPrice) || Number(item.userPrice) == 0){
-					item.userPrice = item.bigPrice
+					this.$message({message: '请填写金额哦',type: 'warning'})
+					return
 				}
 				list.push(item)			
 			}else{
 				if(item.bigCount <= 0 && item.smallCount <= 0){
-					//删除花材
 					list.splice(index,1)
 				}else{
 					list[index].bigCount = item.bigCount
 					list[index].smallCount = item.smallCount
 					list[index].userPrice = item.userPrice
+					list[index].aboutPrice = item.aboutPrice
+					list[index].totalPrice = item.totalPrice
 				}
 			}
-			//点击要响声
-			if(this.kdType == 'HIT' && multiple ==0){
-				//this.$util.hitRemind()
-			}
 			this.hitPlay()
-			//扫码要响声
-			if(scan == 1){
-				//this.$util.hitRemind()
-			}
 			this.pushToSave(list)
 		},
 		delItem(product){

ghs/src/service/shop/index.js

@@ -23,6 +23,14 @@ export class LevelService extends BaseService {
 			url: '/all',
 		});
 	}
+
+	detail(data) {
+		return this.request({
+			url: '/detail',
+			params: data
+		});
+	}
+
 }
 
 export default new LevelService();

ghs/src/views/in/add.vue

@@ -9,7 +9,7 @@
   <div class="app-list-content" v-else>
     <div class="left_box">
       <p class="tor">
-        <span style="color:black;">供货商：{{form.ghsName}}</span>
+        <span style="color:black;font-weight:bold;">供货商：{{form.ghsName}}</span>
         <span>全屏：F11</span>
         <span>修改：回车</span>
         <span>删除：Delete</span>
@@ -29,11 +29,24 @@
         </el-table-column>
 
         <el-table-column prop="name" label="名称" align="center"></el-table-column>
-        <el-table-column prop="userPrice" label="单价" width="110" align="center"></el-table-column>
-        <el-table-column prop="bigCount" label="数量" width="110" align="center"></el-table-column>
+        <el-table-column prop="bigCount" label="数量" width="110" align="center">
+          <template slot-scope="scope">
+            <span v-if="cgUnitType == 0">
+              {{ scope.row.bigCount }}{{ scope.row.bigUnit }}
+            </span>
+            <span v-else>
+              {{ scope.row.smallCount }}{{ scope.row.smallUnit }}
+            </span>
+          </template>          
+        </el-table-column>
+        <el-table-column prop="userPrice" label="单价" width="110" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.aboutPrice == 1 ? '约' : '' }} {{ scope.row.userPrice }}
+          </template>
+        </el-table-column>
         <el-table-column prop="sumPrice" label="金额" width="110" align="center">
           <template slot-scope="scope">
-            ¥{{ parseFloat((Number(scope.row.userPrice)*Number(scope.row.bigCount)).toFixed(2)) }}
+            {{ scope.row.totalPrice }}
           </template>
         </el-table-column>
 
@@ -61,7 +74,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 +100,9 @@
         </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:blue;font-weight:bold;font-size:15px;">
+            已选{{ scope.row.selectedNum }}{{ cgUnitType == 0 ? scope.row.bigUnit : scope.row.smallUnit }}
+            </span>
           </template>
         </el-table-column>
       </el-table>
@@ -95,15 +117,35 @@
         <el-button size="medium" style="margin-left:50px;" @click="comeBack()">返回</el-button>
     </div>
 
-    <el-dialog :title="currentItem.name" v-if="showConfirmNum" :visible.sync="showConfirmNum" width="30%" center>
+    <el-dialog :title="currentItem.name" :visible.sync="showConfirmNum" width="30%" center>
       <div class="el-dialog-center">
-        <el-input ref="bigInput" style="width: 130px;margin-left: 15px" placeholder="数量" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.bigCount"></el-input>
-        <span>{{currentItem.bigUnit}}</span>
-        <el-input style="width: 130px;margin-left: 15px" placeholder="价格" @keyup.enter.native="confirmNumPrice()" type="number" v-model="customData.userPrice"></el-input>
-        <span>元</span>
+
+        <template v-if="cgUnitType == 0">
+          <el-input ref="countInput" style="width: 90px;margin-left: 15px;text-align:center;" placeholder="数量" @keyup.enter.native="confirmNumPrice()" @input="bigCountChange"
+          type="number" v-model="customData.bigCount"></el-input>
+          <span style="padding:0 0 0 4px;">{{currentItem.bigUnit}}</span>
+        </template>
+        <template v-else>
+          <el-input ref="countInput" style="width: 90px;margin-left: 15px;text-align:center;" placeholder="数量" @keyup.enter.native="confirmNumPrice()" @input="smallCountChange"
+          type="number" v-model="customData.smallCount"></el-input>
+          <span style="padding:0 0 0 4px;">{{currentItem.smallUnit}}</span>
+        </template>
+
+        <span style="padding:0 2px 0 15px;color:red;font-weight:bold;"v-if="customData.aboutPrice == 1">约</span>
+        <span style="padding:0 2px 0 15px;color:green;font-weight:bold;" v-else>&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <el-input style="width: 90px;margin-left:0px;text-align:center;" center placeholder="单价" @keyup.enter.native="confirmNumPrice()" @input="userPriceChange"
+        type="number" v-model="customData.userPrice"></el-input>
+        <span style="padding:0 0 0 4px;">元</span>
+        <el-input style="width: 90px;margin-left: 15px;text-align:center;" placeholder="总价" @keyup.enter.native="confirmNumPrice()" @input="totalPriceChange"
+        type="number" v-model="customData.totalPrice"></el-input>
+        <span style="padding:0 0 0 4px;">元</span>
       </div>
       <div style="text-align:center;margin:20px 0 5px 0;font-weight:bold;font-size:18px;">剩 {{ currentItem.stock ? parseFloat(currentItem.stock) : 0 }} {{ currentItem.bigUnit}}</div>
-      <div class="remark">Enter 确定，Esc 取消</div>
+      <div class="remark">
+        <el-button @click="backToSearchItem()">取消</el-button>
+        <el-button type="primary" @click="confirmNumPrice()">确认</el-button>
+      </div>
+      <div class="remark">Esc 取消，Enter 确认</div>
     </el-dialog>
 
     <el-dialog title="确认提交" v-if="showCommitPop" :visible.sync="showCommitPop" width="655px" center :close-on-click-modal="false">
@@ -267,7 +309,8 @@ export default {
       changeType:'add',
       TT:null,
 			selectJobType: "purchase",
-      globalCheckStock:false
+      globalCheckStock:false,
+      cgUnitType:0,//采购入库使用单位
     };
   },
 	mixins: [productMins],
@@ -294,10 +337,18 @@ export default {
 			let price = 0;
 			if (this.selectList) {
 				for (const item of this.selectList) {
-					if(Number(item.bigCount)>0){
-						price += Number(item.userPrice)*Number(item.bigCount);
+					if(this.cgUnitType == 0){
+            if(item.aboutPrice && item.aboutPrice == 1){
+              price += Number(item.totalPrice)
+            }else{
+              price += Number(item.userPrice)*Number(item.bigCount);
+            }
 					}else{
-						price += Number(item.userPrice)*Number(item.smallCount);
+            if(item.aboutPrice && item.aboutPrice == 1){
+              price += Number(item.totalPrice)
+            }else{
+              price += Number(item.userPrice)*Number(item.smallCount);
+            }
 					}
 				}
 			}
@@ -416,6 +467,7 @@ export default {
         that.$service.shopAdmin.getAllStaff().then(res => {
           that.staffList = res.list
         })
+        that.cgUnitType = res.shopInfo.cgUnitType ? res.shopInfo.cgUnitType : 0
 		})
 
     this.$service.itemClass.getAllClassIndex().then(data => {
@@ -471,6 +523,7 @@ export default {
         that.$refs['itemSearchRef'].blur()
         that.$confirm('确定删除 '+current.name+'?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => {
           current.bigCount = 0
+          current.smallCount = 0
           that.replaceItemFn(current,1,'sub')
           that.selectIndex = 0
           that.$refs.singleTable.setCurrentRow(that.selectList[0])
@@ -553,7 +606,9 @@ export default {
 					itemId:ele.itemId,
 					itemPrice: ele.userPrice,
 					ratio:ele.ratio,
-					ratioType:ele.ratioType
+					ratioType:ele.ratioType,
+          aboutPrice:ele.aboutPrice,
+          totalPrice:ele.totalPrice
 				}
 			})
 			formData.itemInfo = JSON.stringify(itemInfo)
@@ -643,7 +698,11 @@ export default {
             }
             let selectedNum = 0
             if(that.selectListIndex[ele.id]){
-              selectedNum = that.selectListIndex[ele.id].bigCount ? Number(that.selectListIndex[ele.id].bigCount) : 0
+              if(that.cgUnitType == 0){
+                selectedNum = that.selectListIndex[ele.id].bigCount ? Number(that.selectListIndex[ele.id].bigCount) : 0
+              }else{
+                selectedNum = that.selectListIndex[ele.id].smallCount ? Number(that.selectListIndex[ele.id].smallCount) : 0
+              }
             }
 	          return {...ele,className:cName,selectedNum:selectedNum}
           })
@@ -680,34 +739,120 @@ export default {
     },
     selectCurrentItem(currentItem){
         this.currentItem = currentItem
-        this.customData.bigCount = currentItem.bigCount > 0 ? currentItem.bigCount : 1
-        this.customData.userPrice = parseFloat(this.currentItem.price)
+        if(this.cgUnitType == 0){
+          this.customData.bigCount = currentItem.bigCount > 0 ? currentItem.bigCount : 1
+        }else{
+          this.customData.smallCount = currentItem.smallCount > 0 ? currentItem.smallCount : 1
+        }
+        this.customData.aboutPrice = currentItem.aboutPrice ? currentItem.aboutPrice : 0
+        let currentPrice = 0
+        if(currentItem.userPrice && Number(currentItem.userPrice)>0){
+          currentPrice = currentItem.userPrice
+        }else{
+          if(currentItem.price && Number(currentItem.price)>0){
+            currentPrice = currentItem.price
+          }
+        }
+        this.customData.userPrice = parseFloat(currentPrice)
+
+        let total = 0
+        if(currentItem.totalPrice && Number(currentItem.totalPrice)>0){
+          this.customData.totalPrice = Number(currentItem.totalPrice)
+        }else{
+          if(this.cgUnitType == 0){
+            total = Number(this.customData.bigCount)*Number(this.customData.userPrice)
+          }else{
+            total = Number(this.customData.smallCount)*Number(this.customData.userPrice)
+          }
+          total = parseFloat(total.toFixed(2))
+          this.customData.totalPrice = total
+        }
+
         this.desk = 'confirmPriceNum';
         this.showGetItemList = false
         this.showConfirmNum = true;
         this.$nextTick(()=>{
-          this.$refs['bigInput'].focus()
-          this.$refs['bigInput'].select()
+          this.$refs['countInput'].focus()
+          this.$refs['countInput'].select()
         })
     },
+    totalPriceChange(){
+      if(Number(this.customData.totalPrice)>0){
+        if(this.cgUnitType == 0){
+          if(Number(this.customData.bigCount)>0){
+            let a = Number(this.customData.totalPrice)/Number(this.customData.bigCount)
+            this.customData.userPrice = Math.floor(a*100)/100
+
+            let newNum = Number(this.customData.userPrice)*Number(this.customData.bigCount)
+            newNum = parseFloat(newNum.toFixed(2))
+            if(Number(this.customData.totalPrice) > Number(newNum)){
+              this.customData.aboutPrice = 1
+            }else{
+              this.customData.aboutPrice = 0
+            }
+          }
+        }else{
+          if(Number(this.customData.smallCount)>0){
+            let a = Number(this.customData.totalPrice)/Number(this.customData.smallCount)
+            this.customData.userPrice = Math.floor(a*100)/100
+            let newNum = Number(this.customData.userPrice)*Number(this.customData.smallCount)
+            newNum = parseFloat(newNum.toFixed(2))
+            if(Number(this.customData.totalPrice) > Number(newNum)){
+              this.customData.aboutPrice = 1
+            }else{
+              this.customData.aboutPrice = 0
+            }
+          }
+        }
+      }
+    },
+    userPriceChange(){
+      if(Number(this.customData.userPrice)>0){
+        if(this.cgUnitType == 0){
+          if(Number(this.customData.bigCount)>0){
+            this.customData.totalPrice = Number(this.customData.bigCount)*Number(this.customData.userPrice)
+            this.customData.totalPrice = parseFloat(this.customData.totalPrice.toFixed(2))
+          }
+        }else{
+          if(Number(this.customData.smallCount)>0){
+            this.customData.totalPrice = Number(this.customData.smallCount)*Number(this.customData.userPrice)
+            this.customData.totalPrice = parseFloat(this.customData.totalPrice.toFixed(2))
+          }
+        }
+      }
+    },
+    bigCountChange(){
+      if(Number(this.customData.bigCount)>0){
+        if(Number(this.customData.userPrice)>0){
+          this.customData.totalPrice = Number(this.customData.bigCount)*Number(this.customData.userPrice)
+          this.customData.totalPrice = parseFloat(this.customData.totalPrice.toFixed(2))
+        }
+      }
+    },
+    smallCountChange(){
+      if(Number(this.customData.smallCount)>0){
+        if(Number(this.customData.userPrice)>0){
+          this.customData.totalPrice = Number(this.customData.smallCount)*Number(this.customData.userPrice)
+          this.customData.totalPrice = parseFloat(this.customData.totalPrice.toFixed(2))
+        }
+      }
+    },
     confirmNumPrice(){
       let currentItem = this.currentItem;
-      if(Number(this.customData.bigCount)<=0){
+      if(Number(this.customData.bigCount)<=0 && Number(this.customData.smallCount)<=0){
         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)
-        }
+      if(Number(this.customData.userPrice)<=0){
+        this.$message({message: '请填写金额',type: 'warning'});
+        return;
+      }
+      if(Number(this.customData.totalPrice)<=0){
+        this.$message({message: '总金额错误',type: 'warning'});
+        return;
       }
-      currentItem = {...currentItem,bigCount:this.customData.bigCount,userPrice:this.customData.userPrice,smallCount:this.customData.smallCount}     
+      currentItem = {...currentItem,bigCount:this.customData.bigCount,userPrice:this.customData.userPrice,smallCount:this.customData.smallCount,
+        totalPrice:this.customData.totalPrice,aboutPrice:this.customData.aboutPrice}    
       this.replaceItemFn(currentItem,1,'add')
       this.backToSearchItem();
     },

ghs/vue.config.js

@@ -3,13 +3,13 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'https://api.shop.wixhb.com';
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
 }
 
-let hostUrl = 'https://img.wixhb.com/';
+let hostUrl = 'http://img.hzghd.com/';
 
 const cdn = {
 	dev: {

ghsApp/src/pagesPurchase/info.vue

@@ -103,7 +103,10 @@
 									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,0)">打标签</text>
 									<text class="item-type" style="color:#3385FF;" @click.stop="printLabel(s,1)">打价码</text>
 									<text class="item-count">
-									{{ parseFloat(s.itemNum) }}扎 × ¥{{ s.bigPrice ? parseFloat(s.bigPrice) : 0 }}
+									{{ parseFloat(s.itemNum) }}扎 × 
+									<text style="font-weight:bold;margin-left:5upx;" v-if="s.aboutPrice==1">约</text>
+									<text v-else style="margin-left:5upx;"></text>
+									¥{{ s.bigPrice ? parseFloat(s.bigPrice) : 0 }}
 									</text>
 									<text style="font-weight:bold;color:red;position:absolute;top:45upx;font-size:20upx;">
 										<text style="font-weight:bold;color:#CCCCCC;margin-right:20upx;">{{s.ratio}}{{s.smallUnit}}装</text>
@@ -116,7 +119,7 @@
 					<view class="summary-bar">
 						<view class="operate-view" ></view>
 						<view class="describe-view">
-							共<text>{{ detailInfo.itemNum ? detailInfo.itemNum : 0 }}扎</text>，
+							共<text>{{ detailInfo.itemNum ? parseFloat(detailInfo.itemNum) : 0 }}扎</text>，
 							合计 ¥<text class="price">{{ detailInfo.price ? parseFloat(detailInfo.price) : 0 }}</text>
 						</view>
 					</view>