Merge remote-tracking branch 'origin/orderChange' into zhairh

feature-order-fix
x_z 3 years ago
commit 2ed9acf038

@ -8,6 +8,14 @@ export function getChangeBusType(query) {
});
}
export function filterAll(query) {
return axios({
url: "/spms/busTypeChange/filter",
method: "get",
params: query
});
}
export function addChangeBusType(query) {
return axios({

@ -28,6 +28,7 @@ import invWarehouse from "../views/basic/invWarehouse"
import BussinessType from "../views/basic/BussinessType.vue";
import BussinessTypeLocl from "../views/basic/BussinessTypeLocl.vue";
import bussinessTypeThird from "../views/basic/BussinessTypeThird.vue";
import otherTypeChange from "../views/basic/OtherTypeChange.vue";
import bussinessTypeChange from "../views/basic/BusTypeChange.vue";
@ -362,6 +363,15 @@ export const asyncRouterMap = [
}
},
{
path: "otherTypeChange",
name: "耗材领用设置",
component: otherTypeChange,
meta: {
authRule: ["admin/otherTypeChange"]
}
},
]
},
@ -472,7 +482,7 @@ export const asyncRouterMap = [
redirect: "/platformManage/platform",
icon: "",
meta: {
authRule: [""]
authRule: ["platformManage"]
},
children: [
{
@ -1055,7 +1065,7 @@ export const asyncRouterMap = [
component: stockOrderRecedLog,
name: "单据接收日志",
meta: {
authRule: ["busOrderUpload/uploadLog"]
authRule: ["busOrderUpload/RecedLog"]
}
}

@ -16,12 +16,6 @@
style="width: 200px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.type">
<el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
@ -37,21 +31,17 @@
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="单据类型名称" prop="originName"></el-table-column>
<el-table-column label="单据类型代码" prop="originAction"></el-table-column>
<el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
<el-table-column label="类型" prop="type">
<template slot-scope="scope">
<span>{{ typeMap[scope.row.type] }}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="enable">
<el-table-column label="原单据类型" prop="originName"></el-table-column>
<el-table-column label="目标单据类型" prop="targetName"></el-table-column>
<el-table-column label="目标当前仓库" prop="locSubInvName"></el-table-column>
<el-table-column label="目标往来仓库" prop="defautSubInvName"></el-table-column>
<el-table-column label="时间推移(小时)" prop="beforeTime"></el-table-column>
<el-table-column label="补单方式" prop="supplementAll">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.enable] }}</span>
<span>{{ enableMap[scope.row.supplementAll] }}</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="备注" prop="intro"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
@ -105,14 +95,10 @@
</div>
</template>
<script>
import {
getBusChange,
updateBusChange, delBusChange,
insertBusChange
} from "../../api/basic/busTypeChange";
import modifyDialog from "./BusTypeChangeModify";
import axios from "axios";
import {addChangeBusType, filterAll, updateChangeBusType, removeBusChange} from "@/api/basic/busChangeType";
export default {
data() {
@ -126,13 +112,8 @@ export default {
list: [],
inputQuery: {},
enableMap: {
true: "禁用",
false: "启用",
},
typeMap: {
1: "耗材领用",
2: "产品申购",
3: "采购计划",
true: "全量补单",
false: "自动补单",
},
total: 0,
loading: false,
@ -167,7 +148,7 @@ export default {
},
getList() {
this.loading = true;
getBusChange(this.filterQuery)
filterAll(this.filterQuery)
.then((response) => {
this.loading = false;
this.list = response.data.list || [];
@ -185,35 +166,34 @@ export default {
},
onAddSubmit() {
if (this.$isBlank(this.inputQuery.originName)) {
this.$message.error("单据类型名称不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.originAction)) {
this.$message.error("单据类型代码不能为空!");
this.$message.error("原单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.targetBusAction)) {
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("目标单据类型不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.type)) {
this.$message.error("请选择设置类型");
if (this.$isBlank(this.inputQuery.locSubInv)) {
this.$message.error("目标所在仓库不能为空");
return;
}
if (this.$isBlank(this.inputQuery.enable)) {
this.$message.error("请选择启用状态");
if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("原单据类型不能为空");
return;
}
if (this.formName == "add") {
if (this.formName == "add") {
let numRegExp = '^[0-9]*$';
let numReg = new RegExp(numRegExp);
if (numReg.test(this.inputQuery.name)) {
this.$message.error("单据类型名称不得为纯数字类型!");
return;
}
insertBusChange(this.inputQuery)
this.inputQuery.type = 1; //
addChangeBusType(this.inputQuery)
.then((response) => {
if (response.code == 20000) {
this.loading = false;
@ -228,7 +208,7 @@ export default {
this.cancelDialog();
});
} else {
updateBusChange(this.inputQuery)
updateChangeBusType(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
@ -272,9 +252,13 @@ export default {
let query = {
id: rowId,
}
delBusChange(query)
removeBusChange(query)
.then((response) => {
if (response.code == 20000) {
this.$message.success("删除成功!");
this.getList();
} else
this.$message.error(response.message);
})
.catch(() => {
});

@ -1,45 +1,36 @@
<template>
<div>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>单据类型名称:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
:disabled="!isAdd"
v-model.trim="inputQuery.originName"
></el-input>
<el-col :span="3">
<div class="ao-text">
<span>原单据类型</span>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>单据类型代码:&nbsp;</span>
</div>
<el-input
style="width: 200px"
:disabled="!isAdd"
size="small"
splaceholder="请输入内容"
v-model.trim="inputQuery.originAction"
></el-input>
</div>
<el-col :span="7" class="el-col">
<el-select v-model="inputQuery.originAction" placeholder="请选择" clearable="true" style="width: 80%">
<el-option
v-for="item in originBusTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
</el-option>
</el-select>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>目标单据类型:&nbsp;</span>
<el-col :span="3">
<div class="ao-text">
<span>目标单据类型</span>
</div>
<el-select v-model="inputQuery.targetBusAction" placeholder="请选择" clearable="true">
</el-col>
<el-col :span="7" class="el-col">
<el-select v-model="inputQuery.action" placeholder="请选择" clearable="true" style="width: 80%">
<el-option
v-for="item in busTypes"
v-for="item in targetBusTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
@ -47,70 +38,118 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>设置类型:&nbsp;</span>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="3">
<div class="ao-text">
<span>目标所在仓库</span>
</div>
<el-select
size="small"
:disabled="inputQuery.systemDefault"
v-model="inputQuery.type"
placeholder="设置类型"
>
<el-option label="耗材领用" :value="1"></el-option>
<!-- <el-option label="产品申购" :value="2"></el-option>-->
<el-option label="采购计划" :value="3"></el-option>
</el-col>
<el-col :span="7" class="el-col">
<el-select v-model="inputQuery.locSubInv" placeholder="目标所在仓库" clearable="true"
@change="invChange" style="width: 80%"
size="small">
<el-option
v-for="item in locInvs"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>目标往来仓库</span>
</div>
</el-col>
<el-col :span="7" class="el-col">
<el-select v-model="inputQuery.defaultSubInv" placeholder="目标往来仓库" clearable="true" style="width: 80%"
@change="invChange"
size="small">
<el-option
v-for="item in fromInvs"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>启用状态:&nbsp;</span>
<el-col :span="3">
<div class="ao-text">
<span>推移时间(小时)</span>
</div>
<el-select
</el-col>
<el-col :span="7" class="el-col">
<el-input
style="width: 80%"
size="small"
:disabled="inputQuery.systemDefault"
v-model="inputQuery.enable"
placeholder="启用状态"
>
<el-option label="启用" :value="false"></el-option>
<el-option label="禁用" :value="true"></el-option>
</el-select>
type="number"
splaceholder="请输入内容"
v-model="inputQuery.beforeTime"
></el-input>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>流转方式</span>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
<el-col :span="7" class="el-col">
<el-select v-model="inputQuery.supplementAll" placeholder="流转方式" style="width: 80%">
<el-option label="全量补单" :value="true"></el-option>
<el-option label="自动补单" :value="false"></el-option>
</el-select>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="3">
<div class="ao-text">
<span>备注</span>
</div>
</el-col>
<el-col :span="7" class="el-col">
<el-input
style="width: 200px"
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="inputQuery.remark"
></el-input>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</template>
<script>
import {
getBasicThirdSys,
} from "../../api/basic/basicThirdSys";
import {
getLocalBusType, getLocalJoinBusType,
getLocalJoinByUser, getLocalJoinBusType,
} from "../../api/basic/busLocalType";
import {filterSubAll, filterSubByInv} from "@/api/basic/invSubWarehouse";
export default {
name: "BusTypeChangeModify",
@ -127,71 +166,87 @@ export default {
enabled: true,
isBuType: true,
},
busTypes: [],
originBusTypes: [],
targetBusTypes: [],
locInvs: [],
fromInvs: [],
isAdd: false,
rules: {
originName: [
{
required: true,
message: "单据类型名称不能为空",
trigger: "blur"
}
],
originAction: [
{
required: true,
message: "单据类型代码不能为空",
trigger: "blur"
}
],
targetBusAction: [
{
required: true,
message: "目标单据类型不能为空",
trigger: "blur"
}
],
type: [
{
required: true,
message: "请选择设置类型",
trigger: "blur"
}
],
enable: [
{
required: true,
message: "请选择启用状态",
trigger: "blur"
}
],
},
}
},
methods: {
getBusType() {
getOriginBusType() {
let query = {
enabled: true,
corpType: 1,
};
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.originBusTypes = response.data.list || [];
})
.catch(() => {
});
},
getTargetBusType() {
let query = {
invWarehouseCode: this.inputQuery.locSubInv,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.targetBusTypes = response.data.list || [];
})
.catch(() => {
});
},
getLocalInv() {
let subQuery = {}
filterSubAll(subQuery).then((res) => {
if (res.code == 20000) {
this.locInvs = res.data;
}
}).catch((error) => {
});
},
invChange(){
this.getTargetBusType();
this.getFromInv();
},
getFromInv() {
let subQuery = {
code:this.inputQuery.locSubInv,
}
filterSubByInv(subQuery).then((res) => {
if (res.code == 20000) {
this.fromInvs = res.data;
}
}).catch((error) => {
});
},
},
created() {
if (this.inputQuery.originAction == null) {
this.isAdd = true;
}else {
this.getFromInv();
this.getTargetBusType();
}
this.getBusType();
}
,
this.getOriginBusType();
this.getLocalInv();
},
}
;
</script>

@ -124,21 +124,21 @@
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"
:disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null || inputQuery.mainAction==null ||inputQuery.preIn">
自动补单
</el-checkbox>
</div>
</el-col>
<el-col :span="4" class="el-col">
<div class="text item">
<el-checkbox v-model="inputQuery.supplementAll"
:disabled="!inputQuery.changeEnable">全量补单
</el-checkbox>
</div>
</el-col>
<!-- <el-col :span="4" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="inputQuery.changeEnable" @change="isChangeOrder"-->
<!-- :disabled="!changeEnable || inputQuery.mainAction=='WareHouseIn' || inputQuery.id == null || inputQuery.mainAction==null ||inputQuery.preIn">-->
<!-- 自动补单-->
<!-- </el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="4" class="el-col">-->
<!-- <div class="text item">-->
<!-- <el-checkbox v-model="inputQuery.supplementAll"-->
<!-- :disabled="!inputQuery.changeEnable">全量补单-->
<!-- </el-checkbox>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="4" class="el-col">
<div class="text item">
@ -159,13 +159,10 @@
<!-- >-->
<!-- </div>-->
<el-table border style="margin-bottom: 20px;margin-top: 10px" :data="changeList">
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="补单说明" prop="intro"></el-table-column>
<!-- <el-table-column label="补单单据类型代码" prop="action"></el-table-column>-->
<el-table-column label="补单扫码单据类型" prop="name"></el-table-column>
<el-table-column label="推前时长(小时)" prop="beforeTime"></el-table-column>
<el-table-column label="补单默认仓库" prop="defautInvName"></el-table-column>
<el-table-column label="补单默认分库" prop="defautSubInvName"></el-table-column>
<el-table-column label="推前时长(小时)" prop="beforeTime"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
@ -474,8 +471,12 @@ export default {
} else {
updateChangeBusType(this.editQuery)
.then((response) => {
if (response.code == 999) {
this.$message.error(response.message);
} else {
this.editChangeTypeVisible = false;
this.getList();
}
})
.catch(() => {
});

@ -226,7 +226,7 @@
<el-checkbox v-model="inputQuery.enable" :disabled="inputQuery.localAction==null"></el-checkbox>
<el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">
</el-checkbox>
<el-checkbox v-model="inputQuery.useDyCount" :disabled="true">使
<el-checkbox v-model="inputQuery.useDyCount" :disabled="inputQuery.corpType !=2">使
</el-checkbox>
<el-checkbox v-model="inputQuery.outTospms">
</el-checkbox>

@ -0,0 +1,304 @@
<template>
<div>
<el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.originName"
placeholder="单据类型名称"
style="width: 200px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.originAction"
placeholder="单据类型代码"
style="width: 200px"
></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.type">-->
<!-- <el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="search"></el-button>
<el-button type="primary" icon="search" @click="handleAddClick"
>新增
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="领用类型名称" prop="originName"></el-table-column>
<el-table-column label="领用类型代码" prop="originAction"></el-table-column>
<el-table-column label="目标业务单据类型" prop="targetBusName"></el-table-column>
<el-table-column label="类型" prop="type">
<template slot-scope="scope">
<span>{{ typeMap[scope.row.type] }}</span>
</template>
</el-table-column>
<el-table-column label="状态" prop="enable">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.enable] }}</span>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="handleModifyClick(scope.row)"
>编辑
</el-button
>
<el-button
type="text"
size="small"
:disabled="scope.row.systemDefault"
@click.native.stop="handleDeleteClick(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
:title="formMap[formName]"
:visible.sync="addDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="addDialogVisible"
>
<modifyDialog :inputQuery="inputQuery"></modifyDialog>
<div style="text-align: center">
<el-button type="primary" size="small" icon="search" @click="onAddSubmit"
>提交
</el-button
>
<el-button type="primary" size="small" icon="search" @click="cancelDialog"
>取消
</el-button
>
</div>
</el-dialog>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
</el-card>
</div>
</template>
<script>
import {
getBusChange,
updateBusChange, delBusChange,
insertBusChange
} from "../../api/basic/busTypeChange";
import modifyDialog from "./OtherTypeChangeModify";
import axios from "axios";
export default {
data() {
return {
filterQuery: {
name: "",
page: 1,
limit: 20,
},
addDialogVisible: false,
list: [],
inputQuery: {},
enableMap: {
true: "禁用",
false: "启用",
},
typeMap: {
1: "耗材领用",
2: "产品申购",
3: "采购计划",
},
total: 0,
loading: false,
configParms: {},
formMap: {
add: "新增单据流转设置",
update: "编辑单据流转设置",
},
formName: "add",
};
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
name: null,
enable: null,
page: 1,
limit: 20,
};
this.getList();
},
cancelDialog() {
this.addDialogVisible = false;
},
search() {
this.filterQuery.page = 1;
this.getList();
},
getList() {
this.loading = true;
getBusChange(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;
});
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
onAddSubmit() {
if (this.$isBlank(this.inputQuery.originName)) {
this.$message.error("单据类型名称不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.originAction)) {
this.$message.error("单据类型代码不能为空!");
return;
}
if (this.$isBlank(this.inputQuery.targetBusAction)) {
this.$message.error("目标单据类型不能为空!");
return;
}
// if (this.$isBlank(this.inputQuery.type)) {
// this.$message.error("");
// return;
// }
if (this.$isBlank(this.inputQuery.enable)) {
this.$message.error("请选择启用状态!");
return;
}
if (this.formName == "add") {
let numRegExp = '^[0-9]*$';
let numReg = new RegExp(numRegExp);
if (numReg.test(this.inputQuery.name)) {
this.$message.error("单据类型名称不得为纯数字类型!");
return;
}
this.inputQuery.type = 1; //
insertBusChange(this.inputQuery)
.then((response) => {
if (response.code == 20000) {
this.loading = false;
this.cancelDialog();
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
} else {
updateBusChange(this.inputQuery)
.then((response) => {
this.loading = false;
this.cancelDialog();
this.getList();
})
.catch(() => {
this.loading = false;
this.cancelDialog();
});
}
},
handleAddClick() {
this.inputQuery = {};
this.formName = "add";
this.addDialogVisible = true;
},
handleModifyClick(row) {
this.inputQuery = row;
this.formName = "update";
this.addDialogVisible = true;
},
handleDeleteClick(row) {
this.deleteDialog(row.id)
},
deleteDialog(rowId) {
this.$confirm("此操作将永久删除该单据类型信息, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let query = {
id: rowId,
}
delBusChange(query)
.then((response) => {
this.getList();
})
.catch(() => {
});
})
.catch(() => {
});
},
thirdSysChange() {
this.getList();
},
},
components: {
modifyDialog,
},
mounted() {
},
created() {
this.getList();
},
};
</script>

@ -0,0 +1,224 @@
<template>
<div>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>领用类型名称:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
:disabled="!isAdd"
v-model.trim="inputQuery.originName"
></el-input>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>领用类型代码:&nbsp;</span>
</div>
<el-input
style="width: 200px"
:disabled="!isAdd"
size="small"
splaceholder="请输入内容"
v-model.trim="inputQuery.originAction"
></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>目标单据类型:&nbsp;</span>
</div>
<el-select v-model="inputQuery.targetBusAction" placeholder="请选择" clearable="true">
<el-option
v-for="item in busTypes"
:key="item.localAction"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.localAction }}</span>
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>启用状态:&nbsp;</span>
</div>
<el-select
size="small"
:disabled="inputQuery.systemDefault"
v-model="inputQuery.enable"
placeholder="启用状态"
>
<el-option label="启用" :value="false"></el-option>
<el-option label="禁用" :value="true"></el-option>
</el-select>
</div>
</el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
<!-- <span>设置类型:&nbsp;</span>-->
<!-- </div>-->
<!-- <el-select-->
<!-- size="small"-->
<!-- :disabled="inputQuery.systemDefault"-->
<!-- v-model="inputQuery.type"-->
<!-- placeholder="设置类型"-->
<!-- >-->
<!-- <el-option label="耗材领用" :value="1"></el-option>-->
<!-- <el-option label="采购计划" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
v-model="inputQuery.remark"
></el-input>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
</div>
</template>
<script>
import {
getBasicThirdSys,
} from "../../api/basic/basicThirdSys";
import {
getLocalBusType, getLocalJoinBusType,
} from "../../api/basic/busLocalType";
export default {
name: "BusTypeChangeModify",
props: {
inputQuery: {
type: Object,
required: true,
},
},
data() {
return {
filterQuery: {
enabled: true,
isBuType: true,
},
busTypes: [],
isAdd: false,
rules: {
originName: [
{
required: true,
message: "单据类型名称不能为空",
trigger: "blur"
}
],
originAction: [
{
required: true,
message: "单据类型代码不能为空",
trigger: "blur"
}
],
targetBusAction: [
{
required: true,
message: "目标单据类型不能为空",
trigger: "blur"
}
],
// type: [
// {
// required: true,
// message: "",
// trigger: "blur"
// }
// ],
enable: [
{
required: true,
message: "请选择启用状态",
trigger: "blur"
}
],
},
}
},
methods: {
getBusType() {
let query = {
enabled: true,
corpType: 1,
};
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
})
.catch(() => {
});
}
},
created() {
if (this.inputQuery.originAction == null) {
this.isAdd = true;
}
this.getBusType();
}
,
}
;
</script>
<style scoped>
.itemTag {
float: left;
text-align: left;
margin-top: 10px;
width: 100px;
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
.el-row {
display: flex;
flex-wrap: wrap;
margin-bottom: 20px;
}
.el-col {
border-radius: 4px;
flex-wrap: wrap;
}
</style>

@ -27,7 +27,7 @@
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件" >
<el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件">
<el-option
v-for="item in filterList"
:key="item.filterType"
@ -510,7 +510,7 @@
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
>以使用单元数量入库
>允许科室多次使用多人份耗材
</el-checkbox>
</el-form-item>
</el-col>
@ -529,18 +529,18 @@
</template>
<script>
import {
import {
getUdiInfos,
updateErpProduct,
thirdSysDetail,
} from "../../api/basic/udiRelevance";
} from "../../api/basic/udiRelevance";
import {udiUpload} from "../../api/thrsys/smp"
import {exportExcel} from "../../api/basic/udiInfoExport"
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo";
import {exportExcel} from "../../api/basic/udiInfoExport"
import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterByUuid} from "../../api/basic/udiInfo";
export default {
export default {
name: "UdIInfoSelect",
props: {
selectType: {
@ -694,7 +694,7 @@ import {udiUpload} from "../../api/thrsys/smp"
this.allUploadSMP();
},
allUploadSMP(){
allUploadSMP() {
udiUpload(this.filterQuery)
.then((response) => {
if (response.code == 20000) {
@ -829,32 +829,34 @@ import {udiUpload} from "../../api/thrsys/smp"
this.getList();
this.selectSysParam();
},
};
};
</script>
<style scoped>
.itemTag {
.itemTag {
float: left;
text-align: left;
margin-top: 10px;
width: 25%;
}
.query-form-item {
}
.query-form-item {
display: block !important;
margin-right: 10px;
margin-bottom: 5px;
}
.text {
}
.text {
font-size: 13px;
font-family: "Microsoft YaHei";
}
}
.el-row {
.el-row {
display: flex;
flex-wrap: wrap;
}
}
.el-col {
.el-col {
border-radius: 4px;
flex-wrap: wrap;
}
}
</style>

@ -488,10 +488,6 @@
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" class=""
:disabled="!isUseDyCheck"
>以使用单元数量入库
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" class=""
@change="diableChange"
>是否禁用
@ -512,6 +508,23 @@
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-bottom: 18px">
<el-checkbox v-model="checked" class=""
:disabled="!isUseDyCheck || editQuery.useMuti==true "
@change="useDyCheckChange"
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.useMuti" class=""
:disabled="checked"
@change="useMutiChange"
>允许科室多次使用出库
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
<el-collapse v-model="activeNames">
@ -538,7 +551,7 @@
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>最小包装单元内包含使用单元数量:&nbsp;</span>
<span>最小包装内包含使用单元数量:&nbsp;</span>
</div>
<el-input
style="width: 65%"
@ -585,6 +598,25 @@
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>最小包装可使用次数:&nbsp;</span>
</div>
<el-input
style="width: 65%"
size="small"
splaceholder="请输入内容"
:disabled="useNumEnable"
type="number"
v-model="editQuery.useNum"
></el-input>
</div>
</el-col>
</el-row>
</el-collapse-item>
<el-collapse-item name="2">
@ -1071,7 +1103,8 @@ export default {
selectLocalVisible: false, //UDI
isUseDyCheck: false,
lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
activeNames: ['1']
activeNames: ['1'],
useNumEnable: true,
};
},
@ -1131,6 +1164,28 @@ export default {
this.detailList = [];
});
},
useDyCheckChange(val) {
this.editQuery.useNum = 0;
},
useDyCountChange(val) {
if (val) {
this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
} else {
this.editQuery.useNum = 0;
}
},
useMutiChange(val) {
if (val) {
this.useNumEnable = false;
this.editQuery.useNum = this.editQuery.zxxsbzbhsydysl;
} else {
this.useNumEnable = true;
this.editQuery.useNum = 0;
}
},
keyup_submit(event) {
this.filterQuery.page = 1;
this.getList();
@ -1569,7 +1624,7 @@ export default {
float: left;
text-align: left;
margin-top: 10px;
width: 25%;
width: 35%;
}
.text {

@ -683,7 +683,7 @@
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" disabled
>是否禁用

@ -360,7 +360,7 @@
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
</el-form-item>
</el-col>
@ -385,9 +385,9 @@ export default {
data() {
return {
sysList: [],
checked:false,
detailList:[],
loading:false,
checked: false,
detailList: [],
loading: false,
}
},
methods: {

@ -1543,8 +1543,9 @@ export default {
var busQuery = {
code: this.currentCode,
page: 1,
limit: 10000
limit: 50
}
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list;
}).catch((error) => {
@ -1592,9 +1593,10 @@ export default {
var busQuery = {
code: this.currentCode,
page: 1,
limit: 100000
limit: 50
}
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list || [];
}).catch((error) => {
});

@ -1,512 +0,0 @@
<template>
<div>
<el-form :model="formData" :rules="formRules" ref="dataForm">
<el-button-group style="display: flex;margin: -50px 0 10px 80%; height: 35px">
<!-- <el-button-->
<!-- type="primary"-->
<!-- @click.native="submit('1')"-->
<!-- style="margin: -50px 0 10px auto; height: 35px"-->
<!-- >保存订单-->
<!-- </el-button-->
<!-- >-->
<el-button
type="primary"
@click.native="closeDialog()"
>草稿保存
</el-button
>
<el-button
type="primary"
@click.native="submit('0')"
>提交订单
</el-button
>
</el-button-group>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>入库单号</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="corpOrderId">
<el-input v-model="formData.corpOrderId" auto-complete="off"
:disabled="corpOrderIdDisabled"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>日期</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="actDate">
<el-date-picker
v-model="formData.actDate"
type="datetime"
placeholder="日期"
:disabled="true"
style="width: 100%; "
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>往来单位</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="fromCorp">
<el-input v-model="formData.fromCorp" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<div class="ao-text">
<span>单据类型</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item class="query-form-item">
<el-select v-model="formData.billType" placeholder="请选择业务类型">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="2">
<div class="ao-text">
<span>条码</span>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="code">
<el-input
@keyup.enter.native="addCode($event)"
v-model="formData.code"
ref='inputRef'
@focus="getInputFocus($event)"
></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
<el-button
type="primary"
size="small"
@click.native.stop="addCode()"
style="height: 31px; margin-left: 20px"
>添加
</el-button
>
</el-col>
<div class="text item" style="margin-left: 30px"> 已扫码条码{{ total }}
</div>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
ref="multipleTable">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="序号" type="index" width="100"></el-table-column>
<el-table-column
label="条码"
prop="code"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
width="200"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteCode(scope.$index, scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
@current-change="handleCurrentChange"
layout="prev, pager, next"
:page-size="query.limit"
:total="total"
:current-page="query.page"
>
</el-pagination>
</div>
</el-form>
</div>
</template>
<script>
import {
orderGetUdi, orderList, codeList, orderListError,
mergeOrder, postOrdersWeb, errorCodeList, addOrderWeb, deleteCodesTempById, submitOrderWeb
} from "../../api/inout/order";
import draggable from "vuedraggable";
import {saveAs} from "file-saver";
import {getBussinessType} from "../../api/basic/bussinessType";
import {parseTime} from "../../filtres/index";
import store from "../../store";
const formJson = {
corpOrderId: "",
code: "",
actor: "",
fromCorpId: "",
fromCorp: "医院",
fromType: "网页端",
actDate: new Date(),
billType: null,
};
export default {
name: "idQuery",
props: {
closeDialog: {
type: Function,
required: true,
},
idQuery: {
type: Object,
required: true,
},
},
data() {
return {
codeQuery: {
code: "",
},
query: {
code: "",
corpOrderId: "",
page: 1,
limit: 10,
},
actionMap: {
1: "ProduceWareHouseIn",
2: "PurchaseWareHouseIn",
3: "ReturnWareHouseIn",
4: "AllocateWareHouseIn",
5: "SalesWareHouseOut",
6: "ReturnWareHouseOut",
7: "AllocateWareHouseOut",
8: "DestoryWareHouseOut",
9: "DirectAllocateWareHouseOut",
10: "ReworkWareHouseOut",
11: "CheckWareHouseOut",
12: "CodeReplace",
13: "CodeDestory",
14: "StockCheck",
15: "deliveryNote",
},
mainActionMap: {
1: "WareHouseIn",
2: "WareHouseIn",
3: "WareHouseIn",
4: "WareHouseIn",
5: "WareHouseOut",
6: "WareHouseOut",
7: "WareHouseOut",
8: "WareHouseOut",
9: "WareHouseOut",
10: "WareHouseOut",
11: "WareHouseOut",
12: "none",
13: "none",
14: "none",
15: "none",
},
formData: formJson,
formRules: {
temp: [
{required: true, message: "请输入条码", trigger: "blur"}
],
},
corpOrderIdDisabled: false,
codeArray: [],
total: 0,
loading: false,
index: null,
formLoading: false,
formVisible: false,
deleteLoading: false,
orderNo: null,
busTypes: [],
};
},
components: {
draggable,
},
methods: {
submit(formName) {
if (this.total < 1) {
this.$message.error('未添加条码');
return;
}
let tQuery = {
orderId: this.idQuery.id
}
submitOrderWeb(tQuery)
.then((response) => {
console.log(response)
if (response.code === 20000) {
this.$message.success("提交成功");
this.closeDialog();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
// if (this.$refs.multipleTable.selection.length < 1) {
// this.$message.error('');
// return;
// }
// this.formData.corpOrderId = this.formData.corpOrderId.trim();
// if (this.formData.corpOrderId === null || this.formData.corpOrderId === '') {
// let date = new Date();
// this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
// }
// for (let i = 0; i < this.codeArray.length; i++) {
// this.codeArray[i].corpOrderId = this.formData.corpOrderId;
// }
// let postOrder = {
// billType: this.formData.billType,
// codes: this.$refs.multipleTable.selection
// }
// let postOrderList = [];
// postOrderList.push(postOrder);
// let tQuery = {
// postOrders: postOrderList,
// submitType: formName,
// oldOrderId: this.idQuery.id !== null && this.idQuery.id !== '' ? this.idQuery.id : '',
// }
// let message = formName === '0' ? "" : "";
// this.$confirm("" + message + "?", "", {
// confirmButtonText: "",
// cancelButtonText: "",
// type: "warning",
// }).then(() => {
// postOrdersWeb(tQuery).then((response) => {
// if (response.code === 20000) {
// this.$message.success(message + "")
// this.closeDialog();
// } else {
// this.$message.error(response.message);
// }
// });
// }).catch(() => {
// });
},
//
resetForm() {
if (this.$refs["dataForm"]) {
//
this.$refs["dataForm"].clearValidate();
//
this.$refs["dataForm"].resetFields();
this.getList();
}
},
addCode(event) {
if (event == null) {
this.$refs.inputRef.focus();
} else event.target.select();
this.formData.corpOrderId = this.formData.corpOrderId.trim();
if (this.$isBlank(this.formData.corpOrderId)) {
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
}
this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return;
this.loading = true;
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
tQuery.orderId = this.idQuery.id;
tQuery.actDate = parseTime(this.formData.actDate, '{y}-{m}-{d} {h}:{i}:{s}');
tQuery.mainAction = this.mainActionMap[tQuery.billType];
tQuery.action = this.actionMap[tQuery.billType];
addOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.idQuery.id = response.data;
this.corpOrderIdDisabled = true;
this.getCodeList();
} else {
this.$alert(response.message, '提示', {
confirmButtonText: '确定',
type: 'warning',
closeOnClickModal: true,
callback: action => {
this.$refs.inputRef.focus();
}
});
// this.$message.error(response.message);
}
this.loading = false;
});
},
deleteCode(index, row) {
console.log(row.id)
this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
this.loading = true;
let tQuery = {
id: row.id
}
deleteCodesTempById(tQuery)
.then((response) => {
if (response.code === 20000) {
this.getCodeList();
} else {
this.$message.error(response.message);
}
this.loading = false;
});
}).catch(() => {
});
},
getInputFocus(event) {
event.currentTarget.select();
},
tableSelection() {
this.$refs.multipleTable.clearSelection();
this.$refs.multipleTable.toggleAllSelection();
},
handleSizeChange(val) {
this.query.limit = val;
this.getCodeList();
},
handleCurrentChange(val) {
this.query.page = val;
this.getCodeList();
},
getCodeList() {
this.loading = true;
this.query.orderId = this.idQuery.id;
errorCodeList(this.query) //
.then((response) => {
this.codeArray = response.data.list || [];
this.total = response.data.total || 0;
for (let i = 0; i < this.codeArray.length; i++) {
this.codeArray[i].fromType = this.formData.fromType;
this.codeArray[i].billType = this.formData.billType;
}
this.tableSelection();
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
getBusType() {
let query = {
enabled: true,
};
getBussinessType(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.billType = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
intentBack() {
this.$router.go(-1);
},
},
filters: {},
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
},
created() {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
this.formData.fromCorp = store.getters.companyName;// store.getters.customerId === 110 ? '' : store.getters.companyName;
this.formData.customerId = store.getters.customerId;
this.getBusType();
if (this.$isNotBlank(this.idQuery.id)) {
this.formData.actDate = new Date(this.idQuery.actDate);
this.formData.corpOrderId = this.idQuery.corpOrderId;
this.corpOrderIdDisabled = true;
this.getCodeList();
} else {
this.corpOrderIdDisabled = false;
if (JSON.stringify(this.$route.query) === '{}') {
// this.formData.corpOrderId = new Date().getTime() + (Math.ceil(Math.random() * 10 + 10) + '');
let date = new Date();
this.formData.corpOrderId = parseTime(date, '{y}{m}{d}{h}{i}{s}') + Math.ceil(Math.random() * 89 + 10);
} else {
//
let query = this.$route.query;
this.orderNo = query.id;
this.query = Object.assign(this.query, query);
this.query.limit = parseInt(this.query.limit);
this.query.corpOrderId = query.id;
//
// this.getCodeList();
}
}
},
};
</script>
<style>
.messageIndex {
z-index: 9999 !important;
}
.ao-text {
width: 100%;
font-size: 13px;
font-family: "Microsoft YaHei";
float: right;
text-align: right;
margin-top: 10px;
}
</style>

@ -365,8 +365,6 @@ import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";

@ -477,15 +477,12 @@ import {
uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText
} from "../../api/inout/stockOrder";
import {BASE_URL} from "../../config/app";
import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport";
import selectThrOrder from "./selectThrOrderDialog";
import selectReceiveOrderDialog from "../inout/selectReceiveOrderDialog";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";

@ -163,13 +163,13 @@
<el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope" v-if="!haveDistributionVisible">
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="handleDetailForm(scope.$index, scope.row)"-->
<!-- >编辑-->
<!-- </el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="handleDetailForm(scope.$index, scope.row)"-->
<!-- >编辑-->
<!-- </el-button-->
<!-- >-->
<el-button
type="text"
size="small"
@ -503,8 +503,6 @@ import stockOrderEditDistribution from "./stockOrderEditDistribution";
import stockQRCodeExport from "./stockQRCodeExport";
import selectThrOrder from "./selectThrOrderDialog";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";

@ -1214,7 +1214,10 @@ export default {
// });
// },
getBusType() {
if( this.formData.id==null){
this.formData.billType=null;
}
let query = {
code: this.formData.invWarehouseCode,
enabled: true,
@ -1289,7 +1292,7 @@ export default {
this.formData.fromSubInvCode = '';
}
// '';
this.locInChange();
// this.locInChange();
this.findMethod();
},
locInChange() {

@ -173,11 +173,16 @@ export default {
type: Function,
required: true,
},
purType: {
type: Object,
required: true,
},
},
data() {
return {
listQuery: {
purType: null,
billNo: "",
page: 1,
limit: 10,
@ -370,7 +375,8 @@ export default {
let tQuery = {
datas: ids,
stockOrderLists: this.data.stockOrderLists,
zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
purType: this.purType
};
getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false;

@ -345,8 +345,6 @@ import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
import stockQRCodeExport from "./stockQRCodeExport";
import draggable from "vuedraggable";
import codeDetail from "./errorCode";
import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store";
import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";

@ -454,7 +454,7 @@
<el-col :span="24" class="el-col">
<div style="margin-top: 18px;margin-bottom: 18px">
<el-checkbox v-model="checked" disabled
>以使用单元数量入库
>启用使用单元
</el-checkbox>
<el-checkbox v-model="editQuery.isDisable" disabled
>是否禁用

@ -700,6 +700,7 @@ export default {
});
},
addCode(event) {
this.originCode = "";
this.sictomText = "";
this.formData.corpOrderId = this.formData.corpOrderId.trim();
@ -764,6 +765,7 @@ export default {
},
addCodeSubmit(tQuery) {
addOrderWeb(tQuery).then((response) => {
if (response.code === 20000) {
this.idQuery.id = response.data.orderId;
@ -966,6 +968,7 @@ export default {
}
,
findMethod(query) {
this.fromOptions = [];
let cQuery = {
key: query,
@ -977,7 +980,7 @@ export default {
this.formData.fromCorpId = this.curAction.defaultUnit;
} else if (this.curAction.corpType == 2)//
{
cQuery.corpType = 4;
cQuery.corpType = 1;
cQuery.outType = 2;
} else if (this.curAction.corpType == 0) {
@ -987,6 +990,7 @@ export default {
getBasicUnitMaintains(cQuery)
.then((response) => {
debugger
this.loading = false;
this.fromOptions = response.data.page.list || [];
if (this.curAction.corpType == 3) {
@ -1095,6 +1099,7 @@ export default {
}
,
actionChange(item) {
this.curAction = this.getActionItem(item);
this.findMethod();
@ -1222,9 +1227,7 @@ export default {
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}
this.getStorage(this.formData.action);
if (this.$isNotBlank(this.idQuery.id)) {
@ -1267,7 +1270,9 @@ export default {
}
}
this.findSubInvByInv(this.formData.locStorageCode);
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}
//
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {

@ -341,7 +341,7 @@ export default {
add: "新增",
edit: "编辑",
},
enableDept:false,
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",

@ -86,7 +86,7 @@
<el-col :span="3">
<div class="ao-text">
<span>是否以使用单元数量入库</span>
<span>是否以使用单元数量入库</span>
</div>
</el-col>
<el-col :span="7">

@ -185,8 +185,10 @@ export default {
getCodeList() {
this.loading = true;
this.query.orderIdFk = this.idQuery.orderIdFk;
debugger
let query = {
orderIdFk: this.idQuery.orderIdFk
orderIdFk: this.idQuery.orderIdFk,
code:this.query.code
}
filterDetailProducts(query) //
.then((response) => {

@ -46,7 +46,7 @@
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="申购人" prop="createByName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="申购分库" prop="subInvName"></el-table-column>
<el-table-column label="申购说明" prop="remark"></el-table-column>
@ -91,9 +91,13 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>-->
</el-table>
</el-card>

@ -62,7 +62,8 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" style="width: 50%"
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
style="width: 50%"
clearable>
<el-option
v-for="item in storageList"
@ -102,7 +103,7 @@
</div>
</el-col>
<el-col :span="7">
<el-form-item >
<el-form-item>
<el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
@ -148,7 +149,7 @@
prop="manufactory"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="单据数量">
<el-table-column width="150" label="申购数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
@ -158,7 +159,26 @@
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
</template>
</el-table-column>
<el-table-column
label="供应商"
prop="supName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
prop="manufactory"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="医疗器械注册人"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button
@ -196,6 +216,7 @@
<stockOrderNewSelectProduct
:closeDialog="closeDialogC2"
:data="thisData"
:purType="1"
></stockOrderNewSelectProduct>
</el-dialog>
</div>
@ -234,8 +255,8 @@ export default {
billDate: "",
remark: "",
deptCode: null,
locStorageCode:null,
invWarehouseCode:null,
locStorageCode: null,
invWarehouseCode: null,
},
formRules: {},
codeArray: [],
@ -497,8 +518,8 @@ export default {
billDate: "",
remark: "",
deptCode: null,
locStorageCode:null,
invWarehouseCode:null,
locStorageCode: null,
invWarehouseCode: null,
};
this.orderEditor = false;
}

@ -30,7 +30,7 @@
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmitFind"></el-button>
<el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
新增单据
新增采购计划
</el-button>
</el-button-group>
@ -91,9 +91,11 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>

@ -43,7 +43,8 @@
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="采购员" prop="createByName"></el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="采购仓库" prop="invName"></el-table-column>
<el-table-column label="采购分库" prop="subInvName"></el-table-column>
<el-table-column label="采购说明" prop="remark"></el-table-column>
@ -86,9 +87,11 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>

@ -87,30 +87,88 @@
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>采购说明</span>
<span>审核说明</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billNo">
<el-input v-model="formData.remark" :disabled="true" auto-complete="off" type="textarea"
<el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
autosize></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20">
<el-col :span="3">
<div class="ao-text">
<span>审核说明</span>
<span>采购说明</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billNo">
<el-input v-model="formData.auditRemark" auto-complete="off" type="textarea"
<el-input v-model="formData.remark" :disabled="true" auto-complete="off" type="textarea"
autosize></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
</el-col>
<el-col :span="7">
<el-form-item>
<el-checkbox v-model="formData.autoPurchase"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px" v-show="formData.autoPurchase">
<el-col :span="3">
<div class="ao-text">
<span>入库仓库</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 100%"
@change="targetInvChange"
clearable>
<el-option
v-for="item in tarSubList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>入库单据类型</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item class="query-form-item" prop="targetBillAction">
<el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"
style="width: 100%"
>
<el-option
v-for="item in busTypes"
:key="item.localName"
:label="item.localName"
:value="item.localAction">
<span style="float: left">{{ item.localName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card>
@ -199,6 +257,7 @@
<stockOrderNewSelectProduct
:closeDialog="closeDialogC2"
:data="thisData"
:purType="1"
></stockOrderNewSelectProduct>
</el-dialog>
</div>
@ -210,6 +269,7 @@ import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
export default {
name: "idQuery",
@ -244,6 +304,10 @@ export default {
locStorageCode: null,
invWarehouseCode: null,
auditRemark: null,
autoPurchase: false,
targetInv: 1000,
targetSubInv: null,
targetBillAction: null,
},
formRules: {},
codeArray: [],
@ -275,8 +339,10 @@ export default {
thisData: {},
storageList: [],
subInvList: [],
tarSubList: [],
invQueryData: {},
};
},
components: {
@ -446,6 +512,38 @@ export default {
.catch(() => {
});
},
findTargetSubInvs() {
this.tarSubList = [];
let query = {
pcode: 1000
};
filterSubByInv(query)
.then((response) => {
this.tarSubList = response.data || [];
if (this.tarSubList != null && this.tarSubList.length == 1) {
this.formData.targetSubInv = this.tarSubList[0].code;
this.targetInvChange();
}
})
.catch(() => {
});
},
targetInvChange() {
let query = {
code: this.formData.targetSubInv,
enabled: true,
spUse: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
// this.formData.targetBillAction = this.busTypes[0].localAction;
})
.catch(() => {
});
},
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
@ -467,6 +565,7 @@ export default {
this.query.limit = 100;
this.query.orderIdFk = this.idQuery.id;
this.formData = this.idQuery.formData;
this.formData.targetInv = 1000;
this.orderEditor = true;
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
@ -479,10 +578,16 @@ export default {
deptCode: null,
locStorageCode: null,
invWarehouseCode: null,
auditRemark: null,
autoPurchase: false,
targetInv: 1000,
targetSubInv: null,
targetBillAction: null,
};
this.orderEditor = false;
}
this.getStorage();
this.findTargetSubInvs();
this.codeArray = [];
},
};

@ -55,25 +55,25 @@
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>采购类型</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择采购类型" style="width: 100%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.originAction"
:label="item.originName"
:value="item.originAction">
<span style="float: left">{{ item.originName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>采购类型</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="7">-->
<!-- <el-form-item prop="billType">-->
<!-- <el-select v-model="formData.billType" placeholder="请选择采购类型" style="width: 100%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left">{{ item.originName }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3">
<div class="ao-text">
@ -107,9 +107,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>采购说明</span>
@ -120,34 +118,49 @@
<el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="3" v-show="formData.status==4">
<div class="ao-text">
                            <span>拒绝原因</span>
                        </div>
                    </el-col>
                    <el-col :span="7" v-show="formData.status==4">
                        <el-form-item >
                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
                        </el-form-item>
                    </el-col>
<span>拒绝原因</span>
</div>
</el-col>
<el-col :span="7" v-show="formData.status==4">
<el-form-item>
<el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
</el-row>
</el-card>
<el-card>
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button
type="primary"
size="small"
@click.native.stop="selectProductFunction()"
style="margin: 0px 60px 10px auto; height: 35px"
:loading="loading"
>产品录入
</el-button
>
<el-button
type="primary"
:loading="loading"
>选入申购单
</el-button
>
</el-button-group>
</el-button-group>
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName"
max-height="300" height="300" ref="multipleTable">
@ -162,27 +175,43 @@
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="计量单位"
prop="measname"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
prop="manufactory"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="单据数量">
<el-table-column width="150" label="申购数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
type='number'
@change="tableCountChange(scope.row)"
:disabled="scope.row.index !== selectedIndex"
oninput="value=value.replace(/[^\d]/g,'')"></el-input>
oninput="value=value.replace(/[^d]/g,'')"></el-input>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="计量单位"-->
<!-- prop="measname"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<el-table-column
label="供应商"
prop="supName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产厂家"
prop="manufactory"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="医疗器械注册人"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
@ -220,6 +249,7 @@
>
<stockOrderNewSelectProduct
:closeDialog="closeDialogC2"
:purType="1"
:data="thisData"
></stockOrderNewSelectProduct>
</el-dialog>
@ -303,6 +333,7 @@ export default {
},
methods: {
saveOrder(status) {
this.$refs["dataForm"].validate(valid => {
if (valid) {
if (this.codeArray.length < 1) {
@ -310,16 +341,17 @@ export default {
return;
}
if (status === '2') {
if(this.formData.billDate=="" || this.formData.billDate==null){
if (this.formData.billDate == "" || this.formData.billDate == null) {
return this.$message.error("单据日期不能为空!");
}
if(this.formData.billType=="" || this.formData.billType==null){
return this.$message.error("采购类型不能为空!");
}
if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
// if (this.formData.billType == "" || this.formData.billType == null) {
// return this.$message.error("");
// }
if (this.formData.locStorageCode == "" || this.formData.locStorageCode == null) {
return this.$message.error("采购仓库不能为空!");
}
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
if (this.formData.invWarehouseCode == "" || this.formData.invWarehouseCode == null) {
return this.$message.error("采购分库不能为空!");
}
for (let i = 0; i < this.codeArray.length; i++) {

@ -43,7 +43,8 @@
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="采购员" prop="createByName"></el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="采购仓库" prop="invName"></el-table-column>
<el-table-column label="采购分库" prop="subInvName"></el-table-column>
<el-table-column label="采购说明" prop="remark"></el-table-column>
@ -85,9 +86,11 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>

@ -52,7 +52,8 @@
<span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="申购人" prop="createByName"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="申购分库" prop="subInvName"></el-table-column>
<el-table-column label="申购说明" prop="remark"></el-table-column>
@ -95,9 +96,11 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>

@ -89,35 +89,47 @@
</el-col>
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>当前仓库</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="7">-->
<!-- <el-form-item prop="targetInv">-->
<!-- <el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
<!-- style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetSubInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3">
<div class="ao-text">
<span>当前仓库</span>
<span>申购说明</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="targetInv">
<el-select v-model="formData.targetInv" placeholder="当前仓库信息" @change="locInChange"
style="width: 50%"
clearable>
<el-option
v-for="item in targetInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
<el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"
clearable>
<el-option
v-for="item in targetSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
<el-form-item prop="billNo">
<el-input v-model="formData.remark" auto-complete="off" type="textarea"
disabled
autosize></el-input>
</el-form-item>
</el-col>
@ -128,25 +140,25 @@
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3">
<div class="ao-text">
<span>生成采购计划</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="billType">
<el-select v-model="formData.targetBillType" placeholder="请选择采购类型" style="width: 100%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.originAction"
:label="item.originName"
:value="item.originAction">
<span style="float: left">{{ item.originName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>生成采购计划</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="7">-->
<!-- <el-form-item prop="billType">-->
<!-- <el-select v-model="formData.targetBillType" placeholder="请选择采购类型" style="width: 100%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left">{{ item.originName }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="3">
<div class="ao-text">
@ -159,6 +171,14 @@
autosize></el-input>
</el-form-item>
</el-col>
<el-col :span="2">
</el-col>
<el-col :span="7">
<el-form-item>
<el-checkbox v-model="formData.audtoPlan"></el-checkbox>
</el-form-item>
</el-col>
</el-row>
@ -180,10 +200,11 @@
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="单据数量" prop="count">
</el-table-column>
<el-table-column
label="计量单位"
prop="measname"
label="注册/备案凭证号"
prop="zczbhhzbapzbh"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -191,8 +212,12 @@
prop="manufactory"
show-overflow-tooltip
></el-table-column>
<el-table-column width="150" label="单据数量" prop="count">
</el-table-column>
<el-table-column
label="医疗器械注册人"
prop="ylqxzcrbarmc"
show-overflow-tooltip
></el-table-column>
<!-- <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
@ -230,6 +255,7 @@
>
<stockOrderNewSelectProduct
:closeDialog="closeDialogC2"
:purType="1"
:data="thisData"
></stockOrderNewSelectProduct>
</el-dialog>
@ -281,7 +307,8 @@ export default {
targetInv: null,
targetSubInv: null,
targetBillType: null,
auditRemark:"",
auditRemark: "",
audtoPlan: false,
},
formRules: {},
codeArray: [],

@ -52,6 +52,7 @@
</template>
</el-table-column>
<el-table-column label="创建人" prop="createByName"></el-table-column>
<el-table-column label="审核人" prop="auditByName"></el-table-column>
<el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="申购分库" prop="subInvName"></el-table-column>
<el-table-column label="申购说明" prop="remark"></el-table-column>
@ -93,12 +94,15 @@
<!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="申购数量" prop="count"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="供应商" prop="supName" show-overflow-tooltip="true"></el-table-column>
</el-table>
</el-card>
<el-dialog
:title="formMap[formName]"
:visible.sync="newSpDistributionVisible"

@ -458,7 +458,7 @@
<el-col :span="12" class="el-col">
<el-form-item prop="name">
<el-checkbox v-model="checked" class="text item itemTag"
>以使用单元数量入库
>启用使用单元
</el-checkbox>
</el-form-item>
</el-col>

@ -476,10 +476,6 @@ export default {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0');
}
if (this.$isBlank(this.codeArray[i].batchNo)) {
return this.$message.error('批次号不能为空');
}
}
}

Loading…
Cancel
Save