diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index f558905..857a0b4 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -21,8 +21,9 @@
-
-
+
+
@@ -83,7 +84,12 @@ import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
import { session } from '@/store/modules/session';
import { headers } from './config';
-@Component
+import jPicker from '@/components/J-Picker/jPicker.vue';
+@Component({
+ components: {
+ jPicker,
+ },
+})
export default class stoOutboundDom extends BasePage {
@Ref('form') readonly $form!: VForm;
@Ref('table') readonly $table: any;
@@ -103,6 +109,7 @@ export default class stoOutboundDom extends BasePage {
row: '',
barCode: '',
};
+ wl: any = '';
rowItemIndex: any = null;
materialList: any = []; //物料列表
//被选中的表格数据
@@ -127,11 +134,9 @@ export default class stoOutboundDom extends BasePage {
async onReady() {
this.$form.setRules(this.rules);
await model.queryReturningTypeList();
- this.form.orderNo = JSON.parse(uni.getStorageSync('SweepCode'));
- uni.removeStorageSync('SweepCode');
- if (this.form.orderNo == null) {
- return;
- } else {
+ if (uni.getStorageSync('SweepCode')) {
+ this.form.orderNo = JSON.parse(uni.getStorageSync('SweepCode'));
+ uni.removeStorageSync('SweepCode');
this.query();
}
}
@@ -210,10 +215,8 @@ export default class stoOutboundDom extends BasePage {
}
//选择成品编码
materialConfirm(v: any) {
- console.log('v[0].value', v);
this.model.materielList.forEach((item: any) => {
- if (v[0].value == item.materialCode) {
- console.log('item', item);
+ if (v.pickerName.materialCode == item.materialCode) {
this.form.productCode = item.materialCode;
this.form.productDescZh = item.materialDesc;
this.form.rowItem = item.materialCode;
diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue
index da3c241..48026b6 100644
--- a/src/pages/raw/warehouse/rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/rowTransfer/index.vue
@@ -17,8 +17,7 @@
-
-
+
@@ -60,7 +59,12 @@ import { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import model from './model';
import { session } from '@/store/modules/session';
-@Component
+import jPicker from '@/components/J-Picker/jPicker.vue';
+@Component({
+ components: {
+ jPicker,
+ },
+})
export default class KanDanHandOver extends BasePage {
order3 = '';
NEWqty = '';
@@ -91,7 +95,7 @@ export default class KanDanHandOver extends BasePage {
}
//选择物料回调函数
materialConfirm(v: any) {
- this.orderlist.productCode = v[0].label;
+ this.orderlist.productCode = v.pickerName.productCode;
model.materielList.forEach((item: any) => {
if (this.orderlist.productCode == item.productCode) {
this.orderlist = item;
diff --git a/src/pages/raw/warehouse/rowTransfer/model.ts b/src/pages/raw/warehouse/rowTransfer/model.ts
index bce6af3..a624d64 100644
--- a/src/pages/raw/warehouse/rowTransfer/model.ts
+++ b/src/pages/raw/warehouse/rowTransfer/model.ts
@@ -65,9 +65,10 @@ export class rowTransfer extends VuexModule {
const orderInInfoList = records.data.records;
const materielList = orderInInfoList.map((item: any) => ({
label: item.productCode,
- value: item.stoItem,
+ value: item.productCode,
...item,
}));
+ console.log('materielList', materielList);
return { orderInInfoList, materielList, code };
} catch {
//uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip11') as any });