Merge remote-tracking branch 'origin/otherChange' into zhairh

# Conflicts:
#	src/views/purchase/purPlanEditDialog.vue
zhairh
x_z 3 years ago
commit 9408eee9be

@ -1,6 +1,6 @@
{
"BASE_URL": "http://192.168.0.41:9996",
"SERVER_IP": "http://192.168.0.41:9996",
"BASE_URL": "http://192.168.0.166:9906",
"SERVER_IP": "http://192.168.0.166:9906",
"hosp_name": "福建省XX市医院"
}

@ -907,7 +907,7 @@
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-col :span="8" class="el-col">
<div class="text item">
<div class="itemTag">
<span>当前版本号:&nbsp;</span>
@ -919,12 +919,22 @@
splaceholder="请输入内容"
v-model="editQuery.versionNumber"
></el-input>
<el-button type="text" size="small" @click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</div>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="updateVersion()"
:loading="updateLoading"
style="margin-left: 5%"
>更新当前版本信息
</el-button>
</el-col>
</el-row>
</el-collapse-item>
@ -1027,7 +1037,7 @@ import {
removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
} from "../../api/basic/udiRelevance";
import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo";
import {dlLastVersionByDi, filterByUuid} from "../../api/basic/udiInfo";
import selectUdi from "./UdiInfoRelevance.vue";
import selectErp from "./UdiInfoselectErpUdi";
@ -1101,6 +1111,7 @@ export default {
configParms: {},
activeNames: ['1'],
useNumEnable: true,
updateLoading: false,
};
},
@ -1219,6 +1230,39 @@ export default {
this.originUuid = this.editQuery.originUuid;
this.relId = this.editQuery.id;
},
updateVersion() {
this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.updateLoading = true;
let query = {nameCode: this.editQuery.nameCode};
dlLastVersionByDi(query)
.then((response) => {
this.updateLoading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.closeDialog();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.updateLoading = false;
this.udidlList = [];
this.total = 0;
});
})
.catch(() => {
});
},
deleteOrders(data) {
this.loading = true;
let tquery = {

@ -712,7 +712,7 @@
<p class="form-title">版本信息</p>
</template>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-col :span="8" class="el-col">
<div class="text item">
<div class="itemTag">
<span>当前版本号:&nbsp;</span>
@ -724,12 +724,22 @@
splaceholder="请输入内容"
v-model="editQuery.versionNumber"
></el-input>
<el-button type="text" size="small" @click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</div>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="updateVersion()"
:loading="updateLoading"
style="margin-left: 5%"
>更新当前版本信息
</el-button>
</el-col>
</el-row>
</el-collapse-item>
@ -766,6 +776,25 @@
:supEnable="true"
></selectErp>
</el-dialog>
<el-dialog
title="选择DI版本"
:visible.sync="selectVersionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
append-to-body
v-if="selectVersionVisible"
>
<selectUdiVersion
:closeDialog="closeDialog"
:relId="relId"
:uuid="uuid"
:originUuid="originUuid"
@closeUdi="closeUdi"
></selectUdiVersion>
</el-dialog>
</div>
</template>
@ -773,6 +802,8 @@
import {removeDiRl, removeRl, updatetUdiInfos} from "@/api/basic/udiRelevance";
import {finProductSet} from "@/api/param/systemParamConfig";
import selectErp from "./UdiInfoselectErpUdi";
import selectUdiVersion from "./UdiinfoSelectVersion";
import {dlLastVersionByDi} from "../../api/basic/udiInfo";
export default {
name: "basicProductEdit",
@ -825,6 +856,9 @@ export default {
isUseDy: false,
isAdavence: null,
},
originUuid: null,
selectVersionVisible: false,
updateLoading: false,
}
},
@ -937,7 +971,7 @@ export default {
type: "success",
message: "删除成功!",
});
this.cancelDialog();
this.closeUdi();
} else {
this.$message.error(response.message);
}
@ -949,16 +983,53 @@ export default {
});
},
selectVersion() {
this.selectVersionVisible = true;
this.uuid = this.editQuery.uuid;
this.originUuid = this.editQuery.originUuid;
this.relId = this.editQuery.rlId;
},
updateVersion() {
this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.updateLoading = true;
let query = {nameCode: this.editQuery.nameCode};
dlLastVersionByDi(query)
.then((response) => {
this.updateLoading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.closeUdi();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.updateLoading = false;
this.udidlList = [];
this.total = 0;
});
})
.catch(() => {
});
},
},
created() {
this.relId = this.editQuery.rlId;
if(this.editQuery.isUseDy==1){
this.checked=true
if (this.editQuery.isUseDy == 1) {
this.checked = true
}
this.findBasicProductSet();
},
}
,
components: {
selectErp,
selectErp, selectUdiVersion
}

@ -152,6 +152,7 @@ export default {
},
methods: {
onReset() {
this.$router.push({
path: "",
});
@ -165,6 +166,8 @@ export default {
supId: null,
page: 1,
limit: 10,
invStorageCode:this.invQueryData.locStorageCode,
invWarehouseCode:this.invQueryData.invWarehouseCode
};
this.getList();
},
@ -333,6 +336,7 @@ export default {
};
},
created() {
this.getBusType();
let query = this.$route.query;

@ -356,9 +356,6 @@ export default {
if (this.formData.billDate == "" || this.formData.billDate == null) {
return this.$message.error("单据日期不能为空!");
}
/*if(this.formData.billType=="" || this.formData.billType==null){
return this.$message.error("采购类型不能为空!");
}*/
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("采购分库不能为空!");

@ -61,18 +61,20 @@
</el-col>
<el-col :span="7">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 100%"
:disabled="true"
clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
</el-select>
<el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" style="width: 100%"
:disabled="true"
clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option>
</el-select>
</el-col>
@ -88,22 +90,8 @@
disabled
autosize></el-input>
</el-form-item>
<el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -150,12 +138,34 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="formData.audtoPlan">
<el-col :span="3">
<div class="ao-text">
<span>采购科室</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv"
style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName"
max-height="300" height="300" ref="multipleTable">
@ -213,7 +223,6 @@
</el-table>
</el-card>
</el-form>
<el-dialog
title="产品录入"
:visible.sync="selectProductVisible"
@ -310,11 +319,8 @@ export default {
thisData: {},
storageList: [],
subInvList: [],
targetInvList: [],
targetSubInvList: [],
invQueryData: {},
};
@ -328,6 +334,12 @@ export default {
let tip = "";
if (status == "3") {
tip = "是否确定通过该申购请求?";
if (this.formData.audtoPlan) {
if (this.$isBlank(this.formData.targetSubInv)) {
this.$message.warning("请选择当前采购科室!");
return;
}
}
} else {
tip = "是否确定拒绝该申购请求?";
}
@ -495,7 +507,7 @@ export default {
findTargetSubInvs() {
this.targetSubInvList = [];
let query = {
pcode: this.formData.targetInv
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -560,7 +572,9 @@ export default {
}
this.getStorage();
this.findSubInvs();
this.getTargetStorage();
// this.getTargetStorage();
this.findTargetSubInvs();
this.codeArray = [];
this.getBusType();
},

@ -26,7 +26,6 @@
</el-row>
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
border>

@ -187,6 +187,7 @@ export default {
},
checDialog(row) {
this.checkVisible = true;
this.remark = "";
this.curRow = row;
},
search() {

@ -499,7 +499,9 @@ export default {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code;
this.formData.locStorageCode = this.subInvList[0].parentId;
this.getBusType();
this.findSubStorageMethod();
}
})
.catch(() => {
@ -514,27 +516,7 @@ export default {
}
},
//
findStorageMethod() {
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
let cQuery = {
locInvCode: this.formData.locStorageCode,
};
filterAllByLoc(cQuery)
.then((response) => {
let temp = response.data || [];
for (let i = 0; i < temp.length; i++) {
if (temp[i].code != this.formData.locStorageCode) {
this.fromStorageOptions.push(temp[i]);
}
}
})
.catch(() => {
});
},
//
findSubStorageMethod() {
@ -918,7 +900,6 @@ export default {
}
this.formData.locStorageCode = item;
this.$forceUpdate();
this.findStorageMethod();
this.findSubInvs();
},
@ -960,7 +941,7 @@ export default {
this.getBusType();
this.findSubInvs();
this.findSubStorageMethod();
// this.findSubInvByInv();
this.codeArray = [];
this.closeConfirmFunction(false);

File diff suppressed because it is too large Load Diff

@ -28,21 +28,22 @@
</el-col>
<el-col>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-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"
@change="subInvChange"
>
@ -55,8 +56,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
@ -476,10 +475,9 @@ export default {
this.idQuery.id = '';
this.idQuery.actDate = '';
this.idQuery.corpOrderId = '';
this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id;
this.idQuery.actDate = row.actDate;
this.idQuery.corpOrderId = row.corpOrderId;
@ -492,7 +490,6 @@ export default {
} else {
this.formName = "add";
}
if (store.getters.customerId == 110) {
this.addHosOrderVisible = true;
this.idQuery.action = row.action;
@ -718,11 +715,15 @@ export default {
getSubInvList() {
let query = {
pcode: this.filterQuery.locStorageCode
// pcode: this.filterQuery.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -749,7 +750,7 @@ export default {
};
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

File diff suppressed because it is too large Load Diff

@ -33,21 +33,21 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-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"
@change="subInvChange">
<el-option
@ -560,7 +560,7 @@ export default {
this.filterQuery.endTime = null;
}
this.getList();
},
handleSizeChange(val) {
@ -978,11 +978,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.filterQuery.locStorageCode
// pcode: this.filterQuery.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1009,7 +1011,7 @@ export default {
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

@ -1005,7 +1005,6 @@ export default {
};
filterSubByInv(cQuery)
.then((response) => {
this.fromSubStorageOptions = response.data || [];
if (val == 1) {
@ -1182,7 +1181,6 @@ export default {
},
created() {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
@ -1221,9 +1219,9 @@ export default {
if (this.$isNotBlank(this.formData.locStorageCode)) {
this.findStorageMethod();
}
this.findSubStorageMethod();
}
this.findSubInvByInv();
this.findSubStorageMethod();
this.getBusType();
//

File diff suppressed because it is too large Load Diff

@ -80,7 +80,7 @@
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位" prop="corpName" width="300"
show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据类型" prop="billType"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column>
</el-table>

@ -800,6 +800,7 @@ export default {
};
this.selectInvProductVisible = true;
} else {
this.selectProductVisible = true;
}
return;

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
@ -825,11 +825,14 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -897,7 +900,7 @@ export default {
},
created() {
//
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

@ -26,21 +26,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
@ -875,11 +875,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -975,7 +977,7 @@ export default {
}
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

@ -26,21 +26,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini" @change="subInvChange">
<el-option
v-for="item in subInvList"
@ -975,11 +975,14 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1021,7 +1024,9 @@ export default {
}
},
created() {
this.getStorage();
// this.getStorage();
this.getSubInvList();
this.getSysParm();
this.getBusType();
this.getList();

@ -26,23 +26,23 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
placeholder="请选择当前仓库" clearable="true" size="mini"
@change="invChange">
<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-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini"-->
<!-- @change="invChange">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -973,17 +973,17 @@ export default {
},
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
},
subInvChange() {
this.getBusType();
}
@ -1019,7 +1019,8 @@ export default {
},
created() {
this.getBusType();
this.getStorage();
// this.getStorage();
this.getSubInvList();
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

@ -302,10 +302,9 @@ export default {
this.getList();
},
getList() {
this.loading = true;
this.listQuery.customerId = store.getters.customerId;
if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){
this.listQuery.companyName=this.data.formData.corpName
}
if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -1026,11 +1026,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1160,7 +1162,7 @@ export default {
if (store.getters.customerId == 110) {
this.isReceAble = true;
}
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item>-->
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -813,11 +813,14 @@ export default {
},
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -883,7 +886,7 @@ export default {
},
created() {
//
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

Loading…
Cancel
Save