Merge branch 'master' of https://git.haier.net/Overseas_WMS/hgwms-factory-app

src/pages/raw/handover/picking/ByOrder.vue

@@ -25,7 +25,7 @@
     <view class="library">
       <view class="library-left">
         <view>{{ $t('message.CommissionedLocation') }}:</view>
-        <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
+        <jPicker sureColor="#ff0000" style="width: 400rpx" @bindpicker="LocationChoice" showKey="value" valKey="value" :val="wlCode.value" class="search" :options="Location" />
       </view>
       <view class="library-right">
         <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}:</view>
@@ -433,7 +433,7 @@ export default class RawReceiptDetail extends BasePage {
     .library-left {
       width: 100%;
       height: 100rpx;
-      padding-left: 56rpx;
+      padding-left: 36rpx;
       // display: flex;
       // view {
       //   width: 230rpx;
@@ -444,7 +444,7 @@ export default class RawReceiptDetail extends BasePage {
     .library-right {
       width: 100%;
       height: 100rpx;
-      padding-left: 56rpx;
+      padding-left: 36rpx;
       display: flex;
       .library-right-title {
         width: 120rpx;
@@ -455,7 +455,7 @@ export default class RawReceiptDetail extends BasePage {
         width: 200rpx;
         height: 70rpx;
         margin-top: 15rpx;
-        margin-left: 0rpx;
+        margin-left: 4rpx;
       }
       .add {
         width: 200rpx;

src/pages/raw/handover/picking/BySummary.vue

@@ -89,7 +89,6 @@ import { summaryHeaders } from './config';
 import { session } from '@/store/modules/session';
 import { VForm, VFormRules } from 'vue/types/form';
 import jPicker from '@/components/J-Picker/jPicker.vue';
-import { pick } from 'lodash/fp';
 @Component({
   components: {
     jPicker,
@@ -111,7 +110,7 @@ export default class RawReceiptDetail extends BasePage {
   LocationList: any = [];
   //库位
   Location: any = [];
-  someIndex: number = 0;
+  someIndex = 0;
   some: any = {};
   qty: any = '';
   //表单数据
@@ -251,7 +250,7 @@ export default class RawReceiptDetail extends BasePage {
   }
   //确保每次表格执行删除操作  单条数据汇总总数实时改变
   business() {
-    let num: number = 0;
+    let num = 0;
     this.LocationList.forEach((item: any) => {
       num += parseFloat(item.qty);
     });
@@ -309,7 +308,7 @@ export default class RawReceiptDetail extends BasePage {
   async GetLocation() {
     this.Location = [];
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
-    let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
+    //let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
     let content = {
       loginName: means.session.user.loginName,
       sendSpot: null,
@@ -424,7 +423,7 @@ export default class RawReceiptDetail extends BasePage {
     .library-left {
       width: 100%;
       height: 100rpx;
-      padding-left: 56rpx;
+      padding-left: 36rpx;
       // display: flex;
       // view {
       //   width: 230rpx;
@@ -435,7 +434,7 @@ export default class RawReceiptDetail extends BasePage {
     .library-right {
       width: 100%;
       height: 100rpx;
-      padding-left: 56rpx;
+      padding-left: 36rpx;
       display: flex;
       .library-right-title {
         width: 120rpx;
@@ -446,7 +445,7 @@ export default class RawReceiptDetail extends BasePage {
         width: 200rpx;
         height: 70rpx;
         margin-top: 15rpx;
-        margin-left: 0rpx;
+        margin-left: 4rpx;
       }
       .add {
         width: 200rpx;