bug修改!,

purchase
anthonyywj2 3 years ago
parent e5cfea56e7
commit 58462e2e3a

@ -304,5 +304,22 @@ export function findOrderByStockOrder(query) {
}); });
} }
export function rollbackOrder(params) {
return axios({
url: "/udiwms/stock/order/received/rollback",
method: "get",
params: params
});
}
export function rollUnReceivebackOrder(params) {
return axios({
url: "/udiwms/stock/order/unReceive/rollback",
method: "get",
params: params
});
}

@ -31,6 +31,7 @@ export function selectSysParamByKey(query) {
params: query params: query
}); });
} }
export function selectIp(query) { export function selectIp(query) {
return axios({ return axios({
url: "/udiwms/basic/thirdsys/selectIp", url: "/udiwms/basic/thirdsys/selectIp",
@ -39,5 +40,15 @@ export function selectIp(query) {
}); });
} }
//获取产品信息设置
export function finProductSet(query) {
return axios({
url: "/udiwms/sys/config/selectByBasic",
method: "get",
params: query
});
}

@ -440,7 +440,7 @@ export const asyncRouterMap = [
{ {
path: "invWarehouse", path: "invWarehouse",
component: invWarehouse, component: invWarehouse,
name: "仓库 / 科室字典", name: "仓库/科室字典",
icon: "", icon: "",
meta: { meta: {
authRule: ["basicProduct/invWarehouse"] authRule: ["basicProduct/invWarehouse"]

@ -28,7 +28,6 @@
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleCurrentChange"> @current-change="handleCurrentChange">
<el-table-column label="序号" type="index" width="120" fixed></el-table-column> <el-table-column label="序号" type="index" width="120" fixed></el-table-column>
@ -65,8 +64,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog <el-dialog
title="第三方系统设置" title="第三方系统设置"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -86,7 +83,6 @@
> >
</div> </div>
</el-dialog> </el-dialog>
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" highlight-current-row="true" <el-table v-loading="loading" :data="detailList" style="width: 100%" highlight-current-row="true"
@ -163,9 +159,10 @@
</el-card> </el-card>
<el-card class="el-card" v-if="addBussinessTypeBtnVisible">
<el-card class="el-card"> <el-button type="primary" style="float: right; margin-bottom: 5px;"
<el-button v-if="addBussinessTypeBtnVisible" type="primary" style="float: right; margin-bottom: 5px;" @click="addBussinessType"></el-button> @click="addBussinessType">添加单据类型
</el-button>
<el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%" highlight-current-row="true"> <el-table v-loading="busTypeLoading" :data="busTypeList" style="width: 100%" highlight-current-row="true">
<el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column> <el-table-column label="序号" type="index" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column> <el-table-column label="单据类型" prop="name" show-overflow-tooltip="true"></el-table-column>
@ -197,12 +194,14 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card>
<div style="margin-top: 18px ; color: #F71616;"> <div style="margin-top: 18px ; color: #F71616;">
<span>重要提示本页功能仅供技术提供方修改&nbsp;</span> <span>重要提示本页功能仅供技术提供方修改&nbsp;</span>
</div> </div>
</el-card>
<!--业务单据提交编辑弹窗--> <!--业务单据提交编辑弹窗-->
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
@ -236,7 +235,8 @@
<div class="itemTag"> <div class="itemTag">
<span>第三方单据类型:&nbsp;</span> <span>第三方单据类型:&nbsp;</span>
</div> </div>
<el-select style="width: 150%;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型" clearable> <el-select style="width: 150%;" v-model="thirdBuyForm.thirdBuyName" placeholder="第三方单据类型"
clearable>
<el-option <el-option
v-for="item in thirdBuyList" v-for="item in thirdBuyList"
:key="item.name" :key="item.name"
@ -449,7 +449,7 @@ export default {
busTypeList: [], busTypeList: [],
total: 0, total: 0,
loading: false, loading: false,
busTypeLoading:false, busTypeLoading: false,
currentCheckIndex: -1, currentCheckIndex: -1,
bussinessTypeFormVisible: false, bussinessTypeFormVisible: false,
bussinessTypeList: [], bussinessTypeList: [],
@ -727,7 +727,7 @@ export default {
} }
// //
this.bussinessTypeList.forEach(item =>{ this.bussinessTypeList.forEach(item => {
// //
if (item.name === this.thirdBuyForm.name) { if (item.name === this.thirdBuyForm.name) {
this.thirdBuyForm.code = item.action; this.thirdBuyForm.code = item.action;
@ -776,7 +776,7 @@ export default {
let query = { let query = {
thirdSys: this.thirdSysFk thirdSys: this.thirdSysFk
} }
getOriginBusType(query).then((res)=> { getOriginBusType(query).then((res) => {
this.thirdBuyList = res.data.list; this.thirdBuyList = res.data.list;
}); });
}, },
@ -803,7 +803,7 @@ export default {
_this.selectInterfaceList.push(row.id); _this.selectInterfaceList.push(row.id);
}); });
}, },
addInterfaceData(){ addInterfaceData() {
let data = []; let data = [];
if (this.selectInterfaceList.length > 0) { if (this.selectInterfaceList.length > 0) {
this.addInterfaceVisible = false; this.addInterfaceVisible = false;
@ -878,7 +878,7 @@ export default {
}); });
}, },
editGeOrderParam(index,row) { editGeOrderParam(index, row) {
this.formName = "edit"; this.formName = "edit";
this.editGeOrderParamVisible = true; this.editGeOrderParamVisible = true;
this.getThirdBuyType(); this.getThirdBuyType();

@ -244,6 +244,7 @@ export default {
uploadFileUrl: null, uploadFileUrl: null,
headers: {}, headers: {},
configParms: {}, configParms: {},
loading: false,
}; };
}, },
@ -304,9 +305,13 @@ export default {
} }
insertBussinessType(this.inputQuery) insertBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
this.getList(); this.getList();
} else {
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -326,9 +331,13 @@ export default {
} }
updateBussinessType(this.inputQuery) updateBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) {
this.loading = false; this.loading = false;
this.cancelDialog(); this.cancelDialog();
this.getList(); this.getList();
} else {
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;

@ -362,16 +362,124 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle1 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak1"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>进口产品代理商:&nbsp;</span> <span>{{ productRemarkSet.remarkTitle2 }}:&nbsp;</span>
</div> </div>
<el-input <el-input
style="width: 65%" style="width: 65%"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="editQuery.cpdls" v-model="editQuery.basicPrductRemak2"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle3 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak3"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle4 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak4"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle5 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"
></el-input>
</div>
</el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
<div class="text item">
<div class="itemTag">
<span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
@ -891,7 +999,7 @@ import {
thirdSysDetail, thirdSysDetail,
removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi removeRl, sysFilter, spcombie, lockStatus, removeDiRl, disableUdi
} from "../../api/basic/udiRelevance"; } from "../../api/basic/udiRelevance";
import {selectSysParamByKey} from "../../api/param/systemParamConfig"; import {selectSysParamByKey, finProductSet} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo"; import {filterByUuid} from "../../api/basic/udiInfo";
import selectUdi from "./UdiInfoRelevance.vue"; import selectUdi from "./UdiInfoRelevance.vue";
@ -916,9 +1024,11 @@ export default {
addType: 1, addType: 1,
thrPiId: null, thrPiId: null,
filterType: null, filterType: null,
diType: 1
}, },
productType: null, productType: null,
editQuery: null, editQuery: null,
productRemarkSet: {},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
thirdId: "", thirdId: "",
@ -981,6 +1091,7 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
addType: 1, addType: 1,
diType: 1
}; };
this.getList(); this.getList();
}, },
@ -1379,6 +1490,18 @@ export default {
}); });
}, },
findBasicProductSet() {
finProductSet().then((response) => {
if (response.code == 20000) {
this.productRemarkSet = response.data;
} else {
//
}
});
},
selectSysParam() { selectSysParam() {
let query = { let query = {
paramKey: "smp_isUploadProuct", paramKey: "smp_isUploadProuct",
@ -1433,6 +1556,8 @@ export default {
selectUdiVersion, selectUdiVersion,
}, },
created() { created() {
this.findBasicProductSet();
this.getList(); this.getList();
this.selectSysParam(); this.selectSysParam();
this.getSysFilter(); this.getSysFilter();

@ -159,24 +159,21 @@
<el-button <el-button
type="text" type="text"
size="small" size="small" :disabled="!configParms.basicInv"
:disabled="!configParms.basicInv"
@click.native.stop="addUser(scope.row)" @click.native.stop="addUser(scope.row)"
>管理用户 >管理用户
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small" :disabled="!configParms.basicInv"
:disabled="!configParms.basicInv"
@click.native.stop="addBussinessType(scope.row)" @click.native.stop="addBussinessType(scope.row)"
>管理单据类型 >管理单据类型
</el-button </el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small" :disabled="!configParms.basicInv"
:disabled="!configParms.basicInv"
@click.native.stop="handleSubForm( scope.row, 'edit')" @click.native.stop="handleSubForm( scope.row, 'edit')"
>编辑 >编辑
</el-button </el-button
@ -227,6 +224,8 @@
@click.native="relBusttype(scope.row)"> @click.native="relBusttype(scope.row)">
关联单据类型 关联单据类型
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -292,6 +291,15 @@
<el-table-column label="用户名" prop="employeeName" fixed></el-table-column> <el-table-column label="用户名" prop="employeeName" fixed></el-table-column>
</el-table> </el-table>
<el-pagination
:page-size="hospitalUserQuery.limit"
@current-change="getHospitalUser"
layout="prev, pager, next"
:total="hospitalUserTotal"
:current-page="hospitalUserQuery.page"
>
</el-pagination>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="userFormVisible = !userFormVisible" <el-button @click.native="userFormVisible = !userFormVisible"
>取消 >取消
@ -317,13 +325,22 @@
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
type="selection" type="selection"
:reserve-selection="false" :reserve-selection="true"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="单据类型编码" prop="action" fixed></el-table-column> <el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
<el-table-column label="单据类型名称" prop="name" fixed></el-table-column> <el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
</el-table> </el-table>
<el-pagination
:page-size="bussinessTypeQuery.limit"
@current-change="getBussinessType"
layout="prev, pager, next"
:total="bussinessTypeTotal"
:current-page="bussinessTypeQuery.page"
>
</el-pagination>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible" <el-button @click.native="bussinessTypeFormVisible = !bussinessTypeFormVisible"
>取消 >取消
@ -638,7 +655,7 @@
<el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini"> <el-form :inline="true" :model="thirdSubQuery" class="query-form" size="mini">
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="thirdSubQuery.key" v-model="thirdSubQuery.name"
clearable clearable
placeholder="分库名称" placeholder="分库名称"
style="width: 400px" style="width: 400px"
@ -693,7 +710,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!--戶關聯單據類--> <!--户关联单据类-->
<el-dialog <el-dialog
title="业务类型关联" title="业务类型关联"
:visible.sync="relBusUserVisile" :visible.sync="relBusUserVisile"
@ -715,6 +732,7 @@ import {
deleteWarehouse, warehouseBussinessTypeList, deleteWarehouse, warehouseBussinessTypeList,
warehouseUserList, saveWarehouseBussinessType, warehouseUserList, saveWarehouseBussinessType,
saveWarehouseUser, updateDirector, disableWarehouse, saveWarehouseUser, updateDirector, disableWarehouse,
deleteWarehouseBussinessType,
bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail
} from "../../api/basic/invWarehouse"; } from "../../api/basic/invWarehouse";
import { import {
@ -802,8 +820,8 @@ export default {
uploadFileUrl: null, uploadFileUrl: null,
userData: [], userData: [],
bussinessTypeData: [], bussinessTypeData: [],
userList: [], userList: null,
bussinessTypeList: [], bussinessTypeList: null,
userFormVisible: false, userFormVisible: false,
relBusUserVisile: false, relBusUserVisile: false,
currentCode: null, currentCode: null,
@ -834,7 +852,7 @@ export default {
}, },
thirdSubQuery: { thirdSubQuery: {
parentId: null, parentId: null,
key: null, name: null,
page: 1, page: 1,
limit: 10, limit: 10,
thirdSysFk: "thirdId", thirdSysFk: "thirdId",
@ -856,6 +874,17 @@ export default {
limit: 10 limit: 10
}, },
busTotal: 0, busTotal: 0,
hospitalUserQuery: {
page: 1,
limit: 10
},
hospitalUserTotal: 0,
bussinessTypeQuery: {
enabled: true,
page: 1,
limit: 100
},
bussinessTypeTotal: 0,
curSeleUser: null, curSeleUser: null,
busTableTitle: null busTableTitle: null
}; };
@ -1230,17 +1259,14 @@ export default {
}, },
loadSubData(parentId) { loadSubData(parentId) {
this.userData = []; this.userData = [];
this.bussinessTypeData = []; this.bussinessTypeData = [];
let subQuery = { let subQuery = {
parentId: parentId, parentId: parentId,
} }
filterSubAll(subQuery).then((res) => { filterSubAll(subQuery).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.subList = res.data; this.subList = res.data;
} }
}).catch((error) => { }).catch((error) => {
}); });
@ -1297,16 +1323,21 @@ export default {
this.$message.error("请先选择当前分库!") this.$message.error("请先选择当前分库!")
} else { } else {
this.userFormVisible = true; this.userFormVisible = true;
this.hospitalUserQuery.page = 1;
this.getHospitalUser(); this.getHospitalUser();
} }
}, },
cancelRelBusDiaolog() { cancelRelBusDiaolog() {
this.relBusUserVisile = false; this.relBusUserVisile = false;
}, },
getHospitalUser() { getHospitalUser(val) {
getHospitalUserList().then((res) => { if (val != null) {
this.hospitalUserQuery.page = val;
}
getHospitalUserList(this.hospitalUserQuery).then((res) => {
this.selectUserList = []; this.selectUserList = [];
this.userList = res.data; this.userList = res.data;
this.hospitalUserTotal = res.data.total;
var that = this; var that = this;
that.$nextTick(() => { that.$nextTick(() => {
if (that.$refs.checkUserList) { if (that.$refs.checkUserList) {
@ -1322,11 +1353,14 @@ export default {
}) })
}); });
}, },
getBussinessType() { getBussinessType(val) {
getJoinBussinessType().then((res) => { if (val != null) {
this.bussinessTypeQuery.page = val;
}
getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = []; this.selectBussinessTypeList = [];
this.bussinessTypeList = res.data.list; this.bussinessTypeList = res.data.list;
this.bussinessTypeTotal = res.data.total;
var that = this; var that = this;
that.$nextTick(() => { that.$nextTick(() => {
if (that.$refs.typeList) { if (that.$refs.typeList) {
@ -1410,6 +1444,7 @@ export default {
this.$message.error("请先选择当前分库!") this.$message.error("请先选择当前分库!")
} else { } else {
this.bussinessTypeFormVisible = true; this.bussinessTypeFormVisible = true;
this.bussinessTypeQuery.page = 1;
this.getBussinessType(); this.getBussinessType();
} }
}, },
@ -1423,7 +1458,9 @@ export default {
bussinessTypes: JSON.stringify(this.selectBussinessTypeList) bussinessTypes: JSON.stringify(this.selectBussinessTypeList)
}; };
saveWarehouseBussinessType(query).then((res) => { saveWarehouseBussinessType(query).then((res) => {
this.$message.success("添加成功");
if (res.code == 20000) {
this.$message.success("修改成功!");
// //
this.busQuery = { this.busQuery = {
code: this.currentCode, code: this.currentCode,
@ -1437,6 +1474,11 @@ export default {
this.bussinessTypeData = []; this.bussinessTypeData = [];
this.busTotal = 0; this.busTotal = 0;
}); });
} else {
this.$message.error(res.message);
}
}).catch((error) => { }).catch((error) => {
}); });
} }
@ -1464,6 +1506,24 @@ export default {
this.relBusUserVisile = true; this.relBusUserVisile = true;
}, },
delWarehouseBussinessType(id) {
let params = {id: id};
deleteWarehouseBussinessType(params).then((res) => {
if (res.code == 20000) {
this.$message.success("已移除");
for (let i = 0; i < this.bussinessTypeData.length; i++) {
if (this.bussinessTypeData[i].id == id) {
this.bussinessTypeData.splice(i, 1);
return;
}
}
} else {
this.$message.error("移除失败");
}
}).catch((error) => {
this.$message.error("移除失败");
})
},
// //
bindThrWarehouse() { bindThrWarehouse() {
this.thrWareHouseVisible = false; this.thrWareHouseVisible = false;
@ -1530,7 +1590,7 @@ export default {
}, },
intentSelect(row) { intentSelect(row) {
if (row != null && row.sysId != undefined) if (row != null)
this.currentSysId = row.sysId; this.currentSysId = row.sysId;
// //
this.thirdQuery.thirdSysFk = this.currentSysId; this.thirdQuery.thirdSysFk = this.currentSysId;
@ -1548,11 +1608,12 @@ export default {
}, },
intentSubSelect(row) { intentSubSelect(row) {
if (row != null) { if (row != null) {
this.thirdSubQuery.parentId = this.superRow.code; this.thirdSubQuery.parentId = this.superRow.code;
if (row.sysId != null && row.sysId != undefined) {
this.thirdSubQuery.thirdSysFk = row.sysId; this.thirdSubQuery.thirdSysFk = row.sysId;
} }
}
this.thrSubWarehouseData = []; this.thrSubWarehouseData = [];
this.thrSubWareHouseVisible = true; this.thrSubWareHouseVisible = true;
filterThridSubByInv(this.thirdSubQuery).then((res) => { filterThridSubByInv(this.thirdSubQuery).then((res) => {
@ -1634,8 +1695,7 @@ export default {
}).catch((error) => { }).catch((error) => {
}) })
}, },
} },
,
filters: { filters: {
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
@ -1643,8 +1703,7 @@ export default {
1: "success", 1: "success",
}; };
return statusMap[status]; return statusMap[status];
} },
,
statusFilterName(status) { statusFilterName(status) {
const statusMap = { const statusMap = {
0: "禁用", 0: "禁用",
@ -1652,12 +1711,9 @@ export default {
}; };
return statusMap[status]; return statusMap[status];
} }
, },
}
,
mounted() { mounted() {
} },
,
components: { components: {
relBusUserDialog, relBusUserDialog,
}, },
@ -1667,9 +1723,7 @@ export default {
this.getList(); this.getList();
this.getSyncConfig(); this.getSyncConfig();
} }
, };
}
;
</script> </script>
<style type="text/scss" lang="scss"> <style type="text/scss" lang="scss">

@ -146,7 +146,13 @@
平衡补单 平衡补单
</el-button> </el-button>
</div> </div>
<el-button
v-if="isSp ==110"
type="text"
size="small"
@click.native="rollback(scope.row)"
>撤回
</el-button>
<el-button <el-button
v-if="scope.row.submitFlag" v-if="scope.row.submitFlag"
type="text" type="text"
@ -332,10 +338,10 @@
import { import {
stockOrderList, stockOrderDetail, stockOrderList, stockOrderDetail,
deleteStockOrderById, deleteStockOrderDetailById, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, submitStockOrder, copyStockOrderDetail,
uploadStockOrderDetail, uploadStockOrderDetailCount, uploadStockOrderDetail
generateStockOrderQRCodeText, supplementOrder, , supplementOrder,
updateStockOrderDetail updateStockOrderDetail, rollbackOrder
} from "../../api/inout/stockOrder"; } from "../../api/inout/stockOrder";
import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
@ -922,6 +928,22 @@ export default {
message: '取消补单' message: '取消补单'
}); });
}); });
},
rollback(row) {
this.$confirm('此操作将回退单据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let param = {billNo: row.billNo};
rollbackOrder(param).then((res) => {
if (res.code === 20000) {
this.$message.success("回退成功");
}
})
}).catch(() => {
this.$message.info('回退失败');
});
} }
}, },
components: { components: {

@ -237,11 +237,19 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" <el-table-column width="250"
label="注册/备案凭证号" label="注册/备案凭证号"
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> >
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.zczbhhzbapzbh"
:disabled="scope.row.index !== selectedIndex"
placeholder="请输入注册/备案凭证号" style="width: 100%"
></el-input>
</template>
</el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="生产厂家" label="生产厂家"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"

@ -344,11 +344,18 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" <el-table-column width="250"
label="注册/备案凭证号" label="注册/备案凭证号"
prop="zczbhhzbapzbh" prop="zczbhhzbapzbh"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> >
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.zczbhhzbapzbh"
:disabled="scope.row.index !== selectedIndex"
placeholder="请输入注册/备案凭证号" style="width: 100%"
></el-input>
</template>
</el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="生产厂家" label="生产厂家"
prop="ylqxzcrbarmc" prop="ylqxzcrbarmc"

@ -132,6 +132,12 @@
>完成验收 >完成验收
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native="rollback(scope.row)"
>撤回
</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -461,7 +467,7 @@ import {
deleteStockOrderById, deleteStockOrderDetailById, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, copyStockOrderDetail,
uploadStockOrderDetail, uploadStockOrderDetail,
updateStockOrderDetail, updateStatus updateStockOrderDetail, updateStatus, rollbackOrder
} from "../../api/inout/stockOrder"; } from "../../api/inout/stockOrder";
import stockOrderDistribution from "./stockOrderDistribution"; import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail"; import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
@ -1019,6 +1025,22 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
rollback(row) {
this.$confirm('此操作将回退单据, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let param = {billNo: row.billNo};
rollbackOrder(param).then((res) => {
if (res.code === 20000) {
this.$message.success("回退成功");
}
})
}).catch(() => {
this.$message.info('回退失败');
});
}
} }
, ,
components: { components: {

@ -663,8 +663,8 @@ export default {
this.originCode = this.formData.code; this.originCode = this.formData.code;
} else if (response.code == 501) { } else if (response.code == 501) {
this.checkSuccess = false; this.checkSuccess = false;
this.formData.code = response.data; // this.formData.code = response.data;
this.originCode = this.formData.code; // this.originCode = this.formData.code;
this.$message.error(response.message); this.$message.error(response.message);
} else if (response.code == 503) { } else if (response.code == 503) {
this.checkSuccess = false; this.checkSuccess = false;

@ -180,6 +180,7 @@ export default {
ybbm: null, ybbm: null,
tyshxydm: null, tyshxydm: null,
qxlb: null, qxlb: null,
cplx:null,
cpms: null cpms: null
}, },
configParms: {}, configParms: {},

@ -322,6 +322,7 @@ export default {
ybbm: null, ybbm: null,
tyshxydm: null, tyshxydm: null,
qxlb: null, qxlb: null,
cplx:null,
cpms: null, cpms: null,
thirdSys: null, thirdSys: null,
cpdls: null cpdls: null

@ -51,7 +51,7 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions class="margin-top" title="上传至UDI自助平台单据" :column="1" :size="100" style="margin-top: 40px" <el-descriptions class="margin-top" title="上传至第三方系统" :column="1" :size="100" style="margin-top: 40px"
border> border>
<el-descriptions-item> <el-descriptions-item>

@ -188,7 +188,7 @@
<el-pagination <el-pagination
:page-size="query.limit" :page-size="query.limit"
@current-change="moduleClick" @current-change="handleSubCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
:current-page="query.page" :current-page="query.page"
@ -528,6 +528,12 @@ export default {
}); });
}, },
handleSubCurrentChange(val) {
this.query.page = val;
this.getList();
},
moduleClick(row) { moduleClick(row) {
this.query = { this.query = {
templateType: row.templateType, templateType: row.templateType,

@ -230,10 +230,10 @@
} }
}, },
formSubmit() { formSubmit() {
if (!Number.isInteger(parseInt(this.formData.paramValue))) { // if (!Number.isInteger(parseInt(this.formData.paramValue))) {
this.$message.warning("参数值必须为数字"); // this.$message.warning("");
return; // return;
} // }
this.$refs["dataForm"].validate((valid) => { this.$refs["dataForm"].validate((valid) => {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;

Loading…
Cancel
Save