bug修改

dev
anthonywj 2 years ago
parent c4e3bd77df
commit 6f1c10572e

@ -26,19 +26,18 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
# 东旭
VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
刘恩典
#
VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
# 平潭正式
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 吴总测试服务器
# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
# 片仔癀诊断
# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'

@ -261,7 +261,11 @@ export default {
advancePreIn: false,
checkVailDate: 0, //
checkExpire: true, //
checkCertExpire: false //
checkCertExpire: false,//
checkReview: null,
secCheckReview: null,
thrCheckReview: null,
},
enableMap: {
@ -538,6 +542,9 @@ export default {
thrCheckChange: null,
thrCheckBalance: null,
thrCheckCopy: null,
checkReview: null,
secCheckReview: null,
thrCheckReview: null,
advancePreIn: false,
checkVailDate: 0, //
checkExpire: 2, //

@ -746,6 +746,27 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">单据验收补单</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.checkReview" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="扫码直接生成业务单" :value="0"></el-option>
<el-option label="有三期业务单配/拣货" :value="1"></el-option>
<el-option label="无三期业务单配/拣货" :value="2"></el-option>
<el-option label="有三期业务单校验" :value="3"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">单据验收补单</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
@ -956,6 +977,27 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">单据验收补单</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.thrCheckReview" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.thrCheckReview"
>
<el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">单据验收补单</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">UDI管理系统同步单据</span>
@ -1184,6 +1226,26 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">单据验收补单</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.secCheckReview" style="width: 65%" placeholder="是否启用"
:disabled="!inputQuery.secCheckEnable"
>
<el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">单据验收补单</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
</el-collapse>

@ -148,7 +148,7 @@
:disabled="true"
size="small"
splaceholder="请输入内容"
v-model="editQuery.hchzsb"
v-model="editQuery.cplb"
></el-input>
</div>
</el-col>

@ -127,14 +127,14 @@
</el-table-column>
<el-table-column label="注册/备案号" width="150" prop="certCode"></el-table-column>
<!-- <el-table-column label="销售清单号(第二票)" width="180" prop="secSalesListNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号(第一票)" width="180" prop="firstSalesInvNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号(第二票)" width="180" prop="secSalesInvNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票日期" width="150" prop="invoiceDate">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="销售清单号(第二票)" width="180" prop="secSalesListNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号(第一票)" width="180" prop="firstSalesInvNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="销售发票号(第二票)" width="180" prop="secSalesInvNo">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票日期" width="150" prop="invoiceDate">-->
<!-- </el-table-column>-->
</el-table>
</el-card>
</div>

@ -167,7 +167,7 @@
<!-- 暂时隐藏-->
<!-- <el-button-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
@ -182,13 +182,13 @@
</el-button
>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button-->
<!-- >-->
</template>
</el-table-column>
@ -573,7 +573,7 @@ import {
} from "@/api/itextpdf/orderPrint"
import {getBasicUnitMaintains, getCorrespondence} from "@/api/basic/basicUnitMaintain";
import {previewImage,previewFile} from '@/api/purchase/supCompany'
import {previewImage, previewFile} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
@ -775,23 +775,23 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
if(row.filePath.substr(-1) == ','){
row.filePath=row.filePath.slice(0, row.filePath.length-1);
if (row.filePath.substr(-1) == ',') {
row.filePath = row.filePath.slice(0, row.filePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
"/udiwms/image/register/file/getImage?type=image2&name=" + row.filePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.filePath.lastIndexOf('.');
if(index===-1){
if (index === -1) {
this.$message.error("文件名异常!")
return false
}
if(row.filePath.substr(index+1)==='pdf'){
if (row.filePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);
@ -816,23 +816,23 @@ export default {
},
showImgViewerCold(row) {
if(row.coldFilePath.substr(-1) == ','){
row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
if (row.coldFilePath.substr(-1) == ',') {
row.coldFilePath = row.coldFilePath.slice(0, row.coldFilePath.length - 1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
"/udiwms/image/register/file/getImage?type=image2&name=" + row.coldFilePath;
this.imgList = [];
this.imgList.push(this.certFileUrl)
let index = row.coldFilePath.lastIndexOf('.');
if(index===-1){
if (index === -1) {
this.$message.error("文件名异常!")
return false
}
if(row.coldFilePath.substr(index+1)==='pdf'){
if (row.coldFilePath.substr(index + 1) === 'pdf') {
let pdf = "application/pdf"
let binaryData = [];
previewFile(this.certFileUrl).then(res=>{
previewFile(this.certFileUrl).then(res => {
binaryData.push(res);
let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
window.open(URL);

@ -73,23 +73,23 @@
</el-row>
<el-row>
<!-- <el-col :span="10">
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="formData.fromInvSpaceCode" placeholder="领用货位信息"
:disabled="detailList.length >0 "
style="width: 90%;"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>-->
<!-- <el-col :span="10">
<el-form-item class="query-form-item" label="领用货位:">
<el-select v-model="formData.fromInvSpaceCode" placeholder="领用货位信息"
:disabled="detailList.length >0 "
style="width: 90%;"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.parentName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>-->
<el-col :span="10">
<el-form-item class="query-form-item" label="领用人:">
@ -145,7 +145,7 @@
highlight-current-row
border max-height="300" height="300">
<el-table-column label="序号" type="index" width="50"></el-table-column>
<!-- <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="条码" width="180" prop="originCode" show-overflow-tooltip></el-table-column>-->
<el-table-column width="150"
label="产品通用名"
prop="productName"
@ -161,23 +161,23 @@
<el-table-column label="供应商" prop="supName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<!-- <el-button
type="text"
size="small"
v-if="scope.row.serialNo === null"
@click.stop="true"
@click.native="editOrderDetail(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="updateOrderDetail(scope.row)"
>保存
</el-button
>-->
<!-- <el-button
type="text"
size="small"
v-if="scope.row.serialNo === null"
@click.stop="true"
@click.native="editOrderDetail(scope.$index, scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
@click.stop="true"
@click.native="updateOrderDetail(scope.row)"
>保存
</el-button
>-->
<el-button
type="text"
size="small"
@ -219,19 +219,19 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item" prop="invSpaceCode">
<el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
:disabled="true"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>-->
<!-- <el-form-item class="query-form-item" prop="invSpaceCode">
<el-select v-model="filterQuery.invSpaceCode" placeholder="领用货位信息"
:disabled="true"
clearable>
<el-option
v-for="item in spaceList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>-->
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
</el-form-item>
@ -321,7 +321,7 @@ export default {
cpmctymc: null,
batchNo: null,
invCode: null,
cplb: "设备",
// cplb: "", //todo
invSpaceCode: null,
page: 1,
limit: 10
@ -594,7 +594,7 @@ export default {
cpmctymc: null,
batchNo: null,
invCode: this.formData.fromInvCode,
cplb: "设备",
// cplb: "",
invSpaceCode: null,
page: 1,
limit: 10

@ -131,7 +131,7 @@
<el-select
size="small"
disabled
v-model="inputQuery.hchzsb"
v-model="inputQuery.cplb"
placeholder="产品类别"
style="width: 100%;"
>

@ -97,7 +97,7 @@
></el-table-column>
<el-table-column
label="器械类别"
prop="qxlb"
prop="cplx"
show-overflow-tooltip
></el-table-column>
<el-table-column

Loading…
Cancel
Save