要开始加报损按钮

hdPad/src/admin/home/workbench.vue

@@ -20,15 +20,15 @@
 					<leftItem v-if="!$util.isEmpty(selectList)" :customId.sync="customId"></leftItem>
 					<leftGroup v-else :customId.sync="customId"></leftGroup>
 				</view>
-				<!-- 按钮操作 -->
-				<view class="open-box">
-					<middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
-				</view>
 				<!-- 分类和花材图片 -->
 				<view class="all-item-area">
 					<rightGoodsArea v-if="currentProperty == 0" :customId.sync="customId"> </rightGoodsArea>
 					<rightItemArea v-else :customId.sync="customId"> </rightItemArea>
 				</view>
+				<!-- 按钮操作 -->
+				<view class="open-box">
+					<middleButton @resetCustomer="resetCustomer" :customId.sync="customId" @changeProperty="changeProperty"></middleButton>
+				</view>
 			</view>
 		</template>
 	</template>
@@ -115,20 +115,16 @@ export default {
 	height: 100vh;
 	& .all-item-area {
 		flex: 63;
-		height: 100%;
 	}
 	& .nav-left {
-		height: 100%;
 		flex: 5;
 		background-color: rgba(72, 91, 107, 1);
 	}
 	& .itemList-box {
 		flex: 25;
-		height: 100%;
 	}
 	& .open-box {
 		flex: 8;
-		height: 100vh;
 	}
 }
 </style>

hdPad/src/admin/work/components/order-info.vue

@@ -1,48 +1,82 @@
 <template>
     <view class="work-info">
         <view class="work-detail">
+          <view class="order-title">工单信息</view>
+          <view class="order-img">
+            <image src="https://img.hzghd.com/item/mg/jsha.png"></image>
+          </view>
+          <view class="order-item">
+            <view><text class="left">分类</text><text class="right">花束</text></view>
+            <view><text class="left">名称</text><text class="right">花束</text></view>
+            <view><text class="left">数量</text><text class="right">花束</text></view>
+            <view><text class="left">商品编号</text><text class="right">花束</text></view>
+            <view><text class="left">售价</text><text class="right">花束</text></view>
+            <view><text class="left">工单号</text><text class="right">花束</text></view>
+            <view><text class="left">订单号</text><text class="right">花束</text></view>
+            <view><text class="left">状态</text><text class="right">花束</text></view>
+            <view><text class="left">备注</text><text class="right">花束</text></view>
+          </view>
         </view>
         <view class="operate-area">
           <view>花材</view>
           <view>成品</view>
         </view>
         <view class="work-item-detail">
-          <view class="flex-space right-detail-title">
-            商品信息
-          </view>
+
+          <view class="flex-space right-detail-title"> 单位用材 </view>
           <view class="module-com content-box">
             <view class="commodity-view">
               <view class="commodity-list">
+                <view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" >
+                  <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})"></image>
+                  <view class="item-info">
+                    <view class="info-line">
+                      <text class="item-name">{{ s.name }}</text>
+                      <text class="item-price">
+                        <text class="unit">5扎</text>
+                      </text>
+                    </view>
+                    <view class="info-line">
+                      <text class="item-type">20支/扎</text>
+                    </view>
+                  </view>
+                </view>
+              </view>
+              <view class="summary-bar">
+                <view class="operate-view" ></view>
+                <view class="describe-view"><text>2扎</text> <text>3支</text></view>
+              </view>
+            </view>
+          </view>
+
+          <view style="height:2vh;background-color:#EEEEEE;"></view>
 
+          <view class="flex-space right-detail-title"> 总共用材 </view>
+          <view class="module-com content-box">
+            <view class="commodity-view">
+              <view class="commodity-list">
                 <view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" >
                   <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
                   <view class="item-info">
-
                     <view class="info-line">
                       <text class="item-name">{{ s.name }}</text>
                       <text class="item-price">
-                        <text class="unit"></text>
-                        <text class="price">
-                          <text>11233</text>
-                          <text></text>
-                        </text>
+                        <text class="unit">5扎</text>
                       </text>
                     </view>
-
                     <view class="info-line">
-                      <text class="item-type"></text>
-                      <text class="item-count">12</text>
+                      <text class="item-type">20支/扎</text>
                     </view>
                   </view>
                 </view>
-
               </view>
               <view class="summary-bar">
                 <view class="operate-view" ></view>
-                <view class="describe-view"> 共5种，共 <text>2扎</text> <text>3支</text> ，合计 ¥<text class="price">30</text> </view>
+                <view class="describe-view"><text>2扎</text> <text>3支</text></view>
               </view>
             </view>
           </view>
+
         </view>
     </view>
 </template>
@@ -50,7 +84,8 @@
 export default {
   data() {
     return {
-      detailInfo:{product:[{id:0,cover:'https://www.baidu.com/img/flexible/logo/pc/result.png',name:'aa',xhUnitName:'扎',xhUnitPrice:20,xhNum:2},{id:0,cover:'https://www.baidu.com/img/flexible/logo/pc/result.png',name:'aa',xhUnitName:'扎',xhUnitPrice:20,xhNum:2}],book:0,stockChange:1}
+      detailInfo:{product:[{id:0,cover:'https://img.hzghd.com/item/mg/jsha.png',name:'红色桔梗',xhUnitName:'扎',xhUnitPrice:20,xhNum:2},
+      {id:0,cover:'https://img.hzghd.com/item/mg/jsha.png',name:'绿色康乃馨',xhUnitName:'扎',xhUnitPrice:20,xhNum:2}],book:0,stockChange:1}
     }
   }
 }
@@ -61,7 +96,43 @@ export default {
   height: 100%;
   & .work-detail{
         flex: 40;
-        background-color:green;
+        border-right:1upx solid #EEEEEE;
+        .order-title{
+          font-size:11upx;
+          font-weight:bold;
+          margin-left:5upx;
+        }
+        .order-img{
+          display:flex;
+          margin:5upx;
+          justify-content:center;
+          image{
+            width:180upx;
+            height:180upx;
+          }
+        }
+        .order-item{
+          display:flex;
+          font-size:11upx;
+          margin-top:10upx;
+          justify-content: center;
+          flex-wrap:wrap;
+          view{
+            justify-content:space-between;
+            align-items:center;
+            display:flex;
+            border-bottom:1upx solid #EEEEEE;
+            width:180upx;
+            height:19upx;
+            padding:0 10upx 0 10upx;
+            .left{
+              color:#CCCCCC;
+            }
+            .right{
+              color:#666666;
+            }
+          }
+        }
     }
 	& .operate-area {
 		flex: 9;
@@ -70,7 +141,7 @@ export default {
     flex-direction: column;
     padding: 5upx;
     & > view {
-        border: 1upx solid #CCCCCC;
+        border: 1upx solid #EEEEEE;
         border-radius: 5upx;
         text-align: center;
         padding: 10upx 0;
@@ -88,36 +159,39 @@ export default {
 	& .work-item-detail {
 		flex: 40;
 		height: 100%;
+    border-left:1upx solid #EEEEEE;
     & .right-detail-title{
-      font-size:12upx;
+      font-size:10upx;
+      font-weight:bold;
+      margin-left:5upx;
+      margin-top:5upx;
     }
     & .commodity-view {
       flex: 40;
       display: flex;
       flex-direction: column;
       .commodity-list {
-        padding: 20upx;
+        padding: 5upx;
         .commodity-item {
           display: flex;
-          margin-bottom: 20upx;
+          margin-top:5upx;
           .item-icon {
             flex-shrink: 0;
-            width: 50upx;
-            height: 50upx;
+            width: 35upx;
+            height: 35upx;
           }
           .item-info {
             display: flex;
             flex-direction: column;
             justify-content: center;
             flex: 1;
-            margin-left: 20upx;
+            margin-left:6upx;
             .info-line {
-              margin-bottom: 10upx;
               display: flex;
               justify-content: space-between;
-              align-items: flex-end;
+              align-items: flex-start;
               .item-name {
-                font-size:12upx;
+                font-size:11upx;
                 color: black;
                 overflow: hidden;
                 white-space: nowrap;
@@ -125,14 +199,11 @@ export default {
               }
               .item-price {
                 color: #333;
-                font-size: 15upx;
-                .price {
-                  font-size: 15upx;
-                }
+                font-size: 10upx;
               }
               .item-type {
                 color: #999;
-                font-size: 15upx;
+                font-size: 8upx;
               }
               .item-count {
                 color: #666;
@@ -163,11 +234,7 @@ export default {
           display: flex;
           align-items: center;
           color: #333;
-          font-size: 12upx;
-          .price {
-            font-weight: bold;
-            font-size: 11upx;
-          }
+          font-size: 9upx;
         }
       }
     }

hdPad/src/admin/work/components/order-list.vue

@@ -133,7 +133,7 @@ export default {
     }
     & .itemList-footer_box {
         height: 20upx;
-        border: 1px solid #eee;
+        border: 1upx solid #eee;
         font-size: 10upx;
         display: flex;
         align-items: center;

hdPad/src/admin/work/index.vue

@@ -44,17 +44,14 @@ export default {
 	display: flex;
 	height: 100vh;
 	& .nav-left {
-		height: 100%;
 		flex: 5;
 		background-color: rgba(72, 91, 107, 1);
 	}
 	& .work-order-list {
 		flex: 32;
-		height: 100%;
 	}
     & .work-order-info{
         flex: 89;
-		height: 100%;
     }
 }
 </style>

hdPad/src/components/casher-nav.vue

@@ -12,6 +12,7 @@ export default {
   },
   methods:{
       goTo(item){
+        this.$util.hitRemind()
         this.$util.pageTo({ url: item.page, type:2 })
       }
   }
@@ -19,9 +20,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .nav-left {
-    height: 100%;
     flex: 5;
-    background-color: rgba(72, 91, 107, 1);
     view:first-child{
         margin-top: 23upx;
     }

hdPad/src/utils/util.js

@@ -232,10 +232,9 @@ export const $formatDate = (num, fmt = "YYYY-MM-DD HH:mm", all) => {
  * @parmas item.funtion 为可执行函数
  * @parmas item.url 为跳转的路径
  * @parmas item.query 为跳转携带的参数
- * @parmas item.type 为跳转调用的函数 1为navigateTo, 2为redirectTo 关闭当前页面，跳转到应用内的某个页面 3为reLaunch 关闭所有页面，打开到应用内的某个页面  4为switchTab
+ * @parmas item.type 为跳转调用的函数 1 navigateTo, 2 redirectTo 关闭当前页面，跳转到应用内的某个页面 3 reLaunch 关闭所有页面，打开到应用内的某个页面 4 switchTab
  */
 export const pageTo = item => {
-	console.log(item,'itemitem')
 	if (isNumber(item)) {
 		uni.navigateBack({
 			delta: item