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

Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

Browse Source
prod
CTP 2 years ago
parent 8e7e9435d6 5f561a8842
commit 0f904e2f5c
8 changed files with 325 additions and 281 deletions
Show Stats Download Patch File Download Diff File

10
src/api/sync/spsSyncStatus.js
Unescape Escape View File

@ -50,3 +50,13 @@ export function updateConfig(query) {
});
}
export function infoByStatus(query) {
return axios({
url: "/spssync/basic/udiinfo/infoByStatus",
method: "post",
data: query,
responseType: 'blob'
});
}

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

@ -1,6 +1,6 @@
<template>
<div>
<el-card style="margin: 5px; margin-top: -20px">
<el-card style="margin: 5px;">
<el-form
:model="orderFormData"
:rules="formRules"

4
src/views/inout/DialogNewReviewOrder.vue
Unescape Escape View File

@ -180,6 +180,8 @@ export default {
page: 1,
limit: 10,
},
isEntrust: false,
}
},
@ -267,6 +269,7 @@ export default {
this.detailList = response.data.orderDetailEntities || [];
this.formData = response.data.orderEntity;
this.orderQuery = this.formData;
this.isEntrust = response.data.entrust;
} else {
this.$message.error(response.message);
}
@ -371,6 +374,7 @@ export default {
postAccept() {
let query = {
orderId: this.orderQuery.billNo,
entrust: this.isEntrust,
};
if (this.reviewType != null && this.reviewType == 2) {
thirdUpdateStatus(query)

1
src/views/inout/IoCheckAuditOrder.vue
Unescape Escape View File

@ -1022,6 +1022,7 @@ export default {
//验收结束
closeAcceptDialog() {
this.acceptOrderVisible = false;
this.newAcceptOrderVisible = false;
},
//开始验收

8
src/views/inventory/InvOrderPlaceModify.vue
Unescape Escape View File

@ -71,13 +71,13 @@
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150"></el-table-column>
</el-table>
@ -96,7 +96,7 @@
<invPlaceSelectOrder
:closeDialog="closeDialog"
:formData="selectFormData"
:getInvProductInfogetInvProductInfogetInvProductInfo="getInvProductInfo"
:getInvProductInfo="getInvProductInfo"
>
</invPlaceSelectOrder>
</el-dialog>
@ -260,7 +260,7 @@ export default {
getInvProductInfo(orderId) {
let params = {
invCode: this.formData.invCode,
code: orderId
orderId: orderId
};
getInvProductInfo(params).then((res) => {
if (res.data !== null) {

4
src/views/inventory/InvPlaceSelectOrder.vue
Unescape Escape View File

@ -125,7 +125,7 @@ export default {
},
getList() {
this.loading = true;
getInvPlaceOrderList().then((res) => {
getInvPlaceOrderList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
@ -153,7 +153,7 @@ export default {
},
},
created() {
this.getInvList();
this.getList();
},
}
</script>

4
src/views/inventory/InvProductPlaceModify.vue
Unescape Escape View File

@ -69,13 +69,13 @@
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150"></el-table-column>
<el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150"></el-table-column>
</el-table>

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

@ -25,10 +25,10 @@
<el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button>
<el-button type="primary" icon="search" @click="createScheduleDialog(1)"
v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">
同步单据
</el-button>
<!-- <el-button type="primary" icon="search" @click="createScheduleDialog(1)"-->
<!-- v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">-->
<!-- 同步单据-->
<!-- </el-button>-->
<!-- <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
v-if="configParms.typeBus==1||configParms.typeScan==1||configParms.typeThird==1">
同步单据类型
@ -58,13 +58,20 @@
</el-table-column>
<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="cacheFilePath" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="remark" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="160">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="detailDialog(scope.row.id)">详情
<el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了' class="mr10"
icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
<el-button type="text" size="small" slot="reference">下载
</el-button>
</el-popconfirm>
<!-- <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row.id)">详情-->
<!-- </el-button>-->
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除
</el-button>
</template>
@ -97,7 +104,7 @@
return {
filterQuery: {
id: null,
status: "1",
status: null,
page: 1,
limit: 10,
syncTime: null,
@ -231,7 +238,8 @@
.then(() => {
this.createSchedule(type);
})
.catch(() => {});
.catch(() => {
});
} else {
this.createSchedule(type);
}
@ -284,8 +292,27 @@
this.loading = false;
});
})
.catch(() => {});
.catch(() => {
});
},
downFile(rows) {
infoByStatus({
'id': rows.id
}).then(res => {
let blob = new Blob([res])
let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
let link = document.createElement("a")
link.href = window.URL.createObjectURL(blob)
link.download = fileName
link.style.display = 'none'
document.body.appendChild(link)
link.click()
window.URL.revokeObjectURL(link.href)
document.body.removeChild(link)
})
},
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
@ -311,7 +338,8 @@
this.configParms = response.data;
}
})
.catch(() => {});
.catch(() => {
});
},
detailDialog(id) {
this.syncVisible = true;
@ -323,7 +351,8 @@
}
},
mounted() {},
mounted() {
},
components: {},
created() {
this.headers = {

Write Preview
Loading…
Cancel
Save