11/15 药品单据管理页面优化1.0

20240912_adapter
wangwei 5 months ago
parent 0f52538ef9
commit 425f6695f3

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单号:">--> <!-- <el-form-item class="query-form-item" label="单号:">-->
@ -97,6 +97,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -171,12 +172,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -982,7 +984,7 @@ export default {
currentManufacturer: {}, currentManufacturer: {},
imgList: [], imgList: [],
imgListCold: [], imgListCold: [],
showSearch: true, showSearch: false,
Upinvoice: false, Upinvoice: false,
filterQuery: { filterQuery: {
id: "", id: "",

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="单号:">--> <!-- <el-form-item class="query-form-item" label="单号:">-->
@ -79,6 +79,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -141,12 +142,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -1211,7 +1213,7 @@ export default {
imgViewerVisibleCold: false, imgViewerVisibleCold: false,
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
IMAGE_URL: process.env.VUE_APP_SYNC_API, IMAGE_URL: process.env.VUE_APP_SYNC_API,
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
@ -101,6 +101,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
@ -168,12 +169,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -1166,7 +1168,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px"> <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单号:">--> <!-- <el-form-item class="query-form-item" label="单号:">-->
@ -80,6 +80,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -142,12 +143,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -927,7 +929,7 @@ export default {
imgListCold: [], imgListCold: [],
imgViewerVisible: false, imgViewerVisible: false,
imgViewerVisibleCold: false, imgViewerVisibleCold: false,
showSearch: true, showSearch: false,
Upinvoice: false, Upinvoice: false,
currentManufacturer: {}, currentManufacturer: {},
filterQuery: { filterQuery: {

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" <el-form v-if="queryList && queryList.length > 0" :model="filterQuery"
:rules="rules" :rules="rules"
ref="form" ref="form"
class="query-form" size="mini" label-width="100px"> class="query-form" size="mini" label-width="100px">
@ -103,6 +103,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <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-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
@ -165,12 +166,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -416,7 +418,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
titleMap: { titleMap: {
add: "新增单据", add: "新增单据",
edit: "编辑单据", edit: "编辑单据",

@ -1,10 +1,11 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
@ -72,12 +73,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -253,7 +255,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
@ -125,6 +125,7 @@
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
@ -192,12 +193,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -428,7 +430,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
titleMap: { titleMap: {
add: "新增单据", add: "新增单据",
edit: "编辑单据", edit: "编辑单据",

@ -1,107 +1,184 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch"> <!--<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-if="showSearch">-->
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="单号:"> <!-- <el-form-item class="query-form-item" label="单号:">-->
<el-input v-model="filterQuery.billNo" placeholder="单号" <!-- <el-input v-model="filterQuery.billNo" placeholder="单号"-->
style="width: 90%" <!-- style="width: 90%"-->
clearable="true"></el-input> <!-- clearable="true"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="出入库类型:"> <!-- <el-form-item class="query-form-item" label="出入库类型:">-->
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <!-- <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
<el-option label="全部" value=""></el-option> <!-- <el-option label="全部" value=""></el-option>-->
<el-option label="入库" value="WareHouseIn"></el-option> <!-- <el-option label="入库" value="WareHouseIn"></el-option>-->
<el-option label="出库" value="WareHouseOut"></el-option> <!-- <el-option label="出库" value="WareHouseOut"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="单据类型:"> <!-- <el-form-item class="query-form-item" label="单据类型:">-->
<el-select v-model="filterQuery.action" placeholder="请选择单据类型" <!-- <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
style="width: 90%" <!-- style="width: 90%"-->
clearable> <!-- clearable>-->
<el-option <!-- <el-option-->
v-for="item in busTypes" <!-- v-for="item in busTypes"-->
:key="item.name" <!-- :key="item.name"-->
:label="item.name" <!-- :label="item.name"-->
:value="item.action"> <!-- :value="item.action">-->
<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-col> <!-- </el-col>-->
<!-- <el-col :span="8">--> <!-- &lt;!&ndash; <el-col :span="8">&ndash;&gt;-->
<!-- <el-form-item class="query-form-item" label="采购仓库:">--> <!-- &lt;!&ndash; <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"--> <!-- &lt;!&ndash; <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
<!-- style="width: 90%"--> <!-- &lt;!&ndash; style="width: 90%"&ndash;&gt;-->
<!-- >--> <!-- &lt;!&ndash; >&ndash;&gt;-->
<!-- <el-option--> <!-- &lt;!&ndash; <el-option&ndash;&gt;-->
<!-- v-for="item in deptList"--> <!-- &lt;!&ndash; v-for="item in deptList"&ndash;&gt;-->
<!-- :key="item.name"--> <!-- &lt;!&ndash; :key="item.name"&ndash;&gt;-->
<!-- :label="item.name"--> <!-- &lt;!&ndash; :label="item.name"&ndash;&gt;-->
<!-- :value="item.code">--> <!-- &lt;!&ndash; :value="item.code">&ndash;&gt;-->
<!-- <span style="float: left">{{ item.name }}</span>--> <!-- &lt;!&ndash; <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
<!-- </el-option>--> <!-- &lt;!&ndash; </el-option>&ndash;&gt;-->
<!-- </el-select>--> <!-- &lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- </el-form-item>--> <!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- </el-col>--> <!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
</el-row> <!-- </el-row>-->
<el-row> <!-- <el-row>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="所属仓库:"> <!-- <el-form-item class="query-form-item" label="所属仓库:">-->
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true" <!-- <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
style="width: 90%" <!-- style="width: 90%"-->
@change="invChange" <!-- @change="invChange"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in invList" <!-- v-for="item in invList"-->
: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-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="往来单位:"> <!-- <el-form-item class="query-form-item" label="往来单位:">-->
<el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位" <!-- <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
style="width: 90%" <!-- style="width: 90%"-->
clearable="true"></el-input> <!-- clearable="true"></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item class="query-form-item" label="创建时间:"> <!-- <el-form-item class="query-form-item" label="创建时间:">-->
<el-date-picker <!-- <el-date-picker-->
:picker-options="pickerOptions" <!-- :picker-options="pickerOptions"-->
v-model="actDateRange" <!-- v-model="actDateRange"-->
type="daterange" <!-- type="daterange"-->
format="yyyy 年 MM 月 dd 日" <!-- format="yyyy 年 MM 月 dd 日"-->
value-format="yyyy-MM-dd" <!-- value-format="yyyy-MM-dd"-->
range-separator="至" <!-- range-separator="至"-->
start-placeholder="开始日期" <!-- start-placeholder="开始日期"-->
end-placeholder="结束日期" <!-- end-placeholder="结束日期"-->
style="width: 90%" <!-- style="width: 90%"-->
> <!-- >-->
</el-date-picker> <!-- </el-date-picker>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </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-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -241,10 +318,10 @@
prop="coName" prop="coName"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <!--<el-table-column-->
label="规格型号" width="150" <!-- label="规格型号" width="150"-->
prop="spec" <!-- prop="spec"-->
></el-table-column> <!--&gt;</el-table-column>-->
<el-table-column <el-table-column
label="包装规格" width="150" label="包装规格" width="150"
prop="bzgg" prop="bzgg"
@ -320,7 +397,7 @@
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案号" width="160" label="批准文号" width="160"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -341,19 +418,25 @@ import {
} from "../../api/inout/order"; } from "../../api/inout/order";
import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain"
import addOrder from "./DialogCreateDrugOrder"; import addOrder from "./DialogCreateDrugOrder";
import {getInvListByUser} from "@/api/system/invWarehouse"; import { getInvListByUser, getInvListByUserOptimize } from '@/api/system/invWarehouse'
import {getLocalJoinByUser} from "@/api/basic/busType"; import { getLocalJoinByUser, getLocalJoinByUserOptimize } from '@/api/basic/busType'
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
import { executeFuc, getHead } from '@/utils/customConfig'
export default { export default {
name: "IoDealCheckOrder", name: "IoDealCheckOrder",
data() { data() {
return { return {
//
tableHeader: [],
queryList: [],
fromList: [],
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,
@ -467,13 +550,28 @@ export default {
bizTotal: 0, bizTotal: 0,
bizDetailLoading: false, bizDetailLoading: false,
bizDetailList: [], bizDetailList: [],
options: {
getInvList: [],
getDeptList: [],
getBusType: [],
},
}; };
}, },
components: { components: {
addOrder, addOrder,
}, },
methods: { 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() { onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
@ -521,17 +619,17 @@ export default {
closeDetailDialog(val) { closeDetailDialog(val) {
this.codeDetailVisible = false; this.codeDetailVisible = false;
}, },
getBusType() { getBusType(_this) {
let query = { let query = {
code: this.filterQuery.invCode, code: _this.filterQuery.invCode,
enabled: true, enabled: true,
vueType: "waitCheck", vueType: "waitCheck",
productType:2 productType:2
}; };
getLocalJoinByUser(query) getLocalJoinByUserOptimize(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; _this.options.getBusType = response.data || [];
this.getList(); _this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -638,17 +736,18 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
getInvList() { getInvList(_this) {
getInvListByUser() getInvListByUserOptimize()
.then((response) => { .then((response) => {
this.invList = response.data || []; _this.options.getInvList = response.data || [];
_this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
invChange() { invChange(_this) {
this.filterQuery.action = null; _this.filterQuery.action = null;
this.getBusType(); _this.getBusType(_this);
}, },
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
@ -743,8 +842,16 @@ export default {
}; };
}, },
created() { created() {
this.getInvList(); this.getInvList(this);
this.getBusType(); 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(); this.getList();
}, },

@ -1,106 +1,11 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
size="mini" label-width="100px"> size="mini" label-width="100px">
<!-- <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>-->
<!-- &lt;!&ndash; <el-col :span="8">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
<!-- &lt;!&ndash; style="width: 90%"&ndash;&gt;-->
<!-- &lt;!&ndash; >&ndash;&gt;-->
<!-- &lt;!&ndash; <el-option&ndash;&gt;-->
<!-- &lt;!&ndash; v-for="item in deptList"&ndash;&gt;-->
<!-- &lt;!&ndash; :key="item.name"&ndash;&gt;-->
<!-- &lt;!&ndash; :label="item.name"&ndash;&gt;-->
<!-- &lt;!&ndash; :value="item.code">&ndash;&gt;-->
<!-- &lt;!&ndash; <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-option>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-select>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </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-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList"> <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)" <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id"> :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-input
@ -168,12 +73,13 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</div>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group> <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 <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@ -544,7 +450,7 @@ export default {
data() { data() {
return { return {
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true, showSearch: false,
filterQuery: { filterQuery: {
id: "", id: "",
billNo: null, billNo: null,

Loading…
Cancel
Save