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

Merge branch 'master' of http://116.204.71.86:3000/UDI/udi-spms-vue

Browse Source
ywj_dev
CTP 2 years ago
parent b5c3b26cee f2f89a1054
commit 6cfde1762b
50 changed files with 897 additions and 391 deletions
Show Stats Download Patch File Download Diff File

10
src/api/basic/product/udiInfo.js
Unescape Escape View File

@ -32,3 +32,13 @@ export function filterByVersion(query) {
});
}
export function selectOriginuuid(query) {
return axios({
url: "/udi/udirel/selectOriginuuid",
method: "post",
data: query
});
}

9
src/api/inout/orderDetailBiz.js
Unescape Escape View File

@ -41,6 +41,15 @@ export function updateById(data) {
});
}
export function updateBizById(data) {
return axios({
url: "/udiwms/inout/bizDetail/updateById",
method: "post",
data: data
});
}
export function insertInvoice(params) {
return axios({
url: "/udiwms/inout/biz/insertInvoice",

2
src/utils/request.js
Unescape Escape View File

@ -98,7 +98,7 @@ service.interceptors.response.use(res => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
Cookies.remove()
location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
location.href = process.env.VUE_APP_CONTEXT_PATH;
})
}).catch(() => {
isRelogin.show = false;

89
src/views/basic/product/SelectDIDetailDialog.vue
Unescape Escape View File

@ -1,5 +1,25 @@
<template>
<div>
<el-card>
<div style="
float: left;
text-align: left;
font-weight: bold;
margin-bottom: 8px;
">
<span>产品标识:</span>
</div>
<el-table :data="detailList" style="width: 100%" border key="3" highlight-current-row>
<el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>
<el-card>
<el-form
:model="editQuery"
@ -446,6 +466,8 @@
<script>
import { filterByUuid, selectOriginuuid } from '@/api/basic/product/udiInfo'
export default {
name: "SelectDIDetailDialog",
props: {
@ -456,12 +478,30 @@ export default {
},
data() {
return {
activeNames: ['1']
activeNames: ['1'],
detailList: []
}
},
methods: {},
methods: {
getDetailList(detailQuery) {
selectOriginuuid(detailQuery)
.then((response) => {
this.detailList = response.data || [];
})
.catch(() => {
this.detailList = [];
});
},
},
created() {
//获取产品标识列表
let ttquery = {
uuid: this.editQuery.uuid,
};
this.getDetailList(ttquery);
},
};
</script>
@ -476,5 +516,50 @@ export default {
padding-bottom: 17px;
padding-top: 17px;
}
.itemTag {
float: left;
text-align: right;
margin-top: 5px;
padding-right: 10px;
width: 35%;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;
flex-wrap: wrap;
margin-bottom: 0px;
}
.el-row {
display: flex;
}
/* .el-col {
border-radius: 4px;
flex-wrap: wrap;
} */
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
</style>

94
src/views/inout/DialogCheck.vue
Unescape Escape View File

@ -39,7 +39,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.batchNo" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -50,7 +50,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.price" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -62,7 +62,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="name">
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.manufacturer" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -73,7 +73,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.certCode" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -83,7 +83,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true" ></el-input>
<el-input v-model="inputQuery.productDate" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
@ -93,7 +93,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="code">
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
<el-input v-model="inputQuery.measname" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -164,10 +164,11 @@
</el-col>
<el-col :span="8">
<el-button type="primary" size="mini" icon="search" v-if="this.inputQuery.filePath!=null"
style="text-align:right" @click="showImgViewer" >
检验报告预览
style="text-align:right" @click="showImgViewer">
检验报告预览
</el-button>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer"
:url-list="imgList"/>
</el-col>
@ -181,13 +182,12 @@
<script>
import draggable from "vuedraggable";
import store from "@/store";
import {updateById} from '@/api/inout/orderDetailBiz'
import {updateBizById, updateById} from '@/api/inout/orderDetailBiz'
import {updateOrderDetailBiz} from '@/api/inout/order'
import { previewImage } from '@/api/purchase/supCompany'
import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
export default {
name: "DialogCheck",
props: {
@ -208,19 +208,19 @@ export default {
},
data() {
return {
imgList:[],
imgViewerVisible:false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
code: "",
formData: {
ggxh:"",
cpmctymc:"",
machineNo:"",
invoiceCode:"",
invoiceEncode:"",
price:"",
remark:"",
licenseUrl:""
ggxh: "",
cpmctymc: "",
machineNo: "",
invoiceCode: "",
invoiceEncode: "",
price: "",
remark: "",
licenseUrl: ""
},
// formRules: {
// name: [
@ -239,20 +239,20 @@ export default {
};
},
components: {
draggable,ElImageViewer
draggable, ElImageViewer
},
methods: {
submitUpload() {
updateById(this.inputQuery).then((res) =>{
if(res.code==20000){
this.$message({
type: "success",
message: "修改成功！",
});
this.closeDialog();
}
updateBizById(this.inputQuery).then((res) => {
if (res.code == 20000) {
this.$message({
type: "success",
message: "修改成功！",
});
this.closeDialog();
}
} )
})
},
@ -299,8 +299,8 @@ export default {
//
// },
uploadHandleRemove(file, fileList) {
this.inputQuery.filePath=null;
this.inputQuery.checkFileName=null;
this.inputQuery.filePath = null;
this.inputQuery.checkFileName = null;
console.log(file, fileList);
},
uploadHandlePreview(file) {
@ -311,7 +311,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(".");
@ -340,7 +340,7 @@ export default {
uploadHandleSuccess(response, file, fileList) {
if (response.code === 20000) {
this.inputQuery.filePath = response.data.name;
// this.onSubmit();
// this.onSubmit();
} else {
this.$message.error("文件上传失败：" + response.message);
}
@ -348,33 +348,37 @@ export default {
uploadHandleError() {
},
uploadHandleBefore(file){
uploadHandleBefore(file) {
console.log(file)
let isJPG = file.type === 'image/jpeg';
let isPNG = file.type === 'image/png';
if(!isJPG&&!isPNG){
if (!isJPG && !isPNG) {
this.$message.error('只能上传jpg或png格式');
}
return isJPG || isPNG;
},
showImgViewer(row){
showImgViewer(row) {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList=[];
previewImage({imageUrl:this.inputQuery.filePath,certFileUrl:this.certFileUrl}).then(response => {
this.imgList = [];
previewImage({imageUrl: this.inputQuery.filePath, certFileUrl: this.certFileUrl}).then(response => {
if (response.code === 20000) {
this.imgList=response.data;
this.imgList = response.data;
}
console.log(this.imgList)
this.imgViewerVisible = true;
});
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'hidden';
document.addEventListener("touchmove", m, false); // 禁止页面滑动
},
closeImgViewer(){
closeImgViewer() {
this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() };
const m = (e) => {
e.preventDefault()
};
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},

2
src/views/inout/DialogInvoice.vue
Unescape Escape View File

@ -96,7 +96,7 @@
<el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">
{{ choiceFile }}
</el-button>
<div>只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB</div>
<div>只能上传 jpg,png 文件，且不超过 10 MB</div>
</el-upload>
</el-form-item>
</el-col>

47
src/views/inout/InvoiceCkeck.vue
Unescape Escape View File

@ -17,18 +17,18 @@
style="padding-top: 40px"
>
<el-card style="margin-top: -30px">
<el-row>
<el-col :span="20">
<el-form-item prop="code" label="扫码校验:">
<el-input
id="inputer"
placeholder="请输入发票码"
type="tel"
:disabled="true"
></el-input>
</el-form-item>
</el-col>
</el-row>
<!--<el-row>-->
<!-- <el-col :span="20">-->
<!-- <el-form-item prop="code" label="发票码:">-->
<!-- <el-input-->
<!-- id="inputer"-->
<!-- placeholder="请输入发票码"-->
<!-- type="tel"-->
<!-- :disabled="true"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-row>
<el-col :span="11">
<el-form-item label="机械编码:" prop="machineNo">
@ -168,6 +168,11 @@
>
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="发票编码"
prop="invoiceCodes"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
@ -224,22 +229,16 @@
prop="certCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="发票编码"
prop="invoiceCodes"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="codeTotal > 0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getOrderDetail"
@pagination="getCodeDetailLists"
/>
</el-tab-pane>
</el-tabs>
<el-image-viewer
v-if="imgViewerVisible"
style="z-index: 9999"
@ -349,7 +348,7 @@ export default {
{ required: true, message: "请输入发票编码", trigger: "blur" },
],
price: [{ required: true, message: "请输入发票价格", trigger: "blur" }],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
invoiceDate: [{ required: true, message: "请输入备注", trigger: "blur" }],
},
certFileUrl: "",
Upinvoice: false,
@ -384,7 +383,7 @@ export default {
4: "pda未校验",
5: "pc端扫码精灵",
6: "流转自动补单",
7: "UDI供应商平台",
7: "UDI管理系统",
8: "平衡补录单据",
10: "手动补单",
11: "仓库盘点",
@ -473,7 +472,7 @@ export default {
components: { AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer },
methods: {
onSubmit() {
if (this.invoiceRow.length == 0) {
if (this.invoiceRow == null) {
this.$message.error("请选择要登记的物资! ");
return false;
}
@ -493,8 +492,8 @@ export default {
this.$message.error("发票价格不能为空！");
return;
}
if (this.$isBlank(this.inputQuery.remark)) {
this.$message.error("备注不能为空！");
if (this.$isBlank(this.inputQuery.invoiceDate)) {
this.$message.error("日期不能为空！");
return;
}
this.inputQuery.list = this.invoiceRow;

90
src/views/inout/InvoiceRegistration.vue
Unescape Escape View File

@ -196,7 +196,9 @@
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.checkStatus==1" size="small" @click.native.stop="determine(scope.row)">确认</el-button>
<el-button type="text" :disabled="scope.row.checkStatus==1 " v-if="showSup" size="small"
@click.native.stop="determine(scope.row)">确认
</el-button>
<el-button
type="text"
size="small"
@ -220,7 +222,7 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
@row-click="BizDetail"
row-key="id" highlight-current-row
>
@ -320,7 +322,7 @@
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getOrderDetails"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
@ -332,11 +334,14 @@
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
<el-table v-loading="bizDetailLoading" :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>
<el-table-column
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column
label="物资名称"
prop="cpmctymc" width="150"
@ -357,10 +362,6 @@
prop="machineNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="发票代码" width="150"
prop="invoiceCode"
></el-table-column>
<el-table-column
label="发票编码" width="150"
prop="invoiceEncode"
@ -457,9 +458,6 @@
</el-dialog>
<el-dialog
:title="formMap[formName]"
:visible.sync="InvoiceRegisterv"
@ -509,7 +507,7 @@
<script>
import {
deleteByOrderId,
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder,filterOrderList
getOrderList, rollUnReceivebackOrder, filterInvoice, filterOrder, filterOrderList
} from '../../api/inout/order'
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
@ -547,9 +545,10 @@ export default {
name: "IoCheckSuccessOrder",
data() {
return {
invoiceRow:[],
inputInv:[],
checkInvoice:false,
savebillno: null,
invoiceRow: [],
inputInv: [],
checkInvoice: false,
imgList: [],
imgViewerVisible: false,
BASE_URL: process.env.VUE_APP_BASE_API,
@ -567,11 +566,11 @@ export default {
invCode: this.$store.getters.locInvCode,
},
determineVisible: false,
determineData:null,
determineData: null,
corpLoading: false,
fromOptions: [],
regId:null,
par:[],
regId: null,
par: [],
formName: 1,
formMap: {
@ -614,7 +613,7 @@ export default {
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"7": "UDI管理系统",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
@ -700,7 +699,7 @@ export default {
subRow: null,
};
},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer,InvoiceRegistrationDetermine,checkInvoice},
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer, InvoiceRegistrationDetermine, checkInvoice},
methods: {
// upData(data){
// this.invoiceRow = data;
@ -721,16 +720,21 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.actDateRange=[];
this.auditDateRange=[];
this.actDateRange = [];
this.auditDateRange = [];
this.getList();
},
InvoiceRegister1(row){
this.inputInv=row;
this.checkInvoice=true;
InvoiceRegister1(row) {
this.savebillno = row.billNo
this.inputInv = row;
this.checkInvoice = true;
},
closecheckInvoice(){
this.checkInvoice=false;
closecheckInvoice() {
this.checkInvoice = false;
this.getList();
this.currentRow.billNo = this.savebillno;
this.bizQuery.orderIdFk = this.savebillno;
this.codeQuery.orderIdFk = this.savebillno;
this.getCodeDetailList();
this.getBizDetailListInv();
@ -819,8 +823,8 @@ export default {
type: "warning",
})
.then(() => {
this.par=row;
this.par.regId=this.regId;
this.par = row;
this.par.regId = this.regId;
deleteById(row)
.then((response) => {
if (response.code == 20000) {
@ -851,7 +855,7 @@ export default {
//this.resultQuery.page = 1;
this.getCodeDetailList();
//this.getResultDetailList();
//this.getResultDetailList();
},
// 清空单据详情数据列表
clearDetailList() {
@ -941,7 +945,14 @@ export default {
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
let invlist1 = response.data || [];
for (var i = 0; i < invlist1.length; i++) {
if (invlist1[i].code == 1000000) {
this.invList.push(invlist1[i]);
}
}
})
.catch(() => {
});
@ -1023,10 +1034,11 @@ export default {
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
if(row != null) {
if (row != null) {
this.bizQuery.orderIdFk = row.orderIdFk;
this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk;
this.bizQuery.bizIdFk = row.id;
//this.bizQuery.bizIdFk = row.id;
}
filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
@ -1048,14 +1060,14 @@ export default {
BizDetail(row) {
this.regId=row.id;
this.regId = row.id;
this.bizQuery.page = 1;
this.subRow = row;
this.getBizDetailListInv(row);
},
determine(row){
this.determineData=row;
this.determineVisible=true;
determine(row) {
this.determineData = row;
this.determineVisible = true;
},
//单据撤回
@ -1084,7 +1096,7 @@ export default {
this.Upinvoice = false;
this.getBizDetailListInv();
this.getOrderDetails();
},
},
closeInvoice(row) {
this.InvoiceRegisterv = false;

2
src/views/inout/InvoiceRegistrationDetermine.vue
Unescape Escape View File

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

2
src/views/inout/IoArrivalSearchOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

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

4
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoCheckSuccessOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoCreateErrorOrder.vue
Unescape Escape View File

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

4
src/views/inout/IoCreateOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoCreateScanOrder.vue
Unescape Escape View File

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

4
src/views/inout/IoDealOrder.vue
Unescape Escape View File

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

10
src/views/inout/IoDeliveryAuditOrder.vue
Unescape Escape View File

@ -613,7 +613,7 @@ export default {
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"7": "UDI管理系统",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
@ -705,6 +705,7 @@ export default {
this.$router.push({
path: "",
});
let invCode = this.filterQuery.invCode
this.filterQuery = {
id: "",
billNo: null,
@ -715,8 +716,11 @@ export default {
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
invCode : this.$store.getters.locInvCode
};
if(invCode!=this.$store.getters.locInvCode){
this.getBusType();
}
this.actDateRange = [];
this.getList();
},
@ -1046,7 +1050,7 @@ export default {
//单据撤回
rollback(row) {
this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
this.$confirm('此操作将撤回单据至待核对, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

4
src/views/inout/IoDeliverySearchOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoEditOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoInoutSearchOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoReturnedSearchOrder.vue
Unescape Escape View File

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

6
src/views/inout/IoSupAduitOrder.vue
Unescape Escape View File

@ -483,7 +483,7 @@ export default {
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"7": "UDI管理系统",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
@ -570,6 +570,7 @@ export default {
this.$router.push({
path: "",
});
let invCode = this.filterQuery.invCode
this.filterQuery = {
id: "",
billNo: null,
@ -582,6 +583,9 @@ export default {
endTime: null,
invCode: this.$store.getters.locInvCode,
};
if(invCode!=this.$store.getters.locInvCode){
this.getBusType();
}
this.actDateRange = [];
this.getList();
},

95
src/views/inout/IoSupSearchOrder.vue
Unescape Escape View File

@ -301,6 +301,28 @@
prop="certCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="检验报告"
width="160"
prop="checkFileName"
show-overflow-tooltip
>
<template slot-scope="scope">
<div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.checkFileName }}</div>
</template>
</el-table-column>
<el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="upload(scope.row)"
v-if="scope.row.checkFileName != null"
>检验报告
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="bizTotal>0"
@ -392,6 +414,24 @@
</el-tab-pane>
</el-tabs>
<el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
<el-dialog
title="编辑"
:visible.sync="Upinvoice"
:before-close="freshen"
width="60%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="Upinvoice"
>
<DialogCheck
:closeDialog="closeCheckDialog"
:inputQuery="currentManufacturer"
></DialogCheck>
</el-dialog>
<el-dialog
title="送货单审核"
:visible.sync="acceptOrderVisible"
@ -423,7 +463,12 @@ import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import DialogCheck from "@/views/inout/DialogCheck";
import {getDeptListByUser} from "@/api/auth/authDept";
import { previewImage } from '@/api/purchase/supCompany'
import { getBizDetailList } from '@/api/inout/orderDetailBiz'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = {
site_id: "",
@ -436,7 +481,12 @@ export default {
name: "IoSupSearchOrder",
data() {
return {
BASE_URL: process.env.VUE_APP_BASE_API,
imgViewerVisible:false,
imgList:[],
showSearch: true,
currentManufacturer:{},
Upinvoice:false,
filterQuery: {
id: "",
billNo: null,
@ -481,7 +531,7 @@ export default {
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "流转自动补单",
"7": "UDI供应商平台",
"7": "UDI管理系统",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
@ -563,7 +613,7 @@ export default {
acceptOrderVisible: false,
};
},
components: {AcceptOrder},
components: {AcceptOrder,DialogCheck,ElImageViewer},
methods: {
onReset() {
this.$router.push({
@ -607,6 +657,45 @@ export default {
this.filterQuery.page = 1;
this.getList();
},
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); // 禁止页面滑动
},
closeImgViewer(){
this.imgViewerVisible = false;
const m = (e) => { e.preventDefault() };
document.body.style.overflow = 'auto';
document.removeEventListener("touchmove", m, true);
},
upload(row){
this.currentManufacturer = row;
this.Upinvoice = true;
},
closeCheckDialog(){
this.Upinvoice = false;
this.getOrderDetails();
},
freshen(){
this.Upinvoice = false;
this.getOrderDetails();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
@ -744,7 +833,7 @@ export default {
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
getResultDetailList(this.bizQuery).then((res) => {
getBizDetailList(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data.list || [];

37
src/views/inout/IoSupSecAuditOrder.vue
Unescape Escape View File

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

2
src/views/inout/IoWaitAllocateOrder.vue
Unescape Escape View File

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

2
src/views/inout/uploadManage/uploadOrder.vue
Unescape Escape View File

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

17
src/views/inventory/InvPreInProductsDetail.vue
Unescape Escape View File

@ -58,7 +58,8 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table v-loading="loading" :data="list" style="width: 100%"
:default-sort="defaultSort" @sort-change="handleSortChange" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -106,6 +107,8 @@
prop="orderTime"
width="150"
show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
</el-table>
@ -147,6 +150,7 @@ export default {
list: [],
total: 0,
loading: false,
defaultSort: {prop: 'orderTime', order: 'desc'},
};
},
methods: {
@ -176,6 +180,17 @@ export default {
this.invPreProductDetailQuery.page = val;
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.invPreProductDetailQuery.sort = 'desc'
} else {
this.invPreProductDetailQuery.sort = 'asc'
}
this.invPreProductDetailQuery.orderBy = column.prop;
this.getList();
},
getList() {
this.loading = true;
this.invPreProductDetailQuery.relId = this.inputQuery.relId;

2
src/views/inventory/InvPreInSerach.vue
Unescape Escape View File

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

17
src/views/inventory/InvPreProductsDetail.vue
Unescape Escape View File

@ -58,7 +58,8 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table v-loading="loading" :data="list" style="width: 100%"
:default-sort="defaultSort" @sort-change="handleSortChange" >
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -106,6 +107,8 @@
prop="orderTime"
width="150"
show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
</el-table>
@ -147,6 +150,7 @@ export default {
list: [],
total: 0,
loading: false,
defaultSort: {prop: 'orderTime', order: 'desc'},
};
},
methods: {
@ -176,6 +180,17 @@ export default {
this.invPreProductDetailQuery.page = val;
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.invPreProductDetailQuery.sort = 'desc'
} else {
this.invPreProductDetailQuery.sort = 'asc'
}
this.invPreProductDetailQuery.orderBy = column.prop;
this.getList();
},
getList() {
this.loading = true;
this.invPreProductDetailQuery.relId = this.inputQuery.relId;

16
src/views/inventory/InvProductsDetail.vue
Unescape Escape View File

@ -56,7 +56,8 @@
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" border>
<el-table v-loading="loading" :data="list" style="width: 100%" :default-sort="defaultSort"
@sort-change="handleSortChange" border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
@ -104,6 +105,8 @@
prop="orderTime"
width="150"
show-overflow-tooltip
sortable="custom"
:sort-orders="['ascending', 'descending']"
></el-table-column>
</el-table>
<pagination
@ -144,6 +147,7 @@ export default {
list: [],
total: 0,
loading: false,
defaultSort: {prop: 'orderTime', order: 'desc'},
};
},
methods: {
@ -173,6 +177,16 @@ export default {
this.invProductDetailQuery.page = val;
this.getList();
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.invProductDetailQuery.sort = 'desc'
} else {
this.invProductDetailQuery.sort = 'asc'
}
this.invProductDetailQuery.orderBy = column.prop;
this.getList();
},
getList() {
this.loading = true;
this.invProductDetailQuery.relId = this.inputQuery.relId;

7
src/views/inventory/InvSupPreInProducts.vue
Unescape Escape View File

@ -305,6 +305,11 @@ export default {
getInvListByUser(query)
.then((response) => {
this.invList = response.data || [];
for(var i=0;i< this.invList.length;i++){
if(this.invList[i].advanceType == 2){
this.filterQuery.invCode=this.invList[i].code;
}
}
this.getList();
})
.catch(() => {
@ -389,7 +394,7 @@ export default {
}
this.findMethod();
this.getInvList();
this.getList();
// this.getList();
},
};
</script>

2
src/views/inventory/InvSupPreInSerach.vue
Unescape Escape View File

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

8
src/views/inventory/InvSupPreProducts.vue
Unescape Escape View File

@ -302,6 +302,12 @@ export default {
getInvListByUser(query)
.then((response) => {
this.invList = response.data || [];
for(var i=0;i< this.invList.length;i++){
if(this.invList[i].advanceType == 3){
this.filterQuery.invCode=this.invList[i].code;
}
}
this.getList();
})
.catch(() => {
@ -386,7 +392,7 @@ export default {
}
this.findMethod();
this.getInvList();
this.getList();
//this.getList();
},
};
</script>

4
src/views/inventory/InvSupProuducts.vue
Unescape Escape View File

@ -231,6 +231,7 @@ export default {
list: [],
total: 0,
invList: [],
invLists: [],
loading: false,
deleteData: {
id: "",
@ -322,7 +323,8 @@ export default {
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
this.invLists = response.data || [];
this.invList = this.invLists.filter( item => item.code != 1000001 && item.code != 1000002)
this.getList();
})
.catch(() => {

2
src/views/inventory/trace/invUdiTraceOrder.vue
Unescape Escape View File

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

2
src/views/inventory/trace/sickerUdiTraceOrder.vue
Unescape Escape View File

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

12
src/views/monitor/logininfor/index.vue
Unescape Escape View File

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

51
src/views/monitor/operlog/index.vue
Unescape Escape View File

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

13
src/views/purchase/cert/supCertAudit.vue
Unescape Escape View File

@ -618,8 +618,11 @@ export default {
});
},
addInfoDialog(row) {
if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
if(row.auditStatus == 2){
this.editManufacturerType = 2;
this.formManufacturerName = 1;
}
else if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
this.editManufacturerType = 2;
this.formManufacturerName = 2;
} else {
@ -678,7 +681,11 @@ export default {
this.showSearch3 = !this.showSearch3;
},
registrationDialog(row) {
if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
if(row.auditStatus == 2){
this.editProductType = 2;
this.formProductName = 1;
}
else if (row.auditStatus == 6 || row.auditStatus == 3 || row.auditStatus == 4) {
this.formProductName = 2;
this.editProductType = 2;
} else {

4
src/views/purchase/company/supCompanyAduditDialog.vue
Unescape Escape View File

@ -474,8 +474,6 @@ export default {
this.getCompanyCertList();
this.customerlist();
this.selectedOptions = this.inputQuery.areaCode.split(",");
},
components: {
draggable,
@ -637,7 +635,7 @@ export default {
getRoIds() {
let params = {companyId: this.inputQuery.customerId}
getRoId(params).then((res) => {
this.inputQuery.roleId = parseInt(res.data.roleId);
this.inputQuery.roleId = res.data.roleId;
})
},
getCompanyCertList() {

24
src/views/purchase/purOrder/purOrderSearch.vue
Unescape Escape View File

@ -22,14 +22,14 @@
<el-col :span="8">
<el-form-item label="采购部门">
<el-select
v-model="filterQuery.invCode"
v-model="filterQuery.deptCode"
placeholder="请选择收货仓库"
style="width: 90%"
placeholder="请选择采购部门"
clearable
>
<el-option
v-for="item in invList"
:key="item.name"
v-for="item in deptList"
:key="item.code"
:label="item.name"
:value="item.code"
>
@ -41,14 +41,14 @@
<el-col :span="8">
<el-form-item label="收货仓库">
<el-select
v-model="filterQuery.deptCode"
placeholder="请选择收货仓库"
v-model="filterQuery.invCode"
style="width: 90%"
placeholder="请选择采购部门"
clearable
>
<el-option
v-for="item in deptList"
:key="item.code"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code"
>
@ -347,15 +347,15 @@ export default {
4: "已拒绝",
},
emergencyMap: {
1: "普通",
2: "紧急",
3: "不紧急",
1: "正常",
2: "较急",
3: "特急",
},
dealStatus: {
1: "已处理",
2: "未处理",
3: "作废",
3: "已作废",
},
showSup: false,
invList: {}, //采购部门

7
src/views/supplier/company/basicCompany.vue
Unescape Escape View File

@ -44,7 +44,7 @@
inputQuery.auditStatus == 1 ||
inputQuery.auditStatus == 2
"
@click="onModifySubmit(3)"
@click="onModifySubmit(inputQuery.auditStatus)"
>提交审核
</el-button>
</div>
@ -539,6 +539,7 @@ export default {
},
onModifySubmit(val) {
//this.$message.error(val);
var status = this.inputQuery.auditStatus;
if (this.editType == 0) {
//新增保存
@ -575,7 +576,9 @@ export default {
var str = "是否确定草稿保存？";
} else if (val == 6) {
var str = "是否确定提交审核？";
} else {
} else if (val == 2) {
var str = "企业信息已拒绝审核，是否确认重新提交审核？";
} else {
var str = "企业信息已通过审核，是否确认重新提交审核？";
}
this.$refs["inputQuery"].validate((valid) => {

377
src/views/supplier/products/selectDIDetailDialog.vue
Unescape Escape View File

@ -1,5 +1,22 @@
<template>
<div>
<el-card>
<div style="
float: left;
text-align: left;
font-weight: bold;
margin-bottom: 8px;
">
<span>产品标识:</span>
</div>
<el-table :data="detailList" style="width: 100%" border key="3" highlight-current-row>
<el-table-column label="产品最小销售标识" prop="nameCode" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
<el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
</el-table>
</el-card>
<el-card>
<el-form :model="editQuery" :rules="rules" ref="editQuery" label-width="150px" style="margin-top: 20px" >
@ -13,7 +30,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="审核意见:">
<el-input style="width: 90%" size="small" :disabled="editQuery.isAudit!=2" splaceholder="请输入审核意见" v-model="remark"></el-input>
<el-input style="width: 65%" size="small" :disabled="editQuery.isAudit!=2" splaceholder="请输入审核意见" v-model="remark"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -21,12 +38,12 @@
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="商品条码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="医保编码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -34,12 +51,12 @@
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="计量单位:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="生产企业:">
<el-input style="width: 90%" size="small" :disabled="true" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -47,12 +64,12 @@
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="商品名称:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.cpmctymc"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.cpmctymc"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="产品描述:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -60,7 +77,7 @@
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="产品价格:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -69,13 +86,13 @@
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak1"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak1"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak2"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak2"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -83,13 +100,13 @@
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak3"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak3"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak4"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak4"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -97,13 +114,13 @@
<el-row >
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak5"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak5"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak6"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak6"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -111,47 +128,58 @@
<el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7 ">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak7"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak7"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak8"></el-input>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.basicPrductRemak8"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title">
<p class="form-title">产品标识基本信息</p>
</template>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="产品标识:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.nameCode"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>产品标识:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.nameCode"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="最小包装单元内包含使用单元数量:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>最小包装单元内包含使用单元数量:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.zxxsbzbhsydysl"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="包含下级产品编码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.bhxjcpbm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>包含下级产品编码:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.bhxjcpbm"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="包含最小销售包装数量:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.bhzxxsbzsl"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>包含最小销售包装数量:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.bhzxxsbzsl"></el-input>
</div>
</el-col>
</el-row>
@ -162,90 +190,129 @@
<p class="form-title">产品基本信息</p>
</template>
<el-row >
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="物资名称:">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>物资名称:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="规格型号:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>规格型号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ggxh"></el-input>
</div>
</el-col>
</el-row>
<el-row >
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="产品类别:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.cplb"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>产品类别:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.cplb"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="分类编码:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.flbm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>分类编码:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.flbm"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="医疗器械注册人:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="ylqxzcrbarmc" v-model="editQuery.ylqxzcrbarmc"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>医疗器械注册人:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="ylqxzcrbarmc" v-model="editQuery.ylqxzcrbarmc"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="注册人英文名称:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ylqxzcrbarywmc"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>注册人英文名称:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ylqxzcrbarywmc"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="器械类别:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.qxlb"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>器械类别:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.qxlb"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="生产企业:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>生产企业:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.manufactory"></el-input>
</div>
</el-col>
</el-row>
<el-row >
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="商品条码:">
<el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>商品条码:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="医保编码:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>医保编码:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="统一社会信用号:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.tyshxydm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>统一社会信用号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.tyshxydm"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="注册证/备案号:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.zczbhhzbapzbh"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>注册证/备案号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.zczbhhzbapzbh"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="产品描述:">
<el-input style="width: 90%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>产品描述:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
</div>
</el-col>
</el-row>
</el-collapse-item>
@ -256,29 +323,41 @@
<p class="form-title">生产标识基本信息</p>
</template>
<el-row >
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="是否包含批号:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.scbssfbhph"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>是否包含批号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.scbssfbhph"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="是否包含序列号:">
<el-input style="width: 90%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>是否包含序列号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" v-model="editQuery.scbssfbhxlh" splaceholder="请输入内容"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="是否包含生产日期:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.scbssfbhscrq"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>是否包含生产日期:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.scbssfbhscrq"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="是否包含失效日期:">
<el-input style="width: 90%" :disabled="true" v-model="editQuery.scbssfbhsxrq" size="small" splaceholder="请输入内容"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>是否包含失效日期:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" v-model="editQuery.scbssfbhsxrq" size="small" splaceholder="请输入内容"></el-input>
</div>
</el-col>
</el-row>
</el-collapse-item>
@ -288,30 +367,42 @@
<p class="form-title">包装标识信息</p>
</template>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="上级产品编码:">
<el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.sjcpbm"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>上级产品编码:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="true" size="small" splaceholder="请输入内容" v-model="editQuery.sjcpbm"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="包装级别:">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.packLevel"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>包装级别:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.packLevel"></el-input>
</div>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-form-item label="包装级别:">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" v-model="editQuery.bzcj" :disabled="true"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>包装级别:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" v-model="editQuery.bzcj" :disabled="true"></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col">
<el-form-item label="包含下级包装数量:">
<el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
</el-form-item>
<div class="text item">
<div class="itemTag">
<span>包含下级包装数量:&nbsp;</span>
</div>
<el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true" v-model="editQuery.bhxjsl"></el-input>
</div>
</el-col>
</el-row>
</el-collapse-item>
@ -327,6 +418,7 @@
import { updateDiProduct } from '@/api/supplier/supProductsAddDi'
import { finProductSet } from '@/api/param/systemParamConfig'
import { selectOriginuuid } from '@/api/basic/product/udiInfo'
export default {
name: "SelectDIDetailDialog",
@ -352,6 +444,7 @@ export default {
return {
activeNames: ['1'],
remark:"",
detailList:[],
productRemarkSet:{}
}
},
@ -383,12 +476,25 @@ export default {
//出错了
}
})
}
},
getDetailList(detailQuery) {
selectOriginuuid(detailQuery)
.then((response) => {
this.detailList = response.data || [];
})
.catch(() => {
this.detailList = [];
});
},
},
created() {
this.findBasicProductSet()
//获取产品标识列表
let ttquery = {
uuid: this.editQuery.uuid,
};
this.getDetailList(ttquery);
},
};
</script>
@ -396,12 +502,57 @@ export default {
<style scoped>
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
.itemTag {
float: left;
text-align: right;
margin-top: 5px;
padding-right: 10px;
width: 35%;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.edit-row {
display: flex;
flex-wrap: wrap;
margin-bottom: 0px;
}
.el-row {
display: flex;
}
/* .el-col {
border-radius: 4px;
flex-wrap: wrap;
} */
.el-table .cell.el-tooltip {
white-space: pre-wrap;
}
.form-title {
font-size: 16px;
font-family: Noto Sans SC;
font-weight: bold;
color: #303133;
padding-bottom: 17px;
padding-top: 17px;
}
</style>

107
src/views/supplier/products/supDiProductsCheck.vue
Unescape Escape View File

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

59
src/views/sync/SysUdimsConfig.vue
Unescape Escape View File

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

8
src/views/sync/SysUdimsData.vue
Unescape Escape View File

@ -72,7 +72,7 @@
</el-table-column>
<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="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
@ -230,8 +230,12 @@ export default {
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.filterQuery.sort = 'desc'
} else {
this.filterQuery.sort = 'asc'
}
this.filterQuery.orderBy = column.prop;
this.filterQuery.sort = column.order;
this.getList();
},

16
src/views/system/role/index.vue
Unescape Escape View File

@ -691,11 +691,19 @@ export default {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
if( this.form.menuIds.length==0){
this.$message.error("菜单权限不能为空");
return
}
updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getCustomerList();
if(response.code === 20000) {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.getCustomerList();
}else{
this.$message.error(response.message);
}
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();

2
vue.config.js
Unescape Escape View File

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `process.env.VUE_APP_BASE_API`,
target: `http://127.0.0.1:9993`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",

Write Preview
Loading…
Cancel
Save