|
|
|
|
@ -1,107 +1,184 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div>
|
|
|
|
|
<el-card class="el-card">
|
|
|
|
|
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item class="query-form-item" label="单号:">
|
|
|
|
|
<el-input v-model="filterQuery.billNo" placeholder="单号"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable="true"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item class="query-form-item" label="出入库类型:">
|
|
|
|
|
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
|
|
|
|
|
<el-option label="全部" value=""></el-option>
|
|
|
|
|
<el-option label="入库" value="WareHouseIn"></el-option>
|
|
|
|
|
<el-option label="出库" value="WareHouseOut"></el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item class="query-form-item" label="单据类型:">
|
|
|
|
|
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in busTypes"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.action">
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="采购仓库:">-->
|
|
|
|
|
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in deptList"-->
|
|
|
|
|
<!-- :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-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
<el-form-item class="query-form-item" label="所属仓库:">
|
|
|
|
|
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
@change="invChange"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in invList"
|
|
|
|
|
: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="8">
|
|
|
|
|
<el-form-item class="query-form-item" label="往来单位:">
|
|
|
|
|
<el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable="true"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item class="query-form-item" label="创建时间:">
|
|
|
|
|
<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="结束日期"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
>
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!--<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">-->
|
|
|
|
|
<!-- <el-row>-->
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="单号:">-->
|
|
|
|
|
<!-- <el-input v-model="filterQuery.billNo" placeholder="单号"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- clearable="true"></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="出入库类型:">-->
|
|
|
|
|
<!-- <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
|
|
|
|
|
<!-- <el-option label="全部" value=""></el-option>-->
|
|
|
|
|
<!-- <el-option label="入库" value="WareHouseIn"></el-option>-->
|
|
|
|
|
<!-- <el-option label="出库" value="WareHouseOut"></el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="单据类型:">-->
|
|
|
|
|
<!-- <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- clearable>-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in busTypes"-->
|
|
|
|
|
<!-- :key="item.name"-->
|
|
|
|
|
<!-- :label="item.name"-->
|
|
|
|
|
<!-- :value="item.action">-->
|
|
|
|
|
<!-- <span style="float: left">{{ item.name }}</span>-->
|
|
|
|
|
<!-- </el-option>-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
<!-- <!– <el-col :span="8">–>-->
|
|
|
|
|
<!-- <!– <el-form-item class="query-form-item" label="采购仓库:">–>-->
|
|
|
|
|
<!-- <!– <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"–>-->
|
|
|
|
|
<!-- <!– style="width: 90%"–>-->
|
|
|
|
|
<!-- <!– >–>-->
|
|
|
|
|
<!-- <!– <el-option–>-->
|
|
|
|
|
<!-- <!– v-for="item in deptList"–>-->
|
|
|
|
|
<!-- <!– :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-row>-->
|
|
|
|
|
<!-- <el-row>-->
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="所属仓库:">-->
|
|
|
|
|
<!-- <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- @change="invChange"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in invList"-->
|
|
|
|
|
<!-- :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="8">-->
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="往来单位:">-->
|
|
|
|
|
<!-- <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- clearable="true"></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="创建时间:">-->
|
|
|
|
|
<!-- <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="结束日期"-->
|
|
|
|
|
<!-- style="width: 90%"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- </el-date-picker>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
<!--</el-form>-->
|
|
|
|
|
|
|
|
|
|
<el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
|
|
|
|
|
size="mini" label-width="100px">
|
|
|
|
|
<el-row style=" display:flex; flex-wrap: wrap; ">
|
|
|
|
|
<template v-for="(item, index) in queryList">
|
|
|
|
|
<div v-if="showSearch || item.isImport">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`" :key="item.id">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
|
|
|
|
|
clearable
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in item.lableRuleObj"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
@change="executeFuc($event,'5',item.checkRules)"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
filterable
|
|
|
|
|
remote
|
|
|
|
|
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in options[item.clickFuc]"
|
|
|
|
|
:key="item.code"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:value="item.code"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<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 v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="filterQuery[item.columnName]"
|
|
|
|
|
:style="`width:${item.width+'px'}`"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
type="date"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form>
|
|
|
|
|
<div class="top-right-btn">
|
|
|
|
|
<el-button-group>
|
|
|
|
|
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
|
|
|
|
|
<el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
icon="el-icon-refresh"
|
|
|
|
|
@ -241,10 +318,10 @@
|
|
|
|
|
prop="coName"
|
|
|
|
|
show-overflow-tooltip
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="规格型号" width="150"
|
|
|
|
|
prop="spec"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<!--<el-table-column-->
|
|
|
|
|
<!-- label="规格型号" width="150"-->
|
|
|
|
|
<!-- prop="spec"-->
|
|
|
|
|
<!--></el-table-column>-->
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="包装规格" width="150"
|
|
|
|
|
prop="bzgg"
|
|
|
|
|
@ -320,7 +397,7 @@
|
|
|
|
|
show-overflow-tooltip
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="注册/备案号" width="160"
|
|
|
|
|
label="批准文号" width="160"
|
|
|
|
|
prop="certCode"
|
|
|
|
|
show-overflow-tooltip
|
|
|
|
|
></el-table-column>
|
|
|
|
|
@ -341,19 +418,25 @@ import {
|
|
|
|
|
} from "../../api/inout/order";
|
|
|
|
|
import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain"
|
|
|
|
|
import addOrder from "./DialogCreateDrugOrder";
|
|
|
|
|
import {getInvListByUser} from "@/api/system/invWarehouse";
|
|
|
|
|
import {getLocalJoinByUser} from "@/api/basic/busType";
|
|
|
|
|
import { getInvListByUser, getInvListByUserOptimize } from '@/api/system/invWarehouse'
|
|
|
|
|
import { getLocalJoinByUser, getLocalJoinByUserOptimize } from '@/api/basic/busType'
|
|
|
|
|
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
|
|
|
|
|
import { executeFuc, getHead } from '@/utils/customConfig'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
name: "IoDealCheckOrder",
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
//页面配置
|
|
|
|
|
tableHeader: [],
|
|
|
|
|
queryList: [],
|
|
|
|
|
fromList: [],
|
|
|
|
|
|
|
|
|
|
defaultSort: {prop: 'createTime', order: 'desc'},
|
|
|
|
|
showSearch: true,
|
|
|
|
|
showSearch: false,
|
|
|
|
|
filterQuery: {
|
|
|
|
|
id: "",
|
|
|
|
|
billNo: null,
|
|
|
|
|
@ -467,13 +550,28 @@ export default {
|
|
|
|
|
bizTotal: 0,
|
|
|
|
|
bizDetailLoading: false,
|
|
|
|
|
bizDetailList: [],
|
|
|
|
|
|
|
|
|
|
options: {
|
|
|
|
|
getInvList: [],
|
|
|
|
|
getDeptList: [],
|
|
|
|
|
getBusType: [],
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
components: {
|
|
|
|
|
addOrder,
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
executeFuc(row, type, clickFuc, value) {
|
|
|
|
|
return executeFuc(this, row, type, clickFuc, value);
|
|
|
|
|
},
|
|
|
|
|
executeEval(row, expression, defaultRet) {
|
|
|
|
|
if (expression) {
|
|
|
|
|
return eval(expression);
|
|
|
|
|
}
|
|
|
|
|
return defaultRet;
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
onReset() {
|
|
|
|
|
this.$router.push({
|
|
|
|
|
path: "",
|
|
|
|
|
@ -521,17 +619,17 @@ export default {
|
|
|
|
|
closeDetailDialog(val) {
|
|
|
|
|
this.codeDetailVisible = false;
|
|
|
|
|
},
|
|
|
|
|
getBusType() {
|
|
|
|
|
getBusType(_this) {
|
|
|
|
|
let query = {
|
|
|
|
|
code: this.filterQuery.invCode,
|
|
|
|
|
code: _this.filterQuery.invCode,
|
|
|
|
|
enabled: true,
|
|
|
|
|
vueType: "waitCheck",
|
|
|
|
|
productType:2
|
|
|
|
|
};
|
|
|
|
|
getLocalJoinByUser(query)
|
|
|
|
|
getLocalJoinByUserOptimize(query)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.busTypes = response.data.list || [];
|
|
|
|
|
this.getList();
|
|
|
|
|
_this.options.getBusType = response.data || [];
|
|
|
|
|
_this.getList();
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
@ -638,17 +736,18 @@ export default {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
getInvList() {
|
|
|
|
|
getInvListByUser()
|
|
|
|
|
getInvList(_this) {
|
|
|
|
|
getInvListByUserOptimize()
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.invList = response.data || [];
|
|
|
|
|
_this.options.getInvList = response.data || [];
|
|
|
|
|
_this.getList();
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
invChange() {
|
|
|
|
|
this.filterQuery.action = null;
|
|
|
|
|
this.getBusType();
|
|
|
|
|
invChange(_this) {
|
|
|
|
|
_this.filterQuery.action = null;
|
|
|
|
|
_this.getBusType(_this);
|
|
|
|
|
},
|
|
|
|
|
findMethod(query) {
|
|
|
|
|
this.fromOptions = [];
|
|
|
|
|
@ -743,8 +842,16 @@ export default {
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.getInvList();
|
|
|
|
|
this.getBusType();
|
|
|
|
|
this.getInvList(this);
|
|
|
|
|
this.getBusType(this);
|
|
|
|
|
getHead("IoDealCheckOrderDrug", "1").then((re) => {
|
|
|
|
|
// 处理返回的数据
|
|
|
|
|
this.tableObj = re.data;
|
|
|
|
|
this.tableHeader = re.data.tableList;
|
|
|
|
|
this.queryList = re.data.queryList;
|
|
|
|
|
this.fromList = re.data.fromList;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
this.getList();
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
wangwei
5 months ago