前端界面修改

ywj_dev
anthonywj 2 years ago
parent b473e38b47
commit 8450619de1

@ -384,7 +384,7 @@ export default {
4: "pda未校验", 4: "pda未校验",
5: "pc端扫码精灵", 5: "pc端扫码精灵",
6: "流转自动补单", 6: "流转自动补单",
7: "UDI供应商平台", 7: "UDI管理系统",
8: "平衡补录单据", 8: "平衡补录单据",
10: "手动补单", 10: "手动补单",
11: "仓库盘点", 11: "仓库盘点",

@ -614,7 +614,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -314,7 +314,7 @@ export default {
'4': 'pda未校验', '4': 'pda未校验',
'5': 'pc端扫码精灵', '5': 'pc端扫码精灵',
'6': '流转自动补单', '6': '流转自动补单',
'7': 'UDI供应商平台', '7': 'UDI管理系统',
'8': '平衡补录单据', '8': '平衡补录单据',
'10': '手动补单', '10': '手动补单',
'11': '仓库盘点', '11': '仓库盘点',

@ -532,7 +532,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -390,7 +390,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -496,7 +496,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -506,7 +506,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -288,7 +288,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -259,7 +259,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -276,7 +276,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -249,7 +249,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -386,7 +386,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -613,7 +613,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",
@ -1046,7 +1046,7 @@ export default {
// //
rollback(row) { rollback(row) {
this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', { this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

@ -608,7 +608,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",
@ -1012,7 +1012,7 @@ export default {
// //
rollback(row) { rollback(row) {
this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', { this.$confirm('此操作将撤回单据至待审核, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'

@ -437,7 +437,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -534,7 +534,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -569,7 +569,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -483,7 +483,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -481,7 +481,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -292,7 +292,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div> <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
</template> </template>
</el-table-column> </el-table-column>
@ -452,11 +452,10 @@ import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import DialogCheck from "@/views/inout/DialogCheck"; import DialogCheck from "@/views/inout/DialogCheck";
import {getBizDetailList} from "@/api/inout/orderDetailBiz"; import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import { previewImage } from '@/api/purchase/supCompany' import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -469,8 +468,8 @@ export default {
data() { data() {
return { return {
BASE_URL: process.env.VUE_APP_BASE_API, BASE_URL: process.env.VUE_APP_BASE_API,
imgList:[], imgList: [],
imgViewerVisible:false, imgViewerVisible: false,
showSearch: true, showSearch: true,
Upinvoice: false, Upinvoice: false,
currentManufacturer: {}, currentManufacturer: {},
@ -518,7 +517,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",
@ -600,7 +599,7 @@ export default {
acceptOrderVisible: false, acceptOrderVisible: false,
}; };
}, },
components: {AcceptOrder, DialogCheck,ElImageViewer}, components: {AcceptOrder, DialogCheck, ElImageViewer},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
@ -644,25 +643,29 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
showImgViewer(row){ showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
console.log(this.certFileUrl+"========"); console.log(this.certFileUrl + "========");
this.imgList=[]; this.imgList = [];
previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) { if (response.code === 20000) {
this.imgList=response.data; this.imgList = response.data;
} }
console.log(this.imgList) console.log(this.imgList)
this.imgViewerVisible = true; this.imgViewerVisible = true;
}); });
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden'; document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // document.addEventListener("touchmove", m, false); //
}, },
closeImgViewer(){ closeImgViewer() {
this.imgViewerVisible = false; this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() }; const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto'; document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true); document.removeEventListener("touchmove", m, true);
}, },
@ -944,7 +947,7 @@ export default {
}, },
// //
rollback(row) { rollback(row) {
this.$confirm('此操作将撤回单据至已校验未审核状态, 是否继续?', '提示', { this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@ -968,7 +971,7 @@ export default {
this.acceptQuery = row; this.acceptQuery = row;
this.acceptOrderVisible = true; this.acceptOrderVisible = true;
}, },
freshen(){ freshen() {
this.Upinvoice = false; this.Upinvoice = false;
this.getOrderDetails(); this.getOrderDetails();
}, },

@ -359,7 +359,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -422,7 +422,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -233,7 +233,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -293,7 +293,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"11": "仓库盘点", "11": "仓库盘点",

@ -268,7 +268,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单", "10": "手动补单",
"12": "采购计划", "12": "采购计划",

@ -192,7 +192,7 @@ export default {
"4": "pda未校验", "4": "pda未校验",
"5": "pc端扫码精灵", "5": "pc端扫码精灵",
"6": "流转自动补单", "6": "流转自动补单",
"7": "UDI供应商平台", "7": "UDI管理系统",
"8": "平衡补录单据", "8": "平衡补录单据",
"10": "手动补单" "10": "手动补单"
}, },

@ -46,14 +46,16 @@
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -132,7 +134,6 @@
align="center" align="center"
prop="userName" prop="userName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:sort-orders="['descending', 'ascending']"
/> />
<el-table-column <el-table-column
label="登录地址" label="登录地址"
@ -164,7 +165,7 @@
<!-- <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>--> <!-- <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>-->
<!-- </template>--> <!-- </template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="操作信息" align="center" prop="msg" /> <el-table-column label="操作信息" align="center" prop="msg"/>
<el-table-column <el-table-column
label="登录日期" label="登录日期"
align="center" align="center"
@ -191,7 +192,7 @@
</template> </template>
<script> <script>
import { list } from "@/api/monitor/logininfor"; import {list} from "@/api/monitor/logininfor";
export default { export default {
name: "Logininfor", name: "Logininfor",
@ -217,7 +218,6 @@ export default {
// //
dateRange: [], dateRange: [],
// //
defaultSort: { prop: "loginTime", order: "descending" },
// //
queryParams: { queryParams: {
page: 1, page: 1,

@ -44,8 +44,8 @@
placeholder="操作状态" placeholder="操作状态"
clearable clearable
> >
<el-option label="正常" value="0" /> <el-option label="正常" value="0"/>
<el-option label="失败" value="1" /> <el-option label="失败" value="1"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -55,14 +55,16 @@
icon="el-icon-search" icon="el-icon-search"
size="mini" size="mini"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索
</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="mini"
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置
</el-button
> >
</el-form-item> </el-form-item>
@ -87,20 +89,19 @@
> >
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="系统模块" align="center" prop="title" /> <el-table-column label="系统模块" align="center" prop="title"/>
<!--<el-table-column label="操作类型" align="center" prop="businessType">--> <!--<el-table-column label="操作类型" align="center" prop="businessType">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>--> <!-- <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>-->
<!-- </template>--> <!-- </template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="请求方式" align="center" prop="requestMethod" /> <el-table-column label="请求方式" align="center" prop="requestMethod"/>
<el-table-column <el-table-column
label="操作人员" label="操作人员"
align="center" align="center"
prop="operUserName" prop="operUserName"
width="100" width="100"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:sort-orders="['descending', 'ascending']"
/> />
<el-table-column <el-table-column
label="操作地址" label="操作地址"
@ -124,15 +125,15 @@
</template> --> </template> -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.status === 0 ? 'success' : 'warning'">{{ <el-tag :type="scope.row.status === 0 ? 'success' : 'warning'">{{
scope.row.status === 0 ? "正常" : "失败" scope.row.status === 0 ? "正常" : "失败"
}}</el-tag> }}
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作日期" label="操作日期"
align="center" align="center"
prop="operTime" prop="operTime"
:sort-orders="['descending', 'ascending']"
width="180" width="180"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -149,7 +150,7 @@
type="text" type="text"
@click="handleView(scope.row, scope.index)" @click="handleView(scope.row, scope.index)"
v-hasPermi="['monitor:operlog:query']" v-hasPermi="['monitor:operlog:query']"
>详情 >详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -173,17 +174,19 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作模块:" <el-form-item label="操作模块:"
>{{ form.title }} / {{ typeFormat(form) }}</el-form-item >{{ form.title }} / {{ typeFormat(form) }}
</el-form-item
> >
<el-form-item label="登录信息:" <el-form-item label="登录信息:"
>{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }} >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="请求地址:">{{ form.operUrl }}</el-form-item> <el-form-item label="请求地址:">{{ form.operUrl }}</el-form-item>
<el-form-item label="请求方式:">{{ <el-form-item label="请求方式:">{{
form.requestMethod form.requestMethod
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="操作方法:">{{ form.method }}</el-form-item> <el-form-item label="操作方法:">{{ form.method }}</el-form-item>
@ -193,8 +196,9 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="返回参数:">{{ <el-form-item label="返回参数:">{{
form.jsonResult form.jsonResult
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作状态:"> <el-form-item label="操作状态:">
@ -204,13 +208,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="操作时间:">{{ <el-form-item label="操作时间:">{{
parseTime(form.operTime) parseTime(form.operTime)
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="异常信息:" v-if="form.status === 1">{{ <el-form-item label="异常信息:" v-if="form.status === 1">{{
form.errorMsg form.errorMsg
}}</el-form-item> }}
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -222,7 +228,7 @@
</template> </template>
<script> <script>
import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog"; import {list, delOperlog, cleanOperlog} from "@/api/monitor/operlog";
export default { export default {
name: "Operlog", name: "Operlog",
@ -246,7 +252,6 @@ export default {
// //
dateRange: [], dateRange: [],
// //
defaultSort: { prop: "operTime", order: "descending" },
// //
form: {}, form: {},
// //

@ -6,7 +6,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物资编码:"> <el-form-item label="物资编码:">
<el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable <el-input v-model="filterQuery.code" placeholder="请输入产品编码/商品条码/医保编码" clearable
style="width: 90%" @keyup.enter.native="keyupErp_submit($event)" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -31,40 +31,40 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="供应商:"> <el-form-item label="供应商:">
<el-select <el-select
v-model="filterQuery.customerId" v-model="filterQuery.customerId"
filterable filterable
remote remote
clearable="true" clearable="true"
reserve-keyword reserve-keyword
style="width: 90%" style="width: 90%"
placeholder="请选择供应商" placeholder="请选择供应商"
:remote-method="findCompany" :remote-method="findCompany"
:loading="loading" :loading="loading"
>
<el-option
v-for="item in companyNames"
:key="item.companyName"
:label="item.companyName"
:value="item.customerId"
> >
<el-option <span style="float: left">{{ item.companyName }}</span>
v-for="item in companyNames" </el-option>
:key="item.companyName" </el-select>
:label="item.companyName" </el-form-item>
:value="item.customerId" </el-col>
> </el-row>
<span style="float: left">{{ item.companyName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></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-search" @click="search"></el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
@ -83,11 +83,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column> <el-table-column label="审核意见" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" > <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button> <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row,1)">详情</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="scope.row.status==2">删除</el-button> <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
<el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)"></el-button> :disabled="scope.row.status==2">删除
</el-button>
<el-button type="text" size="small" :disabled="scope.row.status==2" @click="detailDialog(scope.row,2)">
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -162,7 +165,7 @@ import {
} from '@/api/supplier/supProductsAddDi' } from '@/api/supplier/supProductsAddDi'
import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog' import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
import ThrProductsAdd from '@/views/supplier/products/supProductsAdd' import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
import { filterCustomers } from '@/api/auth/customer' import {filterCustomers} from '@/api/auth/customer'
import thrProductsDetail from '@/views/supplier/products/supProductsDetail' import thrProductsDetail from '@/views/supplier/products/supProductsDetail'
export default { export default {
@ -182,9 +185,9 @@ export default {
}, },
total: 0, total: 0,
list: [], list: [],
title:null, title: null,
editDate:null, editDate: null,
thisDetail:null, thisDetail: null,
uploadFileUrl: null, uploadFileUrl: null,
fileList: [], fileList: [],
checkVisible: false, checkVisible: false,
@ -229,16 +232,16 @@ export default {
this.remark = '' this.remark = ''
this.curRow = row this.curRow = row
}, },
close(){ close() {
this.thrProductsDiDetailVisible=false; this.thrProductsDiDetailVisible = false;
this.thrProductsDetailVisible=false; this.thrProductsDetailVisible = false;
this.getList(); this.getList();
}, },
search() { search() {
this.filterQuery.page = 1 this.filterQuery.page = 1
this.getList() this.getList()
}, },
acts(){ acts() {
gupdateDiProductDetail().then((res) => { gupdateDiProductDetail().then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
@ -292,28 +295,28 @@ export default {
.catch(() => { .catch(() => {
}) })
}, },
detailDialog(row,type) { detailDialog(row, type) {
if(type==1){ if (type == 1) {
this.title="产品信息详情" this.title = "产品信息详情"
}else{ } else {
this.title="物资入院审核" this.title = "物资入院审核"
} }
if(row.type==1){ if (row.type == 1) {
let query = { uuid: row.uuid } let query = {uuid: row.uuid}
getDiProductDetail(query).then((res) => { getDiProductDetail(query).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.thisData = res.data this.thisData = res.data
this.editDate=row this.editDate = row
this.thisData.isAudit=type this.thisData.isAudit = type
this.thrProductsDiDetailVisible = true this.thrProductsDiDetailVisible = true
} else { } else {
this.$message.error('参数错误') this.$message.error('参数错误')
} }
}) })
}else{ } else {
this.thisDetail = row; this.thisDetail = row;
this.thisDetail.isAudit=type this.thisDetail.isAudit = type
this.thrProductsDetailVisible = true; this.thrProductsDetailVisible = true;
} }
}, },
@ -358,7 +361,7 @@ export default {
} }
}, },
components: { components: {
ThrProductsAdd, selectDiDetail,thrProductsDetail ThrProductsAdd, selectDiDetail, thrProductsDetail
}, },
mounted() { mounted() {
}, },

@ -119,7 +119,7 @@
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="延时上传(单位:分钟):">--> <!-- <el-form-item label="延时上传(单位:分钟):">-->
<!-- <el-input--> <!-- <el-input-->
<!-- style="width: 100px"--> <!-- style="width: 100px"-->
<!-- size="small" disabled--> <!-- size="small" disabled-->
@ -444,9 +444,10 @@
prop="action" prop="action"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="250" label="单据状态"> <el-table-column width="180" label="单据状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
style="width: 80%"
v-model="scope.row.orderStatus" v-model="scope.row.orderStatus"
placeholder="请选择单据状态" placeholder="请选择单据状态"
> >
@ -457,6 +458,28 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="目标单据状态">
<template slot-scope="scope">
<el-select style="width: 90%"
v-model="scope.row.syncStatus"
>
<el-option label="草稿" :value="1">草稿</el-option>
<el-option label="待审核" :value="3">待审核</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column width="180" label="是否自动补单">
<template slot-scope="scope">
<el-select style="width: 90%"
v-model="scope.row.syncChange"
>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -497,7 +520,7 @@
splaceholder="请输入内容" splaceholder="请输入内容"
></el-input> ></el-input>
<!-- <span style="margin-left: 30px"--> <!-- <span style="margin-left: 30px"-->
<!-- >单据下载时间间隔(单位:分钟):&nbsp;</span--> <!-- >单据下载时间间隔(单位:分钟):&nbsp;</span-->
<!-- >--> <!-- >-->
<!-- <el-input--> <!-- <el-input-->
@ -538,9 +561,10 @@
prop="action" prop="action"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="250" label="单据状态"> <el-table-column width="180" label="单据状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select <el-select
style="width: 80%"
v-model="scope.row.orderStatus" v-model="scope.row.orderStatus"
placeholder="请选择单据状态" placeholder="请选择单据状态"
> >
@ -551,6 +575,29 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" label="目标单据状态">
<template slot-scope="scope">
<el-select style="width: 90%"
v-model="scope.row.syncStatus"
>
<el-option label="草稿" :value="1">草稿</el-option>
<el-option label="待审核" :value="3">待审核</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column width="180" label="是否自动补单">
<template slot-scope="scope">
<el-select style="width: 90%"
v-model="scope.row.syncChange"
>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -948,6 +995,8 @@ export default {
obj.outChange = false; obj.outChange = false;
obj.orderStatus = 7; obj.orderStatus = 7;
obj.direct = 2; obj.direct = 2;
obj.syncStatus = 3;
obj.syncChange = false;
let isPut = true; let isPut = true;
for (let i = 0; i < this.checkedToInBusTypes.length; i++) { for (let i = 0; i < this.checkedToInBusTypes.length; i++) {
if (this.checkedToInBusTypes[i].action == obj.action) { if (this.checkedToInBusTypes[i].action == obj.action) {
@ -965,6 +1014,8 @@ export default {
obj.outChange = false; obj.outChange = false;
obj.direct = 1; obj.direct = 1;
obj.orderStatus = 7; obj.orderStatus = 7;
obj.syncStatus = 3;
obj.syncChange = false;
let isPut = true; let isPut = true;
for (let i = 0; i < this.checkedBusTypes.length; i++) { for (let i = 0; i < this.checkedBusTypes.length; i++) {
if (this.checkedBusTypes[i].action == obj.action) { if (this.checkedBusTypes[i].action == obj.action) {

@ -72,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip sortable="custom" <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip sortable="custom"
:sort-orders="['desc', 'asc']"></el-table-column> :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column> <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
<el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column> <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
@ -230,8 +230,12 @@ export default {
handleSortChange(column, prop, order) { handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop; this.filterQuery.orderBy = column.prop;
this.filterQuery.sort = column.order;
this.getList(); this.getList();
}, },

Loading…
Cancel
Save