Merge branch 'dev' into test

dev
郑明梁 2 years ago
commit 8413bf46a6

@ -8,7 +8,7 @@ ENV = 'production'
#林纪裕cd
VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/'
@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:81/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/'

@ -0,0 +1,88 @@
import axios from "@/utils/request";
export function getBasicDestinyfilter(query) {
return axios({
url: "/udiwms/basic/destiny/model/filter",
method: "get",
params: query
});
}
export function addModeldestiny(query) {
return axios({
url: "/udiwms/basic/destiny/model/addModeldestiny",
method: "post",
data: query
});
}
export function editModeldestiny(query) {
return axios({
url: "/udiwms/basic/destiny/model/editModeldestiny",
method: "post",
data: query
});
}
export function delectModeldestiny(query) {
return axios({
url: "/udiwms/basic/destiny/model/delectModeldestiny",
method: "post",
data: query
});
}
export function filterDestinyProduct(query) {
return axios({
url: "/udiwms/basic/destiny/model/product/filter",
method: "get",
params: query
});
}
export function addModeldestinyProduct(query) {
return axios({
url: "/udiwms/basic/destiny/model/addModeldestinyProduct",
method: "post",
data: query
});
}
export function filterDestinyDelect(query) {
return axios({
url: "/udiwms/basic/destiny/model/filterDestinyDelect",
method: "get",
params: query
});
}
export function delectModeldestinyProduct(query) {
return axios({
url: "/udiwms/basic/destiny/model/delectModeldestinyProduct",
method: "get",
params: query
});
}
export function uploadModeldestinyProduct(query) {
return axios({
url: "/udiwms/basic/destiny/model/uploadModeldestinyProduct",
method: "post",
data: query
});
}
export function addDestinyProcess(query) {
return axios({
url: "/udiwms/basic/destiny/model/addDestinyProcess",
method: "get",
params: query
});
}

@ -0,0 +1,58 @@
import axios from '@/utils/request'
export function addDestinyDelect(query) {
return axios({
url: "/udiwms/basic/destiny/model/addDestinyDelect",
method: "post",
data: query
});
}
export function filterDestinyDelect(query) {
return axios({
url: "/udiwms/basic/destiny/model/filterDestinyProcessDelect",
method: "get",
params: query
});
}
export function filterDestinyProcess(query) {
return axios({
url: "/udiwms/basic/destiny/model/filterDestinyProcess",
method: "get",
params: query
});
}
export function checkDestinyProcess(query) {
return axios({
url: "/udiwms/basic/destiny/model/checkDestinyProcess",
method: "get",
params: query
});
}
export function filterDestinyProcessCode(query) {
return axios({
url: "/udiwms/basic/destiny/model/filterDestinyProcessCode",
method: "get",
params: query
});
}
export function delectDestinyProcess(query) {
return axios({
url: "/udiwms/basic/destiny/model/delectDestinyProcess",
method: "get",
params: query
});
}

@ -598,7 +598,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>
@ -621,7 +621,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>
@ -644,7 +644,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>
@ -667,7 +667,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>
@ -689,7 +689,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>
@ -712,7 +712,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>
@ -734,7 +734,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>

@ -341,10 +341,9 @@ export default {
endTime: "",
inCodeStatus: 0,
};
this.getList();
this.haveDistributionVisible = true;
this.actDateRange = [];
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;

@ -0,0 +1,455 @@
<template>
<div>
<el-card>
<el-button-group style="display: flex">
<el-button type="primary" @click.native="submitUpload()" style="margin: 0 60px 10px auto; height: 35px"
:loading="loading">提交
</el-button>
</el-button-group>
<el-form :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item label="唯一编码:">
<el-input v-model="filterQuery.destinyNo" :disabled="true" placeholder="请输入唯一编码"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单据号:">
<el-input v-model="filterQuery.billNo" :disabled="true" placeholder="请输入单据号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据时间:">
<el-input v-model="filterQuery.billDate" :disabled="true" placeholder="请输入单据时间"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="当前仓库:">
<el-select v-model="filterQuery.invCode" placeholder="当前仓库" filterable style="width: 100%" clearable>
<el-option
v-for="item in invList"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注:">
<el-input v-model="filterQuery.remark" placeholder="请输入当前仓库" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<el-form-item class="query-form-item" label="扫码录入:">
<el-input
id="inputer"
@focus="getInputFocus($event)"
@keypress.enter.native="addCode($event)"
ref='inputRef'
style="ime-mode:disabled"
type="tel"
v-model="filterQuery.code"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="mini"
@click.native.stop="addCode()"
style="margin-left: 15px"
>添加
</el-button>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-plus" @click="addDestiny"></el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-tabs type="border-card" style="margin-top: 50px">
<el-tab-pane label="定数包详情">
<destiny-process-delect
:billNo="this.filterQuery.billNo"
:destinyProcessCodeShow="destinyProcessDelectShow"
v-if="destinyProcessDelectShow"
></destiny-process-delect>
</el-tab-pane>
<el-tab-pane label="扫码详情">
<destiny-process-code
:billNo="this.filterQuery.billNo"
:destinyProcessCodeShow="destinyProcessCodeShow"
v-if="destinyProcessCodeShow"
></destiny-process-code>
</el-tab-pane>
</el-tabs>
</el-card>
<el-dialog
title="选入定数包"
:visible.sync="orderMutiVisible"
:before-close="close"
width="60%"
append-to-body
v-if="orderMutiVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<destinyModel
:closeDialog="closeDialog"
></destinyModel>
</el-dialog>
</div>
</template>
<script>
import destinyModel from "@/views/basic/destiny/destinyModel";
import {delectMuti, detailMuti, filterList, selectMutiDetailList, selectMutiList} from "@/api/inout/orderMuti";
import {parseTime} from "@/utils/coTools";
import destinyProcessCode from "@/views/basic/destiny/destinyProcessCode";
import destinyProcessDelect from "@/views/basic/destiny/destinyProcessDelect";
import {findInvByUser} from "@/api/system/invSubWarehouse";
import {addDestinyDelect, checkDestinyProcess} from "@/api/inout/ioDestinyProcess";
import {addDestinyProcess} from "@/api/basic/basicDestinyRel";
import {delCorps} from "@/api/thrsys/thrCorps";
export default {
name: "ioOrderMuti",
props: {
editQuery: {
type: Object,
required: true
},
closeDialogpr: {
type: Function,
required: true,
}
},
data() {
return {
showSearch: true,
filterQuery: {
destinyNo: '',
billNo: null,
billDate: null,
invCode: null,
remark: null,
code: null,
status: 0,
page: 1,
limit: 10,
},
inputQuery: {
curInv: null,
fromCorp: "",
targetAction: null,
remark: null,
updateTime: null,
},
total: 0,
loading: false,
list: [],
formName: 1,
destinyProcessCodeShow: false,
destinyProcessDelectShow: false,
formMap: {
1: "新增使用出库",
2: "编辑使用出库",
},
statusMap: {
0: "草稿",
1: "未审核",
},
invList: [],
orderMutiVisible: false,
destinyId: null,
actDateRange: [],
detailList: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
};
},
methods: {
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "warning",
2: "danger",
3: "success",
};
return statusMap[status];
},
onReset() {
this.filterQuery = {
udiCode: null,
orderIdFk: null,
relIdFk: null,
mark: null,
status: 0,
cpmctymc: null,
page: 1,
limit: 10,
}
this.actDateRange = []
this.getList();
this.detailList = []
},
onSubmit() {
this.filterQuery.page = 1;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getList();
},
closeDialog(row) {
this.destinyId = row;
var query = {
destinyNo: this.filterQuery.destinyNo,
billNo: this.filterQuery.billNo,
billDate: this.filterQuery.billDate,
invCode: this.filterQuery.invCode,
remark: this.filterQuery.remark,
destinyId: this.destinyId,
}
addDestinyDelect(query).then((response) => {
if (response.code == 20000) {
this.orderMutiVisible = false;
this.destinyProcessDelectShow = false;
this.destinyProcessCodeShow = false;
this.$nextTick(() => {
this.destinyProcessCodeShow = true;
this.destinyProcessDelectShow = true;
});
} else {
this.$message.error(response.message);
}
}).catch(() => {
this.$message.error(response.message);
});
},
hideSearch() {
this.showSearch = !this.showSearch;
},
getInputFocus(event) {
event.currentTarget.select();
},
addDestiny() {
if (this.filterQuery.invCode == null) {
this.$message.error("请先选择当前仓库!");
return
}
if (this.destinyProcessCodeShow == true) {
this.$confirm("此操作将永久删除扫码信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.orderMutiVisible = true;
})
}else{
this.orderMutiVisible = true;
}
},
editDialog(row) {
this.formName = 2;
this.inputQuery = row;
this.orderMutiVisible = true;
}
,
getList() {
if (this.actDateRange != null) {
this.filterQuery.startDate = this.actDateRange[0];
this.filterQuery.endDate = this.actDateRange[1];
} else {
this.filterQuery.startDate = null;
this.filterQuery.endDate = null;
}
this.loading = true;
selectMutiList(this.filterQuery)
.then((response) => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList = []
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
}
,
deleteDialog(row) {
delectMuti(row)
.then((response) => {
if (response.code == 20000) {
this.getList()
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.$message.error(response.message);
});
}
,
handleDetail(row) {
selectMutiDetailList({mutiIdFk: row.id}).then((response) => {
if (response.code == 20000) {
this.detailList = response.data || [];
this.inputQuery.useCount = this.detailList.length
}
})
}
,
addCode() {
if (this.filterQuery.invCode == null) {
this.$message.error("请先选择当前仓库!");
return
}
if (this.filterQuery.code == null) {
this.$message.error("请先扫码!");
return
}
var query = {
code: this.filterQuery.code,
billNo: this.filterQuery.billNo
}
checkDestinyProcess(query).then((response) => {
if (response.code == 20000) {
this.destinyProcessDelectShow = false;
this.destinyProcessCodeShow = false;
this.$nextTick(() => {
this.destinyProcessCodeShow = true;
this.destinyProcessDelectShow = true;
});
} else {
this.$message.error(response.message);
}
}).catch(() => {
this.$message.error(response.message);
});
}
,
submitUpload() {
var query = {
billNo: this.filterQuery.billNo
}
addDestinyProcess(query).then((response) => {
if (response.code == 20000) {
this.closeDialogpr()
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.$message.error(response.message);
});
}
,
generateUUID() {
//
let date = (new Date()).valueOf();
//
let txt = '1234567890';
//
let len = 13;
//
let pwd = '';
for (let i = 0; i < len; i++) {
//
pwd += txt.charAt(Math.floor(Math.random() * txt.length));
}
// ID
return date + pwd;
}
,
//
findCurInvs() {
this.invList = [];
findInvByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
}
,
},
components: {destinyModel, destinyProcessCode, destinyProcessDelect},
created() {
if (this.$isBlank(this.editQuery.billNo)) {
let date = new Date();
this.filterQuery.billNo =
parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10);
this.filterQuery.billDate = parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
);
this.filterQuery.destinyNo = this.generateUUID();
} else {
this.filterQuery = this.editQuery
this.destinyProcessDelectShow = true
this.destinyProcessCodeShow = true
}
this.getList();
this.findCurInvs();
},
}
</script>
<style scoped>
</style>

@ -0,0 +1,263 @@
<template>
<div>
<el-card>
<el-form :model="filterQuery" label-width="100px" size="mini">
<el-row>
<el-col :span="4">
<el-form-item label="模板名称:" class="query-form-item">
<el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="模板编码:" class="query-form-item">
<el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"></el-button>
</el-button-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="模板编码" prop="name" width="260"></el-table-column>
<el-table-column label="模板名称" prop="code" width="260"></el-table-column>
<el-table-column label="备注" prop="remark" width="260"></el-table-column>
<el-table-column label="创建人" prop="createByName" width="260"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
<el-table-column label="操作" width="220">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</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="selectDialog(scope.row)">选入产品</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-card>
<el-card>
<el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
<el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="数量" prop="count"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案号" prop="certCode"></el-table-column>
</el-table>
<pagination
v-show="delectTotal>0"
:total="delectTotal"
:limit.sync="delectQuery.limit"
:page.sync="delectQuery.page"
@pagination="handleCurrentDelectChange"
></pagination>
</el-card>
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="40%"
:before-close="closeDialog"
v-if="formVisible"
>
<destinyModelEdit
:editQuery="editQuery"
:closeDialog="closeDialog"
></destinyModelEdit>
</el-dialog>
<el-dialog
title="选入产品"
:visible.sync="selectFormVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
:before-close="closeDialog"
v-if="selectFormVisible"
>
<destinyModelSelectProduct
:editQuery="editQuery"
:codeArray="codeArray"
:closeDialog="closeDialog"
></destinyModelSelectProduct>
</el-dialog>
</div>
</template>
<script>
import {
addModeldestiny,
delectModeldestiny,
filterDestinyDelect,
getBasicDestinyfilter
} from "@/api/basic/basicDestinyRel";
import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
export default {
data() {
return {
filterQuery: {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
},
editType: "",
formVisible: false,
selectFormVisible: false,
loading: false,
formName: "",
total: 0,
list: [],
codeArray: [],
editQuery: {},
formMap: {
"add": "新增定数包模板",
"edit": "编辑定数包模板"
},
delectQuery: {
id: null,
page: 1,
limit: 20
},
delectList: [],
delectTotal: 0,
};
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.filterQuery = {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
};
this.getList();
},
onSubmit() {
this.$router.push({
path: "",
});
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getBasicDestinyfilter(this.filterQuery).then(response => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
}).catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
this.roles = [];
});
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getList();
},
handleCurrentDelectChange(val) {
this.delectQuery.page = val.page;
this.filterDestinyDelect()
},
handleAddClick() {
this.formName = "add";
this.formVisible = true;
},
handleModifyClick(row) {
this.formName = "edit";
this.formVisible = true;
this.editQuery = row;
},
deleteDialog(row) {
delectModeldestiny(row).then(res => {
if (res.code == 20000) {
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.$message.error("删除失败!");
});
},
selectDialog(row) {
this.selectFormVisible = true;
this.editQuery = row;
},
closeDialog() {
this.formVisible = false;
this.selectFormVisible = false;
this.getList();
this.delectList=[]
this.editQuery = {}
},
handleDetail(row) {
this.delectQuery.id = row.id
this.filterDestinyDelect()
},
filterDestinyDelect() {
filterDestinyDelect(this.delectQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.delectList = response.data.list || [];
this.delectTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.delectList = [];
this.delectTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.delectList = [];
this.delectTotal = 0;
});
},
}
,
mounted() {
}
,
components: {
destinyModelEdit, destinyModelSelectProduct
}
,
created() {
this.getList();
}
}
;
</script>

@ -0,0 +1,145 @@
<template>
<div>
<el-card>
<el-form :model="filterQuery" label-width="100px" size="mini">
<el-row>
<el-col :span="4">
<el-form-item label="模板名称:" class="query-form-item">
<el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="模板编码:" class="query-form-item">
<el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit"></el-button>
<el-button type="primary" icon="search" @click="combine"></el-button>
</el-button-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table :data="list" border highlight-current-row style="width: 100%" >
<el-table-column width="50">
<template slot-scope="scope">
<el-radio v-model="radio" :label="scope.row.id" @change.native.stop="showRow(scope.row.id)"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="模板编码" prop="name" ></el-table-column>
<el-table-column label="模板名称" prop="code" ></el-table-column>
<el-table-column label="备注" prop="remark" ></el-table-column>
<el-table-column label="创建人" prop="createByName" ></el-table-column>
<el-table-column label="创建时间" prop="createTime" ></el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-card>
</div>
</template>
<script>
import {
addModeldestiny,
delectModeldestiny,
filterDestinyDelect,
getBasicDestinyfilter
} from "@/api/basic/basicDestinyRel";
import destinyModelEdit from "@/views/basic/destiny/destinyModelEdit";
import destinyModelSelectProduct from "@/views/basic/destiny/destinyModelSelectProduct";
import {isBlank} from "@/utils/strUtil";
export default {
props: {
closeDialog: {
type: Function,
required: true,
},
},
data() {
return {
filterQuery: {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
},
total: 0,
destinyId:null,
radio:null,
list: [],
};
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.filterQuery = {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
};
this.getList();
this.destinyId=null
},
onSubmit() {
this.$router.push({
path: "",
});
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getBasicDestinyfilter(this.filterQuery).then(response => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
}).catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
this.roles = [];
});
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getList();
},
showRow (row) {
this.destinyId= row
},
combine(){
if(isBlank(this.destinyId)){
return this.$message.error("请先选择定数包!");
}
this.closeDialog(this.destinyId);
}
}
,
mounted() {
}
,
created() {
this.getList();
}
}
;
</script>

@ -0,0 +1,113 @@
<template>
<div>
<el-form :model="editLogin" label-width="30%">
<el-card>
<el-row>
<el-col :span="18">
<div class="text item">
<el-form-item label="模板名称" prop="unitId">
<el-input v-model="editLogin.name" placeholder="请输入模板名称" style="width: 100%"
size="small"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<div class="text item">
<el-form-item label="模板编号" prop="unitId">
<el-input v-model="editLogin.code" placeholder="请输入模板编号" style="width: 100%"
size="small"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="18">
<div class="text item">
<el-form-item label="备注" prop="unitId">
<el-input type="textarea" :rows="3" v-model="editLogin.remark" placeholder="请输入备注"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<div style="text-align: center; margin-top: 10px;">
<el-button type="primary" size="small" icon="search" @click="onModifySubmit"></el-button>
<el-button type="primary" size="small" icon="search" @click="closeDialog"></el-button>
</div>
</el-card>
</el-form>
</div>
</template>
<script>
import {addModeldestiny,editModeldestiny} from "@/api/basic/basicDestinyRel";
import {isBlank} from "@/utils/strUtil";
export default {
name: 'bindPlatformModel',
props: {
closeDialog: {
type: Function,
required: true,
},
editQuery: {
type: Object,
required: true,
},
},
data() {
return {
editLogin: {
id: null,
name: null,
code: null,
remark: null,
},
};
},
methods: {
onModifySubmit() {
if (this.editLogin.id != null) {
editModeldestiny(this.editLogin).then(res => {
if (res.code == 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.$message.error("编辑失败!");
});
} else {
addModeldestiny(this.editLogin).then(res => {
if (res.code == 20000) {
this.closeDialog();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.$message.error("提交失败!");
});
}
}
},
created() {
if(isBlank(this.editQuery.id)){
this.editLogin = {}
}else {
this.editLogin = this.editQuery
}
}
};
</script>
<style scoped>
</style>

@ -0,0 +1,222 @@
<template>
<div>
<el-form :model="editLogin" label-width="120px">
<el-card>
<el-row>
<el-col :span="6">
<div class="text item">
<el-form-item label="产品名称" prop="unitId">
<el-input v-model="editLogin.cpmctymc" placeholder="请输入产品名称" style="width: 100%"
size="small"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="11" style="margin-left: 20px">
<el-button type="primary" size="small" icon="search" @click="onModifySelect"></el-button>
</el-col>
</el-row>
<el-divider style="margin: 15px"></el-divider>
<el-row>
<el-col :span="24">
<el-button type="primary" style="float: right;margin-bottom: 12px;margin-right: 20px" size="small"
icon="search" @click="selectProduct">选入产品
</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
<el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="数量" prop="count">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
type='number'
:disabled="scope.row.index !== selectedIndex"
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案号" prop="certCode"></el-table-column>
<el-table-column label="操作" width="220">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
@click.native.stop="rowChange(scope.row)">编辑
</el-button>
<el-button type="text" size="small" :disabled="scope.row.index !== selectedIndex" @click.stop="true"
@click.native="tableCountChange(scope.row)">保存
</el-button>
<el-button type="text" size="small" @click.native.stop="delectModifyClick(scope.row)">移除</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</el-form>
<pagination
v-show="total>0"
:total="total"
:page.sync="editLogin.page"
:limit.sync="editLogin.limit"
@pagination="handleErpPageChange"
></pagination>
<el-dialog
title="选入产品详情"
:visible.sync="selectFormVisible"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
:before-close="closeDialog"
v-if="selectFormVisible"
>
<destinySelectProduct
:editQuery="editLogin"
:closeDialog="closeProudDialog"
></destinySelectProduct>
</el-dialog>
</div>
</template>
<script>
import {
addModeldestiny,
editModeldestiny,
filterDestinyDelect,
delectModeldestinyProduct, uploadModeldestinyProduct
} from "@/api/basic/basicDestinyRel";
import {isBlank} from "@/utils/strUtil";
import destinySelectProduct from "@/views/basic/destiny/destinySelectProduct";
import {deleteCompanyCert} from "@/api/purchase/companyCert";
import {updateDetail} from "@/api/purchase/purApply";
export default {
name: 'destinyModelSelectProduct',
props: {
closeDialog: {
type: Function,
required: true,
},
editQuery: {
type: Object,
required: true,
},
},
data() {
return {
editLogin: {
id: null,
cpmctymc: null,
ids: [],
page: 1,
limit: 10,
},
total: 0,
selectedIndex: '',
loading: false,
list: [],
selectFormVisible: false
};
},
methods: {
selectProduct() {
this.selectFormVisible = true;
},
closeProudDialog() {
this.selectFormVisible = false;
this.filterDestinyDelect();
},
filterDestinyDelect() {
filterDestinyDelect(this.editLogin)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
console.log(response)
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
this.list = [];
this.total = 0;
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
onModifySelect() {
this.filterDestinyDelect();
},
handleErpPageChange(val) {
this.editLogin.page = val.page;
this.filterDestinyDelect();
},
delectModifyClick(row) {
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
let tquery = {
id: row.deId
};
delectModeldestinyProduct(tquery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.filterDestinyDelect();
this.$message({
type: "success",
message: "删除成功!",
});
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.certLoading = false;
});
}).catch(() => {
});
},
rowChange(val) {
this.selectedIndex = val.index
},
tableCountChange(row) {
if (this.$isNotBlank(row)) {
var query = {
id: row.deId,
count: row.count
}
uploadModeldestinyProduct(query);
this.selectedIndex = null
}
},
},
components: {
destinySelectProduct
},
created() {
if (!isBlank(this.editQuery.id)) {
this.editLogin.id = this.editQuery.id
this.filterDestinyDelect();
}
}
};
</script>
<style scoped>
</style>

@ -0,0 +1,265 @@
<template>
<div>
<el-card>
<el-form :model="filterQuery" label-width="100px" size="mini">
<el-row>
<el-col :span="4">
<el-form-item label="单据号:" class="query-form-item">
<el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单前仓库:" class="query-form-item">
<el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单据时间:" class="query-form-item">
<el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"></el-button>
</el-button-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="260"></el-table-column>
<el-table-column label="唯一编码" prop="destinyNo" width="260"></el-table-column>
<el-table-column label="当前仓库" prop="invName" width="260"></el-table-column>
<el-table-column label="单据时间" prop="billDate" width="260"></el-table-column>
<el-table-column label="状态" prop="status" show-overflow-tooltip>
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createName" width="260"></el-table-column>
<el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
<el-table-column label="操作" width="220">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.status==2" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-card>
<!-- <el-card>-->
<!-- <el-table v-loading="loading" :data="delectList" border highlight-current-row style="width: 100%">-->
<!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>-->
<!-- <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>-->
<!-- <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="ggxh"></el-table-column>-->
<!-- <el-table-column label="计量单位" prop="measname"></el-table-column>-->
<!-- <el-table-column label="数量" prop="count"></el-table-column>-->
<!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>-->
<!-- <el-table-column label="注册/备案号" prop="certCode"></el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- v-show="delectTotal>0"-->
<!-- :total="delectTotal"-->
<!-- :limit.sync="delectQuery.limit"-->
<!-- :page.sync="delectQuery.page"-->
<!-- @pagination="handleCurrentDelectChange"-->
<!-- ></pagination>-->
<!-- </el-card>-->
<el-dialog
:title="formMap[formName]"
:visible.sync="formVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="80%"
:before-close="closeDialog"
v-if="formVisible"
>
<addDestinyProcess
:editQuery="editQuery"
:closeDialogpr="closeDialog"
></addDestinyProcess>
</el-dialog>
</div>
</template>
<script>
import {
delectModeldestiny,
filterDestinyDelect,
getBasicDestinyfilter
} from "@/api/basic/basicDestinyRel";
import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
import {delectDestinyProcess, filterDestinyProcess} from "@/api/inout/ioDestinyProcess";
export default {
data() {
return {
filterQuery: {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
},
editType: "",
formVisible: false,
loading: false,
formName: "",
total: 0,
list: [],
codeArray: [],
editQuery: {},
formMap: {
"add": "新增定数包模板",
"edit": "编辑定数包模板"
},
statusMap: {
0: "草稿",
1: "未提交",
2: "已提交",
},
delectQuery: {
id: null,
page: 1,
limit: 20
},
delectList: [],
delectTotal: 0,
};
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.filterQuery = {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
};
this.getList();
},
statusFilterType(status) {
const statusMap = {
0: "warning",
1: "warning",
2: "danger",
3: "success",
};
return statusMap[status];
},
onSubmit() {
this.$router.push({
path: "",
});
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
filterDestinyProcess(this.filterQuery).then(response => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
}).catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
this.roles = [];
});
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getList();
},
handleCurrentDelectChange(val) {
this.delectQuery.page = val.page;
this.filterDestinyDelect()
},
handleAddClick() {
this.formName = "add";
this.formVisible = true;
},
handleModifyClick(row) {
this.formName = "edit";
this.formVisible = true;
this.editQuery = row;
},
deleteDialog(row) {
delectDestinyProcess(row).then(res => {
if (res.code == 20000) {
this.getList();
} else {
this.$message.error(res.message);
}
}).catch(() => {
this.$message.error("删除失败!");
});
},
closeDialog() {
this.formVisible = false;
this.getList();
this.delectList=[]
this.editQuery = {}
},
handleDetail(row) {
this.delectQuery.id = row.id
this.filterDestinyDelect()
},
filterDestinyDelect() {
filterDestinyDelect(this.delectQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.delectList = response.data.list || [];
this.delectTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.delectList = [];
this.delectTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.delectList = [];
this.delectTotal = 0;
});
},
}
,
mounted() {
}
,
components: {
addDestinyProcess
}
,
created() {
this.getList();
}
}
;
</script>

@ -0,0 +1,101 @@
<template>
<div>
<el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="UDI码" prop="code" width="260"></el-table-column>
<el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate" width="100"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="100"></el-table-column>
<el-table-column label="序列号" prop="serialNo"></el-table-column>
<el-table-column label="扫码数量" prop="count"></el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
</el-table>
</div>
</template>
<script>
import {filterDestinyDelect, filterDestinyProduct, getBasicDestinyfilter} from "@/api/basic/basicDestinyRel";
import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
import {filterDestinyProcessCode} from "@/api/inout/ioDestinyProcess";
export default {
name: "destinyProcessCode",
props: {
billNo: {
type: Object,
required: true
},
destinyProcessCodeShow: {
type: Object,
required: true
}
},
data() {
return {
filterQuery: {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
},
loading: false,
list: [],
total: 0
};
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.filterQuery = {
page: 1,
limit: 20
};
this.getList();
},
onSubmit() {
this.$router.push({
path: "",
});
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
this.filterQuery.billNo = this.billNo
filterDestinyProcessCode(this.filterQuery).then(response => {
this.loading = false;
this.list = response.data.list || [];
this.total = response.data.total || 0;
}).catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
this.roles = [];
});
},
}
,
mounted() {
}
,
components: {
addDestinyProcess
}
,
created() {
if(this.destinyProcessCodeShow==true){
this.getList();
}
}
}
;
</script>

@ -0,0 +1,97 @@
<template>
<div>
<el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
<el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="计量单位" prop="measname"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="扫码数量" prop="reCount"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案号" prop="certCode"></el-table-column>
</el-table>
</div>
</template>
<script>
import addDestinyProcess from "@/views/basic/destiny/addDestinyProcess";
import {filterDestinyDelect} from "@/api/inout/ioDestinyProcess";
export default {
name: "destinyProcessDelect",
props: {
billNo: {
type: Object,
required: true
},
destinyProcessCodeShow: {
type: Object,
required: true
}
},
data() {
return {
filterQuery: {
name: "",
code: "",
type: 2,
page: 1,
limit: 20
},
loading: false,
list: [],
total: 0
};
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.filterQuery = {
page: 1,
limit: 20
};
this.getList();
},
onSubmit() {
this.$router.push({
path: "",
});
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
this.filterQuery.billNo = this.billNo
filterDestinyDelect(this.filterQuery).then(response => {
this.loading = false;
this.list = response.data || [];
}).catch(() => {
this.loading = false;
this.list = [];
});
},
}
,
mounted() {
}
,
components: {
addDestinyProcess
}
,
created() {
if(this.destinyProcessCodeShow==true){
this.getList();
}
}
}
;
</script>

@ -0,0 +1,339 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row>
<el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="拼音简写:" class="query-form-item">
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="第三方物资编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="分类编码:" class="query-form-item">
<el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商:" class="query-form-item">
<el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="物品编码:" class="query-form-item">
<el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入产品通用名"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="物资分类:" class="query-form-item">
<el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"></el-input>
</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 type="primary" icon="el-icon-plus" @click="confirmSelect"></el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
@selection-change="handleSelectionChange" ref="multipleTable">
<el-table-column type="selection" :reserve-selection="true"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="第三方物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
</el-table>
<pagination
v-show="pageTotal>0"
:total="pageTotal"
:page.sync="listQuery.page"
:limit.sync="listQuery.limit"
@pagination="handleErpPageChange"
></pagination>
</el-card>
</div>
</template>
<script>
import {filterCompanyProductplanRelevance, filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
import store from "../../../store";
import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
import {finProductSet} from "@/api/param/systemParamConfig";
import {addModeldestinyProduct, filterDestinyDelect, filterDestinyProduct} from "@/api/basic/basicDestinyRel";
export default {
name: "stockOrderNewSelectProduct",
props: {
closeDialog: {
type: Function,
required: true,
},
editQuery: {
type: Object,
required: true,
},
codeArray: {
type: Object,
required: true,
},
},
data() {
return {
showSearch: true,
listQuery: {
purType: null,
udiCode: null,
unicode: null,
cpmctymc: null,
ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
pinyinInitial: null,
page: 1,
limit: 10,
},
combineQuery: {
thirdId: "",
relId: "",
erpName: "",
keys: [],
},
ids: [],
lists: [],
radioCheck: null,
dataList: [],
pageTotal: 1,
total: 1,
currentRow: null,
loading: false,
udiRlDetailVisible: false,
thirdSys: [],
thirdSysFk: null,
busTypes: [],
actDateRange: [],
tQuery: {
productId: "",
productName: "",
count: "",
orderIdFk: "",
supId: "",
},
productRemarkSet: {},
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
orderEditor: false,
orderId: "",
currentCert: null,
certList: [],
dialogFormVisible: false,
multipleSelection: null,
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.listQuery = {
purType: null,
udiCode: null,
unicode: null,
cpmctymc: null,
ggxh: null,
ylqxzcrbarmc: null,
thrPiId: null,
page: 1,
limit: 10
}
this.multipleSelection = [];
this.radioCheck = null;
this.currentRow = null;
this.getList();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
handleCurrentChange(val) {
this.unionQuery.page = val;
this.getList();
},
handleChange(val) {
this.radioCheck = val.id;
this.currentRow = val;
this.multipleSelection = val
},
handleDetailClick(row) {
this.currentRow = row;
this.udiRlDetailVisible = true;
},
handleErpPageChange(val) {
this.listQuery.page = val.page;
this.getList();
},
keyup_submit(event) {
this.listQuery.page = 1;
this.getList();
event.target.select();
},
search() {
this.listQuery.page = 1;
this.getList();
},
handleSelectionChange(val) {
this.lists = [];
for (var i = 0; i < val.length; i++) {
this.lists.push(val[i].id)
}
},
getList() {
this.loading = true;
this.listQuery.id = this.editQuery.id
filterDestinyProduct(this.listQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0;
} else {
this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
},
confirmSelect() {
if (this.lists == null) {
this.$message.error('未选择产品');
return;
}
this.combine();
},
combine() {
this.loading = true;
addModeldestinyProduct({pId:this.editQuery.id,list:this.lists}).then((response) => {
this.loading = false;
if (response.code === 20000) {
this.closeDialog(response.data);
} else {
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
},
},
components: {udiRlDetailDialog},
created() {
},
};
</script>
<style scoped>
.query-form-item {
display: block !important;
margin-right: 1px;
margin-bottom: 5px;
}
div /deep/ .el-table .warning-row {
background: #bebebe;
}
div /deep/ .el-table .success-row {
background: #ffffff;
}
</style>

@ -259,7 +259,6 @@ export default {
var ids = this.productList.map((item) => item.id)
var data = {code: this.rId, ids: ids}
saveRel(data).then((response) => {
debugger
if (response.code == 20000) {
this.$message.success("选入成功!");
this.closeDialog();

@ -1550,7 +1550,6 @@ export default {
remove(node, data) {
debugger
if (data.id) {
this.$confirm("确认删除该节点吗?", "提示", {
type: "warning",

@ -455,6 +455,9 @@ export default {
return isJPG || isPNG;
},
showImgViewer(row) {
if(this.inputQuery.filePath.substr(-1) == ','){
this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
@ -493,6 +496,9 @@ export default {
},
showImgViewerCold(row){
if(this.inputQuery.coldFilePath.substr(-1) == ','){
this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
}
this.certFileUrl =
this.BASE_URL +
"/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;

@ -102,6 +102,7 @@
placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled"
style="width: 90%"
filterable
@change="actionChange"
>
<el-option
@ -124,6 +125,7 @@
v-if="
curAction.corpType === 0 ||
curAction.corpType === 2 ||
curAction.corpType === 4 ||
(curAction.corpType === 1 && !curAction.genUnit)
"
>
@ -801,6 +803,9 @@ export default {
} else if (this.curAction.corpType == 1) {
cQuery.corpType = 1;
cQuery.outType = 2;
}else if (this.curAction.corpType == 4) {
//
cQuery.corpType = 4;
} else
return;
getBasicUnitMaintains(cQuery)
@ -815,6 +820,7 @@ export default {
//
actionChange(item) {
this.orderFormData.checkPreInOption = null;
this.orderFormData.checkPreInOrders = null;
this.checkPreInArray = [];
@ -829,6 +835,7 @@ export default {
if (
this.curAction.corpType == 0 ||
this.curAction.corpType == 2 ||
this.curAction.corpType == 4 ||
(this.curAction.corpType == 1 && !this.curAction.genUnit)
) {
//1.
@ -1086,6 +1093,11 @@ export default {
this.refreshCodesPanel();
this.$message.error(response.message);
this.selectRlTitle = response.message;
//
if(tQuery.selectSupId!=null){
this.codeFormData.selectSupId=tQuery.selectSupId
}
this.selectRlVisible = true;
} else if (response.code == 503) {
//

@ -860,6 +860,9 @@ export default {
components: {}
,
created() {
if(this.curRow.selectSupId!=null){
this.fromCorp=this.curRow.selectSupId
}
this.getList();
}
,

@ -110,7 +110,7 @@
:default-sort="defaultSort"
@sort-change="handleSortChange">
<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="fromName" width="220">
</el-table-column>
@ -133,11 +133,11 @@
</el-table-column>
<el-table-column label="采购仓库" prop="deptName" width="120">
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="审核人" prop="reviewUserName" width="120">
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
<el-table-column label="审核人" prop="reviewUserName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
@ -169,14 +169,14 @@
<!-- >报表打印-->
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<!-- 暂时隐藏-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="rollback(scope.row)"-->
<!-- >撤回-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
@ -465,7 +465,7 @@ import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder";
import ElImageViewer from "element-ui/packages/image/src/image-viewer";
import DialogCheck from "@/views/inout/DialogCheck";
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {previewImage,previewFile} from "@/api/purchase/supCompany";
import {previewImage, previewFile} from "@/api/purchase/supCompany";
import {
inspectionStockQRCodeTextPDFFromTemplateStatementFile,
stockQRCodeTextPDFFromTemplateStatementFile
@ -654,20 +654,23 @@ export default {
this.getList();
},
showImgViewer(row) {
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);
@ -693,20 +696,23 @@ export default {
showImgViewerCold(row) {
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);

@ -753,6 +753,9 @@ export default {
this.showSearch = !this.showSearch;
},
showImgViewer(row) {
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;
@ -791,6 +794,9 @@ export default {
},
showImgViewerCold(row) {
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;

@ -620,6 +620,9 @@ export default {
},
showImgViewer(row) {
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;
@ -658,6 +661,9 @@ export default {
},
showImgViewerCold(row) {
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;

@ -61,12 +61,12 @@
<el-col :span="17">
<el-form-item label="往来单位:">
<el-input v-model="inputQuery.fromCorp" ref="fromCorpInputRef"
@keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null"
@keypress.enter.native="addFromCorp($event)" :disabled="this.inputQuery.udiCode==null || this.showFlg ==false"
placeholder="请输入往来单位" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null" @click="addFromCorp"
<el-button type="primary" size="mini" :disabled="this.inputQuery.udiCode==null || this.showFlg == false" @click="addFromCorp"
style="margin-left: 15px">添加
</el-button>
</el-col>
@ -153,6 +153,7 @@ export default {
supId: null,
},
pId: null,
showFlg:false,
popupsVisible: false,
orderMutiDelectVisible: false,
tableName: '使用记录选择',
@ -255,6 +256,8 @@ export default {
this.inputQuery.totalCount = response.data.data.totalCount
this.inputQuery.useCount = response.data.data.useCount
this.$refs.fromCorpInputRef.focus();
this.checkType=null;
this.showFlg=false;
this.enterKeyup();
} else {
this.$refs.markInputRef.focus();
@ -270,6 +273,8 @@ export default {
});
} else if (data == 'no') {
this.inputQuery.mark = "";
this.checkType=1;
this.showFlg=false;
this.$refs.markInputRef.focus();
this.enterKeyup();
}
@ -321,6 +326,9 @@ export default {
if (this.inputQuery.fromCorp != 'true' && this.inputQuery.fromCorp != 'false') {
var query = {
udiCode:this.inputQuery.udiCode,
mark:this.inputQuery.mark,
checkType:this.checkType,
mutiIdFk: this.pId,
fromCorp: this.inputQuery.fromCorp
}
@ -418,6 +426,7 @@ export default {
this.inputQuery.totalCount = response.data.totalCount
this.inputQuery.useCount = response.data.useCount
this.pId = response.data.id;
this.showFlg=true;
this.$refs.fromCorpInputRef.focus();
this.selectMutiDetailList()
} else {

@ -99,25 +99,49 @@
@current-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<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="fromName" width="220">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220">
<el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.auditTime }}</span>
</template>
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120">
<el-table-column label="所属部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120">
<el-table-column label="所属仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
<el-table-column label="审核人" prop="reviewUserName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusAuditFilterType(scope.row.status)">{{
checkStatus[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<el-table-column label="提交状态" prop="exportStatus" width="100">
@ -345,6 +369,7 @@ export default {
endTime: null,
billNo: null,
submitStatus: null,
vueType: "thirdUpload",
page: 1,
limit: 10
},
@ -436,6 +461,17 @@ export default {
1: "已提交",
2: "提交失败"
},
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "待核对",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理", 10: "待审核", 11: "待配货",
},
loading: false,
list: [],
total: 0,
@ -472,13 +508,14 @@ export default {
corpName: null,
invCode: this.$store.getters.locInvCode,
startTime: null,
vueType: "thirdUpload",
endTime: null,
billNo: null,
submitStatus: null,
page: 1,
limit: 10
};
this.actDateRange= [];
this.actDateRange = [];
this.getList();
},
onSubmit() {
@ -633,6 +670,7 @@ export default {
getBusType() {
let params = {
code: this.filterQuery.invCode,
vueType: "thirdUpload",
enabled: true
};
getLocalJoinByUser(params).then((res) => {
@ -640,6 +678,15 @@ export default {
this.onSubmit();
});
},
statusAuditFilterType(status) {
const statusMap = {
5: "warning",
1: "warning",
6: "danger",
7: "success",
};
return statusMap[status];
},
},
filters: {
statusFilterType(status) {

@ -30,7 +30,6 @@
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row">
<el-col :span="20" class="el-col">
<div>
@ -43,7 +42,26 @@
:disabled="configQuery.autoUpload"
splaceholder="请输入内容"
></el-input>
</div>
</el-col>
</el-row>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
参数设置
</template>
<el-row :gutter="20" class="el-row">
<el-col :span="20" class="el-col">
<div>
<span>单据上传起始时间:&nbsp;</span>
<el-date-picker
v-model="configQuery.orderStartTime"
type="date"
value-format="yyyy-MM-dd"
:disabled="configQuery.autoUpload"
placeholder="单据上传起始时间">
</el-date-picker>
</div>
</el-col>
</el-row>
@ -330,6 +348,10 @@ export default {
},
addBusType() {
let selectedData = this.multipleSelection;
selectedData.forEach(item => {
item.id = null
});
this.addBusDialogVisible = false;
let query = {
busTypes: selectedData,

@ -4,19 +4,20 @@
<el-form :model="filterQuery" label-width="100px">
<el-row>
<el-form-item label="单据号">
<el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号" clearable></el-input>
<el-input v-model="filterQuery.recordKey" style="width: 100%" placeholder="请输入单据号"
clearable></el-input>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker
style="width: 100%"
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 100%"
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
@ -62,11 +63,11 @@
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
</el-card>
@ -86,33 +87,33 @@
</el-card>
<el-dialog
:title="formMap[formName]"
:visible.sync="newSpDistributionVisible"
width="80%"
v-if="newSpDistributionVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formMap[formName]"
:visible.sync="newSpDistributionVisible"
width="80%"
v-if="newSpDistributionVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<pureApplyEdit
:closeDialog="closeDialog"
:idQuery="idQuery"
:closeDialog="closeDialog"
:idQuery="idQuery"
></pureApplyEdit>
</el-dialog>
<el-dialog
title="内部码标签打印"
:visible.sync="qrcodeExportVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="qrcodeExportVisible"
@close='closeQRCodeExportDialog'
title="内部码标签打印"
:visible.sync="qrcodeExportVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="qrcodeExportVisible"
@close='closeQRCodeExportDialog'
>
<innerCodeDetail
:closeDialog="closeQRCodeExportDialog"
:inQuery="inQuery"
:closeDialog="closeQRCodeExportDialog"
:inQuery="inQuery"
></innerCodeDetail>
</el-dialog>
@ -205,6 +206,7 @@ export default {
editStatus: 1,
};
this.actDateRange = [];
this.detailList = []
this.getList();
},
@ -223,33 +225,33 @@ export default {
}
listInnerOrder(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
.then((response) => {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleDetail(row) {
let query = {orderIdFk: row.recordKey};
this.loading = true;
listInnerOrderDetail(query) //
.then((response) => {
this.detailList = response.data.list || [];
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
});
.then((response) => {
this.detailList = response.data.list || [];
this.loading = false;
})
.catch(() => {
this.loading = false;
this.detailList = [];
});
},
submitOrder(row) {
this.loading = true;
@ -258,18 +260,18 @@ export default {
purApplyEntity: row,
}
inserThrOrderWeb(tQuery)
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功!");
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
.then(response => {
this.loading = false;
if (response.code === 20000) {
this.$message.success("提交成功!");
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
})
},
deleteDialog(row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
@ -277,25 +279,25 @@ export default {
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
delInnerOrder(row.id)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
this.detailList = "";
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
.then(() => {
delInnerOrder(row.id)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
this.detailList = "";
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
})
.catch(() => {
});
})
.catch(() => {
});
},
handleCurrentChange(val) {
this.filterQuery.page = val.page;

@ -11,7 +11,7 @@
<el-col :span="8">
<el-form-item label="申购部门">
<el-select v-model="filterQuery.targetDeptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
<el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@ -25,7 +25,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="申购仓库">
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option
v-for="item in invList"
:key="item.name"
@ -92,22 +92,23 @@
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @current-change="handleDetail"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@current-change="handleDetail"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="申购单号" prop="billNo"></el-table-column>
<el-table-column label="申购部门" prop="targetDeptName"></el-table-column>
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency" >
<el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }}
</template>
</el-table-column>
<el-table-column label="到货截止" prop="arrivalTime" ></el-table-column>
<el-table-column label="到货截止" prop="arrivalTime"></el-table-column>
<el-table-column label="创建时间" prop="createTime"
sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="审核时间" prop="auditTime"
sortable="custom" :sort-orders="['ascending', 'descending']" ></el-table-column>
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="审核状态" prop="status">
@ -188,8 +189,9 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
emergency:'',
targetDeptCode:'',
emergency: '',
deptCode: '',
invCode: null,
},
formName: null,
formMap: {
@ -202,7 +204,7 @@ export default {
3: "已审核",
4: "已拒绝"
},
emergencyMap:{
emergencyMap: {
1: "正常",
2: "较急",
3: "特急",
@ -211,12 +213,12 @@ export default {
editType: 2,
total: 0,
thirdSys: [],
invCodebe:null,
invCodebe: null,
thirdSysDetail: null,
busTypes: [],
originTypes: [],
invList:{},
deptList:{},
invList: {},
deptList: {},
list: [],
detailList: [],
loading: false,
@ -295,7 +297,7 @@ export default {
this.$router.push({
path: "",
});
let deptCode = this.filterQuery.targetDeptCode
let deptCode = this.filterQuery.deptCode
this.filterQuery = {
billNo: "",
thirdSysFk: "",
@ -308,9 +310,9 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
targetDeptCode: this.invCodebe,
deptCode: this.invCodebe,
};
if(deptCode!=this.invCodebe){
if (deptCode != this.invCodebe) {
this.getInvList()
}
this.actDateRange = [];
@ -358,7 +360,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList=[]
this.detailList = []
} else {
this.$message.error(response.message);
}
@ -452,8 +454,8 @@ export default {
this.newSpDistributionVisible = true;
},
getInvList() {
var query={
parentId:this.filterQuery.targetDeptCode
var query = {
parentId: this.filterQuery.targetDeptCode
}
filterSubAll(query).then((res) => {
this.invList = res.data || [];
@ -462,12 +464,12 @@ export default {
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
if(this.deptList.length>0){
this.filterQuery.targetDeptCode=this.deptList[0].code
this.invCodebe=this.filterQuery.targetDeptCode
if (this.deptList.length > 0) {
this.filterQuery.targetDeptCode = this.deptList[0].code
this.invCodebe = this.filterQuery.targetDeptCode
}
this.getList();
this. getInvList();
this.getInvList();
});
},
}

@ -35,7 +35,7 @@
:value="item.action">
<span style="float: left;font-size: 13px">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.remark
item.action
}}</span>
</el-option>
</el-select>

@ -35,7 +35,7 @@
:value="item.action">
<span style="float: left;font-size: 13px">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.remark
item.action
}}</span>
</el-option>
</el-select>

@ -268,7 +268,6 @@ export default {
}
},
created() {
debugger
if(this.formQuery==1){
this.editLogin.platformId = this.editQuery.platformId;
this.editLogin.appid = this.editQuery.appid;

Loading…
Cancel
Save