任务台

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

@@ -27,11 +27,11 @@
         </view>
         <view class="footer">
             <button @click="cancelCreate()">取消</button>
-            <button @click="confirmAdd()">确认</button>
+            <button @click="beginConfirm()">确认</button>
         </view>
 
         <uni-popup ref="confirmCreateRef" type="dialog">
-            <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认提交？" @confirm="confirmCreate"></uni-popup-dialog>
+            <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认提交？" @confirm="confirmSubmit"></uni-popup-dialog>
         </uni-popup>
 
     </view>
@@ -96,13 +96,13 @@ export default {
         cancelCreate(){
             this.$emit('cancelCreate')
         },
-        confirmAdd(){
+        beginConfirm(){
             this.$util.hitVoice()
-            this.commitCreate()
+            this.$refs.confirmCreateRef.open('center')
         },
-        confirmCreate(){
+        confirmSubmit(){
             this.$util.hitVoice()
-            this.commitCreate()            
+            this.commitCreate()
         },
         commitCreate(){
             let that = this

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

@@ -30,7 +30,7 @@ export default {
       nav: [
         { name: "收银", page: "/pages/home/cash",flag:'casher' },
         { name: "订单", page: "/pages/home/order",flag:'order' },
-        { name: "打样", page: "/pages/home/make",flag:'selItem' },
+        { name: "拆散", page: "/pages/home/make",flag:'selItem' },
         { name: "任务", page: "/pages/home/work",flag:'work' },
         { name: "美团", page: "/pages/home/mt",flag:'mt' },
         { name: "散花", page: "/pages/home/sh",flag:'sh' }

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

@@ -309,15 +309,16 @@ export default {
         border-radius: 5upx;
         text-align: center;
         padding: 10upx 0;
-        color: #666666;
+        color: #CCCCCC;
         margin-bottom: 10upx;
-        font-size: 10upx;
+        font-size: 12upx;
         text-align: center;
+        font-weight:bold;
     }
     & .active {
       color: #3385FF;
       border-color: #3385FF;
-      font-size: 10upx;
+      font-size: 12upx;
       font-weight:bold;
     }
 	}

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

@@ -129,11 +129,17 @@
 
     <view class="button-area">
       <!-- <view :class="[orderInfo.status != 2 && orderInfo.stockLock==0 ? 'active' : '']" @click="lockFn(orderInfo)">锁定</view> -->
+      <view class="active" style="border:1upx solid #FF5722;color:#FF5722;" @tap="draw()">打样</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>
     </view>
 
+    <!-- 完成制作单弹框 -->
+    <uni-popup ref="createWorkRef" background-color="#fff" type="right">
+      <createWork @cancelCreate="cancelCreate()" @confirmCreate="confirmCreate()"></createWork>
+    </uni-popup>
+
     <!-- 选数量金额 -->
     <uni-popup ref="wastageSelectNumRef" background-color="#fff" type="center" :animation="false">
         <wastageSelectNum @confirmWastageSelectNum="confirmWastageSelectNum" :customData.sync="customData" 
@@ -161,9 +167,10 @@ import {modifyWastage} from '@/api/work-item'
 import wastageSelectNum from './wastageSelectNum.vue'
 import { mapGetters } from "vuex";
 import productMins from "@/mixins/product";
+import createWork from './createWork.vue'
 export default {
 	name: "workInfo",
-	components: {wastageSelectNum},
+	components: {wastageSelectNum,createWork},
   data() {
     return {
       orderInfo:[],
@@ -216,6 +223,16 @@ export default {
 
 	},
   methods:{
+		cancelCreate(){
+			this.$refs.createWorkRef.close()
+		},
+		confirmCreate(){
+			this.$refs.createWorkRef.close()
+		},
+		draw(){
+			this.$util.hitVoice()
+			this.$refs.createWorkRef.open('center')
+		},
 		previewImage(url){
 			uni.previewImage({urls:[url]})
 		},
@@ -449,15 +466,16 @@ export default {
         border-radius: 5upx;
         text-align: center;
         padding: 10upx 0;
-        color: #666666;
+        color: #CCCCCC;
+        font-weight:bold;
         margin-bottom: 10upx;
-        font-size: 10upx;
+        font-size: 12upx;
         text-align: center;
     }
     & .active {
       color: #3385FF;
       border-color: #3385FF;
-      font-size: 10upx;
+      font-size: 12upx;
       font-weight:bold;
     }
 	}

hdPad/src/pages/home/make.vue

@@ -15,17 +15,11 @@
             <!-- 按钮操作 -->
             <view class="open-box">
 				<view class="button-area">
-					<view class="active" @click="commit()">打样</view>
 					<view class="active" @click="breakFn">拆散</view>
 					<view class="active" @click="clearItemFn">清空</view>
 				</view>
             </view>
 
-			<!-- 完成制作单弹框 -->
-			<uni-popup ref="createWorkRef" background-color="#fff" type="right">
-				<createWork @cancelCreate="cancelCreate()" @confirmCreate="confirmCreate()"></createWork>
-			</uni-popup>
-
 			<!-- 清空 -->
 			<uni-popup ref="clearItemRef" type="dialog">
 				<uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认清空？" @confirm="confirmClearItem"></uni-popup-dialog>
@@ -44,11 +38,10 @@ import rightItem from './components/rightItem.vue'
 import leftItem from './components/leftArea.vue'
 import casherNav from './components/nav.vue'
 import productMins from "@/mixins/product"
-import createWork from './components/createWork.vue'
 import { partItem } from '@/api/part'
 export default {
 	name: "make",
-	components: { rightItem,leftItem, casherNav,createWork},
+	components: { rightItem,leftItem, casherNav},
 	mixins: [productMins],
 	data() {
 		return {
@@ -134,16 +127,6 @@ export default {
 				}
 			})
 		},
-		cancelCreate(){
-			this.$refs.createWorkRef.close()
-		},
-		confirmCreate(){
-			this.$refs.createWorkRef.close()
-		},
-		commit(){
-			this.$util.hitVoice()
-			this.$refs.createWorkRef.open('center')
-		},
 		clearItemFn(){
 			this.$util.hitVoice()
 			this.$refs.clearItemRef.open()
@@ -196,15 +179,16 @@ export default {
 				border-radius: 5upx;
 				text-align: center;
 				padding: 10upx 0;
-				color: #666666;
+				color: #CCCCCC;
 				margin-bottom: 10upx;
-				font-size: 10upx;
+				font-size: 12upx;
 				text-align: center;
+				font-weight:bold;
 			}
 			& .active {
 				color: #3385FF;
 				border-color: #3385FF;
-				font-size: 10upx;
+				font-size: 12upx;
 				font-weight:bold;
 			}
 		}