|
|
@@ -181,9 +181,9 @@
|
|
|
:close-on-press-escape='false'
|
|
|
:show-close='false'
|
|
|
width="518px">
|
|
|
- <el-date-picker v-model="stime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
|
|
|
+ <el-date-picker v-model="stime" type="date" :picker-options="stimePickerOptions" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
|
|
|
<span style="margin: 0 12px;">至</span>
|
|
|
- <el-date-picker v-model="etime" type="date" :picker-options="pickerOptions" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
|
|
|
+ <el-date-picker v-model="etime" type="date" :picker-options="etimePickerOptions" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dateDialogVisible = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="dateConfirm">确 定</el-button>
|
|
|
@@ -235,9 +235,14 @@
|
|
|
|
|
|
dateDialogVisible = false
|
|
|
dateLoading = false
|
|
|
- stime = null
|
|
|
- etime = new Date()
|
|
|
- pickerOptions : any = {
|
|
|
+ stime : any = null
|
|
|
+ etime : any = null
|
|
|
+ stimePickerOptions : any = {
|
|
|
+ disabledDate(time : any) {
|
|
|
+ return time.getTime() > Date.now();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ etimePickerOptions : any = {
|
|
|
disabledDate(time : any) {
|
|
|
return time.getTime() > Date.now();
|
|
|
}
|
|
|
@@ -1086,7 +1091,8 @@
|
|
|
if(d<10){d='0'+d}
|
|
|
this.tableSearchForm.stime = '2020-01-01';
|
|
|
this.tableSearchForm.etime = y+'-'+m+'-'+d;
|
|
|
- this.getFinancialCode()
|
|
|
+ this.etime = y+'-'+m+'-'+d;
|
|
|
+ // this.getFinancialCode()
|
|
|
this.getTreeList();
|
|
|
}
|
|
|
getTreeList(){
|
|
|
@@ -1222,22 +1228,22 @@
|
|
|
data = { maindataMaterialReceiveParam: query, maindataMaterialSkus: (this.$refs.singeTable as any).getValue() }
|
|
|
// console.log('单规格表格数据 ==> ', data.maindataMaterialSkus);
|
|
|
for (let v of data.maindataMaterialSkus) {
|
|
|
- if (!v.price) return this.$message.warning('物料价格必填');
|
|
|
+ // if (!v.price) return this.$message.warning('物料价格必填');
|
|
|
// if (parseInt(v.price) <= 0) return this.$message.warning('物料价格不能小于1');
|
|
|
if (parseInt(v.price) < 0) return this.$message.warning('物料价格不能为负数');
|
|
|
- if (!v.unit) return this.$message.warning('物料单位必填');
|
|
|
+ // if (!v.unit) return this.$message.warning('物料单位必填');
|
|
|
// if (!v.stock) return this.$message.warning('物料库存必填');
|
|
|
// if (parseInt(v.stock) <= 0) return this.$message.warning('物料库存必须为自然数');
|
|
|
- if (!v.shelfLife) return this.$message.warning('物料保质期必填');
|
|
|
- // if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料保质期必须为自然数');
|
|
|
- if (!v.weight) return this.$message.warning('物料重量必填');
|
|
|
- // if (parseInt(v.weight) <= 0) return this.$message.warning('物料重量不能小于1');
|
|
|
- if (!v.length) return this.$message.warning('物料长必填');
|
|
|
- // if (parseInt(v.length) <= 0) return this.$message.warning('物料长不能小于1');
|
|
|
- if (!v.width) return this.$message.warning('物料宽必填');
|
|
|
- // if (parseInt(v.width) <= 0) return this.$message.warning('物料宽不能小于1');
|
|
|
- if (!v.height) return this.$message.warning('物料高必填');
|
|
|
- // if (parseInt(v.height) <= 0) return this.$message.warning('物料高不能小于1');
|
|
|
+ // if (!v.shelfLife) return this.$message.warning('物料保质期必填');
|
|
|
+ if (parseInt(v.shelfLife) <= 0) return this.$message.warning('物料保质期必须为自然数');
|
|
|
+ // if (!v.weight) return this.$message.warning('物料重量必填');
|
|
|
+ if (parseInt(v.weight) <= 0) return this.$message.warning('物料重量不能小于1');
|
|
|
+ // if (!v.length) return this.$message.warning('物料长必填');
|
|
|
+ if (parseInt(v.length) <= 0) return this.$message.warning('物料长不能小于1');
|
|
|
+ // if (!v.width) return this.$message.warning('物料宽必填');
|
|
|
+ if (parseInt(v.width) <= 0) return this.$message.warning('物料宽不能小于1');
|
|
|
+ // if (!v.height) return this.$message.warning('物料高必填');
|
|
|
+ if (parseInt(v.height) <= 0) return this.$message.warning('物料高不能小于1');
|
|
|
|
|
|
v.weight = v.weight/1000
|
|
|
};
|
|
|
@@ -1470,7 +1476,12 @@
|
|
|
dateConfirm(){
|
|
|
if((this as any).stime){
|
|
|
(this as any).dateLoading = true;
|
|
|
- api.getFinancialCode({stime: (this as any).stime, etime: (this as any).etime}).then((res : any) => {
|
|
|
+ var data = {
|
|
|
+ stime: (this as any).stime,
|
|
|
+ etime: (this as any).etime
|
|
|
+ }
|
|
|
+ console.log(data)
|
|
|
+ api.syncMaterialByKingdeeToOms(data).then((res : any) => {
|
|
|
if(res.code === 200){
|
|
|
(this as any).dateDialogVisible = false;
|
|
|
(this as any).dateLoading = false;
|
|
|
@@ -1626,7 +1637,7 @@
|
|
|
// 获取关联金蝶财务系统物料列表
|
|
|
getFinancialCode(){
|
|
|
this.tableloading = true;
|
|
|
- api.getFinancialCode(this.tableSearchForm).then((res : any) => {
|
|
|
+ api.syncMaterialByKingdeeToOms(this.tableSearchForm).then((res : any) => {
|
|
|
if(res.code==200){
|
|
|
this.tableloading = false;
|
|
|
this.tableData = res.data
|
|
|
@@ -2015,6 +2026,9 @@
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
+<style>
|
|
|
+ .el-tree{max-height: 100%;overflow-y: auto;}
|
|
|
+</style>
|
|
|
<style lang="scss" scoped>
|
|
|
.my-container {
|
|
|
width: 100%;
|
hcf