cosmoim-852 fix 泰国物料转换，退货增加备注字段

src/pages/login/login/index.vue

@@ -173,7 +173,7 @@ export default class LoginPage extends BasePage {
       //修改俄罗斯版本号
       this.Version = '1.1.35';
     } else {
-      this.Version = '1.0.49';
+      this.Version = '1.0.50';
     }
     console.log('////', this.Version);
   }

src/pages/raw/ingoods/dnReturnGoods/Location.vue

@@ -79,6 +79,13 @@
           <u-input :placeholder="$t('message.po_PleaseInput')" v-model="qty" type="number" :border="border" class="input" />
         </view>
       </view>
+      <!-- 备注 -->
+      <view class="material">
+        <view class="material-right">
+          <view class="material-right-title">{{ $t('message.Note') }}:</view>
+          <u-input class="material-right-code" style="overflow: hidden; border: 2rpx solid; border-color: rgb(220, 223, 230); border-radius: 10rpx" v-model="userDefined10" placeholder="" />
+        </view>
+      </view>
       <!-- 添加 -->
       <view class="add">
         <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -156,6 +163,7 @@ export default class RawReceiptDetail extends BasePage {
   some: any = {};
   someIndex: any = 0;
   qty: any = '';
+  userDefined10 = '';
   /**
    * 表单数据
    */
@@ -266,11 +274,13 @@ export default class RawReceiptDetail extends BasePage {
       factoryCode: this.session.factoryCode,
       wlCode: this.wlCode.label,
       nowAmount: this.qty,
+      userDefined10: this.userDefined10,
     };
     this.model.dnReturnList[this.someIndex].receiptAmount += parseFloat(this.qty);
     console.log('this.model.dnReturnList', this.model.dnReturnList);
     this.LocationList.push(arr);
     this.qty = '';
+    this.userDefined10 = '';
   }
   //删除某一项 触发事件
   deleteItem(e: any) {
@@ -317,6 +327,7 @@ export default class RawReceiptDetail extends BasePage {
           this.someIndex = 0;
           this.LocationList = [];
           this.qty = '';
+          this.userDefined10 = '';
           this.Location = [];
           this.wl = {};
           this.wlCode = '';

src/pages/raw/ingoods/dnReturnGoods/config.ts

@@ -20,9 +20,14 @@ export const headers = [
   },
   {
     label: vm.$t('message.product_Number'),
-    key: 'amount', //数量
+    key: 'nowAmount', //数量
     width: 156,
   },
+  {
+    label: vm.$t('message.Note'),
+    key: 'userDefined10', //备注
+    width: 200,
+  },
   // {
   //   label: vm.$t("message.po_MaterielDes"),
   //   key: "materialDesc",//物料描述

src/pages/raw/warehouse/MaterialConversion/index.vue

@@ -46,6 +46,10 @@
       <u-form-item :label="$t('message.dn_Number')">
         <u-input v-model="actualQty" type="number" placeholder="" />
       </u-form-item>
+      <!-- 备注 -->
+      <u-form-item :label="$t('message.Note')">
+        <u-input v-model="userDefined3" placeholder="" />
+      </u-form-item>
       <u-row class="button-bar">
         <u-col :span="6">
           <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
@@ -77,6 +81,7 @@ export default class KanDanHandOver extends BasePage {
   border = true;
   wl: any = {};
   actualQty = 0;
+  userDefined3 = '';
   Some: any = {};
   MaterialList: any = [];
   //查询单号
@@ -147,6 +152,7 @@ export default class KanDanHandOver extends BasePage {
       productCodeTarget: this.Some.productCodeTarget,
       productDescZhTarget: this.Some.productDescZhTarget,
       actualQty: this.actualQty,
+      userDefined3: this.userDefined3,
       originWl: this.Some.originWl,
       type: '1',
       loginName: session.loginName,
@@ -166,6 +172,7 @@ export default class KanDanHandOver extends BasePage {
       });
       this.Some = {};
       this.actualQty = 0;
+      this.userDefined3 = '';
       this.wl = {};
       this.MaterialList = [];
       this.query();