diff --git a/src/pages/product/stoOutbound/config.ts b/src/pages/product/stoOutbound/config.ts
index da372ce..c9ddc05 100644
--- a/src/pages/product/stoOutbound/config.ts
+++ b/src/pages/product/stoOutbound/config.ts
@@ -41,6 +41,7 @@ export const headers = [
{
label: vm.$t('message.scanDate'),
key: 'createdDate',
- width: 300,
+ width: 400,
+
},
];
diff --git a/src/pages/product/stoOutbound/detail.vue b/src/pages/product/stoOutbound/detail.vue
index c79f81e..87d456f 100644
--- a/src/pages/product/stoOutbound/detail.vue
+++ b/src/pages/product/stoOutbound/detail.vue
@@ -9,8 +9,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -19,6 +29,7 @@
+
diff --git a/src/pages/product/stoOutbound/index.vue b/src/pages/product/stoOutbound/index.vue
index cb2dbf2..f4a0bdf 100644
--- a/src/pages/product/stoOutbound/index.vue
+++ b/src/pages/product/stoOutbound/index.vue
@@ -241,7 +241,8 @@ export default class dnReceiptDom extends BasePage {
};
await this.model.QueryStoDetail(params);
uni.setStorageSync('factory', JSON.stringify(params) as any);
- this.toPage(this.page.product.stoOutbound.datile);
+ let url = `${this.page.product.stoOutbound.datile}?stoNo=${this.stoNo}`
+ this.toPage(url);
}
//确认弹窗
async Confirm() {
diff --git a/src/pages/product/stoOutbound/model.ts b/src/pages/product/stoOutbound/model.ts
index 9fac133..04f979d 100644
--- a/src/pages/product/stoOutbound/model.ts
+++ b/src/pages/product/stoOutbound/model.ts
@@ -2,6 +2,7 @@ import { getModule,Action, Module, MutationAction, VuexModule } from 'vuex-modul
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
+import moment from 'moment'
import { session } from '@/store/modules/session';
@Module({
namespaced: true,
@@ -110,6 +111,9 @@ export class ReceiptModule extends VuexModule {
async QueryStoDetail(content: any) {
const res: any = await http.post(url.outbound.stoOutbound.stoDetailQuery, content);
const stoBarcodeList = res.data;
+ stoBarcodeList.forEach(element => {
+ element.createdDate = moment(element.createdDate).format('YYYY-MM-DD hh:mm:ss')
+ });
return {stoBarcodeList};
}
diff --git a/src/pages/raw/handover/aggregating-Vn/index.vue b/src/pages/raw/handover/aggregating-Vn/index.vue
index 601a11f..bee5b21 100644
--- a/src/pages/raw/handover/aggregating-Vn/index.vue
+++ b/src/pages/raw/handover/aggregating-Vn/index.vue
@@ -229,12 +229,12 @@ export default class Aggregating extends BasePage {
this.form.sapFactoryCode = session.factoryCode;
//this.form.requestTime = this.getNowFormatDate();
//设置开始时间，结束时间
- const today = moment(); // 获取当前时间
- const last_month = today.clone().subtract(1, 'month'); // 获取一个月前的日期
+ const first_month = moment().startOf('month').format('YYYY-MM-DD'); // 获取当前月的第一天
+ const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
//开始时间
- this.form.requestTimeFrom = last_month.format('YYYY-MM-DD');
+ this.form.requestTimeFrom = first_month;
//结束时间
- this.form.requestTimeTo = moment().format('YYYY-MM-DD');
+ this.form.requestTimeTo = last_month;
}
bookTypeChange(e: any) {
console.log('///', e);
diff --git a/src/pages/raw/handover/picking-vn/index.vue b/src/pages/raw/handover/picking-vn/index.vue
index dc04f02..0c70332 100644
--- a/src/pages/raw/handover/picking-vn/index.vue
+++ b/src/pages/raw/handover/picking-vn/index.vue
@@ -50,16 +50,16 @@
Picked Qty
- Qty
- {{ $t('message.product_Location') }}
- {{ $t('message.Pi_materielNo') }}
- {{ $t('message.CommissionedMaterielDesc') }}
- {{ $t('message.Summary_ProductionDate') }}
- {{ $t('message.product_FGCode') }}
- FG desc
+ Qty
+ {{ $t('message.product_Location') }}
+ {{ $t('message.Pi_materielNo') }}
+ {{ $t('message.CommissionedMaterielDesc') }}
+
+
-
+
{{ item.prdOrder }}
{{ item.amount }}
@@ -69,8 +69,10 @@
{{ item.totalMoAmount }}
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+ {{item.wkposCode}}
+
+
+
+
+
+
-
+
+
+
+
{{ item.materialCode }}
- {{ item.materialDesc }}
- {{ item.requireDate }}
- {{ item.prodCode }}
- {{ item.prodDesc }}
+ {{ item.materialDesc }}
+
+
@@ -155,14 +155,13 @@ export default class pickingDom extends BasePage {
*/
indexChoose = -1;
amountChange = null;
- // showList = false;
- // loc = '0';
- // subjectAarr = [0];
- // loclist = [
- // { value: 0, label: '篮球1234123' },
- // { value: 1, label: '篮球2123123' },
- // { value: 2, label: '篮球31232131' },
- // ];
+ showList = false;
+ loc = '0';
+ subjectAarr = [0];
+ loclist = [
+ { value: '0', label: '0011' },
+ { value: '1', label: '0029' },
+ ];
arrList = [];
selectIndex = [];
tableData = [];
@@ -280,10 +279,10 @@ export default class pickingDom extends BasePage {
this.mrpFlag = false;
this.$form.setRules(this.mrpRules);
//设置开始时间，结束时间
- const today = moment(); // 获取当前时间
- const last_month = today.clone().subtract(1, 'month'); // 获取一个月前的日期
- this.form.requireDateRegionFrom = last_month.format('YYYY-MM-DD');
- this.form.requireDateRegionTo = moment().format('YYYY-MM-DD');
+ const first_month = moment().startOf('month').format('YYYY-MM-DD'); // 获取当前月的第一天
+ const last_month = moment().endOf('month').format('YYYY-MM-DD'); // 获取当前月的最后一天
+ this.form.requireDateRegionFrom = first_month;
+ this.form.requireDateRegionTo = last_month;
} else {
this.mrpFlag = true;
this.$form.setRules(this.rules);
@@ -408,29 +407,19 @@ export default class pickingDom extends BasePage {
/**
* 点击地址选项触发下拉操作
*/
- // selectClick(index) {
- // console.log('触发了select', index);
- // this.showList = true;
- // this.indexChoose = index;
- // }
+ selectClick(index) {
+ console.log('触发了select', index);
+ this.showList = true;
+ this.indexChoose = index;
+ }
/**
* 地址选项确认操作
*/
- // locConfirm(e) {
- // console.log(e);
- // this.loc = e[0].label;
- // // this.selectDefault[0] = e[0].value;
- // let index = 0;
- // for (let i = 0; i < this.loclist.length; i++) {
- // if (this.loclist[i].value == e[0].value) {
- // index = i;
- // break;
- // }
- // }
- // this.subjectAarr[0] = index;
- // console.log('点击执行后', this.showList);
- // }
+ locConfirm(e) {
+ this.loc = e[0].label;
+ this.model.proOrderList[this.indexChoose].wkposCode = e[0].label
+ }
}
@@ -498,4 +487,16 @@ export default class pickingDom extends BasePage {
padding: 20rpx;
}
}
+.tr{
+ height: 10px;
+}
+.td_input{
+ border: 1px solid rgb(228, 225, 225);
+ border-radius: 2px;
+ padding-left: 2px;
+}
+.td_select{
+ border: 1px solid rgb(228, 225, 225);
+ height: 30px;
+}
diff --git a/src/pages/raw/handover/picking-vn/model.ts b/src/pages/raw/handover/picking-vn/model.ts
index e787dd7..bcf0258 100644
--- a/src/pages/raw/handover/picking-vn/model.ts
+++ b/src/pages/raw/handover/picking-vn/model.ts
@@ -244,6 +244,9 @@ export class PickingModule extends VuexModule {
// });
vm.customToast(vm.$t('message.Pi_NoDataFound') as any);
}
+ proOrderList.forEach(element => {
+ element.wkposCode = '0011'
+ });
// 返回的是proOrderList数组
console.log({ proOrderList }, 1111111111);
return { proOrderList };