wangyingjie 2 ani în urmă
părinte
comite
48b14f072d

+ 1 - 4
package-sales/pages/order-billing/order-billing.wxml

@@ -13,10 +13,7 @@
     <!-- 业务部门 -->
     <van-dropdown-item id="statusItemOrg" title="{{ statusItem_org.text }}" bind:open="openDropdown">
     </van-dropdown-item>
-    <!-- 状态 -->
-    <van-dropdown-item id="statusItem" title="{{ statusItem.text }}">
-      <dk-dropdown-switch dataList="{{statusList}}" bind:commit='dropdowncommit'></dk-dropdown-switch>
-    </van-dropdown-item>
+  
 
     <!-- 筛选 -->
     <van-dropdown-item id='pick' title="{{'筛选'+ (searchFormNumber ? '['+searchFormNumber+']' : '')}}" bind:open='openSearchPop' bind:close='closeSearchPop' data-type="pick" />

+ 136 - 63
package-sales/pages/sales-outbound/detail/not-outbound-detail.wxml

@@ -72,98 +72,171 @@
 </view> 
 </view>
 <!-- todo 差了一个扫码 -->
-<!--选商品-->
-<view class="dk-card-outer-class" style="margin-bottom: 48rpx;">
-  <view style="display: flex; background: white; border-radius: 15rpx;">
-    <view style="width: 21%; padding-left: 5%; background: white; display: flex; justify-content: center; align-items: center; border-radius: 15rpx;">
-      <view style="width: 20%; display: flex; justify-content: center; align-items: center;">
-        <van-checkbox style="background: white;border-radius: 100%;" shape="round" value="{{ checkedSelectAll }}" data-index="{{index}}" bind:change="onCheckedSelectAllChange"></van-checkbox>
-          </view>
-          <view style="margin: 2vw;color: #1B365D;font-size: 14px;">全选</view>
-    </view>
-    <van-tabs style="width: 65%; border-radius: 15rpx; overflow: hidden;" color="#1989FD" nav-class="van-tabs-class" active="{{ active }}" bind:change="onChangeTabs" color="#DEC9A3;" title-active-color="#1B365D" title-inactive-color=" #96A7C5;">
-      <van-tab title="商品明细" name="0">
-      </van-tab>
-      <van-tab title="扫码明细({{barcodeList.length}})" name="1">
-      </van-tab>
-    </van-tabs>
  
-  </view>
-
-</view>
 <view wx:if="{{active==0}}" style="margin: 48rpx 32rpx 10px 32rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
   <view style="  background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx;">
     <van-cell wx:if="{{goodsList.length==0}}" border="{{ false }}" style="border-radius: 15rpx;">
       <van-empty description="暂未选择商品" />
     </van-cell>
   </view>
-</view>
-<!--商品明细-->
-<view wx:if="{{active==0}}" wx:for="{{goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ false }}" style="margin: 48rpx 32rpx 10px 32rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">
+</view> 
+<!-- 商品信息 -->
+<view style="margin: 26rpx 34rpx 26rpx 34rpx;box-shadow:2px 2px 5px #e5e5e6;">
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius: 15rpx 15rpx 0rpx 0rpx;">
+    <view style="padding: 10px 32rpx 10px 32rpx;color: #1B365D;font-size: 32rpx;display: flex;">
+      <view style="width: 70%;font-weight: bold;display: flex;">
+        <view>商品明细</view>
 
-  <view style="display: flex; justify-content: center; align-items: center;">
-    <!-- 第一个面板 -->
-    <view class="panel">
-      <view class="{{(item.outGoingQuantity == item.outQuantity)?'panel-header2':'panel-header1'}}" data-index="{{index}}" catchtap="togglePanel1">
-        <!-- 头部内容 -->
-        <view style="display:flex;justify-content:center;align-items:center;flex: 1;">
-          <view style="width: 20%; display: flex; justify-content: center; align-items: center;">
-            <van-checkbox style="background: white;border-radius: 100%;" shape="round" value="{{ item.checked  }}" data-index="{{index}}" bind:change="onCheckboxChange"></van-checkbox>
+      </view>
+      <view style="width: 30%; padding-right: 3%; background: white; display: flex; justify-content: center; align-items: center; border-radius: 8rpx;">
+        <view  >
+          <view wx:if="{{isStockUp}}" class="choose-goods" style="  width: 111%; border-radius: 8rpx;">
+            <view class="choose-goods-text">备货齐套</view>
           </view>
-          <view style="width: 80%; text-align: left;  font-weight: bold;  color: #1B365D;">
-            {{item.skuName}}
+          <view wx:else class="choose-goods" style=" width: 111%; border-radius: 8rpx;background-color: red;">
+            <view class="choose-goods-text">备货不足</view>
           </view>
         </view>
-        <view class="arrow" wx:if="{{!item.showPanel}}">
-          <van-icon name="arrow-up" size="16" />
-        </view>
-        <view class="arrow" wx:else>
-          <van-icon name="arrow-down" size="16" />
-        </view>
       </view>
-      <view class="panel-content" wx:if="{{item.showPanel}}">
-        <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" async-close bind:close="onCloseDel">
-          <van-card data-item="{{item}}" data-index="{{index}}" bindtap="openChoosedItemInfo">
-            <view slot="thumb">
-              <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
-            </view>
-            <view slot="title" style="display: flex;">
+    </view>
+    <van-cell wx:if="{{goodsList.length==0}}" border="{{ false }}" style="border-radius: 15rpx;">
+      <van-empty description="暂无明细" />
+    </van-cell>
+    <view wx:for="{{goodsList}}" data-item="{{item}}" data-index="{{index}}" wx:for-item="item" wx:key="index" border="{{ true }}">
+      <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" async-close bind:close="onCloseDel">
+        <van-card wx:if="{{index < 2  || collapseFlag}}" data-item="{{item}}" data-index="{{index}}" bindtap="openChoosedItemInfo">
+          <view slot="thumb">
+            <van-image radius="5px" width="80" height="80" src="{{item.iconThumPath }}" />
+          </view>
+          <view slot="title" style="display: flex;">
+            <!-- 标题 -->
+            <view style="display: flex;">
               <dk-title titleTag="{{item.titleTag}}" title="{{item.skuModel}}"></dk-title>
             </view>
-            <view slot="desc">
-              <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="13" titleColor="#95A8CB" contentColor="#1B365D" fontWeight="bold" title="唯一编码:" content="{{item.skuCode}}" amount="{{false}}"></dk-cell>
-              <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="13" titleColor="#95A8CB" contentColor="#1B365D" fontWeight="bold" title="仓库:" content="{{item.whName}}" amount="{{false}}"></dk-cell>
-              <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="13" titleColor="#95A8CB" contentColor="#1B365D" fontWeight="bold" title="非标号:" content="{{item.nonStandardCode}}" amount="{{false}}"></dk-cell>
+
+          </view>
+          <!-- 描述 -->
+          <view slot="desc">
+            <view style="padding-top: 15rpx; padding-bottom: 12rpx; width: 100%;">
+              <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
             </view>
-            <view slot="tag">
+
+          </view>
+          <view slot="price">
+            <view style="display: flex;width: 100%;flex-direction: row; ">
+              <view style="width: 100%;">
+                <dk-cell contentFontSize="16" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{item.orderPriceSale}}"></dk-cell>
+              </view>
+              <view style="width: 100%;text-align: right;font-size:24rpx;color: #95A8CB;line-height: 34rpx;"> 
+                      <van-stepper integer="{{true}}" value="{{currentChoosedItem.itemQuantity}}" data-index="{{index}}" min="0" max="999999999" bind:change="changeChooseItemQuantity" /> 
+              </view>
             </view>
-            <view slot="price">
+          </view>
+
+          <!-- 底部明细 -->
+          <view slot="footer">
+            <view style="margin-top: 15rpx;" wx:if="{{item.goodsSkuList.length > 0  || item.combinedList.length > 0}}">
+              <view style="width: 100%;display: flex;">
+                <view style="font-size:12px;color: #95A8CB;width: 50%;text-align: left;">
+                  明细
+                </view>
+                <view style="font-size:12px;color: #95A8CB;width: 50%;text-align: right;" data-item="{{item}}" data-index="{{index}}" catchtap="onChangeOpenGoodsList">
+                  {{item.packageDetailsFlag ? '收起' :'展开'}}
+                  <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
+                </view>
+              </view>
+
+              <!--子件-->
+              <view class="goods-class" wx:if="{{item.packageDetailsFlag}}">
+                <view wx:for="{{item.goodsSkuList}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
+                  <view class="goods-item-class" wx:if="{{item2.hasChild == 0}}">
+                    <view>
+                      <van-image radius="15rpx" custom-class="goods-item-image" fit="fill" src="{{item2.iconThumPath }}" />
+                    </view>
+                    <view class="goods-item-tag">
+                      <view style="display: flex;">
+                        <view class="{{(item2.replaceableSku && item2.replaceableSku.length > 0)?'goods-item-title-replace':''}}">
+                          <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
+                        </view>
+
+                      </view>
+                      <view style="width: 100%;display: flex;">
+                        <dk-text fontWeight="normal" value="{{item2.skuName}}"></dk-text>
+                      </view>
+                      <!--子级明细价格-->
+                      <view style="display: flex;width: 100%;flex-direction: row;">
+                        <view style="width: 90%;">
+                          <dk-cell contentFontSize="12" height="45rpx" fontWeight="bold" left="0rpx" contentColor="#CAA977" title="" content="{{ item2.orderPriceSalet}}"></dk-cell>
+                        </view>
+                        <view style="width: 10%">
+                          <dk-text fontWeight="nomal" color="#95A8CB" value="x {{item2.tItemQuantity }}"></dk-text>
+                        </view>
+
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
             </view>
-            <view slot="footer">
-              <view class="divide-class"></view>
-              <view style="display: flex;width: 100%;margin-top:5px;align-items: center;" data-index="{{index}}">
-                <!-- catchtap="openRemark" -->
-                <view style="width: 50%;text-align: left;font-size:14px;color: #95A8CB;">
-                  待出库量:{{item.outGoingQuantity}}
+          
+            <view   >
+              <view  style="display: flex;margin: 1vw;font-size: 13px;">
+                <view style="color: #95A8CB; width: 20vw;align-self: center;text-align: -webkit-center;">仓库
                 </view>
-                <view style="width: 50%;text-align: left;font-size:14px;color: #95A8CB;" wx:if="{{item.BoxQuantity > 0}}">
-                  本次出库量:{{item.outQuantity}}/{{item.BoxQuantity}}
+                <view style="color: #1B365D;width: 55vw;align-self: center;text-align: -webkit-center;">{{item.whName}} >
                 </view>
-                <view style="width: 50%;text-align: left;font-size:14px;color: #95A8CB;" wx:if="{{item.BoxQuantity == null}}">
-                  本次出库量:{{item.outQuantity}}
+
+                <view style="white-space: nowrap;color: red;width: 25vw;align-self: center;text-align: -webkit-center;">可售量:{{item.usableQty?item.usableQty:0}}
                 </view>
               </view>
+            </view>
+
+            <view style="display: flex;width: 100%;align-items: center;height: 60rpx;" data-index="{{index}}" catchtap="openRemark">
+              <view style="width: 50%;text-align: left;font-size:12px;color: #95A8CB;">
+                <van-image width="19rpx" height="20rpx" src="/static/img/remerk-edit.png" />
+                备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : '请输入内容'}}</span>
+              </view>
 
             </view>
-          </van-card>
-          <view slot="right">删除</view>
-        </van-swipe-cell>
+            <view class="divide-class"></view>
+          </view>
+        </van-card>
+        <view slot="right">删除</view>
+      </van-swipe-cell>
+
+
+    </view>
+
+    <view catchtap="collapseFlagChange" data-index="{{index}}" wx:if="{{goodsList.length > 2}}" style="padding: 30rpx 32rpx 30rpx 32rpx;border-radius: 16rpx;color:#95A8CB;text-align: center;font-size: 26rpx;display: flex;justify-content: center;">
+      <view>{{!collapseFlag ? '展开查看更多' : '收起查看更多'}}</view>
+      <view style="padding-left: 10rpx;">
+        <van-icon name="{{!collapseFlag ? 'arrow-down':'arrow-up'}}" size="24rpx" />
       </view>
     </view>
+
   </view>
 
 
+  <view style="background: #FFFFFF;box-shadow: 0rpx 10rpx 20rpx rgba(225, 229, 238, 0.6);border-radius:0rpx 0rpx 15rpx 15rpx;">
+
+
+    <view style="display:flex;;margin-right: 24rpx;">
+      <view style="width: 48%;">
+        <view style="padding-left: 30rpx;padding-top: 25rpx;">
+          <text style="color: #95A8CB;font-size: 32rpx;">{{form.categoryQuantity ? form.categoryQuantity : 0}}品类 共计{{form.sumOutGoingQuantity ? form.sumOutGoingQuantity : 0}}件</text>
+        </view>
+      </view>
+
+      <view style="width: 52%;">
+        <dk-cell fontSize="13" contentColor="#CAA977" titleColor="#1B365D;" contentRight="right" fontWeight="bold" title="合计金额:" content="{{form.sumOutGoingAmount}}"></dk-cell>
+      </view>
+    </view>
+
+
+  </view>
+
 </view>
+
 <!--扫码明细-->
 <view wx:if="{{active==1}}" wx:for="{{goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" border="{{ false }}" style="margin: 0rpx 32rpx  0px 32rpx;border-radius: 15rpx;box-shadow:2px 2px 5px #e5e5e6;">