css

assets/css/tallyReceive/operate.scss

@@ -136,6 +136,16 @@
                     overflow: hidden;
                     overflow: hidden;
                     max-width: 176rpx;
                     max-width: 176rpx;
                 }
                 }
+                .desc {
+                    font-size: 16rpx;
+                    color: #484b59;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    margin-left: 6rpx;
+                }
             }
             }
         }
         }
         .bor {
         .bor {

pages/container/index.vue

@@ -55,7 +55,7 @@
                 <view class="bor row"></view>
                 <view class="bor row"></view>
                 <view class="text-item row verCenter">
                 <view class="text-item row verCenter">
                     <text class="label">长*宽*高：</text>
                     <text class="label">长*宽*高：</text>
-                    <text class="tt">{{ item.length }}{{ item.width }}{{ item.height }}(cm)</text>
+                    <text class="tt">{{ item.length }}*{{ item.width }}*{{ item.height }}(cm)</text>
                 </view>
                 </view>
                 <view class="text-item row verCenter">
                 <view class="text-item row verCenter">
                     <text class="label">净重kg：</text>
                     <text class="label">净重kg：</text>
@@ -275,7 +275,10 @@ export default {
          * 导出
          * 导出
          */
          */
         exportContainerStock() {
         exportContainerStock() {
-            this.request(API.exportContainerStock, 'POST', this.searchParams, true).then(res => {
+            var params = Object.assign({}, this.searchParams, {
+                container_ids: this.filter_id.join(',')
+            });
+            this.request(API.exportContainerStock, 'POST', params, true).then(res => {
                 if (res.code === 0) {
                 if (res.code === 0) {
                     uni.downloadFile({
                     uni.downloadFile({
                         url: res.data.oss_file_url,
                         url: res.data.oss_file_url,

pages/tallyReceive/operate.vue

@@ -114,13 +114,13 @@
                     <text class="label">供应商：</text>
                     <text class="label">供应商：</text>
                     <text class="tt" style="max-width: 491rpx;">{{ detail.supplier_name }}</text>
                     <text class="tt" style="max-width: 491rpx;">{{ detail.supplier_name }}</text>
                 </view>
                 </view>
-                <view class="item row verCenter" style="flex: 0 0 100%;">
+                <view class="item row" style="flex: 0 0 100%;">
                     <text class="label">上游备注：</text>
                     <text class="label">上游备注：</text>
-                    <text class="tt" style="max-width: 491rpx;">{{ detail.stock_in_upstream_remark }}</text>
+                    <text class="desc" style="max-width: 491rpx;">{{ detail.stock_in_upstream_remark }}</text>
                 </view>
                 </view>
-                <view class="item row verCenter" style="flex: 0 0 100%;">
+                <view class="item row" style="flex: 0 0 100%;">
                     <text class="label">明细备注：</text>
                     <text class="label">明细备注：</text>
-                    <text class="tt" style="max-width: 491rpx;">{{ detail.upstream_remark }}</text>
+                    <text class="desc" style="max-width: 491rpx;">{{ detail.upstream_remark }}</text>
                 </view>
                 </view>
             </view>
             </view>
             <view class="form-input">
             <view class="form-input">