修改单据和采购功能bug

zhairh
郑明梁 3 years ago
parent 3625cbf995
commit c8c41a94a7

@ -1060,6 +1060,7 @@ export default {
}, },
productType: null, productType: null,
editQuery: null, editQuery: null,
pId:0,
productRemarkSet: {}, productRemarkSet: {},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
@ -1071,6 +1072,7 @@ export default {
allowNoBatch: null, allowNoBatch: null,
allowNoExpire: null, allowNoExpire: null,
allowNoProduct: null, allowNoProduct: null,
pId:null,
}, },
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
@ -1415,6 +1417,7 @@ export default {
this.thisData = row; this.thisData = row;
this.editDialogVisible = true; this.editDialogVisible = true;
this.editQuery = row; this.editQuery = row;
this.pId=row.id;
this.relevanceEdit = { this.relevanceEdit = {
id: row.id, id: row.id,
// thirdId: row.thirdId, // thirdId: row.thirdId,
@ -1527,6 +1530,7 @@ export default {
this.relevanceEdit.isLock = this.editQuery.isLock; this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence; this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit = this.editQuery; this.relevanceEdit = this.editQuery;
this.relevanceEdit.pid = this.pId;
if (this.checked == true) { if (this.checked == true) {
this.relevanceEdit.isUseDy = 1; this.relevanceEdit.isUseDy = 1;
} else { } else {
@ -1561,7 +1565,7 @@ export default {
let query = { let query = {
paramKey: "smp_isUploadProuct", paramKey: "smp_isUploadProuct",
}; };
debugger
spcombie().then((response) => { spcombie().then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
if (response.data.paramValue == "1") { if (response.data.paramValue == "1") {

@ -161,11 +161,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" v-if="enableDept">
<el-col :span="2"> <el-col :span="2">
<div class="ao-text"> <div class="ao-text">
<span>使用科室</span> <span>使用科室</span>
@ -195,9 +190,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="20">--> <!-- <el-row :gutter="20">-->
<!-- <el-col :span="20" class="el-col">--> <!-- <el-col :span="20" class="el-col">-->
<!-- <div class="text item">--> <!-- <div class="text item">-->

@ -25,7 +25,18 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-col> </el-col>
<el-col> <el-col>
<!-- <el-form-item class="query-form-item">--> <!-- <el-form-item class="query-form-item">-->
@ -41,20 +52,19 @@
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item class="query-form-item"> <!-- <el-form-item class="query-form-item">-->
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true" <!-- <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"-->
size="mini" <!-- size="mini"--><!-- @change="subInvChange"-->
@change="subInvChange" <!-- >-->
> <!-- <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> <!-- </el-option>-->
</el-option> <!-- </el-select>-->
</el-select> <!-- </el-form-item> -->
</el-form-item>
<el-form-item> <el-form-item>

@ -62,18 +62,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange" <el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 100%"
style="width: 50%" :disabled="true"
clearable>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
<el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 50%"
:disabled="true" clearable> :disabled="true" clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"

Loading…
Cancel
Save