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

修改bug

Browse Source
zhairh
郑明梁 3 years ago
parent 7942a0fb49
commit ba166ea6bc
11 changed files with 84 additions and 89 deletions
Show Stats Download Patch File Download Diff File

13
src/views/basic/BasicEntrutsRece.vue
Unescape Escape View File

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

12
src/views/basic/BasicEntrutsReceModify.vue
Unescape Escape View File

@ -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"}
], ],

1
src/views/basic/BusTypeChangeModify.vue
Unescape Escape View File

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

6
src/views/home/index.vue
Unescape Escape View File

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

1
src/views/purchase/pureApplyDetailDialog.vue
Unescape Escape View File

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

6
src/views/purchase/supCertificationAdd.vue
Unescape Escape View File

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

15
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -123,7 +123,7 @@
<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"
@ -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,

31
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -84,7 +84,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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -132,10 +134,8 @@
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>
@ -688,10 +690,7 @@ export default {
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: "确定",
@ -926,9 +926,7 @@ export default {
this.findSubInvByInv(this.formData.locStorageCode); this.findSubInvByInv(this.formData.locStorageCode);
}, },
subStorageChange() {
this.getBusType();
},
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
@ -1025,6 +1023,7 @@ export default {
let query = { let query = {
filter: 3 filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];

3
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

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

2
src/views/warehouse/stockOrderNewDistribution.vue
Unescape Escape View File

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

7
src/views/warehouse/stockOrderNewSelectProduct.vue
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save