UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/views/sync/SysUdimsData.vue
ywj_dev
wj 3 years ago
parent df9884913c dfb14d2f97
commit a8c62fcfe3
10 changed files with 104 additions and 54 deletions
Show Stats Download Patch File Download Diff File

16
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -3,7 +3,8 @@
<el-card style="margin: 5px;margin-top: -20px">
<el-form :model="orderFormData" :rules="formRules" ref="dataForm" label-width="100px"
style="margin-bottom: -15px">
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
<el-button-group
style="display: flex; margin: 0px 0 15px 75%; height: 35px">
<el-button
size="mini"
type="primary"
@ -11,13 +12,14 @@
>草稿保存
</el-button
>
<el-button
size="mini"
type="primary"
@click.native="submit()"
<el-button size="mini" type="primary" @click.native="submit()"
v-if="curAction.checkWebNew != 2 || viewType !=1"
>立即提交
</el-button
>
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew > 1 && viewType == 1"
>待配货提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew == 3"

6
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

@ -83,6 +83,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

6
src/views/inventory/InvPreProductsDetail.vue
Unescape Escape View File

@ -83,6 +83,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

6
src/views/inventory/InvProductsDetail.vue
Unescape Escape View File

@ -81,6 +81,12 @@
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="货位"
prop="invSpaceName"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="入库数量"
prop="inCount"

2
src/views/inventory/InvSpaceManage.vue
Unescape Escape View File

@ -75,7 +75,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item prop="name" label="仓库名称">
<el-form-item prop="invName" label="仓库名称">
<el-input v-model="formData.invName" disabled auto-complete="off" style="width: 90%"
></el-input>
</el-form-item>

23
src/views/sync/SysUdimsConfig.vue
Unescape Escape View File

@ -60,7 +60,7 @@
</el-descriptions>
</el-collapse-item>
<!-- 上传值UDI自助平台基础数据 -->
<el-collapse-item title="上传至UDI自助平台基础数据" name="2">
<el-collapse-item title="基础数据同步" name="2">
<el-descriptions class="margin-top" :column="1" :size="100" border>
<!-- 参数设置 -->
<el-descriptions-item>
@ -291,6 +291,25 @@
</el-form-item>
</el-form>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 其他数据</template>
<el-form label-positiom="right" label-width="200px" :inline="true">
<el-form-item label="UDI码补齐数据">
<el-select v-model="configQuery.udiCodeLost" disabled>
<el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
<el-form-item label="UDI关联关系">
<el-select v-model="configQuery.udiCodeRel" disabled>
<el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-descriptions-item>
<!-- 第三方基础信息 -->
<el-descriptions-item>
<template slot="label"> 第三方基础信息</template>
@ -795,6 +814,8 @@ export default {
scanChangeConfig: null,
busChangeConfig: null,
dbDiCompany: null,
udiCodeLost: null,
udiCodeRel: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],

23
src/views/sync/SysUdimsData.vue
Unescape Escape View File

@ -48,7 +48,7 @@
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="任务ID" prop="id" width="140" show-overflow-tooltip></el-table-column>
@ -72,9 +72,9 @@
<el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
<el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
<el-table-column label="文件路径" prop="cacheFilePath" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
@ -83,7 +83,8 @@
<el-button type="text" size="small" slot="reference">下载
</el-button>
</el-popconfirm>
<el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" confirm-button-text='删除' cancel-button-text='不用了'
<el-popconfirm v-if="scope.row.status==4" @confirm="deleteData(scope.row.id)" confirm-button-text='删除'
cancel-button-text='不用了'
icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
<el-button type="text" size="small" slot="reference">删除
</el-button>
@ -120,7 +121,7 @@ export default {
return {
filterQuery: {
id: null,
status: "1",
status: null,
page: 1,
limit: 10,
syncTime: null,
@ -275,7 +276,8 @@ export default {
.then(() => {
this.createSchedule(type);
})
.catch(() => {});
.catch(() => {
});
} else {
this.createSchedule(type);
}
@ -298,7 +300,8 @@ export default {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: "warning",
callback: action => {}
callback: action => {
}
});
} else {
@ -334,7 +337,8 @@ export default {
this.loading = false;
});
})
.catch(() => {});
.catch(() => {
});
},
handleChange(response, files, fileList) {
if (response.code != 20000) {
@ -366,7 +370,8 @@ export default {
this.configParms = response.data;
}
})
.catch(() => {});
.catch(() => {
});
},
detailDialog(id) {
this.syncVisible = true;

4
src/views/sync/SysUdimsDownloadData.vue
Unescape Escape View File

@ -28,6 +28,7 @@
<el-table
v-loading="loading"
:data="list"
border
style="width: 100%"
>
<el-table-column label="序号" type="index"></el-table-column>
@ -324,7 +325,8 @@ export default {
}
this.getList();
})
.catch(() => {});
.catch(() => {
});
}
},

2
src/views/system/param/busTypeChange.vue
Unescape Escape View File

@ -252,6 +252,8 @@ export default {
this.cancelDialog();
this.loading = false;
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.loading = false;

4
src/views/thirdSys/inv/index.vue
Unescape Escape View File

@ -453,8 +453,8 @@ export default {
// 更改值
this.formVisible = false;
this.subFormVisible = false;
let Item = JSON.parse(localStorage.getItem('obj'))
this.subData=Item;
// let Item = JSON.parse(localStorage.getItem('obj'))
// this.subData=Item;
this.getSubList();
return true;
},

Write Preview
Loading…
Cancel
Save