新增DI版本更新,单据类型修改

ywj_dev
anthonywj 2 years ago
parent 099d99767f
commit c18a159f88

@ -184,6 +184,15 @@ export function changeVersion(query) {
});
}
export function syncOnline(query) {
return axios({
url: "/udi/udirel/syncOnline",
method: "post",
data: query
});
}
export function getGgxhList(params) {
return axios({
url: "/udiwms/udiinfo/getGgxhList",

@ -115,7 +115,7 @@
<el-col :span="11">
<el-form-item label="供应商使用权限" prop="prefix">
<el-select v-model="inputQuery.spUse"
style="width: 90%" placeholder="是否允许" >
style="width: 90%" placeholder="是否允许">
<el-option label="无" :value="0"></el-option>
<el-option label="可查看" :value="1"></el-option>
<el-option label="增删改查" :value="2"></el-option>
@ -125,7 +125,7 @@
<el-col :span="11">
<el-form-item label="物资近效期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkVailDate"
style="width: 90%" placeholder="" >
style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@ -153,7 +153,7 @@
<el-col :span="11">
<el-form-item label="物资过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkExpire"
style="width: 90%" placeholder="" >
style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@ -163,7 +163,7 @@
<el-col :span="11">
<el-form-item label="资质过期处理方式" prop="prefix">
<el-select v-model="inputQuery.checkCertExpire"
style="width: 90%" placeholder="" >
style="width: 90%" placeholder="">
<el-option label="不处理" :value=0></el-option>
<el-option label="弹框提醒" :value=1></el-option>
<el-option label="禁止录入" :value=2></el-option>
@ -192,7 +192,7 @@
<el-row type="flex">
<el-col :span="11">
<el-form-item label="禁用单据类型" prop="prefix">
<el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态" >
<el-select v-model="inputQuery.enable" style="width: 90%" placeholder="状态">
<el-option label="否" :value="true"></el-option>
<el-option label="是" :value="false"></el-option>
</el-select>
@ -239,7 +239,7 @@
<el-col span="5">
<el-select v-model="inputQuery.codeFillCheck" style="width: 65%"
:disabled="inputQuery.corpType!=2 || inputQuery.mainAction!= 'WareHouseIn'"
placeholder="是否启用" >
placeholder="是否启用">
<el-option label="启用" :value="true"></el-option>
<el-option label="不启用" :value="false"></el-option>
</el-select>
@ -295,7 +295,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用" >
<el-select v-model="inputQuery.vailGroupBuy" style="width: 65%" placeholder="是否启用">
<el-option label="无需校验" :value=0></el-option>
<el-option label="只采集集采产品" :value=1></el-option>
<el-option label="只采集非集采产品" :value=2></el-option>
@ -335,7 +335,7 @@
<el-col span="5">
<el-select v-model="inputQuery.scanPreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
placeholder="是否启用" >
placeholder="是否启用">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
@ -355,7 +355,7 @@
<el-col span="5">
<el-select v-model="inputQuery.advancePreIn" style="width: 65%"
:disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
placeholder="是否启用" >
placeholder="是否启用">
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
@ -436,7 +436,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.backPreinType" style="width: 65%" >
<el-select v-model="inputQuery.backPreinType" style="width: 65%">
<el-option label="按单使用和退库" :value="1"></el-option>
<el-option label="按货位(仓库)使用和退库" :value="2"></el-option>
</el-select>
@ -454,7 +454,7 @@
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="inputQuery.preInBackAction" style="width: 65%" >
<el-select v-model="inputQuery.preInBackAction" style="width: 65%">
<el-option
v-for="item in preInBackList"
:key="item.name"
@ -529,7 +529,7 @@
<el-select v-model="inputQuery.checkWebNew" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -552,7 +552,7 @@
<el-select v-model="inputQuery.checkPdaUn" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -575,7 +575,7 @@
<el-select v-model="inputQuery.checkPdaEd" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -598,7 +598,7 @@
<el-select v-model="inputQuery.checkUdims" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -621,7 +621,7 @@
<el-select v-model="inputQuery.checkPc" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -644,7 +644,7 @@
<el-select v-model="inputQuery.checkSp" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -666,7 +666,7 @@
<el-select v-model="inputQuery.checkChange" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -689,7 +689,7 @@
<el-select v-model="inputQuery.checkBalance" :disabled="!inputQuery.checkEnable" style="width: 75%"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -711,7 +711,7 @@
<el-select v-model="inputQuery.checkCopy" style="width: 75%" :disabled="!inputQuery.checkEnable"
placeholder="是否启用"
>
<el-option label="无业务单扫码拣货" :value="0"></el-option>
<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>
@ -723,6 +723,8 @@
<span class="sptext">手工补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
<el-collapse-item title="是否人工核对单据设置(一次审核)">
@ -1140,6 +1142,7 @@
<span class="sptext">手工补单的单据</span>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</el-collapse-item>
</el-collapse>
@ -1152,7 +1155,7 @@
import {candidateBusType} from '@/api/basic/busType'
import busTypeAdvancedSettings from '@/views/basic/busType/busTypeAdvancedSettings.vue'
import {isBlank} from '@/utils/strUtil'
import {getOriginBusType,selectList} from '@/api/basic/busOriginType'
import {getOriginBusType, selectList} from '@/api/basic/busOriginType'
import {getBasicUnitMaintains2} from '@/api/basic/basicUnitMaintain'
export default {
@ -1286,17 +1289,17 @@ export default {
},
selectBussinessList(){
selectBussinessList() {
selectList().then((res) => {
this.preInBackList=res.data;
this.preInBackList = res.data;
})
},
getPreInBack(){
if(this.inputQuery.preInBack==false){
this.inputQuery.preInBackAction=null;
this.inputQuery.backPreinType='';
}else{
this.inputQuery.backPreinType=1;
getPreInBack() {
if (this.inputQuery.preInBack == false) {
this.inputQuery.preInBackAction = null;
this.inputQuery.backPreinType = '';
} else {
this.inputQuery.backPreinType = 1;
}
},
//
@ -1381,9 +1384,9 @@ export default {
this.findSpecialMethod()
this.selectBussinessList()
this.oldData = Object.assign({}, this.inputQuery)
if(this.inputQuery.id==null || this.inputQuery.id==''){
this.inputQuery.codeFillCheck=false;
this.inputQuery.preInBack=false;
if (this.inputQuery.id == null || this.inputQuery.id == '') {
this.inputQuery.codeFillCheck = false;
this.inputQuery.preInBack = false;
}
}

@ -46,7 +46,7 @@
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" >
<el-table-column label="操作">
<template slot-scope="scope">
<el-button
type="text"
@ -63,6 +63,7 @@
>选入
</el-button
>
</template>
</el-table-column>

@ -12,8 +12,8 @@
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span style="font-size: 14px; font-weight: 500">{{
node.label
}}</span></span
node.label
}}</span></span
>
</el-tree>
</el-col>
@ -164,32 +164,38 @@
<div class="top-right-btn">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch"
>显示/隐藏搜索栏</el-button
>显示/隐藏搜索栏
</el-button
>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button
>重置
</el-button
>
<el-button type="primary" icon="el-icon-search" @click="submit"
>查询</el-button
>查询
</el-button
>
<!-- <el-button type="primary" icon="el-icon-plus" @click="editUdiType"></el-button>-->
<el-button
type="primary"
icon="el-icon-plus"
@click="intentImportUdi"
>选入DI信息</el-button
>选入DI信息
</el-button
>
<el-button
type="primary"
icon="el-icon-plus"
@click="intentImportErp"
>添加院内字典</el-button
>添加院内字典
</el-button
>
<el-button
type="primary"
icon="el-icon-plus"
@click="intentDetail"
>关联添加</el-button
>关联添加
</el-button
>
</el-button-group>
</div>
@ -270,27 +276,27 @@
size="small"
:disabled="scope.row.originUuid != null"
@click.native.stop="intentSelectUdi(scope.row)"
>关联DI
>关联DI
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>详情
>详情
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="diEdit(scope.row)"
>编辑
>编辑
</el-button>
<el-button
type="text"
size="small"
@click.native.stop="deleteDialog(scope.row)"
>删除
>删除
</el-button>
</template>
</el-table-column>
@ -899,7 +905,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span
>
</div>
<el-input
@ -920,7 +926,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span
>
</div>
<el-input
@ -943,7 +949,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span
>
</div>
<el-input
@ -964,7 +970,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span
>
</div>
<el-input
@ -987,7 +993,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span
>
</div>
<el-input
@ -1008,7 +1014,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span
>
</div>
<el-input
@ -1031,7 +1037,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span
>
</div>
<el-input
@ -1052,7 +1058,7 @@
<div class="text item">
<div class="itemTag">
<span
>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span
>
</div>
<el-input
@ -1206,7 +1212,6 @@
<template slot="title">
<p class="form-title">版本信息</p>
</template>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
@ -1220,15 +1225,24 @@
splaceholder="请输入内容"
v-model="editQuery.versionNumber"
></el-input>
<el-button
type="text"
size="small"
@click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</div>
</el-col>
<el-col :span="2" class="el-col">
<el-button
type="text"
size="small"
@click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="updateVersion()"
:loading="updateLoading"
style="margin-left: 5%"
>更新当前版本信息
</el-button>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
@ -1261,14 +1275,14 @@
size="small"
icon="search"
@click="onAddSubmit(false)"
>提交
>提交
</el-button>
<el-button
type="primary"
size="small"
icon="search"
@click="cancelDialog"
>取消
>取消
</el-button>
</div>
</el-dialog>
@ -1290,14 +1304,14 @@
size="small"
icon="search"
@click="onAddSingleSubmit(false)"
>提交
>提交
</el-button>
<el-button
type="primary"
size="small"
icon="search"
@click="cancelDialog"
>取消
>取消
</el-button>
</div>
</el-dialog>
@ -1436,13 +1450,13 @@ import {
spcombie,
lockStatus,
removeDiRl,
disableUdi,
disableUdi, syncOnline,
} from "@/api/basic/product/udiRelevance";
import {
selectSysParamByKey,
finProductSet,
} from "@/api/param/systemParamConfig";
import { filterByUuid } from "@/api/basic/product/udiInfo";
import {filterByUuid} from "@/api/basic/product/udiInfo";
import selectUdi from "./UdiInfoSelectRel.vue";
import selectErp from "./udiInfoselectErpUdi";
@ -1453,7 +1467,8 @@ import ProductSingleEdit from "@/views/basic/product/productSingleEdit";
import productUdiType from "@/views/basic/product/productUdiType";
import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
import { getBasicHospType, getListTree } from "@/api/basic/basicHospType";
import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
import {dlLastVersionByDi} from "@/api/basic/udiInfo";
export default {
data() {
@ -1548,9 +1563,10 @@ export default {
selectVersionVisible: false,
selectLocalVisible: false, //UDI
isUseDyCheck: false,
lockStatusMap: { 1: "未提交", 2: "已提交", 3: "已锁定" },
lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
activeNames: ["1"],
useNumEnable: true,
updateLoading: false,
};
},
filters: {
@ -1678,7 +1694,8 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {});
.catch(() => {
});
},
deleteDialog(rowId) {
@ -1690,7 +1707,8 @@ export default {
.then(() => {
this.deleteOrders(rowId);
})
.catch(() => {});
.catch(() => {
});
},
intentDetail() {
@ -1728,9 +1746,11 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {});
.catch(() => {
});
})
.catch(() => {});
.catch(() => {
});
},
removeDi() {
@ -1757,9 +1777,11 @@ export default {
this.$message.error(response.message);
}
})
.catch(() => {});
.catch(() => {
});
})
.catch(() => {});
.catch(() => {
});
},
intentSelectErp(val) {
@ -2045,7 +2067,8 @@ export default {
var invlist = response.data || [];
this.treeList = this.handleTree(invlist, "code", "parentCode");
})
.catch(() => {});
.catch(() => {
});
},
addHospProduct(data) {
@ -2075,8 +2098,40 @@ export default {
}
this.getList();
},
updateVersion() {
this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
debugger
this.updateLoading = true;
let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
syncOnline(query)
.then((response) => {
this.updateLoading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.closeUdi();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.updateLoading = false;
this.udidlList = [];
this.total = 0;
});
})
.catch(() => {
});
},
},
mounted() {
},
mounted() {},
components: {
ProductSingleEdit,
ProductEdit,
@ -2101,12 +2156,14 @@ export default {
.tree {
::v-deep .el-tree-node {
white-space: normal;
.el-tree-node__content {
height: 100%;
align-items: start;
}
}
}
.itemTag {
float: left;
text-align: right;

@ -799,12 +799,24 @@
splaceholder="请输入内容"
v-model="editQuery.versionNumber"
></el-input>
<el-button type="text" size="small" @click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</div>
</el-col>
<el-col :span="2" class="el-col">
<el-button
type="text"
size="small"
@click.native.stop="selectVersion()"
style="margin-left: 5%"
>切换版本
</el-button>
</el-col>
<el-col :span="2" class="el-col">
<el-button type="text" size="small" @click.native.stop="updateVersion()"
:loading="updateLoading"
style="margin-left: 5%"
>更新当前版本信息
</el-button>
</el-col>
</el-row>
</el-collapse-item>
@ -881,7 +893,7 @@
<script>
import {updateById} from '@/api/basic/udiRelevance'
import {removeDiRl, removeRl, thirdSysDetail, updatetSingleUdiInfo} from '@/api/basic/product/udiRelevance'
import {removeDiRl, removeRl, syncOnline, thirdSysDetail, updatetSingleUdiInfo} from '@/api/basic/product/udiRelevance'
import {filterByUuid} from '@/api/basic/udiInfo'
import selectErp from "./udiInfoselectErpUdi";
@ -937,6 +949,7 @@ export default {
editSingleDiDialogVisible: false,
selectErpDialogVisible: false, //ERP
updateLoading: false,
}
},
@ -1080,6 +1093,36 @@ export default {
.catch(() => {
});
},
updateVersion() {
this.$confirm("此操作将访问国家库查询最新版本信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
debugger
this.updateLoading = true;
let query = {uuid: this.editQuery.uuid, originUuid: this.editQuery.originUuid};
syncOnline(query)
.then((response) => {
this.updateLoading = false;
if (response.code == 20000) {
this.$message.success("更新成功!");
this.closeUdi();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.updateLoading = false;
this.udidlList = [];
this.total = 0;
});
})
.catch(() => {
});
},
},
components: {

@ -308,6 +308,13 @@
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
<el-form-item label="发票信息">
<el-select v-model="configQuery.orderInvoice" disabled>
<el-option :value="0" label="不同步"></el-option>
<el-option :value="1" label="由内向外"></el-option>
<el-option :value="2" label="由外向内"></el-option>
</el-select>
</el-form-item>
</el-form>
</el-descriptions-item>
<!-- 第三方基础信息 -->
@ -816,6 +823,7 @@ export default {
dbDiCompany: null,
udiCodeLost: null,
udiCodeRel: null,
orderInvoice: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],

Loading…
Cancel
Save