Merge remote-tracking branch 'origin/master'

prod
wj 2 years ago
commit b6d30256df

1
.gitignore vendored

@ -20,5 +20,6 @@ UDI_WMS_NEW/
*.sln
*.local
/vue.config.js
package-lock.json
yarn.lock

@ -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'
});
}

@ -96,7 +96,8 @@ export default {
handleCurrentChange(val) {
this.$emit('pagination', { page: val, limit: this.pageSize })
if (this.autoScroll) {
scrollTo(0, 800)
//
// scrollTo(0, 800)
}
}
}

@ -529,10 +529,10 @@
<el-select v-model="inputQuery.checkWebNew" 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-option label="有业务单货(有无三期)" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
@ -551,7 +551,7 @@
<el-select v-model="inputQuery.checkPdaUn" 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>
@ -573,7 +573,7 @@
<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>
@ -595,7 +595,7 @@
<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>
@ -617,7 +617,7 @@
<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>
@ -639,7 +639,7 @@
<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>
@ -660,7 +660,7 @@
<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>
@ -682,7 +682,7 @@
<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>
@ -703,7 +703,7 @@
<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>

@ -296,7 +296,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -436,7 +436,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -467,7 +467,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -239,7 +239,7 @@
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -241,7 +241,7 @@
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -254,7 +254,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -147,7 +147,7 @@
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -558,15 +558,17 @@ export default {
let selectData = this.multipleUdiSelection;
let selected = null;
if (this.multipleUdiSelection.length == 0) {
this.$message.warning('请选入产品!');
if (this.relId != null) {
this.combineQuery.relId = this.relId;
this.combineQuery.keys.push(this.currentRow.uuid);
if (this.currentRow.check) {
selected = this.currentRow;
}
} else
} else{
this.$message.warning('请选入产品!');
return;
}
} else {
selectData.forEach((obj) => {

@ -435,6 +435,10 @@ export default {
selectExport() {
var selectData = this.multipleSelection;
if(selectData.length==0){
this.$message.error("请先选择产品!");
return
}
selectData.forEach((obj) => {
this.filterQuery.rlIds.push(obj.id);
this.filterQuery.nameCode=obj.nameCode;

File diff suppressed because it is too large Load Diff

@ -265,7 +265,7 @@
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -151,7 +151,7 @@ export default {
filters: {},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -246,7 +246,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -242,7 +242,7 @@
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -402,7 +402,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -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"
@ -39,7 +39,7 @@
auto-complete="off"
style="width: 90%"
clearable
:disabled="corpOrderIdDisabled"
:disabled="true"
></el-input>
</el-form-item>
</el-col>
@ -643,6 +643,24 @@ export default {
this.$message.warning("请选择单据类型!");
return;
}
if(this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)){
if(this.$isBlank(this.orderFormData.fromCorp)){
this.$message.warning("请选择往来单位!");
return;
}
}
if(this.curAction.corpType == 3){
if(this.$isBlank(this.orderFormData.fromInvCode)){
this.$message.warning("请选择往来单位!");
return;
}
}
if(this.curAction.corpType === 1 && this.curAction.genUnit){
if(this.$isBlank(this.orderFormData.fromCorp)){
this.$message.warning("请选择往来单位!");
return;
}
}
if (this.$isBlank(this.orderFormData.corpOrderId)) {
let date = new Date();
this.orderFormData.corpOrderId =
@ -1052,7 +1070,7 @@ export default {
</script>
<style>
<style scoped>
#inputer {
width: 100%;
min-height: 30px;

@ -345,7 +345,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -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)

@ -65,6 +65,8 @@ import {
} from "@/api/inventory/invPorduct";
import {addDetail} from "@/api/inout/receiveOrder";
import {addBizProduct} from "@/api/inout/orderDetailCode";
import {getInvPreInProduct} from "@/api/inventory/invPreInSearch";
import {getInvPreProduct} from "@/api/inventory/invPreProduct";
export default {
@ -162,19 +164,51 @@ export default {
},
getList() {
debugger
this.loading = true;
getInvProduct(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
//
if(this.invQueryData.advanceType==3){
getInvPreProduct(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
//
}else if(this.invQueryData.advanceType==2){
getInvPreInProduct(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
}else{
getInvProduct(this.filterQuery)
.then((response) => {
this.showSup = response.data.showSup;
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
}
},
hideSearch() {
this.showSearch = !this.showSearch;

@ -119,10 +119,10 @@
</template>
</el-table-column>
<el-table-column label="审核时间" prop="checkTime" show-overflow-tooltip width="150">
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.checkTime }}</span>
<span>{{ scope.row.auditTime }}</span>
</template>
</el-table-column>

@ -84,7 +84,7 @@
>查询
</el-button
>
<el-button type="primary" icon="el-icon-search" @click="newReview"
<el-button type="primary" icon="el-icon-plus" @click="newReview"
>新增单据审核
</el-button
>
@ -1022,6 +1022,7 @@ export default {
//
closeAcceptDialog() {
this.acceptOrderVisible = false;
this.newAcceptOrderVisible = false;
},
//

@ -588,6 +588,8 @@ export default {
})
.then(() => {
this.deleteOrders(rowId);
this.currentRow=null;
this.bizDetailList=[];
})
.catch(() => {
});

@ -72,7 +72,7 @@
<el-table-column width="100"
label="扫码数量"
prop="scanCount"
prop="reCount"
v-if="viewType!=2"
show-overflow-tooltip
></el-table-column>

@ -59,7 +59,7 @@
</el-col>
<el-col :span="11">
<el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
<el-select v-model="formData.targetInvCode" placeholder="请选择往来信息"
<el-select v-model="formData.targetInvCode" placeholder="请选择往来信息" @change="getTargerType"
clearable="true"
style="width: 100%"
>
@ -277,6 +277,7 @@ export default {
findFromInv() {
let cQuery = {
locInvCode: this.formData.invCode,
type:1,
};
findByFrom(cQuery)
.then((response) => {
@ -301,7 +302,10 @@ export default {
hideSearch() {
this.showSearch = !this.showSearch;
},
getTargerType(){
this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
console.log(this.formData)
},
saveOrder(status) {
this.code = "";
this.$refs.multipleTable.setCurrentRow();
@ -528,7 +532,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -22,7 +22,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
@ -67,7 +80,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmitFind"></el-button>
<el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">
新增单据
</el-button>
</el-button-group>
@ -147,7 +160,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -178,6 +191,7 @@ export default {
4: "已拒绝"
},
idQuery: {},
corpList: [],
total: 0,
thirdSys: [],
thirdSysDetail: null,
@ -373,6 +387,23 @@ export default {
.catch(() => {
});
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
},
components: {
thrOrderNew,
@ -382,6 +413,7 @@ export default {
created() {
this.finCurInv();
this.getBusType();
// this.finCorpList();
},
};
</script>

@ -22,7 +22,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
@ -135,7 +148,7 @@
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -164,6 +177,7 @@ export default {
total: 0,
thirdSys: [],
invList:[],
corpList:[],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@ -291,6 +305,23 @@ export default {
this.idQuery=row;
this.newSpDistributionVisible = true;
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
finCurInv() {
this.invList = [];
let query = {

@ -155,7 +155,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -22,7 +22,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
<el-select v-model="filterQuery.corpName" placeholder="请输入往来信息"
filterable
remote
reserve-keyword
:remote-method="finCorpList"
:loading="loading"
style="width: 100%;">
<el-option
v-for="item in corpList"
:key="item.code"
:label="item.name"
:value="item.code">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
@ -154,7 +167,7 @@
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import auditDetail from "@/views/inout/receive/receiveAuditDetail"
import {delReceive} from "@/api/thrsys/thrOrderReceive";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
export default {
data() {
@ -188,6 +201,7 @@ export default {
busTypes: [],
originTypes: [],
list: [],
corpList:[],
detailList: [],
uploadFileUrl: null,
fileList: [],
@ -369,6 +383,23 @@ export default {
this.filterQuery.page = val.page;
this.getList();
},
finCorpList(val){
let query ={
name : val,
page : 1,
limit : 10,
}
filterSubAll(query)
.then((response) => {
this.loading = false;
this.corpList = response.data || [];
})
.catch(() => {
this.loading = false;
this.corpList = [];
});
},
finCurInv() {
this.invList = [];
let query = {

@ -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,8 +260,7 @@ export default {
getInvProductInfo(orderId) {
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode,
code: orderId
orderId: orderId
};
getInvProductInfo(params).then((res) => {
if (res.data !== null) {

@ -42,16 +42,18 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="仓库" prop="invName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="productName"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="产品标识" prop="nameCode" width="150"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="批准文号" prop="zczbhhzbapzbh" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip
width="200"></el-table-column>
<el-table-column label="供应商" prop="ylqxzcrbarmc" show-overflow-tooltip
width="200"></el-table-column>
</el-table>
<pagination
v-show="total>0"
@ -131,39 +133,48 @@ export default {
this.getList();
},
onSubmit() {
if (isBlank(this.filterQuery.invSpaceCode)) {
this.$message.error("请选择指定货位");
return;
}
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getPlaceDetailList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
if (isBlank(this.filterQuery.invSpaceCode) && this.spaceList.length > 0) {
this.filterQuery.invSpaceCode = this.spaceList[0].code;
}
if (!isBlank(this.filterQuery.invSpaceCode)) {
this.loading = true;
getPlaceDetailList(this.filterQuery).then((res) => {
this.loading = false;
if (res.code === 20000) {
this.list = res.data.list || [];
this.total = res.data.total || 0;
} else {
this.$message.error(res.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
}
}).catch((error) => {
this.loading = false;
this.$message.error(error.message);
this.list = [];
this.total = 0;
})
});
}
},
invChange() {
this.spaceList = [];
this.filterQuery.invSpaceCode = null;
this.getSpaceList();
this.getList();
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.getSpaceList();
this.getList();
})
.catch(() => {
});
@ -175,6 +186,7 @@ export default {
};
getInvSpaceList(params).then((res) => {
this.spaceList = res.data.list || [];
this.getList();
})
},
invPlace(type) {

@ -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>

@ -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>
@ -234,7 +234,6 @@ export default {
getInvProductInfo(code) {
let params = {
invCode: this.formData.invCode,
invSpaceCode: this.formData.invSpaceCode,
code: code
};
getInvProductInfo(params).then((res) => {

@ -435,7 +435,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -444,7 +444,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -752,7 +752,7 @@ export default {
</script>
<style>
<style scoped>
.el-table .warning-row {
background: #ffb5b5;
}

@ -379,7 +379,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -165,15 +165,21 @@
<el-card class="el-card">
<el-form :model="registrationQuery" class="query-form" label-width="100px" v-show="showSearch2">
<el-row style="width: 100%">
<el-col :span="6">
<el-form-item label="物资名称:">
<el-input v-model="registrationQuery.recordProductName" style="width: 90%" clearable="true" placeholder="请输入物资名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="注册备案号:">
<el-input v-model="registrationQuery.recordCode" style="width: 90%" clearable="true" placeholder="请输入注册备案号"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="注册备案人:">
<el-input v-model="registrationQuery.recordPeopleName" style="width: 90%" clearable="true" placeholder="请输入注册备案人"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>

@ -813,7 +813,7 @@ export default {
},
}
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -667,7 +667,7 @@ export default {
}
;
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -887,7 +887,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -735,7 +735,7 @@ export default {
}
}
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -861,7 +861,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -798,7 +798,7 @@ export default {
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -527,7 +527,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -419,7 +419,7 @@ export default {
},
};
</script>
<style>
<style scoped>

@ -491,7 +491,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -521,7 +521,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -272,6 +272,7 @@ export default {
} else {
this.newSpDistributionVisible = false
}
this.getList();
},
getId(id) {
if (this.formName == 'add' && id != null) {

@ -479,7 +479,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -459,6 +459,8 @@ export default {
this.invCodeList = response.data || [];
if (this.invCodeList != null && this.invCodeList.length == 1) {
this.formData.invCode = this.invCodeList[0].code;
this.formData.deptCode = this.invCodeList[0].parentId;
}
})
.catch(() => {
@ -515,7 +517,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -18,24 +18,24 @@
</el-form-item>
<el-form-item class="query-form-item">
<el-date-picker v-model="filterQuery.syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<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(2)"
v-if="configParms.typeBus==1||configParms.typeScan==1||configParms.typeThird==1">
同步单据类型
</el-button>
<el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="configParms.basicProducts==1||configParms.basicCorp==1||configParms.basicInv==1||configParms.basicThirdProducts==1||
configParms.basicThirdCorp==1||configParms.basicThirdInv==1||configParms.basicThirdBusOrder==1||configParms.sysUser==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">
同步单据类型
</el-button>
<el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="configParms.basicProducts==1||configParms.basicCorp==1||configParms.basicInv==1||configParms.basicThirdProducts==1||
configParms.basicThirdCorp==1||configParms.basicThirdInv==1||configParms.basicThirdBusOrder==1||configParms.sysUser==1">同步基础信息
</el-button> -->
</el-button-group>
</el-form-item>
</el-row>
@ -58,24 +58,31 @@
</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-button>
<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>
</el-table-column>
</el-table>
<el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
:total="total" :current-page="filterQuery.page"></el-pagination>
:total="total" :current-page="filterQuery.page"></el-pagination>
</el-card>
<el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
:visible.sync="syncVisible">
:visible.sync="syncVisible">
<span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
</el-dialog>
@ -83,286 +90,308 @@
</template>
<script>
import {
filterLog,
deleteLog,
createSchedule,
findConfig,
updateConfig
} from "@/api/sync/spsSyncStatus";
import store from "@/store";
export default {
data() {
return {
filterQuery: {
id: null,
status: "1",
page: 1,
limit: 10,
syncTime: null,
},
list: [],
headers: {},
detailList: [],
thirdSys: [],
thirdSysDetail: null,
total: 0,
currentRow: null,
editQuery: null,
status: {
1: "处理异常",
2: "处理完成",
},
configQuery: {
id: null,
typeBus: null,
typeScan: null,
typeThird: null,
basicProducts: null,
basicCorp: null,
basicInv: null,
basicThirdProducts: null,
basicThirdCorp: null,
basicThirdInv: null,
basicThirdBusOrder: null,
orderScanFinish: null,
dbDiProducts: null,
downstreamEnable: null,
syncTime: null,
},
uploadFileUrl: null,
uploadData: {
thirdSys: "thirdId",
},
templateDlUrl: null,
checked: false,
configParms: {},
syncInfo: null,
syncVisible: false
};
},
import {
filterLog,
deleteLog,
createSchedule,
findConfig,
updateConfig
} from "@/api/sync/spsSyncStatus";
import store from "@/store";
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
syncTime: null,
id: null,
status: null,
page: 1,
limit: 20,
};
this.syncTime = null;
this.getList();
export default {
data() {
return {
filterQuery: {
id: null,
status: null,
page: 1,
limit: 10,
syncTime: null,
},
getList() {
this.loading = true;
filterLog(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
list: [],
headers: {},
detailList: [],
thirdSys: [],
thirdSysDetail: null,
total: 0,
currentRow: null,
editQuery: null,
status: {
1: "处理异常",
2: "处理完成",
},
getConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configQuery = response.data;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
configQuery: {
id: null,
typeBus: null,
typeScan: null,
typeThird: null,
basicProducts: null,
basicCorp: null,
basicInv: null,
basicThirdProducts: null,
basicThirdCorp: null,
basicThirdInv: null,
basicThirdBusOrder: null,
orderScanFinish: null,
dbDiProducts: null,
downstreamEnable: null,
syncTime: null,
},
saveConfig() {
updateConfig(this.configQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.getConfig();
}
})
.catch(() => {
this.loading = false;
});
uploadFileUrl: null,
uploadData: {
thirdSys: "thirdId",
},
templateDlUrl: null,
checked: false,
configParms: {},
syncInfo: null,
syncVisible: false
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
syncTime: null,
id: null,
status: null,
page: 1,
limit: 20,
};
this.syncTime = null;
this.getList();
},
getList() {
this.loading = true;
filterLog(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
cancelDialog(val) {
this.udiImportDetailVisible = false;
this.thrCorpSelectVisible = false;
if (val) {
this.getList();
}
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
getConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configQuery = response.data;
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
saveConfig() {
updateConfig(this.configQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.getConfig();
}
})
.catch(() => {
this.loading = false;
});
},
createScheduleDialog(type) {
if (this.$isNotBlank(this.filterQuery.syncTime)) {
this.$confirm("此操作将从" + this.filterQuery.syncTime + "开始同步最新数据,是否继续", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.createSchedule(type);
})
.catch(() => {});
} else {
this.createSchedule(type);
}
},
cancelDialog(val) {
this.udiImportDetailVisible = false;
this.thrCorpSelectVisible = false;
if (val) {
this.getList();
}
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
createSchedule(type) {
let query = {
createType: type,
syncTime: this.filterQuery.syncTime,
}
createSchedule(query)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("创建成功!");
} else if (response.code == 501) {
this.$message.warning(response.message);
} else {
this.$message.error(response.message);
}
this.getList();
createScheduleDialog(type) {
if (this.$isNotBlank(this.filterQuery.syncTime)) {
this.$confirm("此操作将从" + this.filterQuery.syncTime + "开始同步最新数据,是否继续", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.createSchedule(type);
})
.catch(() => {
this.loading = false;
});
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let dQuery = {
id: rowId,
};
deleteLog(dQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {});
},
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
this.getList();
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList();
}
},
statusFilterType(status) {
const statusMap = {
2: "success",
1: "danger",
};
return statusMap[status];
},
getSyncConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configParms = response.data;
}
})
.catch(() => {});
},
detailDialog(id) {
this.syncVisible = true;
this.list.forEach(item => {
if (id === item.id) {
this.syncInfo = item.remark;
} else {
this.createSchedule(type);
}
},
createSchedule(type) {
let query = {
createType: type,
syncTime: this.filterQuery.syncTime,
}
createSchedule(query)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("创建成功!");
} else if (response.code == 501) {
this.$message.warning(response.message);
} else {
this.$message.error(response.message);
}
this.getList();
})
}
.catch(() => {
this.loading = false;
});
},
deleteDialog(rowId) {
this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let dQuery = {
id: rowId,
};
deleteLog(dQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
} else {
this.$message.error(response.message);
}
this.getList();
})
.catch(() => {
this.loading = false;
});
})
.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)
})
},
mounted() {},
components: {},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
this.getList();
} else {
// console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success(response.data);
this.getList();
}
},
statusFilterType(status) {
const statusMap = {
2: "success",
1: "danger",
};
this.getSyncConfig();
this.getList();
this.getConfig();
return statusMap[status];
},
};
getSyncConfig() {
findConfig()
.then((response) => {
if (response.code == 20000) {
this.configParms = response.data;
}
})
.catch(() => {
});
},
detailDialog(id) {
this.syncVisible = true;
this.list.forEach(item => {
if (id === item.id) {
this.syncInfo = item.remark;
}
})
}
},
mounted() {
},
components: {},
created() {
this.headers = {
ADMIN_ID: store.getters.adminId,
ADMIN_TOKEN: store.getters.token,
};
this.getSyncConfig();
this.getList();
this.getConfig();
},
};
</script>
<style>
.itemTag {
float: left;
text-align: left;
margin-top: 10px;
width: 100px;
}
<style scoped>
.itemTag {
float: left;
text-align: left;
margin-top: 10px;
width: 100px;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.el-row {
display: flex;
flex-wrap: wrap;
.el-row {
display: flex;
flex-wrap: wrap;
}
}
.el-col {
border-radius: 4px;
flex-wrap: wrap;
}
.el-col {
border-radius: 4px;
flex-wrap: wrap;
}
.syncInfo {
font-size: medium;
font-family: "Microsoft YaHei";
line-height: 25px;
}
.syncInfo {
font-size: medium;
font-family: "Microsoft YaHei";
line-height: 25px;
}
</style>

@ -355,7 +355,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -559,6 +559,7 @@ export default {
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));
this.subData.advanceType = this.subData.advanceType.toString();
this.query.advanceType=1;
if (this.subData.parentCode != null && this.subData.parentCode != "") {
this.isAdvanceTypeShow = true;
this.isShow = false;
@ -612,6 +613,7 @@ export default {
},
hideForm() { // ---
this.query.advanceType=null;
this.formVisible = false;
this.subFormVisible = false;
this.resetForm();
@ -628,6 +630,7 @@ export default {
}
},
forInvSubmit() { // ---
this.subData.advanceType=1;
this.$refs["dataForm"].validate(valid => {
if (valid) {
saveSubWarehouse(this.subData, this.formName).then((response) => {

@ -302,7 +302,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.ao-text {
width: 100%;

@ -234,7 +234,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -239,7 +239,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -143,7 +143,7 @@ export default {
filters: {},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -275,7 +275,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -428,7 +428,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -152,7 +152,7 @@ export default {
filters: {},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -238,7 +238,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -240,7 +240,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -404,7 +404,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -145,7 +145,7 @@ export default {
filters: {},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -238,7 +238,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -384,7 +384,7 @@ export default {
},
};
</script>
<style>
<style scoped>
.itemTag {
float: left;
text-align: left;

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://192.168.0.166:9991/`,
target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Loading…
Cancel
Save