UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

耗材领用单据提交

Browse Source
prod
郑明梁 3 years ago
parent 5c6fca4e80
commit 80d63be205
2 changed files with 125 additions and 78 deletions
Show Stats Download Patch File Download Diff File

71
src/views/inout/receive/DialogNewReceive.vue
Unescape Escape View File

@ -22,14 +22,15 @@
<el-card style="margin-top: -5px;"> <el-card style="margin-top: -5px;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="billNo" label="单据号:"> <el-form-item prop="billNo" label="领用单号:">
<el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="billDate" label="单据日期:"> <el-form-item prop="createTime" label="创建时间:">
<el-date-picker <el-date-picker
v-model="formData.billDate" :disabled="true"
v-model="formData.createTime"
type="datetime" type="datetime"
placeholder="选择日期" placeholder="选择日期"
style="width: 100%" style="width: 100%"
@ -43,8 +44,8 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="invCode" label="当前仓库:"> <el-form-item prop="invCode" label="领用仓库:">
<el-select v-model="formData.invCode" :disabled="editType" @change="subStorageChange" placeholder="当前仓库信息" <el-select v-model="formData.invCode" @change="subStorageChange" placeholder="当前仓库信息"
style="width: 100%;" style="width: 100%;"
clearable> clearable>
<el-option <el-option
@ -58,7 +59,7 @@
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:"> <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
<el-select v-model="formData.targetInvCode" :disabled="editType" placeholder="请选择仓库" <el-select v-model="formData.targetInvCode" placeholder="请选择往来信息"
clearable="true" clearable="true"
style="width: 100%" style="width: 100%"
> >
@ -74,20 +75,20 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="11"> <!-- <el-col :span="11">-->
<el-form-item prop="billType" label="领用类型:"> <!-- <el-form-item prop="billType" label="领用类型:">-->
<el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%" <!-- <el-select v-model="formData.billType" placeholder="请选择领用类型" style="width: 100%"-->
clearable> <!-- clearable>-->
<el-option <!-- <el-option-->
v-for="item in busTypes" <!-- v-for="item in busTypes"-->
:key="item.originAction" <!-- :key="item.originAction"-->
:label="item.originName" <!-- :label="item.originName"-->
:value="item.originAction"> <!-- :value="item.originAction">-->
<span style="float: left">{{ item.originName }}</span> <!-- <span style="float: left">{{ item.originName }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="remark" label="备注:"> <el-form-item prop="remark" label="备注:">
<el-input v-model="formData.remark" auto-complete="off"></el-input> <el-input v-model="formData.remark" auto-complete="off"></el-input>
@ -110,10 +111,12 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
border border
max-height="300" height="300" ref="multipleTable"> max-height="300" height="300" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据数量"> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="领用数量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.count" <el-input v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%" placeholder="请输入数量" style="width: 80%"
@ -124,8 +127,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true" <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
@ -166,6 +170,7 @@ import {inserThrOrderWeb, updateReceive, updateReceiveDetail, delReceiveDetail}
import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse"; import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
import dialogInvProduct from "../DialogSelectInvProduct"; import dialogInvProduct from "../DialogSelectInvProduct";
import {getOrderDetail} from "@/api/inout/receiveOrder"; import {getOrderDetail} from "@/api/inout/receiveOrder";
import {parseTime} from "@/utils/coTools";
export default { export default {
name: "idQuery", name: "idQuery",
@ -201,12 +206,12 @@ export default {
targetInvCode: null, targetInvCode: null,
billNo: null, billNo: null,
billDate: "", createTime: "",
billType: "HCLY", billType: "HCLY",
}, },
formRules: { formRules: {
billDate: [ createTime: [
{required: true, message: "请输入单据日期", trigger: "blur"} {required: true, message: "请输入创建日期", trigger: "blur"}
], ],
billType: [ billType: [
{required: true, message: "请选择业务类型", trigger: "blur"} {required: true, message: "请选择业务类型", trigger: "blur"}
@ -464,6 +469,7 @@ export default {
}); });
}, },
subStorageChange(item) { subStorageChange(item) {
this.formData.targetInvCode='';
this.getBusType(); this.getBusType();
this.findFromInv(); this.findFromInv();
}, },
@ -501,14 +507,17 @@ export default {
this.sValue = this.formData.corpName; this.sValue = this.formData.corpName;
this.getOrderDetailList(); this.getOrderDetailList();
} else { } else {
this.editType = false; this.editType = false;
let date = new Date();
this.formData = { this.formData = {
invCode: this.$store.getters.locInvCode, invCode: this.$store.getters.locInvCode,
targetInvCode: null, targetInvCode: null,
billType: "HCLY", billType: "HCLY",
billNo: null, billNo: null,
billDate: "", createTime: parseTime(
date,
"{y}-{m}-{d} {h}:{i}:{s}"
),
}; };
this.orderEditor = false; this.orderEditor = false;
} }

104
src/views/inout/receive/receiveAdd.vue
Unescape Escape View File

@ -3,34 +3,48 @@
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6" > <el-col :span="8" >
<el-form-item label="单据号:"> <el-form-item label="领用单号:">
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input> <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="往来信息:"> <el-form-item label="领用仓库:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input> <el-select v-model="filterQuery.invCode" placeholder="请选择领用仓库" style="width: 100%;">
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="领用类型:">
<el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">
<el-option <el-option
v-for="item in originTypes" v-for="item in invList"
:key="item.originAction" :key="item.code"
:label="item.originName" :label="item.name"
:value="item.originAction"> :value="item.code">
<span style="float: left;font-size: 13px">{{ item.originName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.thirdSysName
}}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="单据日期:"> <el-form-item label="往来信息:">
<el-input v-model="filterQuery.corpName" style="width: 90%" placeholder="请输入往来信息" clearable></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="领用类型:">-->
<!-- <el-select v-model="filterQuery.billType" style="width: 90%" placeholder="请选择领用类型" clearable="true">-->
<!-- <el-option-->
<!-- v-for="item in originTypes"-->
<!-- :key="item.originAction"-->
<!-- :label="item.originName"-->
<!-- :value="item.originAction">-->
<!-- <span style="float: left;font-size: 13px">{{ item.originName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{-->
<!-- item.thirdSysName-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
style="width: 90%" style="width: 90%"
:picker-options="pickerOptions" :picker-options="pickerOptions"
@ -63,18 +77,19 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @current-change="handleDetail"> <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" border @current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用类型" prop="billType"></el-table-column> <el-table-column label="领用单号" prop="billNo"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="领用部门" prop="deptName"></el-table-column>
<el-table-column label="领用仓库" prop="invName"></el-table-column> <el-table-column label="领用仓库" prop="invName"></el-table-column>
<el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="往来信息" prop="targetInvName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据日期" prop="billDate"></el-table-column> <el-table-column label="单据状态" prop="status">
<el-table-column label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.status)"> <el-tag :type="(scope.row.status)">
{{ statusMap[scope.row.status] }} {{ statusMap[scope.row.status] }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="createTime"></el-table-column>
<!-- <el-table-column label="领用类型" prop="billType"></el-table-column>-->
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.status==3 " @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button> <el-button type="text" size="small" :disabled="scope.row.status==3 " @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
@ -93,14 +108,15 @@
</el-card> </el-card>
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border> <el-table v-loading="loading" :data="detailList" style="width: 100%" border>
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="产品编码" prop="nameCode"></el-table-column> <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
<el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column> <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column> <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column> <el-table-column label="领用数量" prop="count"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column> <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column> <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
<el-table-column label="供应商" prop="supName"></el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog <el-dialog
@ -131,6 +147,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
import thrOrderNew from "./DialogNewReceive"; import thrOrderNew from "./DialogNewReceive";
import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder"; import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
import {getBusChange} from "@/api/basic/busTypeChange"; import {getBusChange} from "@/api/basic/busTypeChange";
import {findInvByUser} from "@/api/system/invSubWarehouse";
export default { export default {
data() { data() {
@ -142,11 +159,13 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
type: 1, type: 1,
invCode:'',
editStatus: 1, editStatus: 1,
thirdPartyDate: 2, thirdPartyDate: 2,
startDate: null, startDate: null,
endDate: null, endDate: null,
}, },
invList:[],
formName: null, formName: null,
formMap: { formMap: {
add: "新增领用单据", add: "新增领用单据",
@ -171,6 +190,7 @@ export default {
uploadData: { uploadData: {
thirdSys: "thirdId", thirdSys: "thirdId",
}, },
invCodebe:null,
closeConfirm: false, closeConfirm: false,
loading: false, loading: false,
actDateRange: [], actDateRange: [],
@ -227,6 +247,7 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
thirdPartyDate: 2, thirdPartyDate: 2,
invCode: this.invCodebe,
}; };
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
@ -251,6 +272,7 @@ export default {
if (response.code == 20000) { if (response.code == 20000) {
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.detailList=[]
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
@ -334,7 +356,23 @@ export default {
this.formName = "add"; this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
finCurInv() {
this.invList = [];
let query = {
filter: 3
};
findInvByUser(query)
.then((response) => {
this.invList = response.data || [];
if(this.invList.length>0){
this.filterQuery.invCode=this.invList[0].code
this.invCodebe=this.filterQuery.invCode
}
this.getList();
})
.catch(() => {
});
},
}, },
components: { components: {
thrOrderNew, thrOrderNew,
@ -342,7 +380,7 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.getList(); this.finCurInv();
this.getBusType(); this.getBusType();
}, },
}; };

Write Preview
Loading…
Cancel
Save