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

领用，审核修改

Browse Source
prod
anthonywj 2 years ago
parent dafb694ea8
commit 7f53afaa8f
3 changed files with 115 additions and 73 deletions
Show Stats Download Patch File Download Diff File

121
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -533,6 +533,7 @@
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -555,6 +556,7 @@
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -573,10 +575,11 @@
<el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -588,132 +591,140 @@
<el-row>
<el-col span="5">
<span class="sptext">是否校验UDIMS平台单据</span>
<span class="sptext">UDIMS平台推送的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">是否校验UDIMS平台单据</span>
<span class="sptext">UDIMS平台推送的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">自助平台同步</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">自助平台同步</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<el-option label="无业业务单扫码拣货" :value="0"></el-option>
<el-option label="有业务单有三期拣货" :value="1"></el-option>
<el-option label="有业务单无三期拣货" :value="2"></el-option>
<el-option label="有业务单拣货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
<el-collapse-item title="是否人工核对单据设置(一次审核)">
@ -806,7 +817,7 @@
<el-row>
<el-col span="5">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">UDIMS平台推送的数据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -819,14 +830,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">是否校验UDIMS平台单据</span>
<span class="sptext">UDIMS平台推送的数据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -839,14 +850,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -859,14 +870,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -879,14 +890,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -899,14 +910,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -919,12 +930,31 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">UDI管理系统同步单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.thrCheckSp" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckEnable"
>
<el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">UDI管理系统同步单据</span>
</el-col>
</el-row>
</div>
</el-collapse-item>
<el-collapse-item title="是否人工审核据设置(二次审核)">
<el-collapse-item title="是否人工审核单据设置(二次审核)">
<div>
<div style="width: 100%;margin: 0 auto;margin-top: 20px">
<el-row style="margin-bottom: 15px">
@ -1015,7 +1045,7 @@
<el-row>
<el-col span="5">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">UDIMS平台推送的数据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1028,14 +1058,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">是否校验UDIMS平台单据</span>
<span class="sptext">UDIMS平台推送的数据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1048,14 +1078,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">UDI扫码通</span>
<span class="sptext">UDI扫码通单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1068,14 +1098,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">校验产品是否可配送</span>
<span class="sptext">内外网系统同步的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1088,14 +1118,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">缺量补单</span>
<span class="sptext">自动补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1108,14 +1138,14 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">平衡补单</span>
<span class="sptext">内部平衡补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
@ -1128,9 +1158,10 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">手动补单</span>
<span class="sptext">手工补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
</el-collapse>
@ -1314,7 +1345,7 @@ export default {
// this.inputQuery.actionType = null
// }
// // 联动修改允许手动输入客户信息 有bug允许手动输入一直为false
// 联动修改允许手动输入客户信息值
// if (this.inputQuery.corpType != 1 || this.inputQuery.mainAction != "WarehouseOut") {
// this.inputQuery.genUnit = false;
// }

59
src/views/inout/receive/receiveAudit.vue
Unescape Escape View File

@ -1,16 +1,16 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8" >
<el-col :span="8">
<el-form-item label="领用单号:">
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领用仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-select v-model="filterQuery.targetInvCode" placeholder="请选择领用仓库" style="width: 100%;">
<el-option
v-for="item in invList"
:key="item.code"
@ -22,7 +22,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
@ -85,7 +85,8 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true" @current-change="handleDetail">
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用单号" prop="billNo"></el-table-column>
<el-table-column label="领用部门" prop="deptName"></el-table-column>
@ -99,9 +100,10 @@
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<el-table-column label="操作" >
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.status!=2" @click.native.stop="auditDialog(scope.row)"
<el-button type="text" size="small" :disabled="scope.row.status!=2"
@click.native.stop="auditDialog(scope.row)"
>审核
</el-button>
</template>
@ -162,9 +164,10 @@ export default {
page: 1,
limit: 10,
corpName: null,
invCode:'',
invCode: '',
type: 2,
editStatus: 2,
targetInvCode: null,
},
statusMap: {
1: "草稿",
@ -172,12 +175,12 @@ export default {
3: "已审核",
4: "已拒绝"
},
idQuery:null,
newSpDistributionVisible:false,
idQuery: null,
newSpDistributionVisible: false,
total: 0,
thirdSys: [],
invList:[],
corpList:[],
invList: [],
corpList: [],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@ -188,7 +191,7 @@ export default {
uploadData: {
thirdSys: "thirdId",
},
invCodebe:null,
invCodebe: null,
loading: false,
actDateRange: [],
pickerOptions: {
@ -240,7 +243,7 @@ export default {
page: 1,
limit: 10,
corpName: null,
invCode: this.invCodebe,
targetInvCode: this.invCodebe,
type: 2,
editStatus: 2,
};
@ -252,7 +255,7 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
closeDialog(){
closeDialog() {
this.newSpDistributionVisible = false;
this.getList();
},
@ -274,7 +277,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList=[]
this.detailList = []
} else {
this.$message.error(response.message);
}
@ -287,7 +290,7 @@ export default {
});
},
handleDetail(row) {
var query={};
var query = {};
query.orderIdFk = row.billNo;
getOrderDetail(query) //查找该单号下的所有条码
.then((response) => {
@ -302,14 +305,14 @@ export default {
this.getList();
},
auditDialog(row) {
this.idQuery=row;
this.idQuery = row;
this.newSpDistributionVisible = true;
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
finCorpList(val) {
let query = {
name: val,
page: 1,
limit: 10,
}
filterSubAll(query)
.then((response) => {
@ -330,9 +333,9 @@ export default {
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
if(this.invList.length>0){
this.filterQuery.invCode=this.invList[0].code
this.invCodebe=this.filterQuery.invCode
if (this.invList.length > 0) {
this.filterQuery.targetInvCode = this.invList[0].code
this.invCodebe = this.filterQuery.targetInvCode
}
this.getList();
})
@ -346,7 +349,7 @@ export default {
mounted() {
},
created() {
this.finCurInv();
this.finCurInv();
},
};
</script>

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

@ -245,6 +245,13 @@
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票信息">
<el-select v-model="configQuery.orderInvoice" >
<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>
@ -747,6 +754,7 @@ export default {
busChangeConfig: null,
udiCodeLost: null,
udiCodeRel: null,
orderInvoice: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],

Write Preview
Loading…
Cancel
Save