业绩

ghsApp/src/admin/staff/achieve.vue

@@ -9,16 +9,33 @@
 				<block v-if="!$util.isEmpty(list.data)">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 						<t-tr header>
-							<t-th>名称</t-th>
-							<t-th>批发</t-th>
-							<t-th>零售</t-th>
-							<t-th>合计</t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">名称</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">批发</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">零售</view></t-th>
+							<t-th><view style="color:#333333;font-size:30upx;font-weight:bold;">合计</view></t-th>
 						</t-tr>
 						<t-tr v-for="(item, index) in list.data" :key="index">
-							<t-td> <view> {{item.name}} </view> </t-td>
-							<t-td> <view> {{item.pfNum||0}}笔&nbsp;¥{{item.pfAmount?parseFloat(item.pfAmount):0}} </view> </t-td>
-							<t-td> <view> {{item.lsNum||0}}笔&nbsp;¥{{item.lsAmount?parseFloat(item.lsAmount):0}} </view> </t-td>
-							<t-td> <view> {{item.num||0}}笔&nbsp;¥{{item.amount?parseFloat(item.amount):0}} </view> </t-td>
+							<t-td> 
+								<view style="color:#333333;font-size:30upx;"> {{item.name}} </view> 
+							</t-td>
+							<t-td>
+								<view style="color:#333333;font-size:30upx;">
+									<view> {{item.pfNum||0}}笔</view>
+									<view>¥{{item.pfAmount?parseFloat(item.pfAmount):0}} </view> 
+								</view>
+							</t-td>
+							<t-td> 
+								<view style="color:#333333;font-size:30upx;">
+									<view> {{item.lsNum||0}}笔</view>
+									<view>¥{{item.lsAmount?parseFloat(item.lsAmount):0}} </view> 
+								</view>
+							</t-td>
+							<t-td> 
+								<view style="color:#333333;font-size:30upx;">
+									<view> {{item.num||0}}笔</view>
+									<view>¥{{item.amount?parseFloat(item.amount):0}} </view>
+								</view>
+							</t-td>
 						</t-tr>
 					</t-table>
 				</block>

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -74,7 +74,9 @@
         </text>
       </view>
       <button v-if="!$util.isEmpty(selectList)" class="admin-button-com big default" @click="removeFromSave()">清空花材</button>
-      <button class="admin-button-com blue big" @click="stockOutFn()">确认出库</button>
+      <button class="admin-button-com blue big" @click="stockOutFn(1)" 
+      style="width:300upx;background-color:green;border:1upx solid green;">确认出库并入库</button>
+      <button class="admin-button-com blue big" @click="stockOutFn(0)">确认出库</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
@@ -189,7 +191,7 @@ export default {
 		gotoSelectPage() {
 			uni.navigateTo({ url: `/pagesStorehouse/allot/exSelect` })
 		},
-		stockOutFn() {
+		stockOutFn(flag) {
 			let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];
 			let formData = this.form;
 			const itemInfo = this.selectList.map(ele => {
@@ -200,43 +202,17 @@ export default {
 				};
 			});
 			formData.itemInfo = JSON.stringify(itemInfo);
-
 			formData.action = "confirm";
-
 			let checkRes = formUtil.validation(formData, rules);
-			// 验证通过!
 			if (!checkRes) {
 				let that = this;
-				that.$util.confirmModal({content:'确定出库？'},() => {
-					that.confirmStockOut(formData)
+				that.$util.confirmModal({content:'确定提交？'},() => {
+					that.confirmStockOut({confirmIn:flag,...formData})
 				})
 			} else {
 				this.$msg(checkRes);
 			}
 		},
-		confirmStockOutOrder() {
-			let rules = [ { name: "inShopId", rule: ["required"], msg: ["请选择门店"] } ];
-			let formData = this.form;
-			const itemInfo = this.selectList.map(ele => {
-				return {
-					productId: ele.id,
-					bigNum: ele.bigCount,
-					smallNum: ele.smallCount
-				};
-			});
-			formData.itemInfo = JSON.stringify(itemInfo);
-
-			formData.action = "wait";
-
-			let checkRes = formUtil.validation(formData, rules);
-			// 验证通过!
-			if (!checkRes) {
-				let self = this;
-				self.confirmStockOut(formData)
-			} else {
-				this.$msg(checkRes);
-			}
-		},
 		confirmStockOut(formData){
 			let that = this
 			uni.showLoading({title: '加载中',mask:true})