修改bug

zhairh
郑明梁 3 years ago
parent 7942a0fb49
commit ba166ea6bc

@ -202,25 +202,16 @@ export default {
this.$message.error("单据类型不能为空!"); this.$message.error("单据类型不能为空!");
return; return;
} }
if (this.$isBlank(this.inputQuery.curInv)) {
this.$message.error("请输入委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustInv)) {
this.$message.error("请输入接受委托仓库!");
return;
}
if (this.$isBlank(this.inputQuery.entrustUser)) { if (this.$isBlank(this.inputQuery.entrustUser)) {
this.$message.error("请输入接受委托人!"); this.$message.error("请输入接受委托人!");
return; return;
} }
if (this.$isBlank(this.inputQuery.invWarehouseCode)) { if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
this.$message.error("当前库不能为空!"); this.$message.error("当前仓库不能为空!");
return; return;
} }
if (this.$isBlank(this.inputQuery.entrustSubInv)) { if (this.$isBlank(this.inputQuery.entrustSubInv)) {
this.$message.error("请输入接受委托库!"); this.$message.error("请输入接受委托库!");
return; return;
} }

@ -5,9 +5,9 @@
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>当前:&nbsp;</span> <span>当前:&nbsp;</span>
</div> </div>
<el-select v-model="inputQuery.invWarehouseCode" placeholder="当前库" <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前库"
@change="entrustInvChange" @change="entrustInvChange"
filterable filterable
clearable> clearable>
@ -56,9 +56,9 @@
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>接受委托:&nbsp;</span> <span>接受委托:&nbsp;</span>
</div> </div>
<el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托库" <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托库"
@change="entrustSubInvChange" @change="entrustSubInvChange"
filterable filterable
clearable> clearable>
@ -167,9 +167,7 @@ export default {
action: [ action: [
{required: true, message: "请输入扫码单据类型", trigger: "blur"} {required: true, message: "请输入扫码单据类型", trigger: "blur"}
], ],
curInv: [
{required: true, message: "请输入委托仓库", trigger: "blur"}
],
entrustInv: [ entrustInv: [
{required: true, message: "请输入委托验收人仓库", trigger: "blur"} {required: true, message: "请输入委托验收人仓库", trigger: "blur"}
], ],
@ -230,11 +228,11 @@ export default {
findEntrustSubInvByInv() { findEntrustSubInvByInv() {
this.entrustSubInvList = []; this.entrustSubInvList = [];
let query = { let query = {
code: this.inputQuery.invWarehouseCode, code: this.inputQuery.invWarehouseCode,
}; };
filterSub(query) filterSub(query)
.then((response) => { .then((response) => {
@ -258,7 +256,7 @@ export default {
}); });
}, },
getOrderType() { getOrderType() {
let query = { let query = {
locSubInvCode: this.inputQuery.invWarehouseCode locSubInvCode: this.inputQuery.invWarehouseCode
} }

@ -222,6 +222,7 @@ export default {
getFromInv() { getFromInv() {
let subQuery = { let subQuery = {
code:this.inputQuery.locSubInv, code:this.inputQuery.locSubInv,
filter:2
} }
filterSubByInv(subQuery).then((res) => { filterSubByInv(subQuery).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {

@ -208,12 +208,12 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<div class="ao-text"> <div class="ao-text">
<span></span> <span></span>
</div> </div>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<el-form-item prop="locInvCode"> <el-form-item prop="locInvCode">
<el-select v-model="userInfo.locSubInvCode" filterable placeholder="库信息" clearable <el-select v-model="userInfo.locSubInvCode" filterable placeholder="库信息" clearable
> >
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -229,7 +229,7 @@
</el-row> </el-row>
<div style="margin-top: 8px ; color: #F71616;"> <div style="margin-top: 8px ; color: #F71616;">
<span>提示进入系统前请选择您默认所在分&nbsp;</span> <span>提示进入系统前请选择您默认所&nbsp;</span>
</div> </div>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'> <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button> <el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button>

@ -87,6 +87,7 @@
<el-input v-model="formData.remark" auto-complete="off" type="textarea" <el-input v-model="formData.remark" auto-complete="off" type="textarea"
disabled disabled
autosize></el-input> autosize></el-input>
</el-form-item>
<el-form-item prop="targetInv"> <el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%" <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
clearable> clearable>

@ -162,9 +162,11 @@
:data="registrationList" :data="registrationList"
style="width: 100%"> style="width: 100%">
<el-table-column type="index" label="序号" width="50"></el-table-column> <el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案产品名称" prop="recordProductName"
show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案人名称" prop="recordPeopleName"
show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column> <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
<el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column> <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120"> <el-table-column label="审核状态" prop="auditStatus" width="120">
@ -285,7 +287,7 @@ export default {
add: "新增生产企业资质信息", add: "新增生产企业资质信息",
update: "编辑生产企业资质信息", update: "编辑生产企业资质信息",
}, },
tital:"", tital: "",
currentManufacturer: null, currentManufacturer: null,
@ -363,7 +365,7 @@ export default {
this.registrationList = []; this.registrationList = [];
}, },
onSubmit() { onSubmit() {
this.filterQuery.page=1 this.filterQuery.page = 1
this.getList(); this.getList();
this.registrationList = []; this.registrationList = [];
}, },
@ -378,7 +380,7 @@ export default {
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -393,11 +395,11 @@ export default {
this.enterpriseId = row.id; this.enterpriseId = row.id;
this.editType = 1; this.editType = 1;
this.inputQuery = row; this.inputQuery = row;
this.tital="编辑生产企业资质信息"; this.tital = "编辑生产企业资质信息";
} else { } else {
this.enterpriseId = null; this.enterpriseId = null;
this.editType = 0; this.editType = 0;
this.tital="新增生产企业资质信息"; this.tital = "新增生产企业资质信息";
this.inputQuery = { this.inputQuery = {
auditStatus: 0 auditStatus: 0
}; };
@ -480,24 +482,24 @@ export default {
this.getRegistrationList(); this.getRegistrationList();
}, },
onSubmit2() { onSubmit2() {
if(this.currentManufacturer==null){ if (this.currentManufacturer == null) {
this.$message.error("请先选中生产企业!"); this.$message.error("请先选中生产企业!");
return return
} }
this.registrationQuery.page=1; this.registrationQuery.page = 1;
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(row) { registrationDialog(row) {
if(this.currentManufacturer==null){ if (this.currentManufacturer == null) {
this.$message.error("请先选中生产企业!"); this.$message.error("请先选中生产企业!");
return return
} }
if (this.$isNotBlank(row)) { if (this.$isNotBlank(row)) {
this.registrationId = row.id; this.registrationId = row.id;
this.curProductQuery = row; this.curProductQuery = row;
this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus; this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
this.formName = "update"; this.formName = "update";
this.editProductType = 1; this.editProductType = 1;
} else { } else {
@ -505,7 +507,7 @@ export default {
this.formName = "add"; this.formName = "add";
this.curProductQuery = { this.curProductQuery = {
auditStatus: 0, auditStatus: 0,
cuStatus:this.currentManufacturer.auditStatus cuStatus: this.currentManufacturer.auditStatus
}; };
} }
this.registrationVisible = true; this.registrationVisible = true;
@ -579,7 +581,7 @@ export default {
created() { created() {
this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name="; this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
this.getList(); this.getList();
// this.getRegistrationList(); // this.getRegistrationList();
}, },
} }
</script> </script>

@ -122,8 +122,8 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1"> v-if="curAction.corpType ==1">
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" @change="getFormStorageCode"
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
@ -146,7 +146,7 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -242,14 +242,6 @@ export default {
this.$message.warning("请选择单据类型!"); this.$message.warning("请选择单据类型!");
return; return;
} }
if (this.$isBlank(this.formData.locStorageCode)) {
this.$message.error('当前仓库不能为空');
return;
}
if (this.$isBlank(this.formData.fromCorp)) {
this.$message.error('当前往来单位不能为空');
return;
}
if (this.$isBlank(this.formData.invWarehouseCode)) { if (this.$isBlank(this.formData.invWarehouseCode)) {
this.$message.error("当前分库不能为空"); this.$message.error("当前分库不能为空");
return; return;
@ -305,7 +297,9 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
getFormStorageCode(){
// this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
},
locCHange() { locCHange() {
@ -346,6 +340,7 @@ export default {
}); });
}, },
findSubStorageMethod() { findSubStorageMethod() {
this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
let cQuery = { let cQuery = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,

@ -77,14 +77,16 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="invWarehouseCode"> <el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
:disabled="corpOrderIdDisabled" @change="findSubStorageMethod" filterable> :disabled="corpOrderIdDisabled" @change="findSubStorageMethod" filterable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -131,11 +133,9 @@
<el-form-item class="query-form-item" prop="fromCorp" <el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1" v-if="curAction.corpType ==1"
> >
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
:disabled="corpOrderIdDisabled" filterable :disabled="corpOrderIdDisabled" filterable @change="getFormStorageCode"
> >
<el-option <el-option
v-for="item in fromSubStorageOptions" v-for="item in fromSubStorageOptions"
@ -143,7 +143,9 @@
:label="item.name" :label="item.name"
:value="item.code"> :value="item.code">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>--> <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option> </el-option>
</el-select> </el-select>
@ -160,7 +162,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-if="enableDept"> <el-row :gutter="20" v-if="enableDept">
@ -574,7 +576,7 @@ export default {
this.$message.error('未选择扫码单据类型'); this.$message.error('未选择扫码单据类型');
return return
} }
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
@ -683,15 +685,12 @@ export default {
this.$message.warning("请选择单据类型!"); this.$message.warning("请选择单据类型!");
return; return;
} }
if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
this.$message.error('当前分库不能为空'); this.$message.error('当前分库不能为空');
return; return;
} }
if (this.$isBlank(this.formData.fromCorp)) {
this.$message.error('当前往来单位不能为空');
return;
}
if (this.curAction.corpType == 1) { if (this.curAction.corpType == 1) {
if (this.$isBlank(this.formData.fromSubInvCode)) { if (this.$isBlank(this.formData.fromSubInvCode)) {
this.$message.error('当前往来分库不能为空'); this.$message.error('当前往来分库不能为空');
@ -815,13 +814,14 @@ export default {
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
this.curRow = row; this.curRow = row;
}, },
storageChange(row) { getFormStorageCode(code) {
this.formData.fromSubInvCode = ""; var row= this.fromSubStorageOptions.find(item => item.code == code)
this.formData.fromCorpId = row.code; this.formData.fromSubInvCode = row.code
this.formData.fromCorpId = row.parentId;
this.formData.fromCorp = row.name; this.formData.fromCorp = row.name;
this.findSubStorageMethod();
}, },
deleteCode(index, row) { deleteCode(index, row) {
this.$confirm("是否确定移除一个条码?", "提示", { this.$confirm("是否确定移除一个条码?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -888,7 +888,7 @@ export default {
let query = { let query = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
type:1 type: 1
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
@ -926,11 +926,9 @@ export default {
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
}, },
subStorageChange() {
this.getBusType();
},
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
@ -984,7 +982,7 @@ export default {
findStorageMethod() { findStorageMethod() {
if (this.formData.locStorageCode == null) if (this.formData.locStorageCode == null)
return; return;
this.fromStorageOptions = []; this.fromStorageOptions = [];
@ -1000,14 +998,14 @@ export default {
}, },
findSubStorageMethod(val) { findSubStorageMethod(val) {
this. getBusType() ; this.getBusType();
let cQuery = { let cQuery = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
filter: 2, filter: 2,
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
.then((response) => { .then((response) => {
this.fromSubStorageOptions = response.data || []; this.fromSubStorageOptions = response.data || [];
if (val == 1) { if (val == 1) {
@ -1020,11 +1018,12 @@ export default {
findSubInvByInv() { findSubInvByInv() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
filter:3 filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
@ -1062,7 +1061,7 @@ export default {
} }
}, },
actionChange(item) { actionChange(item) {
this.curAction = this.getActionItem(item); this.curAction = this.getActionItem(item);
this.findMethod(); this.findMethod();
@ -1183,7 +1182,7 @@ export default {
}, },
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];

@ -142,7 +142,7 @@
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: 5px"> <el-row :gutter="20" style="margin-top: 5px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>当前分库</span> <span>当前分库</span>
@ -218,7 +218,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
@ -617,7 +616,7 @@ export default {
this.findSubStorageMethod(); this.findSubStorageMethod();
}, },
getActionName(action) { getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
@ -676,7 +675,7 @@ export default {
}, },
findSubInvByInv(invCode) { findSubInvByInv(invCode) {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: invCode, pcode: invCode,
@ -754,7 +753,6 @@ export default {
}); });
}, },
selectProductFunction(event) { selectProductFunction(event) {
if (event != null) { if (event != null) {
event.target.select(); event.target.select();
} }
@ -821,6 +819,7 @@ export default {
let tQuery = { let tQuery = {
code: this.code, code: this.code,
customerId: store.getters.customerId, customerId: store.getters.customerId,
}; };
stockOrderDetailQueryProduct(tQuery).then((response) => { stockOrderDetailQueryProduct(tQuery).then((response) => {
@ -1272,7 +1271,7 @@ export default {
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code; this.formData.invWarehouseCode = this.subInvList[0].code;

@ -72,7 +72,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="billType"> <el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" <el-select v-model="formData.billType" placeholder="请选择业务类型"
:disabled="codeArray.length>0" :disabled="codeArray.length>0"
clearable> clearable>
<el-option <el-option
@ -542,6 +542,7 @@ export default {
}); });
}, },
selectProductFunction(event) { selectProductFunction(event) {
if (event != null) if (event != null)
event.target.select(); event.target.select();
if (this.$isBlank(event)) { if (this.$isBlank(event)) {
@ -562,6 +563,7 @@ export default {
this.thisData.code = ""; this.thisData.code = "";
this.thisData.orderEditor = this.orderEditor; this.thisData.orderEditor = this.orderEditor;
this.thisData.orderId = ""; this.thisData.orderId = "";
this.thisData.corpName=this.formData.corpName;
this.thisData.billType = this.formData.billType; this.thisData.billType = this.formData.billType;
this.thisData.stockOrderLists = this.codeArray; this.thisData.stockOrderLists = this.codeArray;
if (this.orderEditor) { if (this.orderEditor) {
@ -905,7 +907,7 @@ export default {
}, },
getBusType() { getBusType() {
if(this.$isBlank(this.query.orderIdFk)){ if(this.$isBlank(this.query.orderIdFk)){
this.formData.billType=null; this.formData.billType=null;
} }
@ -976,7 +978,7 @@ export default {
}; };
}, },
created() { created() {
this.formData = {}; this.formData = {};
this.codeArray = []; this.codeArray = [];
this.closeConfirmFunction(false); this.closeConfirmFunction(false);
@ -1005,7 +1007,7 @@ export default {
} }
if(this.formData.invWarehouseCode!=null){ if(this.formData.invWarehouseCode!=null){
this.getBusType(); this.getBusType();
} }

@ -302,8 +302,15 @@ export default {
this.getList(); this.getList();
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.listQuery.customerId = store.getters.customerId; this.listQuery.customerId = store.getters.customerId;
if(this.listQuery.customerId==110){
this.listQuery.companyName=this.data.formData.corpName
}else{
this.listQuery.companyName=this.data.corpName
}
stockOrderDetailFilterProduct(this.listQuery) stockOrderDetailFilterProduct(this.listQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

Loading…
Cancel
Save