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

单据，条码新增，合并单据修改

Browse Source
master
anthonywj 4 years ago
parent d0dfdfd820
commit b0da7d87fd
7 changed files with 107 additions and 35 deletions
Show Stats Download Patch File Download Diff File

1
src/api/param/systemPDFTemplate.js
Unescape Escape View File

@ -38,6 +38,7 @@ export function updateDetailRel(query) {
} }
export function getSystemPDFModules(query) { export function getSystemPDFModules(query) {
return axios({ return axios({
url: "/system/pdf/module/pdfModules", url: "/system/pdf/module/pdfModules",

8
src/views/basic/UdiInfoManage.vue
Unescape Escape View File

@ -57,7 +57,7 @@
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="search" @click="submit">查询</el-button>
<el-button type="primary" icon="search" @click="intentDetail" <el-button type="primary" icon="search" @click="intentDetail"
>关联选入 >关联选入
</el-button> </el-button>
@ -857,9 +857,13 @@ export default {
}; };
this.getList(); this.getList();
}, },
getList() { submit(){
this.loading = true; this.loading = true;
this.filterQuery.page = 1; this.filterQuery.page = 1;
this.getList();
},
getList() {
getUdiInfos(this.filterQuery) getUdiInfos(this.filterQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

8
src/views/basic/UdiInfoSelectLocalUdi.vue
Unescape Escape View File

@ -45,6 +45,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
:disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
v-model="unionQuery.cpmctymc" clearable="true" v-model="unionQuery.cpmctymc" clearable="true"
size="mini" size="mini"
placeholder="器械通用名称" placeholder="器械通用名称"
@ -58,7 +59,7 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="unionQuery.ggxh" clearable="true" v-model="unionQuery.ggxh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
placeholder="规格型号" placeholder="规格型号"
size="mini" size="mini"
></el-input> ></el-input>
@ -66,7 +67,7 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="unionQuery.zczbhhzbapzbh" clearable="true" v-model="unionQuery.zczbhhzbapzbh" clearable="true"
:disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)" :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && (unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''))"
placeholder="注册证/备案号" placeholder="注册证/备案号"
size="mini" size="mini"
></el-input> ></el-input>
@ -554,7 +555,8 @@ export default {
// this.$emit("closeUdi", false); // this.$emit("closeUdi", false);
// }); // });
}) })
.catch(_ => {}); .catch(_ => {
});
} }
}) })
.catch(() => { .catch(() => {

15
src/views/basic/UdiInfoselectErpUdi.vue
Unescape Escape View File

@ -2,12 +2,6 @@
<div> <div>
<!--<div v-if="isImport">-->
<!--<el-checkbox v-model="combineQuery.isRlInv" class="checkitemTag"-->
<!--&gt;全部选入时是否根据库存信息过滤-->
<!--</el-checkbox-->
<!--&gt;-->
<!--</div>-->
<el-card class="el-card"> <el-card class="el-card">
<div> <div>
<el-form :inline="true" :model="erpQuery" style="display: flex;" size="mini"> <el-form :inline="true" :model="erpQuery" style="display: flex;" size="mini">
@ -47,6 +41,13 @@
@keyup.enter.native="keyup_submit($event)" @keyup.enter.native="keyup_submit($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="erpQuery.supName" clearable="true"
placeholder="配送企业"
@keyup.enter.native="keyup_submit($event)"
></el-input>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport"> <el-select v-model="thirdSysFk" placeholder="请设置主系统" disabled="isImport">
@ -100,6 +101,7 @@
<el-table-column label="规格型号" prop="spec"></el-table-column> <el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column> <el-table-column label="注册/备案凭证号" prop="registerNo"></el-table-column>
<el-table-column label="生产厂家" prop="manufactory"></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="配送企业" prop="supName"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:page-size="erpQuery.limit" :page-size="erpQuery.limit"
@ -352,6 +354,7 @@
registerNo: null, registerNo: null,
manufactory: null, manufactory: null,
thirdSys: null, thirdSys: null,
supName:null,
page: 1, page: 1,
limit: 10, limit: 10,

55
src/views/userManage/param/systemPDFModule.vue
Unescape Escape View File

@ -98,7 +98,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="业务类型" prop="localActionName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="模板名称"> <el-table-column label="模板名称" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.templateName === null"> <p v-if="scope.row.templateName === null">
<el-button <el-button
@ -120,6 +120,41 @@
</p> </p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注字段1" prop="remark1" show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark1"
placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column label="备注字段2" prop="remark1" show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark2"
placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column label="备注字段3" prop="remark1" show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input :disabled="scope.$index !== currentCheckIndex" v-model="scope.row.remark3"
placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="150" prop="price" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="handleEdit(scope.$index, scope.row)"
>编辑
</el-button>
<el-button
type="text"
size="small"
@click="handleSave(scope.$index, scope.row)"
>保存
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
<el-dialog <el-dialog
title="接口参数设置" title="接口参数设置"
@ -352,11 +387,12 @@ import {
systemPDFTemplateDeleteById, systemPDFTemplateDeleteById,
systemPDFModuleList, systemPDFModuleList,
systemPDFModuleSave, updateDetailRel, systemPDFModuleSave, updateDetailRel,
getSystemPDFModules, moduleDetail getSystemPDFModules, moduleDetail, updatePdfRelData
} from "../../../api/param/systemPDFTemplate"; } from "../../../api/param/systemPDFTemplate";
import {saveAs} from 'file-saver'; import {saveAs} from 'file-saver';
import {BASE_URL, SERVER_IP} from "../../../config/app"; import {BASE_URL, SERVER_IP} from "../../../config/app";
import {authRoleAuthList} from "../../../api/auth/authRole"; import {authRoleAuthList} from "../../../api/auth/authRole";
import {updateStockOrderDetail} from "@/api/warehouse/stockOrder";
const formJson = { const formJson = {
id: "", id: "",
@ -435,6 +471,7 @@ export default {
{required: true, message: "请选择所属模块", trigger: "blur"} {required: true, message: "请选择所属模块", trigger: "blur"}
] ]
}, },
currentCheckIndex: -1,
deleteLoading: false, deleteLoading: false,
uploadUrl: "", uploadUrl: "",
fileList: [], fileList: [],
@ -837,6 +874,20 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
handleEdit(index, row) {
this.currentCheckIndex = index;
console.log(this.currentCheckIndex)
},
handleSave(index, row) {
this.currentCheckIndex = -1;
updateDetailRel(row).then((res) => {
if (res.code == 20000) {
this.$message.success(res.data);
}
})
},
}, },
filters: { filters: {
paramStatusFilterType(paramStatus) { paramStatusFilterType(paramStatus) {

29
src/views/warehouse/DialogSelectUnit.vue
Unescape Escape View File

@ -12,13 +12,13 @@
>查询 >查询
</el-button </el-button
> >
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
icon="search" <!-- icon="search"-->
@click.native.stop="selectUnit()" <!-- @click.native.stop="selectUnit()"-->
>确定 <!-- >确定-->
</el-button <!-- </el-button-->
> <!-- >-->
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -51,6 +51,17 @@
></el-table-column> ></el-table-column>
<el-table-column label="状态" prop="status"></el-table-column> <el-table-column label="状态" prop="status"></el-table-column>
<el-table-column label="类型" prop="type"></el-table-column> <el-table-column label="类型" prop="type"></el-table-column>
<el-table-column width="200" label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="selectUnit(scope.row)"
>选入绑定
</el-button>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</template> </template>
@ -112,8 +123,8 @@ export default {
handleDetail(row) { handleDetail(row) {
this.curUnitRow = row; this.curUnitRow = row;
}, },
selectUnit() { selectUnit(row) {
this.$emit("selectSupUnit", this.curUnitRow); this.$emit("selectSupUnit", row);
this.$emit("closeBindDialog", true); this.$emit("closeBindDialog", true);
}, },
}, },

24
src/views/warehouse/errorCode.vue
Unescape Escape View File

@ -11,10 +11,10 @@
>查询 >查询
</el-button </el-button
> >
<!-- <el-button type="primary" icon="search" @click="deleteDialog"--> <el-button type="primary" icon="search" @click="deleteDialog"
<!-- >删除--> >删除
<!-- </el-button--> </el-button
<!-- >--> >
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -27,7 +27,7 @@
tooltip-effect="dark" tooltip-effect="dark"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- <el-table-column type="selection" width="55"></el-table-column>--> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" fixed></el-table-column> <el-table-column label="序号" type="index" fixed></el-table-column>
<!-- <el-table-column label="ID" prop="id" fixed></el-table-column> --> <!-- <el-table-column label="ID" prop="id" fixed></el-table-column> -->
<el-table-column label="条码" prop="code" fixed></el-table-column> <el-table-column label="条码" prop="code" fixed></el-table-column>
@ -52,13 +52,13 @@
<el-table-column label="操作" fixed="right" width="250"> <el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click.native.stop="deleteCode(scope.$index, scope.row)" <!-- @click.native.stop="deleteCode(scope.$index, scope.row)"-->
>删除 <!-- >删除-->
</el-button <!-- </el-button-->
> <!-- >-->
<el-button <el-button
type="text" type="text"
size="small" size="small"

Write Preview
Loading…
Cancel
Save