修改花材

hdPad/src/api/product/index.js

@@ -77,7 +77,7 @@ export const generatePriceTable = data => {
 };
 
 //所有花材
-export const allProduct = data => {
+export const allProduct = async data => {
 	return https.get("/product/all", data);
 };
 

hdPad/src/pages/home/components/workInfo.vue

@@ -82,7 +82,7 @@
     <view class="button-area">
       <!-- <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="lockFn(orderInfo)">锁定</view> -->
       	<view class="active" @click="calcFn">{{calc == 'add' ? '+' : '-'}}</view>
-      <!-- <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="modifyItem(orderInfo)">修改</view> -->
+      <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="modifyItem(orderInfo)">修改</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @tap="finishFn(orderInfo)">完成</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==0 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>

hdPad/src/pages/home/modify.vue

@@ -85,24 +85,7 @@ export default {
 				this.$msg('请选择花材')
 				return false
 			}
-			const product = this.selectList.map(e => {
-				return { productId: e.id, unitType:e.unitType,num:e.currentNum,unitPrice:e.unitPrice}
-			})
-			modifyItem({product:JSON.stringify(product),id:this.option.id}).then(res=>{
-				if(res.code == 1){
-					this.$msg('修改成功')
-
-					//返回上一页带参数
-					let pages = getCurrentPages();
-					let prevPage = pages[ pages.length - 2 ];
-					//修改上一页data里面的modifyInfo
-					prevPage.$vm.modifyInfo = {hasModify:1}
-
-					setTimeout(function(){
-						uni.navigateBack()
-					},1500)
-				}
-			})
+			uni.navigateBack()
 		},
 		getOrderDetail(id){
 			getFullInfo({id}).then(res=>{

hdPad/src/pages/home/work.vue

@@ -27,6 +27,8 @@ export default {
 	mixins: [productMins],
 	data() {
 		return {
+			currentJobType:'modify',
+			currentJobId:0,
 			selectOrderId:0,
 			modifyInfo:{hasModify:0}
 		}
@@ -38,14 +40,18 @@ export default {
 		if(this.modifyInfo.hasModify && this.modifyInfo.hasModify == 1){
 			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
 		}
+		// #ifdef APP-PLUS
+		console.log('11111')
+		this.listenScanItem()
+		// #endif
 	},
-	onUnload() {
+	onHide(){
 		// #ifdef APP-PLUS
 		//避免重复，每次进来先移除全局自定义事件监听器
 		uni.$off('listenGetScanCode')
 		// #endif
 	},
-	onHide(){
+	onUnload() {
 		// #ifdef APP-PLUS
 		//避免重复，每次进来先移除全局自定义事件监听器
 		uni.$off('listenGetScanCode')
@@ -54,6 +60,7 @@ export default {
 	methods: {
 		getOrder(item){
 			this.selectOrderId = Number(item.id)
+			this.currentJobId = Number(item.id)
 			this.$refs.workInfoRef.getOrderDetail(this.selectOrderId)
 		}
 	}