shish 4 năm trước cách đây
mục cha
commit
17e1f99666

+ 1 - 1
hdPad/src/pages.json

@@ -3,7 +3,7 @@
 		{"path": "pages/home/cash","style": {"navigationBarTitleText": "收银"}},
 		{"path": "pages/home/order","style": {"navigationBarTitleText": "订单"}},
 		{"path": "pages/home/mt","style": {"navigationBarTitleText": "美团单"}},
-		{"path": "pages/home/work","style": {"navigationBarTitleText": "制作单"}},
+		{"path": "pages/home/work","style": {"navigationBarTitleText": "门店单"}},
 		{"path": "pages/home/modify","style": {"navigationBarTitleText": "修改"}},
 		{"path": "pages/home/make","style": {"navigationBarTitleText": "制作"}},
 		{"path": "pages/home/selectMake","style": {"navigationBarTitleText": "选款"}},

+ 1 - 1
hdPad/src/pages/home/cash.vue

@@ -35,7 +35,7 @@
 	</template>
 
     <uni-popup ref="refrshRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" @close="cancelRefresh" confirmText="确认" title="提示" content="花材价格已修改,请刷新" @confirm="confirmRefresh"></uni-popup-dialog>
+        <uni-popup-dialog type="info" cancelText="取消" @close="cancelRefresh" confirmText="确认" title="提示" content="花材价格库存已修改,请刷新" @confirm="confirmRefresh"></uni-popup-dialog>
     </uni-popup>
 
 </view>

+ 1 - 9
hdPad/src/pages/home/components/createWork.vue

@@ -107,14 +107,6 @@ export default {
         confirmCreate(){
             let that = this
             this.$util.hitVoice()
-            //if(this.form.cover == ''){
-                //this.$msg('请上传图片')
-                //return false
-            //}
-			if(this.$util.isEmpty(this.selectList)){
-				this.$msg('请选择花材')
-				return false
-			}
             this.commitCreate()            
         },
         commitCreate(){
@@ -144,7 +136,7 @@ export default {
 .finish-area {
     background-color: #ffffff;
     width:40vw;
-    height:90vh;
+    height:98vh;
     .cell-item{
         display:flex;
         font-size:11upx;

+ 2 - 2
hdPad/src/pages/home/components/nav.vue

@@ -30,8 +30,8 @@ export default {
         { name: "开单", page: "/pages/home/cash",flag:'casher' },
         { name: "订单", page: "/pages/home/order",flag:'order' },
         { name: "美团单", page: "/pages/home/mt",flag:'mt' },
-        { name: "制作单", page: "/pages/home/work",flag:'work' },
-        { name: "选材制作", page: "/pages/home/make",flag:'selItem' },
+        { name: "门店单", page: "/pages/home/work",flag:'work' },
+        { name: "制作", page: "/pages/home/make",flag:'selItem' },
         //{ name: "选品建单", page: "/pages/home/selectMake",flag:'selGoods' }
       ],
       device:'',

+ 0 - 4
hdPad/src/pages/home/make.vue

@@ -104,10 +104,6 @@ export default {
 		},
 		commit(){
 			this.$util.hitVoice()
-			if(this.$util.isEmpty(this.selectList)) {
-				this.$msg('请选择花材')
-				return false
-			}
 			this.$refs.createWorkRef.open('center')
 		},
 		clearItemFn(){