修改价格

ghsApp/src/admin/breakage/confirm.vue

@@ -53,7 +53,7 @@
     </view>
     <view class="under-bar">
       <view class="price-view"></view>
-      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">提交</button>
+      <button class="admin-button-com blue big" style="width:200upx;" @click="affirmFormSubmit">确认</button>
     </view>
 
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
@@ -238,11 +238,13 @@ export default {
       });
       that.$util.confirmModal({content:'确认报损？'},() => {
           wastage({product:JSON.stringify(product),remark:that.form.remark}).then((res) => {
-            //删除记忆
-            that.removeFromSaveDirect()
-            const {data: { id, orderSn },} = res;
-            that.pageTo({url: '/admin/breakage/result',type:2})
-          });
+            if(res.code == 1){
+              //删除记忆
+              that.removeFromSaveDirect()
+              const {data: { id, orderSn },} = res;
+              that.pageTo({url: '/admin/breakage/result?orderSn='+orderSn+'&id='+id,type:2})
+            }
+          })
       })
     },
     gobackEvent () {

ghsApp/src/admin/breakage/list.vue

@@ -18,13 +18,11 @@
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
 			</block>
       <view class="app-footer open_btn">
-        <view @click="selectProduct" class="admin-button-com big blue">新增损耗</view>
+        <view @click="selectProduct" class="admin-button-com big blue">新增报损</view>
       </view>
   </div>
 </template>
-
 <script>
-
 import { list } from "@/mixins";
 import { wastageList } from "@/api/wastage";
 export default {
@@ -37,13 +35,13 @@ export default {
   },
   onPullDownRefresh() {
     this.resetList();
-    this._list().then((res) => {
+    this.getBreakList().then((res) => {
       uni.stopPullDownRefresh();
     });
   },
   onReachBottom() {
     if (!this.list.finished) {
-      this._list().then((res) => {
+      this.getBreakList().then((res) => {
         uni.stopPullDownRefresh();
       });
     } else {
@@ -56,7 +54,7 @@ export default {
   },
   onShow() {
   	this.resetList();
-    this._list();
+    this.getBreakList();
   },
   methods: {
     init(){
@@ -64,22 +62,20 @@ export default {
     },
     selectProduct(){
       if(this.$util.isScanEnv()){
-        this.$util.pageTo({url: '/admin/breakage/confirm'})
+        this.$util.pageTo({url: '/admin/breakage/confirm',type:2})
       }else{
-        this.$util.pageTo({url: '/admin/breakage/index'})
+        this.$util.pageTo({url: '/admin/breakage/index',type:2})
       }
     },
-    _list(type, timeArr) {
-      return wastageList({
-        page: this.list.page,
-      }).then((res) => {
+    getBreakList(type, timeArr) {
+      return wastageList({ page: this.list.page, }).then((res) => {
         this.completes(res);
         if (this.$util.isEmpty(res.data)){
           return false
         }
-      });
-    },
-  },
+      })
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -103,4 +99,4 @@ export default {
 			}
 		}
 	}
-</style>
+</style>

ghsApp/src/admin/breakage/result.vue

@@ -1,72 +1,61 @@
 <template>
-	<view class="app-content">
-		<view class="billing_box_bg">
-			<view class="top-view"> </view>
-			<view class="result-view">
-				<view class="iconfont iconchenggong"></view>
-				<view class="result-title">报损成功</view>
-				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回列表</button>
-			</view>
-		</view>
-	</view>
-</template>
+<appResult :title="title">
+
+  	<button class="admin-button-com big blue" @click="goDetail()">查看详情</button>
+    <button class="admin-button-com big blue" @click="goOn()">继续报损</button>
+	<button class="admin-button-com big" @click="goList()">报损记录</button>
+    <button class="admin-button-com big" @click="goBackHome">返回</button>
+
+    <!-- #ifdef MP-WEIXIN -->
+    <view style="width:688upx;height:20upx;background-color: #ece5e5;"></view>
+    <ad-custom unit-id="adunit-42a99bd9e25e3626" v-if="currentEnv=='production'" style="width:688upx;"></ad-custom>
+    <ad-custom unit-id="adunit-9523c840341ccb1f" v-else style="width:688upx;"></ad-custom>
+    <!-- #endif -->
 
+</appResult>
+
+</template>
 <script>
+import appResult from "@/components/app-result"
+import { CURRENT_ENV } from "@/config"
 export default {
-    name: "success",
-	methods: {
-		goBackHome() {
-			uni.navigateBack({})
-		},
-		init(){
-		}
-	}
+  name: "result",
+  components: {
+    appResult
+  },
+  mixins: [],
+  data() {
+    return {
+      title:'报损成功',
+      currentEnv:'production'
+    };
+  },
+  onLoad() {
+    //当前环境
+    this.currentEnv = CURRENT_ENV
+  },
+  methods: {
+    init() {
+    },
+    goDetail() {
+        let orderSn = this.option.orderSn?this.option.orderSn:''
+        this.$util.pageTo({url: "/admin/breakage/info?orderSn="+orderSn,type:2})
+    },
+    goOn(){
+        this.$util.pageTo({url: "/admin/breakage/index",type:2})
+    },
+    goList(){
+        this.$util.pageTo({url: "/admin/breakage/list",type:2})
+    },
+    goBackHome() {
+      uni.navigateBack({ delta: 1 });
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
-.go-back{
-	width: 80%;
-	height: 80upx;
-	color: #FFFFFF;
-	margin-top: 50upx;
-	background: #3385FF;
-	border-radius: 10upx;
-	font-size:30upx;
-}
-.billing_box_bg {
-	position: relative;
-	padding: 60upx 30upx;
-	display: flex;
-	background: white;
-	flex-direction: column;
-    background-color: #f5f5f5;
-	.top-view {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 299upx;
-		background: #3385ff;
-		border-radius: 0upx 0upx 83upx 83upx;
-	}
-	.result-view {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		padding: 70upx;
-		width: 100%;
-		background: #ffffff;
-		border-radius: 20upx;
-		z-index: 1;
-		.iconchenggong {
-			font-size: 170upx;
-			color: $mainColor1;
-		}
-		.result-title {
-			margin: 50upx 0 70upx;
-			font-size: 32upx;
-		}
-	}
+.admin-button-com {
+  margin-bottom:30upx;
+  width: 100%;
 }
 </style>

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -246,7 +246,7 @@ export default {
 				saveCgPrice({data:JSON.stringify(newProduct),cgId:targetId}).then(res => {
 					uni.hideLoading()
 					if(res.code == 1){
-						that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn,type:2})
+						that.pageTo({url: '/pagesPurchase/result?orderSn='+that.info.orderSn+'&title=价格已保存',type:2})
 					}
 				})
 			})

ghsApp/src/pagesPurchase/result.vue

@@ -36,6 +36,9 @@ export default {
   },
   methods: {
     init() {
+      if(this.option.title!=''){
+        this.title = this.option.title
+      }
     },
     goDetail() {
         let orderSn = this.option.orderSn?this.option.orderSn:''