Compare commits

..

2 Commits

Author SHA1 Message Date
wangwei 4c461ff897 检验报告 冷链报告 发票 更换或result表 2 years ago
anthonywj 12ed603a4f 新增扫码比对结果 2 years ago

@ -6,7 +6,8 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
#林纪裕
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
@ -22,10 +23,14 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:82/UDI_SPMS_SERVER/'
# 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_SPMS_SERVER/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
# 吴雨泽
# VUE_APP_BASE_API = 'http://192.168.0.58:9150/UDI_SPMS_SERVER/'
# 漳州中医院
VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

@ -74,27 +74,4 @@ export function updateInv(data) {
data: data
});
}
//获取当前登陆人用户信息
export function selectUser(query) {
return axios({
url: "/admin/auth/admin/selectUser",
method: "get",
params: query
});
}
export function modifyPasswd(data) {
return axios({
url: "/admin/auth/admin/updateUser",
method: "post",
data: data
});
}
export function filterByUser(query) {
return axios({
url: "/admin/auth/admin/selectUser",
method: "get",
params: query
});
}

@ -108,6 +108,15 @@ export function parseInvoice(params) {
});
}
export function updateorderResult(params) {
return axios({
url: "/udiwms/inout/biz/updateorderResult",
method: "post",
data: params
});
}

@ -75,16 +75,3 @@ export function getCodeSms() {
timeout: 20000
})
}
export function getTitleConfig() {
return request({
url: '/spms/getTitleConfig',
headers: {
isToken: false
},
method: 'get',
timeout: 20000
})
}

@ -172,15 +172,6 @@ export function previewImage(data) {
});
}
export function previewFile(url) {
return axios({
url: url,
method: "get",
responseType: 'arraybuffer'
});
}

@ -1,50 +1,42 @@
import axios from "@/utils/request";
export function getThrProducts(query) {
return axios({
url: "/udiwms/thrsys/getThrProducts",
method: "get",
params: query
});
return axios({
url: "/udiwms/thrsys/getThrProducts",
method: "get",
params: query
});
}
export function delThrProducts(query) {
return axios({
url: "/udiwms/thrsys/delThrProducts",
method: "post",
data: query
});
return axios({
url: "/udiwms/thrsys/delThrProducts",
method: "post",
data: query
});
}
export function downloadAll(query) {
return axios({
url: "/udiwms/thrsys/products/downloadAll",
method: "get",
params: query
});
return axios({
url: "/udiwms/thrsys/products/downloadAll",
method: "get",
params: query
});
}
export function productsDlAll(query) {
return axios({
url: "/udiwms/thrsys/products/productsDlAll",
method: "post",
data: query
});
return axios({
url: "/udiwms/thrsys/products/productsDlAll",
method: "post",
data: query
});
}
export function saveNewProduct(data) {
return axios({
url: '/udiwms/udiinfo/erp/products/saveProduct',
method: 'post',
data: data
})
}
export function updateProduct(data) {
return axios({
url: '/udiwms/udiinfo/erp/products/update',
method: 'post',
data: data
})
return axios({
url: '/udiwms/udiinfo/erp/products/saveProduct',
method: 'post',
data: data
})
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

@ -9,8 +9,9 @@
<template v-if="device!=='mobile'">
<div class="inv-hos-title">
<span
style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
<!-- <span style="font-weight: bold;color: #303133;">协和医院平潭分院</span>-->
<span
style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
<span
style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
@ -40,9 +41,6 @@
<el-dropdown-item divided @click.native="changeInv">
<span>切换仓库</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="modifyPassword">
<span>修改密码</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
</el-dropdown-item>
@ -105,78 +103,6 @@
</el-form>
</el-dialog>
<el-dialog
title="修改密码"
:visible.sync="isVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="35%"
v-if="isVisible"
>
<el-form :model="inputQuery" label-width="100px" :rules="formRules" ref="dataForm">
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="userName" label="用户账号:">
<el-input
size="small"
placeholder="请输入登录用户账号"
v-model="inputQuery.userName"
@input="change()"
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="passWord" label="当前密码:">
<el-input
size="small"
placeholder="请输入当前密码"
type="password"
v-model="inputQuery.passWord"
@input="change()"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="newPassword" label="新密码:">
<el-input
size="small"
placeholder="请输入新密码"
type="password"
v-model="inputQuery.newPassword"
@input="change()"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="20">
<el-form-item prop="confirmPassword" label="确认密码:">
<el-input
size="small"
placeholder="请输入确认密码"
type="password"
v-model="inputQuery.confirmPassword"
@input="change()"
></el-input>
</el-form-item>
</el-col>
</el-row>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="onSubmit"></el-button>
<el-button @click="closeDialog"></el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
@ -193,37 +119,21 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
import store from "@/store";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin";
import {updateInv} from "@/api/auth/authAdmin";
import {isRelogin} from "@/utils/request";
import router from "@/router";
export default {
data() {
// let validatePass2 = (rule, value, callback) => {
// if (value === "") {
// callback(new Error(""));
// } else if (value !== this.inputQuery.password) {
// callback(new Error("!"));
// } else {
// callback();
// }
// };
return {
inv: store.getters.locInvName,
deptName: store.getters.locDeptName,
inv: store.getters.locInvName,
selInvVisible: false,
isVisible: false,
userInfo: {},
inputQuery: {
passWord: "",
newPassword: "",
confirmPassword: "",
userName: "",
locInvCode: "",
},
deptList: [],
invList: [],
userName: '',
companyName: '',
formRules: {
locDeptCode: [
{required: true, message: "请选择当前部门", trigger: "blur"}
@ -231,19 +141,6 @@ export default {
locInvCode: [
{required: true, message: "请选择当前仓库", trigger: "blur"}
],
password: [{required: true, message: "请输入密码", trigger: "blur"}],
newPassword: [{required: true, message: "请输入密码", trigger: "blur"}],
confirmPassword: [
{required: true, message: "请确认密码", trigger: "blur"},
// {validator: validatePass2, trigger: "blur"},
],
},
rules: {
password: [{required: true, message: "请输入密码", trigger: "blur"}],
confirmPassword: [
{required: true, message: "请确认密码", trigger: "blur"},
// {validator: validatePass2, trigger: "blur"},
],
},
};
@ -282,41 +179,6 @@ export default {
}
},
methods: {
onSubmit() {
if (this.inputQuery.newPassword != this.inputQuery.confirmPassword) {
this.$message.error("新密码与确认密码不一致!!!!");
return
}
if (this.inputQuery.passWord == this.inputQuery.newPassword) {
this.$message.error("旧密码与新密码不能相同!!!!");
return
}
this.$refs["dataForm"].validate((valid) => {
if (valid) {
this.loading = true;
modifyPasswd(this.inputQuery).then((response) => {
if (response.code === 20000) {
this.loading = false;
this.$confirm('密码重置成功,请点击确定重新登录', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
location.href = process.env.VUE_APP_CONTEXT_PATH;
})
}).catch(() => {
});
} else {
this.$message.error(response.message);
}
});
} else {
return false;
}
});
},
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
@ -335,9 +197,7 @@ export default {
changeInv() {
this.selInvVisible = true;
},
modifyPassword() {
this.isVisible = true;
this.getDeptList();
},
getDeptList() {
@ -350,16 +210,6 @@ export default {
.catch(() => {
});
},
// getInputQuery() {
// this.inputQuery = [];
// filterByUser()
// .then((response) => {
// this.inputQuery = response.data || [];
// // this.getInvList();
// })
// .catch(() => {
// });
// },
deptChange() {
this.getInvList();
@ -369,7 +219,8 @@ export default {
getInvList() {
this.invList = [];
let query = {
deptCode: this.userInfo.locDeptCode
deptCode: this.userInfo.locDeptCode,
type:1
};
findByDeptUser(query)
.then((response) => {
@ -415,8 +266,6 @@ export default {
closeDialog() {
this.selInvVisible = false;
this.isVisible = false;
this.getDeptList()
this.resetForm();
},
@ -434,17 +283,14 @@ export default {
},
created() {
this.userName = this.$store.getters.name;
this.companyName = this.$store.getters.companyName;
this.userInfo = {
id: store.getters.adminId,
locInvCode: store.getters.locInvCode,
locDeptCode: store.getters.locDeptCode,
};
this.inputQuery = {
userName: this.userName,
id: this.userInfo.id,
};
// this.getInputQuery();
this.getDeptList();
//this.getInvList()

@ -60,7 +60,7 @@ export default {
.sidebar-logo-container {
position: relative;
width: 100%;
height: 110px;
height: 100px;
line-height: 50px;
background: #2b2f3a;
text-align: center;
@ -72,7 +72,7 @@ export default {
& .sidebar-logo {
width: 100px;
height: 100px;
height: 73px;
margin-top: 12px;
vertical-align: middle;
margin-right: 12px;
@ -94,7 +94,7 @@ export default {
&.collapse {
.sidebar-logo {
width: 44px;
height: 44px;
height: 32px;
margin-right: 0px;
}
}

@ -87,18 +87,14 @@
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="getStockOrderDetailList" ref="multipleTable"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@row-click="getStockOrderDetailList" ref="multipleTable">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="打印状态" width="100" prop="inCodeStatus">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
@ -211,7 +207,6 @@ export default {
name: "stockOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
convertDateFun: convertDate,
query: {
@ -227,7 +222,7 @@ export default {
limit: 10,
startTime: "",
endTime: "",
inCodeStatus: 0,
inCodeStatus: 1,
},
detailQuery: {
orderIdFk: "",
@ -344,7 +339,7 @@ export default {
limit: 10,
startTime: "",
endTime: "",
inCodeStatus: 0,
inCodeStatus: 1,
};
this.getList();
@ -392,17 +387,6 @@ export default {
this.getList();
}
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.query.sort = 'desc'
} else {
this.query.sort = 'asc'
}
this.query.orderBy = column.prop;
this.getList();
},
getList() {
this.loading = true;
this.query.corpId = store.getters.customerId;

@ -122,9 +122,8 @@
<el-col :span="12" type="flex">
<el-form-item label="往来单位名称" prop="name">
<el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()"
placeholder="请输入往来单位名称" :maxlength="40"></el-input>
splaceholder="请输入往来单位名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" type="flex">
<el-form-item label="往来单位编码" prop="erpId">

@ -13,8 +13,8 @@
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span style="font-size: 14px; font-weight: 500">{{
node.label
}}</span></span
node.label
}}</span></span
>
</el-tree>
</el-col>
@ -183,32 +183,32 @@
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch"
>显示/隐藏搜索栏
>显示/隐藏搜索栏
</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="submit"
>查询
>查询
</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="editUdiType"></el-button>-->
<el-button
type="primary"
icon="el-icon-plus"
@click="intentImportUdi"
>选入DI信息
>选入DI信息
</el-button>
<el-button
type="primary"
icon="el-icon-plus"
@click="intentImportErp"
>添加院内字典
>添加院内字典
</el-button>
<el-button
type="primary"
icon="el-icon-plus"
@click="intentDetail"
>关联添加
>关联添加
</el-button>
</el-button-group>
</div>
@ -246,36 +246,6 @@
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="商品名称"
prop="spmc"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:spmc')"
></el-table-column>
<el-table-column
label="商品条码"
prop="sptm"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:sptm')"
></el-table-column>
<el-table-column
label="医保编码"
prop="ybbm"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:ybbm')"
></el-table-column>
<el-table-column
label="计量单位"
prop="measname"
width="160"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:measname')"
></el-table-column>
<el-table-column
label="注册/备案号"
prop="zczbhhzbapzbh"
@ -288,69 +258,11 @@
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle1"
prop="basicPrductRemak1"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak1')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle2"
prop="basicPrductRemak2"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak2')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle3"
prop="basicPrductRemak3"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak3')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle4"
prop="basicPrductRemak4"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak4')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle5"
prop="basicPrductRemak5"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak5')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle6"
prop="basicPrductRemak6"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak6')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle7"
prop="basicPrductRemak7"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak7')"
></el-table-column>
<el-table-column
:label="productRemarkSet.remarkTitle8"
prop="basicPrductRemak8"
width="180"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:basicPrductRemak8')"
></el-table-column>
<el-table-column
label="集采状态"
prop="groupBuy"
width="120"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:groupBuy')"
>
<template slot-scope="scope">
<el-tag :type="scope.row.groupBuy | statusFilterType">
@ -363,7 +275,6 @@
prop="dispatch"
width="120"
show-overflow-tooltip
v-if="$auth.hasPermi('basic:dispatch')"
>
<template slot-scope="scope">
<el-tag :type="scope.row.dispatch | statusFilterType">
@ -378,27 +289,27 @@
size="small"
:disabled="scope.row.originUuid != null"
@click.native.stop="intentSelectUdi(scope.row)"
>关联DI
>关联DI
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>详情
>详情
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="diEdit(scope.row)"
>编辑
>编辑
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
>删除
</el-button>
</template>
</el-table-column>
@ -1007,7 +918,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
>
</div>
<el-input
@ -1028,7 +939,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
>
</div>
<el-input
@ -1051,7 +962,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
>
</div>
<el-input
@ -1072,7 +983,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
>
</div>
<el-input
@ -1095,7 +1006,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
>
</div>
<el-input
@ -1116,7 +1027,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
>
</div>
<el-input
@ -1139,7 +1050,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
>
</div>
<el-input
@ -1160,7 +1071,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
>
</div>
<el-input
@ -1335,7 +1246,7 @@
size="small"
@click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
>切换版本
</el-button>
</el-col>
<el-col :span="2" class="el-col">
@ -1345,7 +1256,7 @@
@click.native.stop="updateVersion()"
:loading="updateLoading"
style="margin-left: 5%"
>更新当前版本信息
>更新当前版本信息
</el-button>
</el-col>
</el-row>
@ -1380,14 +1291,14 @@
size="small"
icon="search"
@click="onAddSubmit(false)"
>提交
>提交
</el-button>
<el-button
type="primary"
size="small"
icon="search"
@click="cancelDialog"
>取消
>取消
</el-button>
</div>
</el-dialog>
@ -1409,14 +1320,14 @@
size="small"
icon="search"
@click="onAddSingleSubmit(false)"
>提交
>提交
</el-button>
<el-button
type="primary"
size="small"
icon="search"
@click="cancelDialog"
>取消
>取消
</el-button>
</div>
</el-dialog>
@ -1562,7 +1473,7 @@ import {
selectSysParamByKey,
finProductSet,
} from "@/api/param/systemParamConfig";
import {filterByUuid} from "@/api/basic/product/udiInfo";
import { filterByUuid } from "@/api/basic/product/udiInfo";
import selectUdi from "./UdiInfoSelectRel.vue";
import selectErp from "./udiInfoselectErpUdi";
@ -1573,8 +1484,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
import productUdiType from "@/views/basic/product/productUdiType";
import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
import {dlLastVersionByDi} from "@/api/basic/udiInfo";
import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
import { dlLastVersionByDi } from "@/api/basic/udiInfo";
export default {
data() {
@ -1623,16 +1534,7 @@ export default {
false: "不可配送",
},
pId: 0,
productRemarkSet: {
remarkTitle1: "备注字段1",
remarkTitle2: "备注字段2",
remarkTitle3: "备注字段3",
remarkTitle4: "备注字段4",
remarkTitle5: "备注字段5",
remarkTitle6: "备注字段6",
remarkTitle7: "备注字段7",
remarkTitle8: "备注字段8",
},
productRemarkSet: {},
relevanceEdit: {
id: null,
thirdId: "",
@ -1679,7 +1581,7 @@ export default {
selectVersionVisible: false,
selectLocalVisible: false, //UDI
isUseDyCheck: false,
lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
activeNames: ["1"],
useNumEnable: true,
updateLoading: false,
@ -1810,8 +1712,7 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {
});
.catch(() => {});
},
deleteDialog(rowId) {
@ -1823,8 +1724,7 @@ export default {
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {
});
.catch(() => {});
},
intentDetail() {
@ -1862,11 +1762,9 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {
});
.catch(() => {});
})
.catch(() => {
});
.catch(() => {});
},
removeDi() {
@ -1893,11 +1791,9 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {
});
.catch(() => {});
})
.catch(() => {
});
.catch(() => {});
},
intentSelectErp(val) {
@ -2077,10 +1973,10 @@ export default {
isAdavence: row.isAdavence,
};
this.editFormat = JSON.parse(JSON.stringify(row));
if (this.editFormat.overStockNum == null) {
if( this.editFormat.overStockNum == null){
this.editFormat.overStockNum = 0;
}
if (this.editFormat.lowStockNum == null) {
if( this.editFormat.lowStockNum == null){
this.editFormat.lowStockNum = 0;
}
this.editDiDialogVisible = true;
@ -2189,8 +2085,7 @@ export default {
var invlist = response.data || [];
this.treeList = this.handleTree(invlist, "code", "parentCode");
})
.catch(() => {
});
.catch(() => {});
},
addHospProduct(data) {
@ -2228,6 +2123,7 @@ export default {
type: "warning",
})
.then(() => {
debugger;
this.updateLoading = true;
let query = {
uuid: this.editQuery.uuid,
@ -2249,12 +2145,10 @@ export default {
this.total = 0;
});
})
.catch(() => {
});
.catch(() => {});
},
},
mounted() {
},
mounted() {},
components: {
ProductSingleEdit,
ProductEdit,
@ -2280,7 +2174,6 @@ export default {
margin-left: -2px;
height: 30px;
}
.tree {
::v-deep .el-tree-node {
.el-tree-node__content {

@ -219,7 +219,6 @@ export default {
});
},
handleSubForm(data, formName) { //
debugger
this.formName = formName;
if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data));

@ -17,7 +17,7 @@
:model="inputQuery"
:rules="rules"
ref="inputQuery"
style="margin-left: 20%"
style="margin-left: 20%"
>
<el-row :gutter="20">
<el-col :span="4">

@ -138,10 +138,9 @@
:action="this.uploadUrl"
:on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove"
:limit="1"
:headers="headers"
:on-exceed="uploadHandleExceed"
accept=".jpg,.png,.pdf"
accept=".jpg,.png"
:on-change="uploadOnchange"
:on-success="uploadHandleSuccess"
:on-error="uploadHandleError"
@ -152,7 +151,7 @@
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile }}
</el-button>
<div>只能上传 jpg,png,pdf 文件且不超过 10 MB</div>
<div>只能上传 jpg,png 文件且不超过 10 MB</div>
</el-upload>
</el-form-item>
@ -190,10 +189,9 @@
:action="this.uploadUrl"
:on-preview="uploadHandlePreview"
:on-remove="uploadHandleRemove1"
:limit="1"
:headers="headers"
:on-exceed="uploadHandleExceed"
accept=".jpg,.png,.pdf"
accept=".jpg,.png"
:on-change="uploadOnchange1"
:on-success="uploadHandleSuccess1"
:on-error="uploadHandleError"
@ -204,7 +202,7 @@
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile1 }}
</el-button>
<div>只能上传 jpg,png,pdf 文件且不超过 10 MB</div>
<div>只能上传 jpg,png 文件且不超过 10 MB</div>
</el-upload>
</el-form-item>
@ -219,7 +217,8 @@
style="text-align:right" @click="showImgViewerCold">
冷链报告预览
</el-button>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold" :url-list="imgListCold"/>
<el-image-viewer v-if="imgViewerVisibleCold" style="z-index:9999" :on-close="closeImgViewerCold"
:url-list="imgListCold"/>
</el-col>
@ -227,7 +226,6 @@
</el-row>
</el-card>
</el-form>
@ -238,7 +236,7 @@
import draggable from "vuedraggable";
import store from "@/store";
import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
import {previewImage,previewFile} from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -263,9 +261,9 @@ export default {
data() {
return {
imgList: [],
imgListCold:[],
imgListCold: [],
imgViewerVisible: false,
imgViewerVisibleCold:false,
imgViewerVisibleCold: false,
BASE_URL: process.env.VUE_APP_BASE_API,
code: "",
formData: {
@ -292,7 +290,8 @@ export default {
headers: {},
choiceFile: "选取文件",
choiceFile1: "选取文件",
isChangeCheck: false,
isChangeCold: false,
};
},
components: {
@ -373,7 +372,7 @@ export default {
this.$message.warning(`当前限制选择 1 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
},
uploadOnchange(file, fileList) {
this.inputQuery.checkFileName = file.name;
// this.inputQuery.checkFileName = file.name;
let fileName = file.name;
let uid = file.uid
let pos = fileName.lastIndexOf(".");
@ -400,7 +399,7 @@ export default {
return isLt;
},
uploadOnchange1(file, fileList) {
this.inputQuery.checkColdFileName = file.name;
// this.inputQuery.checkColdFileName = file.name;
let fileName = file.name;
let uid = file.uid
let pos = fileName.lastIndexOf(".");
@ -427,20 +426,37 @@ export default {
return isLt;
},
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.filePath = response.data.name;
// this.onSubmit();
if (this.inputQuery.filePath == null || this.isChangeCheck == true) {
this.inputQuery.filePath = response.data.name + ",";
this.inputQuery.checkFileName = file.name + ",";
this.isChangeCheck = false;
} else {
this.inputQuery.filePath += response.data.name + ",";
this.inputQuery.checkFileName += file.name + ",";
}
} else {
this.$message.error("文件上传失败:" + response.message);
}
},
uploadHandleSuccess1(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.coldFilePath = response.data.name;
// this.onSubmit();
if (this.inputQuery.coldFilePath == null || this.isChangeCold == true) {
this.inputQuery.coldFilePath = response.data.name + ",";
this.inputQuery.checkColdFileName = file.name + ",";
this.isChangeCold = false;
} else {
this.inputQuery.coldFilePath += response.data.name + ",";
this.inputQuery.checkColdFileName += file.name + ",";
}
} else {
this.$message.error("文件上传失败:" + response.message);
}
},
uploadHandleError() {
@ -455,85 +471,36 @@ export default {
return isJPG || isPNG;
},
showImgViewer(row) {
if(this.inputQuery.filePath.substr(-1) == ','){
this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = this.inputQuery.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(this.inputQuery.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row){
if(this.inputQuery.coldFilePath.substr(-1) == ','){
this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
showImgViewerCold(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = this.inputQuery.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(this.inputQuery.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({imageUrl: this.inputQuery.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -547,9 +514,11 @@ export default {
document.removeEventListener("touchmove", m, true);
},
closeImgViewerCold(){
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
@ -578,11 +547,13 @@ export default {
}
if (this.inputQuery.filePath != null) {
this.choiceFile = "更换检验报告";
this.isChangeCheck = true;
} else {
this.choiceFile = "选取检验报告";
}
if (this.inputQuery.coldFilePath != null) {
this.isChangeCold = true;
this.choiceFile1 = "更换冷链报告";
} else {
this.choiceFile1 = "选取冷链报告";

@ -20,7 +20,6 @@
v-if="curAction.checkWebNew > 1 && viewType == 1"
>待配货提交
</el-button>
<el-button size="mini" type="primary" @click.native="submit(1)"
v-if="curAction.checkWebNew == 3"
>未配货提交
@ -59,7 +58,7 @@
@change="actionChange">
<el-option
v-for="item in busTypeOptions"
:key="item.action"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
@ -196,6 +195,14 @@
</el-form>
</el-card>
<el-tabs type="border-card" style="margin: 5px">
<el-tab-pane label="校验结果" v-if="bizShow && viewBizVisible">
<resultDetailPanel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
:viewType="viewType"
:curBustype="curAction"
v-if="isBizDetailAlive"></resultDetailPanel>
</el-tab-pane>
<el-tab-pane label="业务详情" v-if="bizShow && viewBizVisible">
<biz-detail-panel :idQuery="orderFormData" :refreshPanel="refreshCodesPanel" :refreshOrder="refreshOrder"
:viewType="viewType"
@ -251,6 +258,7 @@ import editCodeDialog from "./DialogEditCode";
import codesPanel from "./PanelCreateOrderCodes"
import codeDetailPanel from "./PanelCreateOrderCodeDetail"
import bizDetailPanel from "./PanelCreateOrderBizDetail"
import resultDetailPanel from "./PanelCreateOrderResultDetail"
import A from "../../plugins/KeyScaner"
import {findByInvUser, getLocalJoinByUser} from '@/api/basic/busType'
@ -364,7 +372,7 @@ export default {
};
},
components: {
codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog
codesPanel, codeDetailPanel, bizDetailPanel, editCodeDialog, resultDetailPanel
},
methods: {
//
@ -877,6 +885,7 @@ export default {
inputer.focus();
},
created() {
//
this.codeFormData.code = '';
@ -897,7 +906,7 @@ export default {
this.orderFormData = this.orderQuery;
this.actionEnable = true;
this.refreshCodesPanel();
// //
//
this.findInvListByUser();
this.initBusType();
this.findMethod(this.orderFormData.fromCorp);
@ -930,7 +939,31 @@ export default {
<style>
#inputer {
width: 100%;
min-height: 30px;
background-color: white;
border: #d0d0d0;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
#inputer:focus {
width: 100%;
min-height: 30px;
background-color: white;
border: #0080FF;
border-style: solid;
border-width: 0.1px;
color: #4a4a4a;
}
.ime-disabled {
ime-mode: disabled;
}
</style>

@ -136,11 +136,11 @@
/>
</el-card>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -6,7 +6,7 @@
type="primary"
icon="el-icon-bottom-right"
@click="onSubmit"
>登记
>登记
</el-button>
<el-form
@ -123,7 +123,7 @@
>
{{ choiceFile }}
</el-button>
<div>只能上传 jpg,png文件且不超过 10 MB</div>
<div>只能上传 jpg,png,pdf,doc 文件且不超过 10 MB</div>
</el-upload>
</el-form-item>
</el-col>
@ -169,7 +169,7 @@
row-key="id"
highlight-current-row
>
<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"></el-table-column>
<el-table-column
label="发票编码"
@ -265,16 +265,15 @@ import {
insertInvoice,
updateOrder,
filterBizOrderList,
updateorderBiz, parseInvoice
updateorderBiz,parseInvoice
} from "@/api/inout/orderDetailBiz";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogInvoice from "@/views/inout/DialogInvoice";
import InvoiceRegister from "@/views/inout/InvoiceRegister";
import {previewImage,previewFile} from "@/api/purchase/supCompany";
import { previewImage } from "@/api/purchase/supCompany";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import store from "@/store";
import {deleteRe} from "@/api/auth/register";
const formJson = {
site_id: "",
@ -295,7 +294,7 @@ export default {
required: true,
},
getOrderDetails: {
type: Function,
type: Object,
required: true,
},
invoiceRow: {
@ -342,7 +341,7 @@ export default {
corpLoading: false,
fromOptions: [],
invoiceLoading: false,
formName: 1,
formMap: {
1: "发票登记",
@ -355,10 +354,10 @@ export default {
// { required: true, message: "", trigger: "blur" },
// ],
invoiceEncode: [
{required: true, message: "请输入发票编码", trigger: "blur"},
{ required: true, message: "请输入发票编码", trigger: "blur" },
],
price: [{required: true, message: "请输入发票价格", trigger: "blur"}],
invoiceDate: [{required: true, message: "请输入备注", trigger: "blur"}],
price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
invoiceDate: [{ required: true, message: "请输入备注", trigger: "blur" }],
},
certFileUrl: "",
Upinvoice: false,
@ -479,13 +478,21 @@ export default {
subRow: null,
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
methods: {
onSubmit() {
if (this.invoiceRow == null) {
this.$message.error("请选择要登记的物资! ");
return false;
}
// if (this.$isBlank(this.inputQuery.machineNo)) {
// this.$message.error("");
// return;
// }
// if (this.$isBlank(this.inputQuery.invoiceCode)) {
// this.$message.error("");
// return;
// }
if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error("发票编码不能为空!");
return;
@ -499,35 +506,19 @@ export default {
return;
}
this.inputQuery.list = this.invoiceRow;
let mount = 0;
for (var i = 0; i < this.invoiceRow.length; i++) {
mount += this.invoiceRow[i].amount
let mount=0;
for(var i=0;i<this.invoiceRow.length;i++){
mount+=this.invoiceRow[i].amount
}
if (mount != this.inputQuery.price) {
this.$confirm("价格不匹配,是否确定提交?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.postInvoice();
})
.catch(() => {
});
if(mount != this.inputQuery.price){
this.$message.error("价格不匹配!");
return;
} else {
this.postInvoice();
}
},
postInvoice() {
insertInvoice(this.inputQuery)
.then((response) => {
if (response.code === 20000) {
this.statusCode = response.code;
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
@ -537,7 +528,7 @@ export default {
});
//
updateorderBiz(this.inputQuery.list).then((res) => {
updateorderResult(this.inputQuery.list).then((res) => {
this.closeDialog();
});
},
@ -546,14 +537,14 @@ export default {
event.currentTarget.select();
},
enterKey() {
let param = {
code: this.inputQuery.code
enterKey(){
let param={
code :this.inputQuery.code
}
parseInvoice(param)
.then((res) => {
if (res.code == 20000) {
this.inputQuery = res.data;
.then((res)=>{
if(res.code == 20000){
this.inputQuery=res.data;
}
})
@ -561,9 +552,9 @@ export default {
},
uploadHandleError() {
},
uploadHandleError() {},
uploadHandleSuccess(response, file, fileList) {
debugger;
if (response.code === 20000) {
this.inputQuery.licenseUrl = response.data.name;
// this.onSubmit();
@ -690,40 +681,23 @@ export default {
.then((res) => {
this.closeDialog();
})
.catch((error) => {
});
.catch((error) => {});
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.licenseUrl;
"/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = this.inputQuery.licenseUrl.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(this.inputQuery.licenseUrl.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({
imageUrl: this.inputQuery.licenseUrl,
certFileUrl: this.certFileUrl,
}).then((response) => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList);
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
};

@ -138,19 +138,17 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange">
@row-click="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="登记状态" prop="invoiceStatus" width="100">
<el-table-column label="登记状态" prop="checkStatus" width="100">
<template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.invoiceStatus==0">
<el-tag type="danger" v-if="scope.row.allCout==0">
未登记
</el-tag>
<el-tag type="warning" v-if="scope.row.invoiceStatus==1 ">
<el-tag type="warning" v-if="scope.row.partCount>0 && scope.row.allCout>0">
未全部登记
</el-tag>
<el-tag type="success" v-if="scope.row.invoiceStatus == 2 ">
<el-tag type="success" v-if="scope.row.partCount == 0 && scope.row.allCout>0">
全部登记
</el-tag>
</template>
@ -162,13 +160,9 @@
</el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220" v-if="showSup">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="审核时间" prop="auditTime" width="150" show-overflow-tooltip>
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">
@ -200,8 +194,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@ -231,7 +223,7 @@
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
@current-change="BizDetail"
@row-click="BizDetail"
row-key="id" highlight-current-row
>
<el-table-column label="序号" type="index"></el-table-column>
@ -342,7 +334,7 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
<el-table v-loading="invoiceLoading" :data="bizDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
@ -462,7 +454,6 @@
<checkInvoice
:closeDialog="closecheckInvoice"
:input="inputInv"
:getOrderDetails="getOrderDetails"
></checkInvoice>
</el-dialog>
@ -539,7 +530,7 @@ import InvoiceRegistrationDetermine from "@/views/inout/InvoiceRegistrationDeter
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getDeptListByUser} from "@/api/auth/authDept";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {previewImage,previewFile} from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -554,7 +545,6 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
savebillno: null,
invoiceRow: [],
inputInv: [],
@ -686,7 +676,6 @@ export default {
bizTotal: 0,
invTotal: 0,
bizDetailLoading: false,
invoiceLoading: false,
bizDetailList: [],
codeQuery: {
orderIdFk: null,
@ -775,40 +764,19 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.licenseUrl;
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.licenseUrl.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.licenseUrl.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({imageUrl: row.licenseUrl, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -860,16 +828,12 @@ export default {
deleteById(row)
.then((response) => {
if (response.code == 20000) {
if (response.data.length == 0) {
this.getList();
}else{
this.getCodeDetailList();
}
this.getBizDetailListInv(this.subRow);
this.$message({
type: "success",
message: "删除成功!",
});
this.getCodeDetailList();
}
})
.catch(() => {
@ -905,18 +869,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;
@ -997,7 +949,7 @@ export default {
for (var i = 0; i < invlist1.length; i++) {
if (invlist1[i].code == 1000000) {
this.invList.push(invlist1[i]);
this.filterQuery.invCode = invlist1[i].code;
this.filterQuery.invCode=invlist1[i].code;
}
}
@ -1044,7 +996,7 @@ export default {
}
this.codeQuery.orderIdFk = this.currentRow.billNo;
this.codeDetailLoading = true;
this.codeDetailList = [];
filterBizOrderList(this.codeQuery).then((res) => {
this.codeDetailLoading = false;
if (res.code === 20000) {
@ -1080,7 +1032,7 @@ export default {
this.$message.error("请先选择需要查询的单据!")
return;
}
this.invoiceLoading = true;
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
if (row != null) {
this.bizQuery.orderIdFk = row.orderIdFk;
@ -1089,7 +1041,7 @@ export default {
//this.bizQuery.bizIdFk = row.id;
}
filterListInvoice(this.bizQuery).then((res) => {
this.invoiceLoading = false;
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data.list || [];
this.invTotal = res.data.total || 0;
@ -1099,7 +1051,7 @@ export default {
this.invTotal = 0;
}
}).catch((error) => {
this.invoiceLoading = false;
this.bizDetailLoading = false;
this.$message.error(error.message);
this.bizDetailList = [];
this.invTotal = 0;
@ -1186,7 +1138,6 @@ export default {
}
,
created() {
debugger
let supId = this.$store.getters.customerId;
if (supId == "110") {
this.showSup = true;

@ -145,8 +145,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">

@ -114,8 +114,6 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="校验状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->

@ -99,16 +99,12 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@cell-click="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange">
@cell-click="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -135,8 +131,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button
@ -465,7 +459,6 @@ export default {
name: "IoCheckErrorOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@ -689,17 +682,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -122,8 +122,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="160">
<template slot-scope="scope">

@ -109,15 +109,12 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border :default-sort="defaultSort"
@sort-change="handleSortChange"
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@ -139,8 +136,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
@ -240,7 +235,6 @@ export default {
name: "IoCreateBusOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
titleMap: {
add: "新增单据",
@ -417,18 +411,6 @@ export default {
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -137,8 +137,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button

@ -99,16 +99,13 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border :default-sort="defaultSort"
@sort-change="handleSortChange"
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -137,8 +134,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
@ -228,7 +223,6 @@ export default {
name: "IoDealOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@ -407,16 +401,7 @@ export default {
},
closeDialog() {
this.addOrderVisible = false;
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.addHosOrderVisible = false;
this.getList();
},

@ -99,16 +99,13 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border :default-sort="defaultSort"
@sort-change="handleSortChange"
border
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@ -130,8 +127,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
@ -201,7 +196,6 @@ export default {
name: "IoCreateScanOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
titleMap: {
add: "新增单据",
@ -373,17 +367,6 @@ export default {
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -10,21 +10,6 @@
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.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-col :span="8">
<el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
@ -101,16 +86,12 @@
highlight-current-row
@row-click="handleSelectionChange"
border
:default-sort="defaultSort"
@sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip>
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -137,8 +118,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="150" fixed="right">
<template slot-scope="scope">
<el-button
@ -208,30 +187,6 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow == null ? '' : currentRow.billNo }}-业务扫码校验结果</span>
<!--<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
<!-- <el-form-item class="query-form-item" label="物资名称:">-->
<!-- <el-input-->
<!-- v-model="bizQuery.productName"-->
<!-- placeholder="请输入物资名称"-->
<!-- clearable-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item>-->
<!-- <el-button-group>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-refresh"-->
<!-- @click="onBizReset"-->
<!-- >重置-->
<!-- </el-button>-->
<!-- <el-button type="primary" @click="onBizSubmit"-->
<!-- icon="el-icon-search"-->
<!-- >查询-->
<!-- </el-button>-->
<!-- </el-button-group>-->
<!-- </el-form-item>-->
<!--</el-form>-->
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
@ -343,7 +298,6 @@ export default {
name: "IoDealOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@ -532,17 +486,6 @@ export default {
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -135,25 +135,19 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
<!--</template>-->
</el-table-column>
<el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="核对时间" prop="checkTime" show-overflow-tooltip width="150">
<!--<template slot-scope="scope">-->
<!-- <i class="el-icon-time"></i>-->
<!-- <span>{{ scope.row.createTime }}</span>-->
@ -198,8 +192,6 @@
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="250" fixed="right">
<template slot-scope="scope">
@ -594,7 +586,7 @@ import {
orderPDFFromTemplateFile
} from '@/api/itextpdf/orderPrint'
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import { previewImage ,previewFile} from '@/api/purchase/supCompany'
import { previewImage } from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -610,7 +602,6 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
imgList:[],
imgListCold:[],
imgViewerVisible:false,
@ -796,78 +787,33 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row){
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row){
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -1017,19 +963,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -152,26 +152,20 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="送单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="往来单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
@ -217,8 +211,6 @@
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
@ -616,7 +608,7 @@ import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import { previewImage,previewFile } from '@/api/purchase/supCompany'
import { previewImage } from '@/api/purchase/supCompany'
import DialogCheck from "@/views/inout/DialogCheck";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -634,7 +626,6 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
imgViewerVisible:false,
imgViewerVisibleCold:false,
imgList:[],
@ -822,85 +813,35 @@ export default {
this.getList();
},
showImgViewer(row){
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row){
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -1017,18 +958,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -139,26 +139,20 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="退货单号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
<el-table-column label="供应商" prop="fromName" width="220" v-if="showSup">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -530,7 +524,6 @@ export default {
name: "IoReturnedSearchOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
showSearch: true,
filterQuery: {
id: "",
@ -803,18 +796,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -99,15 +99,11 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange">
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@ -129,8 +125,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="140" fixed="right">
<template slot-scope="scope">
<el-button
@ -443,7 +437,7 @@ import AcceptOrder from "@/views/inout/DialogThrReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck";
import { getBizDetailList } from '@/api/inout/orderDetailBiz'
import { previewFile, previewImage } from '@/api/purchase/supCompany'
import { previewImage } from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -458,7 +452,6 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgList:[],
imgListCold:[],
@ -641,85 +634,35 @@ export default {
});
},
showImgViewer(row) {
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
showImgViewer(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgList=[];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row) {
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
showImgViewerCold(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -773,18 +716,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -129,19 +129,13 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="审核时间" prop="checkTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="审核时间" prop="checkTime" width="140" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@ -164,8 +158,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="验收状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
@ -500,7 +492,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogCheck from "@/views/inout/DialogCheck";
import {getDeptListByUser} from "@/api/auth/authDept";
import {previewImage,previewFile} from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import {getBizDetailList} from '@/api/inout/orderDetailBiz'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -516,7 +508,6 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible: false,
imgViewerVisibleCold: false,
@ -697,98 +688,53 @@ export default {
},
showImgViewer(row) {
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl + "========");
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row) {
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl + "========");
this.imgListCold = [];
previewImage({imageUrl: row.coldFilePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold = response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
closeImgViewer() {
this.imgViewerVisible = false;
closeImgViewerCold() {
this.imgViewerVisibleCold = false;
const m = (e) => {
e.preventDefault()
};
@ -796,6 +742,7 @@ export default {
document.removeEventListener("touchmove", m, true);
},
upload(row) {
this.currentManufacturer = row;
this.Upinvoice = true;
@ -855,18 +802,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -113,19 +113,13 @@
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@current-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange" >
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="140"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']">
<el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip>
</el-table-column>
<el-table-column label="核对时间" prop="checkTime" width="140" show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']" >
<el-table-column label="核对时间" prop="checkTime" width="140" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="送货单位" prop="fromName" width="220">-->
<!-- </el-table-column>-->
@ -148,8 +142,6 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
</el-table-column>
<!-- <el-table-column label="验收状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
@ -480,7 +472,7 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck";
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import { previewFile, previewImage } from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -495,7 +487,6 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
defaultSort: {prop: 'createTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
imgList: [],
imgListCold:[],
@ -675,84 +666,36 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl + "========");
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => {
e.preventDefault();
e.preventDefault()
};
document.body.style.overflow = "hidden";
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
showImgViewerCold(row) {
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
})
// window.open(this.imgList[0])
return false
}
this.imgViewerVisible = true;
// previewImage({
// imageUrl: this.inputQuery.licenseUrl,
// certFileUrl: this.certFileUrl,
// }).then((response) => {
// if (response.code === 20000) {
// }
// console.log(this.imgList);
// });
const m = (e) => {
e.preventDefault();
};
document.body.style.overflow = "hidden";
showImgViewerCold(row){
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========");
this.imgListCold=[];
previewImage({imageUrl:row.coldFilePath,certFileUrl:this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgListCold=response.data;
}
console.log(this.imgListCold)
this.imgViewerVisibleCold = true;
});
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); //
},
@ -819,17 +762,6 @@ export default {
this.resultDetailList = [];
this.resultTotal = 0;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
//
getList() {
this.loading = true;

@ -36,14 +36,13 @@
<template slot-scope="scope">
<el-input v-model="scope.row.batchNo"
:disabled="scope.row.index !== selectedIndex"
@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"
ref='inputBatchNoRef'
placeholder="请输入批次号"></el-input>
</template>
<!--@input="scope.row.batchNo =scope.row.batchNo.replace(/[\W]/g, '')"-->
</el-table-column>
<el-table-column width="120" label="生产日期">
<template slot-scope="scope">
<el-input v-model="scope.row.productDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
:disabled="scope.row.index !== selectedIndex"
@ -53,7 +52,6 @@
</el-table-column>
<el-table-column width="120" label="失效日期">
<template slot-scope="scope">
<el-input v-model="scope.row.expireDate" auto-complete="off"
oninput="if(value.length>6)value=value.slice(0,6)"
:disabled="scope.row.index !== selectedIndex"

@ -0,0 +1,489 @@
<template>
<div>
<el-table v-loading="loading" :data="detailList" style="width: 100%" border
:row-style="rowStyle"
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="150"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="150"
prop="spec"
></el-table-column>
<el-table-column label="批次号" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bbatchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码"
prop="sbatchNo" width="100"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="生产日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bproductDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sproductDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="失效日期" header-align="center">
<el-table-column header-align="center"
label="手录" width="100"
prop="bexpireDate"
show-overflow-tooltip
></el-table-column>
<el-table-column header-align="center"
label="扫码" width="100"
prop="sexpireDate"
show-overflow-tooltip
></el-table-column>
</el-table-column>
<el-table-column label="数量" header-align="center">
<el-table-column
header-align="center"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
header-align="center"
label="扫码数量" width="100"
prop="scanCount"
></el-table-column>
</el-table-column>
<el-table-column
label="价格"
prop="price" width="100"
></el-table-column>
<el-table-column width="100" label="计量单位" prop="measname">
</el-table-column>
<el-table-column
label="生产企业"
prop="manufacturer" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号" width="160"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
<el-dialog
title="业务详情-物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectProductVisible"
:append-to-body='true'
>
<stockOrderNewSelectProduct
:closeDialog="closeDialog"
:data="thisData"
></stockOrderNewSelectProduct>
</el-dialog>
<el-dialog
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectInvProductVisible"
:append-to-body='true'
>
<dialogInvProduct
:closeDialog="closeDialogC2"
:invQueryData="invQueryData"
:orderQuery="thisData"
:type="2"
></dialogInvProduct>
</el-dialog>
<!-- 绑定产品-->
<el-dialog
title="绑定产品"
:visible.sync="selectRlVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectRlVisible"
append-to-body
>
<selectRlDialog
:curRow="curRow"
:type="bizType"
v-on:selectBindRl="selectBindRl"
v-on:closeBindDialog="closeBindDialog"
></selectRlDialog>
</el-dialog>
<!-- 绑定供应商-->
<el-dialog
title="绑定供应商"
:visible.sync="dialogTableVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="dialogTableVisible"
width="80%"
append-to-body
>
<DialogSelectUnit
:codeId="curRow"
:type="bizType"
v-on:selectSupUnit="selectSupUnit"
v-on:closeBindDialog="closeBindDialog"
></DialogSelectUnit>
</el-dialog>
</div>
</template>
<script>
import stockOrderNewSelectProduct from "./DialogSelectProduct";
import dialogInvProduct from "./DialogSelectInvProduct";
import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
import {updateBizBind} from "@/api/inout/order";
import selectRlDialog from "@/views/inout/DialogSelectRl";
import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
export default {
name: "PanelCreateOrderResultDetail",
props: {
idQuery: {
type: Object,
required: true,
},
refreshPanel: {
type: Function,
required: true,
},
refreshOrder: {
type: Function,
required: true,
},
viewType: {
type: Object,
required: true,
},
curBustype: {
type: Object,
required: true,
},
},
data() {
return {
bizType: 1,
loading: false,
query: {
orderId: null,
code: "",
corpOrderId: "",
},
detailList: [],
total: 0,
iCount: 0,
selectProductVisible: false,
selectInvProductVisible: false,
thisData: {},
selectedIndex: null,
invQueryData: {
invCode: null,
},
selectRlVisible: false,
dialogTableVisible: false,
curRow: null,
};
},
components: {
selectRlDialog, DialogSelectUnit,
stockOrderNewSelectProduct,
dialogInvProduct,
},
methods: {
getOrderDetails() {
this.loading = true;
this.query.orderIdFk = this.idQuery.billNo;
getCheckDetailList(this.query) //
.then((response) => {
this.detailList = response.data || [];
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
});
},
rowChange(val) {
this.currentRow = val;
if (this.currentRow.batchNo == '')
this.currentRow.batchNo = null;
if (this.currentRow.produceDate == '')
this.currentRow.produceDate = null;
if (this.currentRow.expireDate == '')
this.currentRow.expireDate = null;
this.selectedIndex = val.index;
},
closeDialog(rData) {
this.selectProductVisible = false;
this.selectInvProductVisible = false;
this.idQuery = rData;
this.getOrderDetails();
},
closeDialogC2(rData) {
this.idQuery = rData;
this.selectInvProductVisible = false;
this.getOrderDetails();
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
rowBackground.color = '#f60303';
return rowBackground;
}
if (this.viewType == 1)
return null;
if (!row.checkSuccess) {
rowBackground.color = '#f60303';
}
return rowBackground;
},
tableRowClassName({row, rowIndex}) {
row.index = rowIndex;
},
selectProductFunction() {
this.thisData = this.idQuery;
if (this.$isBlank(this.idQuery.action)) {
this.$message.error("单据类型不能为空!")
return;
}
if (this.$isBlank(this.idQuery.invCode)) {
this.$message.error("当前仓库不能为空!");
return;
}
if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
this.$message.error("往来信息不能为空!");
return;
}
if (this.curBustype.corpType == 3) {//
this.invQueryData.invCode = this.idQuery.invCode;
this.selectInvProductVisible = true;
} else if (this.curBustype.corpType == 2)//
{
this.selectProductVisible = true;
}
},
saveChange(row) {
if (row.batchNo == '') {
row.batchNo = null;
}
if (row.produceDate == '') {
row.produceDate = null;
}
if (row.expireDate == '') {
row.expireDate = null;
}
updateBizProduct(row)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("保存成功!");
this.selectedIndex = null;
this.refreshPanel();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
copyDetail(row) {
let data = {
relId: row.bindRlFk,
supId: row.supId,
zczbhhzbapzbh: row.certCode,
orderEntity: this.idQuery,
}
this.loading = true;
addBizProduct(data)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
deleteDetail(row) {
let data = {
id: row.id,
}
this.loading = true;
delBizProduct(data)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
bindRl(val) {
this.curRow = val;
this.selectRlVisible = true;
},
handleUnitClick(row) {
this.curRow = row;
this.dialogTableVisible = true;
},
selectBindRl(row) {
let query = {
id: this.curRow.id,
bindRlFk: row.id,
};
updateBizBind(query).then((response) => {
if (response.code == 20000) {
this.$message.success("绑定成功");
this.getOrderDetails();
} else
this.$message.error(response.message);
}
).catch(() => {
});
},
selectSupUnit(row) {
let query = {
id: this.curRow.id,
supId: row.erpId,
};
updateBizBind(query).then((response) => {
if (response.code == 20000) {
this.$message.success("绑定成功");
this.getOrderDetails();
} else {
this.$message.error(response.message);
}
}).catch(() => {
});
}
,
closeBindDialog() {
this.selectRlVisible = false;
this.dialogTableVisible = false;
this.refreshPanel();
}
,
}
,
filters: {}
,
watch: {
'idQuery.billNo':
{
handler() {
this.refreshOrder(this.idQuery);
}
,
}
}
,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}
,
created() {
if (this.idQuery.billNo != null)
this.getOrderDetails();
}
,
}
;
</script>
<style scoped>
.el-table_fixed, el-table__fixed-right {
height: 80% !important;
}
.el-table__fixed-body-wrapper {
height: 80% !important;
}
.ao-text {
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
}
/**
解决el-input输入框 type=number时输入中文光标上移问题
*/
.el-input__inner {
line-height: 1px !important;
}
</style>

@ -160,8 +160,8 @@ import {stockQRCodeText, filterPrint, generateInnerQRCodeText} from "@/api/inout
import draggable from "vuedraggable";
import {
filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile, inspectionStockQRCodeTextPDFFromTemplateStatementFile,
stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax, stockQRCodeTextPDFFromTemplateStatementFile
} from '@/api/itextpdf/itextpdf'
stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
} from "@/api/itextpdf/itextpdf";
export default {

@ -105,11 +105,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -2,9 +2,7 @@
<div class="login-container">
<div>
<el-row>
<!-- <h3 class="toptitle">漳州市中医院</h3>-->
<h3 class="toptitle">{{ title }}</h3>
<h3 class="toptitle">协和医院平潭分院</h3>
</el-row>
<el-row>
<h3 class="topSubtitle">医院UDI管理系统</h3>
@ -20,7 +18,7 @@
>
<el-card class="box-card">
<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>
<h3 class="title">用户登录</h3>
<el-form-item prop="username" class="item" style="margin-top: -20px">
@ -32,7 +30,7 @@
v-model="loginForm.username"
>
<i slot="prefix" class="el-input__icon">
<icon-svg icon-class="user"/>
<icon-svg icon-class="user" />
</i>
</el-input>
</el-form-item>
@ -47,14 +45,14 @@
autocomplete="on"
>
<i slot="prefix" class="el-input__icon">
<icon-svg icon-class="pwd"/>
<icon-svg icon-class="pwd" />
</i>
<i
slot="suffix"
class="el-input__icon"
@click="isShowPwd = !isShowPwd"
>
<icon-svg icon-class="eye"/>
<icon-svg icon-class="eye" />
</i>
</el-input>
</el-form-item>
@ -79,15 +77,15 @@
style="width: 60%; margin-bottom: 30px"
:loading="loading"
@click.native="handleLogin()"
>登录
>登录
</el-button>
</div>
<div style="margin-top: -15px">
<a style="margin-left: 50%; font-size: 12px" :href="'#/register'"
>新用户注册</a
>新用户注册</a
>
<a style="margin-left: 5%; font-size: 12px" :href="'#/forgetPasswd'"
>忘记密码</a
>忘记密码</a
>
</div>
</el-card>
@ -122,8 +120,7 @@
import Verify from "vue2-verify";
import axios from "axios";
import Cookies from "js-cookie";
import {decrypt, encrypt} from "@/utils/jsencrypt";
import {getTitleConfig} from "@/api/login";
import { decrypt, encrypt } from "@/utils/jsencrypt";
export default {
data() {
@ -151,16 +148,15 @@ export default {
},
rules: {
userName: [
{required: true, message: "请输入登录名", trigger: "blur"},
{ required: true, message: "请输入登录名", trigger: "blur" },
],
pwd: [{validator: validatePwd, trigger: "blur"}],
pwd: [{ validator: validatePwd, trigger: "blur" }],
},
isShowPwd: false, //
loading: false, // loading
showDialog: false, // dialog
redirect: null, //
hospName: "",
title: "福建省XXX医院"
};
},
methods: {
@ -234,7 +230,7 @@ export default {
if (this.loginForm.verificationCode) {
this.loading = true;
if (this.loginForm.rememberMe) {
Cookies.set("username", this.loginForm.username, {expires: 30});
Cookies.set("username", this.loginForm.username, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), {
expires: 30,
});
@ -249,9 +245,8 @@ export default {
.dispatch("Login", this.loginForm)
.then((res) => {
this.$router
.push({path: this.redirect || "/"})
.catch((res) => {
});
.push({ path: this.redirect || "/" })
.catch((res) => {});
})
.catch((res) => {
this.loading = false;
@ -270,11 +265,6 @@ export default {
}
});
},
getTitleConfig() {
getTitleConfig().then(res => {
this.title = res.data.title;
});
},
},
components: {
Verify,
@ -290,7 +280,7 @@ export default {
axios.get("./config.json").then((res) => {
this.hospName = res.data.hosp_name;
});
this.getTitleConfig();
this.getCookie();
},
};
@ -376,7 +366,6 @@ $light_gray: #eee;
text-align: center;
font-weight: bold;
}
.topSubtitle {
position: absolute;
font-size: 45px;
@ -417,7 +406,6 @@ $light_gray: #eee;
width: 490px;
}
}
.el-input--mini .el-input__icon {
line-height: 32px;
}

@ -15,7 +15,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1" :maxlength="30"></el-input>
<el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
</el-form-item>
</el-col>

@ -95,11 +95,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -100,11 +100,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -96,11 +96,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -138,11 +138,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -151,8 +151,6 @@
border
highlight-current-row="true"
@current-change="handleDetail"
:default-sort="defaultSort"
@sort-change="handleSortChange"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
@ -166,8 +164,6 @@
prop="auditTime"
width="150"
show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column
label="供应商"
@ -197,8 +193,6 @@
prop="arrivalTime"
width="150"
show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
<el-table-column
label="订单说明"
@ -292,7 +286,6 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
export default {
data() {
return {
defaultSort: {prop: 'auditTime', order: 'desc'},
BASE_URL: process.env.VUE_APP_BASE_API,
filterQuery: {
billAction: null,
@ -468,18 +461,6 @@ export default {
"/udiwms/image/register/file/getImage?type=image2&name=";
window.open(this.certFileUrl + this.filePath);
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.getList();
},
getList() {
if (this.auditTimes != null) {
this.filterQuery.startAuditDate = this.auditTimes[0];

@ -99,11 +99,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -95,11 +95,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -138,11 +138,11 @@
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog>
<el-dialog title="请选择对应的注册/备案证" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-dialog title="请选择对应的资质证书" :visible.sync="dialogFormVisible" append-to-body width="40%">
<el-form :model="form">
<el-form-item label="" prop="isGive">
<el-radio-group v-model="currentCert">
<el-radio style="width: 100%; margin-top: 10px;" :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
<el-radio :label="item" :key="item" v-for="item in certList">{{ item }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>

@ -30,7 +30,7 @@
type="primary"
size="mini"
icon="search"
v-if=" inputQuery.auditStatus == 1"
v-if="inputQuery.auditStatus == 0 || inputQuery.auditStatus == 6"
@click="onModifySubmit(6)"
>提交审核
</el-button>
@ -40,11 +40,11 @@
size="mini"
icon="search"
v-if="
inputQuery.auditStatus == 0 ||
inputQuery.auditStatus == 2 ||
inputQuery.auditStatus == 3
inputQuery.auditStatus == 3 ||
inputQuery.auditStatus == 1 ||
inputQuery.auditStatus == 2
"
@click="onModifySubmit(3)"
@click="onModifySubmit(inputQuery.auditStatus)"
>提交审核
</el-button>
</div>
@ -580,9 +580,9 @@ export default {
//
if (val == 0) {
var str = "是否确定草稿保存?";
} else if (val == 1) {
} else if (val == 6) {
var str = "是否确定提交审核?";
} else if (val == 2||val == 3|| val ==0) {
} else if (val == 2) {
var str = "企业信息已拒绝审核,是否确认重新提交审核?";
} else {
var str = "企业信息已通过审核,是否确认重新提交审核?";

@ -682,7 +682,7 @@ export default {
isUseDy: row.isUseDy,
isDisable: row.isDisable,
isAdavence: row.isAdavence,
useMuti: row.useMuti
useMuti: row.useMuti
};
},
sumitLockStatus(row) {

@ -1100,6 +1100,7 @@ export default {
type: "warning",
})
.then(() => {
debugger
this.updateLoading = true;
let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
syncOnline(query)

@ -83,94 +83,50 @@
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak2"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak3"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak4"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8+':'">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"
></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row type="flex" class="edit-row">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="库存积压预警数量:">-->
<!-- <el-input-->
<!-- style="width: 80%"-->
<!-- size="small"-->
<!-- splaceholder="请输入内容"-->
<!-- v-model="editQuery.overStockNum"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="低库存预警数量:">-->
<!-- <el-input-->
<!-- style="width: 80%"-->
<!-- size="small"-->
<!-- splaceholder="请输入内容"-->
<!-- v-model="editQuery.lowStockNum"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row type="flex" class="edit-row">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="近效期预警时间:">-->
<!-- <el-input-->
<!-- style="width: 80%"-->
<!-- size="small"-->
<!-- splaceholder="请输入内容"-->
<!-- v-model="editQuery.recentDateTime"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="预警时间单位:">-->
<!-- <el-select v-model="editQuery.isDateBy" style="width: 65%" placeholder="状态" clearable>-->
<!-- <el-option label="天" :value="1"></el-option>-->
<!-- <el-option label="小时" :value="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="产品描述:">
@ -178,16 +134,16 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label="是否可集采:"
prop="spUse"
class="query-form-item"
>
<el-radio-group v-model="editQuery.groupBuy">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label="是否可集采:"
prop="spUse"
class="query-form-item"
>
<el-radio-group v-model="editQuery.groupBuy">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -295,9 +251,8 @@ export default {
lowStockNum: this.editQuery.lowStockNum,
recentDateTime: this.editQuery.recentDateTime,
isDateBy: this.editQuery.isDateBy,
relSupId: this.editQuery.id,
groupBuy: this.editQuery.groupBuy,
uid: this.editQuery.uid,
relSupId:this.editQuery.id,
groupBuy:this.editQuery.groupBuy,
}
updateById(data).then(res => {

@ -81,12 +81,12 @@
@click="addDiProductVisible = true"
>选入DI信息</el-button
>
<!-- <el-button-->
<!-- type="primary"-->
<!-- icon="el-icon-plus"-->
<!-- @click="addProductVisible = true"-->
<!-- >添加院内字典</el-button-->
<!-- >-->
<el-button
type="primary"
icon="el-icon-plus"
@click="addProductVisible = true"
>添加院内字典</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>

@ -534,6 +534,7 @@ export default {
},
onResetintent() {
debugger;
this.$router.push({
path: "",
});

@ -117,7 +117,7 @@
>文件预览
</el-button
>
<div>只能上传 jpg,png文件且不超过 10 MB</div>
<div>只能上传 jpg,png,pdf,doc 文件且不超过 10 MB</div>
</el-upload>

@ -438,6 +438,7 @@ export default {
previewPdf(row) {
debugger
let query = {id: row.id,module:row.module};
demoPrint(query).then((response) => {
//pdfurl

@ -1,42 +1,38 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="query" size="mini" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item label="用户账号:">
<el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item" label="账号状态:">
<el-select v-model="query.userFlag" placeholder="请选择账号状态:">
<el-option label="全部" value=""></el-option>
<el-option label="禁用" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属部门:">
<el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-form :inline="true" :model="query" size="mini">
<el-form-item label="用户账号:">
<el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item" label="账号状态:">
<el-select v-model="query.userFlag" placeholder="请选择账号状态:">
<el-option label="全部" value=""></el-option>
<el-option label="禁用" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
:disabled="!configParms.sysUser && query.customerId == 110"
v-hasPermi="['system:user:add']"
>新增
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"></el-button>
<el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
:disabled="!configParms.sysUser && query.customerId == 110"
v-hasPermi="['system:user:add']">新增</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list"
style="width: 100%"
border highlight-current-row>
@ -75,7 +71,7 @@
</el-button>
<el-button
type="text"
:disabled="scope.row.id === '1' || !configParms.sysUser"
:disabled="scope.row.id === 1 || !configParms.sysUser"
@click.native="handleDel(scope.$index, scope.row)"
v-hasPermi="['system:user:remove']"
>删除
@ -106,14 +102,13 @@
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="用户账号" prop="userName">
<el-input v-model="formData.userName" size="small" style="width: 90%"
:disabled="formData.id == 1"></el-input>
<el-input v-model="formData.userName" size="small" style="width: 90%"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="用户名称" prop="employeeName">
<el-input v-model="formData.employeeName" size="small"
style="width: 90%" :disabled="formData.id == 1"></el-input>
style="width: 90%"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -172,46 +167,46 @@
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="状态" prop="userFlag">
<el-radio-group v-model="formData.userFlag" :disabled="formData.id == 1">
<el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
<el-radio :label="1">正常</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="11" type="flex">
<el-form-item label="所属仓库" prop="locInvCode">
<el-select
v-model="formData.locInvCode"
filterable
remote
clearable="true"
style="width: 90%"
size="small"
reserve-keyword
placeholder="请选择"
:loading="loading"
@change="change"
>
<el-option
v-for="item in fromWarehouseOptions"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.name
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>-->
<!-- <el-col :span="11" type="flex">
<el-form-item label="所属仓库" prop="locInvCode">
<el-select
v-model="formData.locInvCode"
filterable
remote
clearable="true"
style="width: 90%"
size="small"
reserve-keyword
placeholder="请选择"
:loading="loading"
@change="change"
>
<el-option
v-for="item in fromWarehouseOptions"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.name
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>-->
</el-row>
<el-row :gutter="20" type="flex">
<el-col :span="11" type="flex">
<el-form-item label="角色" prop="roles">
<el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1">
<el-form-item label="角色">
<el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" >
<el-checkbox
v-for="item in roles"
:key="item.roleId"
@ -263,7 +258,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
import {listRole} from "@/api/system/role";
import {selectSysParamByKey} from "@/api/system/systemParamConfig";
import {filterList, selectInvById, getDeptById} from '@/api/system/invWarehouse'
import {filterList, selectInvById,getDeptById} from '@/api/system/invWarehouse'
const formJson = {
id: "",
@ -296,12 +291,10 @@ export default {
}
};
return {
showSearch: true,
roles: [],
query: {
userName: "",
userFlag: "1",
deptName: "",
userFlag: "",
page: 1,
limit: 10,
roleId: "",
@ -347,12 +340,6 @@ export default {
depts: [
{required: true, message: "请选择所属部门", trigger: "change"}
],
roles: [
{required: true, message: "请选择用户角色"}
],
employeeName: [
{required: true, message: "请输入用户名称", trigger: "blur"}
]
},
editRules: {
userName: [
@ -369,20 +356,13 @@ export default {
};
},
methods: {
getDeptList(){
},
hideSearch() {
this.showSearch = !this.showSearch;
},
onReset() {
this.$router.push({
path: ""
});
this.query = {
userName: "",
userFlag: "1",
deptName: null,
userFlag: "",
page: 1,
limit: 10,
roleId: "",
@ -398,7 +378,7 @@ export default {
this.query.page = 1;
this.getList();
},
change() {
change(){
this.$forceUpdate();
},
findInv(val) {
@ -417,7 +397,7 @@ export default {
},
getList() {
this.loading = true;
this.query.key = 'key';
this.query.key='key';
authAdminList(this.query)
.then(response => {
this.loading = false;
@ -479,7 +459,7 @@ export default {
roles: row.roles,
depts: row.depts,
dept: row.dept,
locInvCode: row.locInvCode
locInvCode:row.locInvCode
};
}
this.formName = "add";
@ -584,10 +564,10 @@ export default {
};
filterList(query)
.then((response) => {
var deptList = [];
var deptList=[];
this.loading = false;
for (var i = 0; i < response.data.list.length; i++) {
if (response.data.list[i].id != 1) {
for(var i=0;i<response.data.list.length;i++){
if(response.data.list[i].id!=1){
deptList.push(response.data.list[i]);
}
}
@ -637,6 +617,7 @@ export default {
this.getSyncConfig();
this.findDeptMethod();
//
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {

@ -5,8 +5,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="产品编码:">
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable
@keyup.enter.native="keyupErp_submit($event)"></el-input>
<el-input v-model="filterQuery.code" style="width: 90%" placeholder="请输入产品编码/商品条码/医保编码" clearable @keyup.enter.native="keyupErp_submit($event)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -23,8 +22,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="注册/备案号:">
<el-input v-model="filterQuery.registerNo" clearable style="width: 90%"
placeholder="请输入注册/备案号"></el-input>
<el-input v-model="filterQuery.registerNo" clearable style="width: 90%" placeholder="请输入注册/备案号"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -50,16 +48,14 @@
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true"
:disabled="!configParms.basicThirdProducts">新增
</el-button>
</el-button-group>
</div>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click="addProductVisible=true" :disabled="!configParms.basicThirdProducts">新增</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
@ -74,9 +70,7 @@
<el-table-column label="操作" width="180px">
<template slot-scope="scope">
<el-button type="text" @click.native.stop="detailDialog(scope.row)">详情</el-button>
<el-button type="text" @click.native.stop="editDialog(scope.row)">编辑</el-button>
<el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0"
:disabled="!configParms.basicThirdProducts">删除
<el-button type="text" @click.native.stop="deleteDialog(scope.row)" v-if="thirdSysDetail.fromType!=0" :disabled="!configParms.basicThirdProducts">
</el-button>
</template>
</el-table-column>
@ -118,40 +112,21 @@
class="dialog-two"
top="5vh"
>
<ThrProductsAdd
:newType="newType"
:closeAddDialog="closeAddDialog"></ThrProductsAdd>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息编辑"
:visible.sync="thrProductsEditVisible"
width="60%"
class="dialog-two"
top="5vh"
v-if="thrProductsEditVisible"
>
<thrProductsEdit
:newProductData="thisData"
:closeAddDialog="closeAddDialog"
></thrProductsEdit>
</el-dialog>
</div>
</template>
<script>
import {
delThrProducts, saveNewProduct
import {delThrProducts, saveNewProduct
} from "@/api/thrsys/thrProducts";
import {getInvbasdoc} from "@/api/thrsys/getErps";
import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
import {selectIp} from "@/api/system/systemParamConfig";
import thrProductsDetail from "./thrProductsDetail";
import ThrProductsAdd from "@/views/thirdSys/product/thrProductsAdd";
import thrProductsEdit from "@/views/thirdSys/product/thrProductsEdit";
import {findConfig} from "@/api/sync/spsSyncStatus";
export default {
@ -168,7 +143,7 @@ export default {
page: 1,
limit: 20,
},
mainThirdSys: '',
mainThirdSys:'',
total: 0,
thirdSys: [],
thirdSysDetail: null,
@ -180,7 +155,6 @@ export default {
},
newType: 1,
thrProductsDetailVisible: false,
thrProductsEditVisible: false,
thisData: null,
loading: false,
addProductVisible: false,
@ -232,7 +206,7 @@ export default {
this.getList();
},
getList() {
if (this.filterQuery.thirdSys == null) {
if (this.filterQuery.thirdSys == null ) {
this.$message.warning("请先选择第三方系统!")
return;
}
@ -287,12 +261,6 @@ export default {
this.thisData = row;
this.thrProductsDetailVisible = true;
},
editDialog(row) {
this.thisData = row;
this.thrProductsEditVisible = true;
},
getBasicThirdSys() {
let query = {
enabled: true,
@ -300,8 +268,8 @@ export default {
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
for (var i = 0; i < this.thirdSys.length; i++) {
if (this.thirdSys[i].mainSys) {
for(var i=0;i<this.thirdSys.length;i++){
if(this.thirdSys[i].mainSys){
this.filterQuery.thirdSys = this.thirdSys[i].thirdId;
this.mainThirdSys = this.thirdSys[i].thirdId;
}
@ -348,8 +316,6 @@ export default {
})
},
closeAddDialog(val) {
this.thrProductsEditVisible = false;
this.thrProductsDetailVisible = false;
this.addProductVisible = false;
if (val) {
this.getList();
@ -368,7 +334,7 @@ export default {
},
},
components: {
thrProductsDetail, ThrProductsAdd, thrProductsEdit
thrProductsDetail, ThrProductsAdd
},
mounted() {
},

@ -1,221 +0,0 @@
<template>
<el-form :model="newProductData" label-width="120px">
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="第三方系统" prop="thirdSysFk">
<el-select
style="width: 90%"
disabled
v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
>
<el-option
v-for="item in thirdSys"
:key="item.value"
:label="item.thirdName"
:value="item.thirdId">
<span style="float: left">{{ item.thirdName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.thirdId
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="产品编码:" prop="code">
<el-input style="width: 90%" size="small" placeholder="请输入产品编码"
disabled
v-model.trim="newProductData.code"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" type="flex">
<el-form-item label="产品名称:" prop="name">
<el-input style="width: 90%" size="small" placeholder="请输入产品名称" v-model.trim="newProductData.name"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="规格型号:" prop="spec">
<el-input style="width: 90%" size="small" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="measname">
<el-input style="width: 90%" size="small" placeholder="请输入计量单位"
v-model.trim="newProductData.measname"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="生产企业:" prop="manufactory">
<el-input style="width: 90%" size="small" placeholder="请输入生产企业"
v-model.trim="newProductData.manufactory"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="注册证号:" prop="registerNo">
<el-input style="width: 90%" size="small" placeholder="请输入注册证号"
v-model.trim="newProductData.registerNo"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
<el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人"
v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
<el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称"
v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="产品类别:" prop="cplb">
<el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="分类编码:" prop="flbm">
<el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="商品条码:" prop="sptm">
<el-input style="width: 90%" size="small" placeholder="请输入商品条码" v-model.trim="newProductData.sptm"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="医保编码:" prop="ybbm">
<el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="统一社会信用号:" prop="tyshxydm">
<el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
v-model.trim="newProductData.tyshxydm"></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="器械类别:" prop="qxlb">
<el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="23" class="el-col">
<el-form-item label="产品描述:" prop="cpms">
<el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
v-model.trim="newProductData.cpms"></el-input>
</el-form-item>
</el-col>
</el-row>
<div style='text-align: center; margin-bottom: 10px;'>
<el-button type="primary" @click="saveNewProduct"></el-button>
<el-button type="primary" @click="closeAddDialog"></el-button>
</div>
</el-form>
</template>
<script>
import {updateProduct} from "@/api/thrsys/thrProducts";
import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
export default {
name: "thrProductsEdit",
props: {
newProductData: {
type: Object,
required: true,
},
closeAddDialog: {
type: Function,
required: true,
},
},
data() {
return {
thirdSys: [],
}
},
methods: {
saveNewProduct() {
this.addProductVisible = false;
if (this.$isBlank(this.newProductData.thirdSysFk)) {
this.$message.warning("第三方系统不能为空!");
return;
}
if (this.$isBlank(this.newProductData.code)) {
this.$message.warning("产品编码为空!");
return;
}
if (this.$isBlank(this.newProductData.name)) {
this.$message.warning("产品名称不能为空!");
return;
}
if (this.$isBlank(this.newProductData.spec)) {
this.$message.warning("规格型号不能为空");
return;
}
if (this.$isBlank(this.newProductData.measname)) {
this.$message.warning("计量单位不能为空!");
return;
}
if (this.$isBlank(this.newProductData.manufactory)) {
this.$message.warning("生产企业不能为空!");
return;
}
if (this.$isBlank(this.newProductData.registerNo)) {
this.$message.warning("注册证号不能为空!");
return;
}
updateProduct(this.newProductData).then((res) => {
if (res.code == 20000) {
this.$message.success("修改成功!");
this.closeAddDialog(true);
} else {
this.$message.error(res.message);
}
}).catch((error) => {
})
},
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
})
.catch(() => {
this.loading = false;
this.list = [];
});
},
},
created() {
this.getBasicThirdSys();
},
}
</script>
<style scoped>
</style>

@ -257,8 +257,8 @@ export default {
systemParamConfigList(this.systemQuery)
.then((response) => {
this.systemLoading = false;
this.systemList = response.data.list || [];
// this.systemList = this.systemLists.filter(item => item.paramValue !=0);
this.systemLists = response.data.list || [];
this.systemList = this.systemLists.filter(item => item.paramValue !=0);
this.systemTotal = response.data.total || 0;
})
.catch(() => {

Loading…
Cancel
Save