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

zhairh
x_z 3 years ago
commit 14183ac140

@ -27,21 +27,21 @@
<el-form-item class="query-form-item">
<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"
@change="subInvChange"
size="mini">
<el-option
@ -378,13 +378,13 @@ import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {convertDate} from "@/utils/date"
import {convertDate} from "@/utils/date"
export default {
name: "stockOrder",
data() {
return {
convertDateFun:convertDate,
convertDateFun: convertDate,
query: {
billType: null,
corpName: null,
@ -826,11 +826,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(() => {
});
@ -898,7 +901,7 @@ export default {
},
created() {
//
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">
<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"
@change="subInvChange"
size="mini">
<el-option
@ -879,11 +879,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(() => {
});
@ -1035,7 +1038,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"
@change="subInvChange"
size="mini">
<el-option
@ -645,11 +645,11 @@ export default {
this.query.startTime = null;
this.query.endTime = null;
}
this.query.page=1
this.query.page = 1
this.getList();
//
this.detailQuery.page=1
this.detailTotal=0
this.detailQuery.page = 1
this.detailTotal = 0
if (this.query.status === "202") {
this.haveDistributionVisible = true;
} else {
@ -979,11 +979,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(() => {
});
@ -1025,7 +1027,7 @@ export default {
}
},
created() {
this.getStorage();
this.getSubInvList();
this.getSysParm();
this.getBusType();
this.getList();

File diff suppressed because it is too large Load Diff

@ -27,21 +27,21 @@
<el-form-item class="query-form-item">
<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"
@change="subInvChange"
size="mini">
<el-option
@ -1002,11 +1002,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(() => {
});
@ -1120,7 +1122,7 @@ export default {
created() {
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"
@change="subInvChange"
size="mini">
<el-option
@ -813,11 +813,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(() => {
});
@ -884,7 +886,7 @@ export default {
},
created() {
//
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

@ -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"
@change="subInvChange"
size="mini">
<el-option
@ -495,7 +495,7 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {convertDate} from "@/utils/date"
import {convertDate} from "@/utils/date"
const formJson = {
@ -514,7 +514,7 @@ export default {
data() {
return {
convertDateFun:convertDate,
convertDateFun: convertDate,
query: {
page: 1,
limit: 20,
@ -541,7 +541,7 @@ export default {
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10":"手动补单",
"10": "手动补单",
"11": "仓库盘点"
},
busTypes: [],
@ -781,7 +781,7 @@ export default {
this.list = response.data.list || [];
this.total = response.data.total || 0;
}else {
} else {
this.$message.error(response.message);
}
this.detailList = [];
@ -1131,11 +1131,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(() => {
});
@ -1162,7 +1164,7 @@ export default {
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

@ -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"
@change="subInvChange"
size="mini">
<el-option
@ -883,11 +883,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(() => {
});
@ -914,7 +916,7 @@ export default {
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

File diff suppressed because it is too large Load Diff

@ -28,21 +28,21 @@
</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"
>
@ -682,11 +682,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(() => {
});
@ -720,7 +722,7 @@ export default {
};
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

@ -177,7 +177,7 @@
show-overflow-tooltip></el-table-column>
<el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作" fixed="right" width="200">
<template slot-scope="scope">
<el-button
type="text"

@ -1,11 +1,8 @@
<template>
<div class="login-container">
<div>
<h3 class="toptitle">{{ hospName }}</h3>
</div>
<el-form
class="card-box login-form"
autocomplete="on"

@ -245,13 +245,11 @@ export default {
listApplyDetail(query) //
.then((response) => {
this.detailList = response.data.list || [];
this.total = response.data.total || 0;
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
});
},
deleteDialog(row) {

@ -108,7 +108,9 @@
<el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3" v-show="formData.status==4">
<div class="ao-text">
<span>拒绝原因</span>
@ -121,10 +123,6 @@
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
</el-row>
</el-card>
<el-card>
@ -143,6 +141,7 @@
<el-button
type="primary"
:loading="loading"
@click.native.stop="selectApply()"
>选入申购单
</el-button
>
@ -243,6 +242,21 @@
:data="thisData"
></stockOrderNewSelectProduct>
</el-dialog>
<el-dialog
title="申购单据选入"
:visible.sync="selectApplyVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
append-to-body
v-if="selectApplyVisible"
>
<select-apply-list-dialog
:data="thisData"
:closeDialog="closeDialogC2"
></select-apply-list-dialog>
</el-dialog>
</div>
</template>
@ -253,6 +267,7 @@ import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {getBusChange} from "@/api/basic/busTypeChange";
import SelectApplyListDialog from "@/views/purchase/selectApplyListDialog";
export default {
name: "idQuery",
@ -314,12 +329,13 @@ export default {
storageList: [],
subInvList: [],
invQueryData: {},
selectApplyVisible: false
};
},
components: {
draggable,
stockOrderNewSelectProduct,
SelectApplyListDialog
},
methods: {
saveOrder(status) {
@ -398,6 +414,7 @@ export default {
},
closeDialogC2(rData) {
this.selectProductVisible = false;
this.selectApplyVisible = false;
this.thisData = {};
if (this.$isNotBlank(rData)) {
this.codeArray = [];
@ -537,6 +554,9 @@ export default {
.catch(() => {
});
},
selectApply() {
this.selectApplyVisible = true;
},
},
filters: {},
mounted() {

@ -61,65 +61,24 @@
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
:disabled="true"
style="width: 50%"
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>
<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-form-item>
<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>
<!-- <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.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
<!-- style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetInvList"-->
<!-- :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.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetSubInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3">
<div class="ao-text">
<span>申购说明</span>
@ -133,7 +92,6 @@
</el-form-item>
</el-col>
</el-row>
@ -180,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">
@ -243,7 +223,6 @@
</el-table>
</el-card>
</el-form>
<el-dialog
title="产品录入"
:visible.sync="selectProductVisible"
@ -340,11 +319,8 @@ export default {
thisData: {},
storageList: [],
subInvList: [],
targetInvList: [],
targetSubInvList: [],
invQueryData: {},
};
@ -358,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 = "是否确定拒绝该申购请求?";
}
@ -525,7 +507,7 @@ export default {
findTargetSubInvs() {
this.targetSubInvList = [];
let query = {
pcode: this.formData.targetInv
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -590,7 +572,9 @@ export default {
}
this.getStorage();
this.findSubInvs();
this.getTargetStorage();
// this.getTargetStorage();
this.findTargetSubInvs();
this.codeArray = [];
this.getBusType();
},

@ -0,0 +1,375 @@
<template>
<div>
<el-card class="el-card" style="margin-top: -15px">
<el-form :inline="true" :model="filterQuery" style="display: flex;" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.billNo"
placeholder="单据号"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-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="onSubmitFind"></el-button>
<el-button type="primary" icon="search" @click="combine"
>确定
</el-button
>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="申购日期" prop="billDate">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="申购分库" prop="subInvName"></el-table-column>
<el-table-column label="申购说明" prop="remark"></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>
</el-card>
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>
</div>
</template>
<script>
import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {getStockOrderDetailInstrumentById} from "@/api/inout/stockOrder";
export default {
name: "selectApplyListDialog",
props: {
data: {
type: Object,
required: true,
},
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
filterQuery: {
billAction: null,
billNo: "",
originType: null,
page: 1,
limit: 10,
},
formName: null,
statusMap: {
1: "草稿",
2: "未审核",
3: "已审核",
4: "已拒绝"
},
ids: [],
idQuery: {},
editType: 2,
total: 0,
thirdSys: [],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
list: [],
detailList: [],
loading: false,
currentRow: null,
actDateRange: [],
newSpDistributionVisible: false,
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
billNo: "",
thirdSysFk: "",
billFlag: null,
billAction: null,
startDate: null,
endDate: null,
page: 1,
limit: 10,
corpName: null,
type: 1,
editStatus: 1,
};
this.actDateRange = [];
this.getList();
},
onSubmitFind() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
if (this.actDateRange != null) {
this.filterQuery.startDate = this.actDateRange[0];
this.filterQuery.endDate = this.actDateRange[1];
} else {
this.filterQuery.startDate = null;
this.filterQuery.endDate = null;
}
this.loading = true;
this.filterQuery.status = 3;
auditListApply(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleDetail(row) {
this.currentRow = row;
let query = {orderIdFk: row.id};
this.loading = true;
listApplyDetail(query) //
.then((response) => {
this.detailList = response.data.list || [];
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
this.total = 0;
});
},
submitOrder(row) {
this.loading = true;
let tQuery = {
editStatus: 2,
purApplyEntity: row,
}
auditOrder(tQuery)
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功!");
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
},
deleteDialog(row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
delApply(row.id)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {
});
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
combine() {
if (this.$isBlank(this.currentRow.id)) {
return;
}
if (this.ids.length > 0) {
for (var i = 0; i < this.ids.length; i++) {
for (let j = 0; j < this.detailList.length; j++) {
if (this.ids[i] == this.detailList[j].productId) {
this.$message.error("该申购单已有产品被选入!");
return;
}
}
}
}
let productDatas = [];
for (let j = 0; j < this.detailList.length; j++) {
let data = {
relId: this.detailList[j].productId,
supId: this.detailList[j].supId,
zczbhhzbapzbh: this.detailList[j].zczbhhzbapzbh,
count:this.detailList[j].count,
}
productDatas.push(data);
}
this.loading = true;
let tQuery = {
datas: productDatas,
stockOrderLists: this.data.stockOrderLists,
purType: 1,
};
getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false;
if (response.code === 20000) {
this.closeDialog(response.data);
} else {
if (response.code == 601) {
this.$alert(response.message, "提示", {
confirmButtonText: "确定",
});
} else
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
},
},
created() {
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getList();
this.ids = [];
if (this.data.stockOrderLists.length > 0) {
for (var i = 0; i < this.data.stockOrderLists.length; i++) {
this.ids.push(this.data.stockOrderLists[i].productId);
}
}
},
components: {
pureApplyDetail
},
filters: {
statusFilterType(status) {
const statusMap = {
2: "warning",
3: "success",
4: "danger",
};
return statusMap[status];
}
,
}
,
};
</script>
<style scoped>
div /deep/ .el-table .warning-row {
background: #bebebe;
}
div /deep/ .el-table .success-row {
background: #ffffff;
}
</style>
Loading…
Cancel
Save