UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据相关修改

Browse Source
ywj_dev
anthonywj 3 years ago
parent 71b7b3c87a
commit 06b298d6ed
8 changed files with 124 additions and 62 deletions
Show Stats Download Patch File Download Diff File

19
src/api/basic/busType.js
Unescape Escape View File

@ -82,6 +82,7 @@ export function getBusTypeListByUser(params) {
params: params params: params
}); });
} }
export function filterUnUse(params) { export function filterUnUse(params) {
return axios({ return axios({
url: "/udiwms/localBusType/filterUnUse", url: "/udiwms/localBusType/filterUnUse",
@ -100,3 +101,21 @@ export function findByInvUser(query) {
} }
export function findChangeOrigin(query) {
return axios({
url: "/udiwms/busType/change/origin",
method: "get",
params: query
});
}
export function findChangeTarget(query) {
return axios({
url: "/udiwms/busType/change/target",
method: "get",
params: query
});
}

44
src/views/basic/locUdi/UdiSupplement.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<div> <div>
<el-form :model="unionQuery" size="mini" label-width="125px" v-show="showSearch"> <el-form :model="unionQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item class="query-form-item" label="UDI码:"> <el-form-item class="query-form-item" label="UDI码:">
@ -14,10 +14,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8">
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号"> <el-form-item class="query-form-item" label="批次号">
<el-input <el-input
v-model="unionQuery.batchNo" clearable="true" v-model="unionQuery.batchNo" clearable="true"
@ -26,18 +24,18 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item class="query-form-item" label="产品通用名称:"> <el-form-item class="query-form-item" label="物资名称:">
<el-input <el-input
v-model="unionQuery.cpmctymc" clearable="true" v-model="unionQuery.cpmctymc" clearable="true"
size="mini" size="mini"
placeholder="请输入产品通用名称" placeholder="请输入物资名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input <el-input
v-model="unionQuery.ggxh" clearable="true" v-model="unionQuery.ggxh" clearable="true"
@ -46,7 +44,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="创建时间:"> <el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -64,6 +62,8 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-divider></el-divider>
<div class="top-right-btn" style="display:flex;"> <div class="top-right-btn" style="display:flex;">
<el-button-group> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏 <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏
@ -95,22 +95,22 @@
width="280" width="280"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-table-column
label="产品名称" label="产品名称"
prop="cpmctymc" prop="cpmctymc"
width="80" width="160"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="规格型号"
prop="ggxh" prop="ggxh"
width="80" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
width="120"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
@ -143,11 +143,11 @@
<el-table-column <el-table-column
label="备注" label="备注"
prop="remark" prop="remark"
width="120" width="160"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -267,8 +267,8 @@ export default {
}; };
}, },
methods: { methods: {
closeCodeDialog(){ closeCodeDialog() {
this.selectDialog=false; this.selectDialog = false;
this.getList(); this.getList();
}, },
@ -285,7 +285,7 @@ export default {
cpmctymc: "", cpmctymc: "",
ggxh: "" ggxh: ""
}; };
this.actDateRange=[]; this.actDateRange = [];
this.getList(); this.getList();
}, },
searchList() { searchList() {

51
src/views/inout/InvoiceRegister.vue
Unescape Escape View File

@ -8,47 +8,64 @@
<el-button type="primary" size="small" @click="selectSet()">选入</el-button> <el-button type="primary" size="small" @click="selectSet()">选入</el-button>
</div> </div>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleCheckedChange"> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
<el-table-column type="selection" width="55"></el-table-column>
@selection-change="handleCheckedChange">
<el-table-column type="selection" width="55" fixed="left"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="物资名称称" label="物资名称"
prop="coName" prop="coName"
width="150"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="规格型号"
width="150"
prop="spec" prop="spec"
show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批次号" label="批次号"
width="100"
prop="batchNo" prop="batchNo"
show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="数量"
prop="productDate" prop="count"
></el-table-column> width="100"
<el-table-column
label="失效日期"
prop="expireDate"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="单据数量" label="扫码数量"
prop="reCount" prop="reCount"
width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="价格" label="价格"
prop="price" prop="price"
width="100"
></el-table-column>
<el-table-column
label="生产日期"
prop="productDate"
width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="100"
></el-table-column> ></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column <el-table-column
label="生产厂家" label="生产企业"
prop="manufacturer" prop="manufacturer"
width="160"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="注册/备案凭证号" label="注册/备案号"
width="160"
prop="certCode" prop="certCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
@ -69,7 +86,7 @@
<script> <script>
import { getBizDetailList, insertInvoice } from '@/api/inout/orderDetailBiz' import {getBizDetailList, insertInvoice} from '@/api/inout/orderDetailBiz'
export default { export default {
@ -114,7 +131,7 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.bizQuery.orderIdFk=this.inputQueryId; this.bizQuery.orderIdFk = this.inputQueryId;
getBizDetailList(this.bizQuery) getBizDetailList(this.bizQuery)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
@ -130,7 +147,7 @@ export default {
selectSet() { selectSet() {
var a=JSON.parse(JSON.stringify(this.multipleSelection)) var a = JSON.parse(JSON.stringify(this.multipleSelection))
insertInvoice(a) insertInvoice(a)
.then(response => { .then(response => {
if (response.code === 20000) { if (response.code === 20000) {

11
src/views/inout/PanelCreateOrderBizDetail.vue
Unescape Escape View File

@ -319,6 +319,10 @@ export default {
this.currentRow = val; this.currentRow = val;
if (this.currentRow.batchNo == '') if (this.currentRow.batchNo == '')
this.currentRow.batchNo = null; this.currentRow.batchNo = null;
if (this.currentRow.produceDate == '')
this.currentRow.produceDate = null;
if (this.currentRow.expireDate == '')
this.currentRow.expireDate = null;
this.selectedIndex = val.index; this.selectedIndex = val.index;
}, },
@ -385,6 +389,13 @@ export default {
if (row.batchNo == '') { if (row.batchNo == '') {
row.batchNo = null; row.batchNo = null;
} }
if (row.produceDate == '') {
row.produceDate = null;
}
if (row.expireDate == '') {
row.expireDate = null;
}
updateBizProduct(row) updateBizProduct(row)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

23
src/views/myLogin.vue
Unescape Escape View File

@ -1,7 +1,12 @@
<template> <template>
<div class="login-container"> <div class="login-container">
<div> <div>
<h3 class="toptitle">协和医院平潭分院</h3> <el-row>
<h3 class="toptitle">协和医院平潭分院</h3>
</el-row>
<el-row>
<h3 class="topSubtitle">医院UDI管理系统</h3>
</el-row>
</div> </div>
<el-form <el-form
class="card-box login-form" class="card-box login-form"
@ -15,7 +20,7 @@
<div style="text-align: center; margin-top: 10px;margin-bottom: 15px"> <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
<img alt="element-logo" src="@/assets/logo/logo.png"/> <img alt="element-logo" src="@/assets/logo/logo.png"/>
</div> </div>
<h3 class="title">用户登录</h3> <h3 class="title">供应商自助管理系统</h3>
<el-form-item prop="username" class="item" style="margin-top: -20px"> <el-form-item prop="username" class="item" style="margin-top: -20px">
<el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username"> <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
<i slot="prefix" class="el-input__icon"> <i slot="prefix" class="el-input__icon">
@ -305,16 +310,24 @@ $light_gray: #eee;
.toptitle { .toptitle {
position: absolute; position: absolute;
font-size: 55px; font-size: 45px;
color: #FFFFFF; color: #FFFFFF;
margin: 50px auto 0.5333rem 50px; margin: 120px auto 0.5333rem 180px;
text-align: center;
font-weight: bold;
}
.topSubtitle {
position: absolute;
font-size: 45px;
color: #fcd38b;
margin: 200px auto 0.5333rem 180px;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
} }
.login-form { .login-form {
//@include fxied-center; //@include fxied-center;
margin: 0px 80px auto auto; margin: 0px 60px auto auto;
width: 50em; width: 50em;
/*background-color: silver;*/ /*background-color: silver;*/
/*background: #fff;*/ /*background: #fff;*/

16
src/views/supplier/products/supProductsAddDi.vue
Unescape Escape View File

@ -3,32 +3,34 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="DI产品标识:"> <el-form-item label="DI产品标识:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入DI产品标识" clearable <el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入DI产品标识" clearable
@keyup.enter.native="keyupErp_submit($event)" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="产品名称:"> <el-form-item label="产品名称:">
<el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入产品名称"></el-input> <el-input v-model="filterQuery.name" style="width: 90%" clearable placeholder="请输入产品名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:"> <el-form-item label="规格型号:">
<el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input> <el-input v-model="filterQuery.spec" style="width: 90%" clearable placeholder="请输入规格型号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="注册证编号:"> <el-form-item label="注册证编号:">
<el-input v-model="filterQuery.registerNo" style="width: 90%" clearable <el-input v-model="filterQuery.registerNo" style="width: 90%" clearable
placeholder="请输入注册证编号"></el-input> placeholder="请输入注册证编号"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="6">
<el-form-item label="审核状态:"> <el-form-item label="审核状态:">
<el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态"> <el-select v-model="filterQuery.checkStatus" style="width: 90%" placeholder="请选择审核状态">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>

6
src/views/system/param/busTypePreModify.vue
Unescape Escape View File

@ -161,7 +161,7 @@
<script> <script>
import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType"; import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse"; import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getBusTypeChangeList} from "@/api/basic/busTypeChange"; import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
@ -235,7 +235,7 @@ export default {
let query = { let query = {
enable: true enable: true
}; };
getBusTypeList(query).then((res) => { findChangeOrigin(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.originBusTypes = res.data.list || []; this.originBusTypes = res.data.list || [];
} }
@ -246,7 +246,7 @@ export default {
let query = { let query = {
enable: true enable: true
}; };
getBusTypeList(query).then((res) => { findChangeTarget(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.targetTypes = res.data.list || []; this.targetTypes = res.data.list || [];
} }

16
src/views/system/print/pdfPrintSet.vue
Unescape Escape View File

@ -129,14 +129,14 @@
placeholder="请输入"></el-input> placeholder="请输入"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true"> <!-- <el-table-column label="打印方式" prop="remark1" show-overflow-tooltip="true">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-select v-model="scope.row.printType" placeholder="打印方式"> <!-- <el-select v-model="scope.row.printType" placeholder="打印方式">-->
<el-option label="批次号" :value=0></el-option> <!-- <el-option label="批次号" :value=0></el-option>-->
<el-option label="条码清单" :value=1></el-option> <!-- <el-option label="条码清单" :value=1></el-option>-->
</el-select> <!-- </el-select>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" width="150" prop="price"> <el-table-column label="操作" width="150" prop="price">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

Write Preview
Loading…
Cancel
Save