Merge remote-tracking branch 'origin/dev' into dev
郑明梁
2 years ago
commit
6d0b59fe30
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 509 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 19 KiB |
@ -1,513 +1,521 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-card class="el-card">
|
||||
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="申购单号">
|
||||
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<div>
|
||||
<el-card class="el-card">
|
||||
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="申购单号">
|
||||
<el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="申购部门">
|
||||
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
|
||||
<el-option
|
||||
v-for="item in deptList"
|
||||
:key="item.code"
|
||||
: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="8">
|
||||
<el-form-item label="申购部门">
|
||||
<el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList"
|
||||
style="width: 90%">
|
||||
<el-option
|
||||
v-for="item in deptList"
|
||||
:key="item.code"
|
||||
: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="8">
|
||||
<el-form-item label="申购仓库">
|
||||
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
|
||||
<el-option
|
||||
v-for="item in invList"
|
||||
: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-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="申购仓库">
|
||||
<el-select v-model="filterQuery.targetInvCode" style="width: 90%" clearable placeholder="请选择所属仓库">
|
||||
<el-option
|
||||
v-for="item in invList"
|
||||
: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-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="紧急程度：" prop="emergency">
|
||||
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
|
||||
<el-option label="正常" :value=1></el-option>
|
||||
<el-option label="较急" :value=2></el-option>
|
||||
<el-option label="特急" :value=3></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="创建时间:">
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="actDateRange"
|
||||
type="daterange"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
style="width: 90%"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="紧急程度：" prop="emergency">
|
||||
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
|
||||
<el-option label="正常" :value=1></el-option>
|
||||
<el-option label="较急" :value=2></el-option>
|
||||
<el-option label="特急" :value=3></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="创建时间:">
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="actDateRange"
|
||||
type="daterange"
|
||||
format="yyyy 年 MM 月 dd 日"
|
||||
style="width: 90%"
|
||||
value-format="yyyy-MM-dd"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-form>
|
||||
</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="onSubmitFind">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<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="onSubmitFind">查询</el-button>
|
||||
<el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据
|
||||
</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
|
||||
<el-divider style="margin: 15px"></el-divider>
|
||||
<el-divider style="margin: 15px"></el-divider>
|
||||
|
||||
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border highlight-current-row
|
||||
: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" >
|
||||
<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="status">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="(scope.row.status) | statusFilterType">
|
||||
{{ statusMap[scope.row.status] }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="remark"></el-table-column>
|
||||
<el-table-column label="创建时间" prop="createTime"
|
||||
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
|
||||
<el-table-column label="操作" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, scope.row)">编辑</el-button>
|
||||
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table v-loading="loading" :data="list" style="width: 100%" @current-change="handleDetail" border
|
||||
highlight-current-row
|
||||
: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">
|
||||
<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="status">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="(scope.row.status) | statusFilterType">
|
||||
{{ statusMap[scope.row.status] }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="remark"></el-table-column>
|
||||
<el-table-column label="创建时间" prop="createTime"
|
||||
sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
|
||||
<el-table-column label="操作" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click.native="newDistributionForm(scope.$index, 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"
|
||||
:page.sync="filterQuery.page"
|
||||
:limit.sync="filterQuery.limit"
|
||||
@pagination="handleCurrentChange"
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="filterQuery.page"
|
||||
:limit.sync="filterQuery.limit"
|
||||
@pagination="handleCurrentChange"
|
||||
|
||||
></pagination>
|
||||
</el-card>
|
||||
></pagination>
|
||||
</el-card>
|
||||
|
||||
<el-card class="el-card">
|
||||
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
|
||||
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
||||
<el-table-column label="DI/物资编码" prop="nameCode"></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="measname" show-overflow-tooltip="true" width="100"></el-table-column>
|
||||
<el-table-column label="申购数量" prop="count"></el-table-column>
|
||||
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
|
||||
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
|
||||
<el-table-column label="供应商" prop="supName"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
<el-card class="el-card">
|
||||
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
|
||||
<el-table-column label="序号" type="index" width="60"></el-table-column>
|
||||
<el-table-column label="DI/物资编码" prop="nameCode"></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="measname" show-overflow-tooltip="true" width="100"></el-table-column>
|
||||
<el-table-column label="申购数量" prop="count"></el-table-column>
|
||||
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
|
||||
<el-table-column label="生产厂家" prop="manufactory"></el-table-column>
|
||||
<el-table-column label="供应商" prop="supName"></el-table-column>
|
||||
</el-table>
|
||||
</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"
|
||||
:before-close ="handleClose"
|
||||
>
|
||||
<pureApplyEdit
|
||||
:closeDialog="closeDialog"
|
||||
:idQuery="idQuery"
|
||||
v-on:cancelDialog="getId"
|
||||
:isChang="isChang"
|
||||
></pureApplyEdit>
|
||||
</el-dialog>
|
||||
</div>
|
||||
<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"
|
||||
:before-close="handleClose"
|
||||
>
|
||||
<pureApplyEdit
|
||||
:closeDialog="closeDialog"
|
||||
:idQuery="idQuery"
|
||||
v-on:cancelDialog="getId"
|
||||
:isChang="isChang"
|
||||
></pureApplyEdit>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import pureApplyEdit from "./purApplyEditDiaolog";
|
||||
import {delApply, delApplyDetailAll, inserThrOrderWeb, listApply, listApplyDetail} from "@/api/purchase/purApply";
|
||||
import { getInvListByUser } from '@/api/system/invWarehouse'
|
||||
import { getDeptListByUser } from '@/api/auth/authDept'
|
||||
import {filterSubAll} from "@/api/system/invSubWarehouse";
|
||||
import {getInvListByUser} from '@/api/system/invWarehouse'
|
||||
import {filterDepts, getDeptListByUser} from '@/api/auth/authDept'
|
||||
import {filterGroupBySpuse, filterSubAll} from "@/api/system/invSubWarehouse";
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
defaultSort: {prop: 'createTime', order: 'desc'},
|
||||
showSearch: true,
|
||||
pId:null,
|
||||
filterQuery: {
|
||||
billAction: null,
|
||||
billNo: "",
|
||||
originType: null,
|
||||
thirdSysFk: "",
|
||||
page: 1,
|
||||
limit: 10,
|
||||
corpName: null,
|
||||
type: 1,
|
||||
editStatus: 1,
|
||||
emergency:'',
|
||||
targetDeptCode:'',
|
||||
targetInvCode:null
|
||||
},
|
||||
isChang:false,
|
||||
formName: null,
|
||||
formMap: {
|
||||
add: "新增申购单据",
|
||||
update: "编辑申购单据",
|
||||
},
|
||||
statusMap: {
|
||||
1: "草稿",
|
||||
2: "未审核",
|
||||
3: "已审核",
|
||||
4: "已拒绝"
|
||||
data() {
|
||||
return {
|
||||
defaultSort: {prop: 'createTime', order: 'desc'},
|
||||
showSearch: true,
|
||||
pId: null,
|
||||
filterQuery: {
|
||||
billAction: null,
|
||||
billNo: "",
|
||||
originType: null,
|
||||
thirdSysFk: "",
|
||||
page: 1,
|
||||
limit: 10,
|
||||
corpName: null,
|
||||
type: 1,
|
||||
editStatus: 1,
|
||||
emergency: '',
|
||||
targetDeptCode: '',
|
||||
targetInvCode: null
|
||||
},
|
||||
isChang: false,
|
||||
formName: null,
|
||||
formMap: {
|
||||
add: "新增申购单据",
|
||||
update: "编辑申购单据",
|
||||
},
|
||||
statusMap: {
|
||||
1: "草稿",
|
||||
2: "未审核",
|
||||
3: "已审核",
|
||||
4: "已拒绝"
|
||||
},
|
||||
emergencyMap: {
|
||||
1: "正常",
|
||||
2: "较急",
|
||||
3: "特急",
|
||||
},
|
||||
idQuery: {},
|
||||
total: 0,
|
||||
thirdSys: [],
|
||||
invList: {},
|
||||
invCodebe: null,
|
||||
deptList: {},
|
||||
thirdSysDetail: null,
|
||||
busTypes: [],
|
||||
originTypes: [],
|
||||
list: [],
|
||||
createTimes: null,
|
||||
detailLoading: false,
|
||||
detailList: [],
|
||||
loading: false,
|
||||
actDateRange: [],
|
||||
newSpDistributionVisible: false,
|
||||
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]);
|
||||
},
|
||||
emergencyMap:{
|
||||
1: "正常",
|
||||
2: "较急",
|
||||
3: "特急",
|
||||
},
|
||||
{
|
||||
text: "最近一个月",
|
||||
onClick(picker) {
|
||||
const end = new Date();
|
||||
const start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
|
||||
picker.$emit("pick", [start, end]);
|
||||
},
|
||||
idQuery: {},
|
||||
total: 0,
|
||||
thirdSys: [],
|
||||
invList:{},
|
||||
invCodebe:null,
|
||||
deptList:{},
|
||||
thirdSysDetail: null,
|
||||
busTypes: [],
|
||||
originTypes: [],
|
||||
list: [],
|
||||
createTimes:null,
|
||||
detailLoading: false,
|
||||
detailList: [],
|
||||
loading: false,
|
||||
actDateRange: [],
|
||||
newSpDistributionVisible: false,
|
||||
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]);
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
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: {
|
||||
onReset() {
|
||||
this.$router.push({
|
||||
path: "",
|
||||
});
|
||||
let deptCode = this.filterQuery.targetDeptCode
|
||||
this.filterQuery = {
|
||||
billNo: "",
|
||||
thirdSysFk: "",
|
||||
billFlag: null,
|
||||
billAction: null,
|
||||
startDate: null,
|
||||
endDate: null,
|
||||
page: 1,
|
||||
limit: 10,
|
||||
corpName: null,
|
||||
type: 1,
|
||||
editStatus: 1,
|
||||
targetDeptCode: this.invCodebe,
|
||||
targetInvCode:null
|
||||
};
|
||||
this.initActDateRange()
|
||||
if(deptCode!=this.invCodebe){
|
||||
this.getInvList()
|
||||
}
|
||||
this.actDateRange = [];
|
||||
this.getList();
|
||||
},
|
||||
getId(id){
|
||||
if( this.formName=='add' && id!=null){
|
||||
var data={
|
||||
id:id
|
||||
}
|
||||
this.pId=id
|
||||
//当在新增时取消添加操作删除掉这次的数据
|
||||
delApplyDetailAll(data).then((response)=>{
|
||||
if(response.code==20000){
|
||||
this.newSpDistributionVisible=false
|
||||
}
|
||||
});
|
||||
}else{
|
||||
this.newSpDistributionVisible=false
|
||||
methods: {
|
||||
onReset() {
|
||||
this.$router.push({
|
||||
path: "",
|
||||
});
|
||||
let deptCode = this.filterQuery.targetDeptCode
|
||||
this.filterQuery = {
|
||||
billNo: "",
|
||||
thirdSysFk: "",
|
||||
billFlag: null,
|
||||
billAction: null,
|
||||
startDate: null,
|
||||
endDate: null,
|
||||
page: 1,
|
||||
limit: 10,
|
||||
corpName: null,
|
||||
type: 1,
|
||||
editStatus: 1,
|
||||
targetDeptCode: this.invCodebe,
|
||||
targetInvCode: null
|
||||
};
|
||||
this.initActDateRange()
|
||||
if (deptCode != this.invCodebe) {
|
||||
this.getInvList()
|
||||
}
|
||||
this.actDateRange = [];
|
||||
this.getList();
|
||||
},
|
||||
getId(id) {
|
||||
if (this.formName == 'add' && id != null) {
|
||||
var data = {
|
||||
id: id
|
||||
}
|
||||
this.pId = id
|
||||
//当在新增时取消添加操作删除掉这次的数据
|
||||
delApplyDetailAll(data).then((response) => {
|
||||
if (response.code == 20000) {
|
||||
this.newSpDistributionVisible = false
|
||||
}
|
||||
});
|
||||
} else {
|
||||
this.newSpDistributionVisible = false
|
||||
}
|
||||
|
||||
},
|
||||
onSubmitFind() {
|
||||
this.filterQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
hideSearch() {
|
||||
this.showSearch = !this.showSearch;
|
||||
},
|
||||
},
|
||||
onSubmitFind() {
|
||||
this.filterQuery.page = 1;
|
||||
this.getList();
|
||||
},
|
||||
hideSearch() {
|
||||
this.showSearch = !this.showSearch;
|
||||
},
|
||||
|
||||
handleSortChange(column, prop, order) {
|
||||
if (column.order === 'descending') {
|
||||
this.filterQuery.sort = 'desc'
|
||||
} else {
|
||||
this.filterQuery.sort = 'asc'
|
||||
}
|
||||
this.filterQuery.orderBy = column.prop;
|
||||
this.getList();
|
||||
},
|
||||
handleSortChange(column, prop, order) {
|
||||
if (column.order === 'descending') {
|
||||
this.filterQuery.sort = 'desc'
|
||||
} else {
|
||||
this.filterQuery.sort = 'asc'
|
||||
}
|
||||
this.filterQuery.orderBy = column.prop;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
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;
|
||||
console.log(this.filterQuery)
|
||||
listApply(this.filterQuery)
|
||||
.then((response) => {
|
||||
if (response.code == 20000) {
|
||||
this.list = response.data.list || [];
|
||||
this.total = response.data.total || 0;
|
||||
this.detailList=[]
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
this.loading = false;
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
this.list = [];
|
||||
this.total = 0;
|
||||
});
|
||||
},
|
||||
handleDetail(row) {
|
||||
let query = {orderIdFk: row.id};
|
||||
this.detailLoading = true;
|
||||
listApplyDetail(query) //查找该单号下的所有条码
|
||||
.then((response) => {
|
||||
this.detailList = response.data.list || [];
|
||||
this.detailLoading = false;
|
||||
})
|
||||
.catch(() => {
|
||||
this.detailLoading = false;
|
||||
this.detailList = [];
|
||||
});
|
||||
},
|
||||
handleClose(){
|
||||
if( this.formName=='add'){
|
||||
this.isChang=!this.isChang
|
||||
}else{
|
||||
this.newSpDistributionVisible=false
|
||||
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;
|
||||
console.log(this.filterQuery)
|
||||
listApply(this.filterQuery)
|
||||
.then((response) => {
|
||||
if (response.code == 20000) {
|
||||
this.list = response.data.list || [];
|
||||
this.total = response.data.total || 0;
|
||||
this.detailList = []
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
},
|
||||
submitOrder(row) {
|
||||
this.loading = true;
|
||||
let tQuery = {
|
||||
editStatus: 2,
|
||||
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;
|
||||
})
|
||||
},
|
||||
deleteDialog(row) {
|
||||
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
delApply(row.id)
|
||||
.then((response) => {
|
||||
this.loading = false;
|
||||
if (response.code == 20000) {
|
||||
this.$message.success("删除成功");
|
||||
this.getList();
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.filterQuery.page = val.page;
|
||||
this.loading = false;
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
this.list = [];
|
||||
this.total = 0;
|
||||
});
|
||||
},
|
||||
handleDetail(row) {
|
||||
let query = {orderIdFk: row.id};
|
||||
this.detailLoading = true;
|
||||
listApplyDetail(query) //查找该单号下的所有条码
|
||||
.then((response) => {
|
||||
this.detailList = response.data.list || [];
|
||||
this.detailLoading = false;
|
||||
})
|
||||
.catch(() => {
|
||||
this.detailLoading = false;
|
||||
this.detailList = [];
|
||||
});
|
||||
},
|
||||
handleClose() {
|
||||
if (this.formName == 'add') {
|
||||
this.isChang = !this.isChang
|
||||
} else {
|
||||
this.newSpDistributionVisible = false
|
||||
}
|
||||
},
|
||||
submitOrder(row) {
|
||||
this.loading = true;
|
||||
let tQuery = {
|
||||
editStatus: 2,
|
||||
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;
|
||||
})
|
||||
},
|
||||
deleteDialog(row) {
|
||||
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
cancelButtonText: "取消",
|
||||
type: "warning",
|
||||
})
|
||||
.then(() => {
|
||||
delApply(row.id)
|
||||
.then((response) => {
|
||||
this.loading = false;
|
||||
if (response.code == 20000) {
|
||||
this.$message.success("删除成功");
|
||||
this.getList();
|
||||
} else {
|
||||
this.$message.error(response.message);
|
||||
}
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
});
|
||||
|
||||
closeDialog() {
|
||||
this.newSpDistributionVisible = false;
|
||||
this.getList();
|
||||
this.detailList = [];
|
||||
},
|
||||
})
|
||||
.catch(() => {
|
||||
});
|
||||
},
|
||||
handleCurrentChange(val) {
|
||||
this.filterQuery.page = val.page;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
closeDialog() {
|
||||
this.newSpDistributionVisible = false;
|
||||
this.getList();
|
||||
this.detailList = [];
|
||||
},
|
||||
|
||||
newDistributionForm(index, row) {
|
||||
this.idQuery.id = '';
|
||||
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
|
||||
this.idQuery.id = row.id;
|
||||
this.idQuery.formData = row;
|
||||
this.formName = "update";
|
||||
} else
|
||||
this.formName = "add";
|
||||
this.newSpDistributionVisible = true;
|
||||
},
|
||||
getInvList() {
|
||||
var query={
|
||||
parentId:this.filterQuery.targetDeptCode
|
||||
}
|
||||
this.filterQuery.targetInvCode = null
|
||||
this.$forceUpdate()
|
||||
filterSubAll(query).then((res) => {
|
||||
this.invList = res.data || [];
|
||||
})
|
||||
},
|
||||
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
|
||||
}
|
||||
this.getList();
|
||||
this. getInvList();
|
||||
});
|
||||
},
|
||||
initActDateRange(){
|
||||
|
||||
let end = new Date();
|
||||
let start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||
this.actDateRange = [start, end];
|
||||
newDistributionForm(index, row) {
|
||||
this.idQuery.id = '';
|
||||
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
|
||||
this.idQuery.id = row.id;
|
||||
this.idQuery.formData = row;
|
||||
this.formName = "update";
|
||||
} else
|
||||
this.formName = "add";
|
||||
this.newSpDistributionVisible = true;
|
||||
},
|
||||
getInvList() {
|
||||
var query = {
|
||||
parentId: this.filterQuery.targetDeptCode,
|
||||
spUse: true,
|
||||
}
|
||||
this.filterQuery.targetInvCode = null
|
||||
this.$forceUpdate()
|
||||
filterGroupBySpuse(query).then((res) => {
|
||||
this.invList = res.data || [];
|
||||
})
|
||||
},
|
||||
getDeptList() {
|
||||
let query = {
|
||||
spUse: true,
|
||||
};
|
||||
filterDepts(query).then((res) => {
|
||||
this.deptList = res.data || [];
|
||||
if (this.deptList.length > 0) {
|
||||
this.filterQuery.targetDeptCode = this.deptList[0].code
|
||||
this.invCodebe = this.filterQuery.targetDeptCode
|
||||
}
|
||||
this.getList();
|
||||
this.getInvList();
|
||||
});
|
||||
},
|
||||
initActDateRange() {
|
||||
|
||||
let end = new Date();
|
||||
let start = new Date();
|
||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
|
||||
this.actDateRange = [start, end];
|
||||
}
|
||||
,
|
||||
components: {
|
||||
pureApplyEdit,
|
||||
}
|
||||
,
|
||||
filters: {
|
||||
statusFilterType(status) {
|
||||
const statusMap = {
|
||||
1: "warning",
|
||||
2: "success",
|
||||
};
|
||||
return statusMap[status];
|
||||
}
|
||||
,
|
||||
}
|
||||
,
|
||||
mounted() {
|
||||
}
|
||||
,
|
||||
created() {
|
||||
this.initActDateRange()
|
||||
this.getDeptList();
|
||||
|
||||
}
|
||||
,
|
||||
components: {
|
||||
pureApplyEdit,
|
||||
}
|
||||
,
|
||||
filters: {
|
||||
statusFilterType(status) {
|
||||
const statusMap = {
|
||||
1: "warning",
|
||||
2: "success",
|
||||
};
|
||||
return statusMap[status];
|
||||
}
|
||||
,
|
||||
}
|
||||
,
|
||||
mounted() {
|
||||
}
|
||||
,
|
||||
created() {
|
||||
this.initActDateRange()
|
||||
this.getDeptList();
|
||||
}
|
||||
,
|
||||
}
|
||||
;
|
||||
</script>
|
||||
<style scoped>
|
||||
.itemTag {
|
||||
float: left;
|
||||
text-align: left;
|
||||
margin-top: 10px;
|
||||
width: 25%;
|
||||
float: left;
|
||||
text-align: left;
|
||||
margin-top: 10px;
|
||||
width: 25%;
|
||||
}
|
||||
|
||||
.text {
|
||||
font-size: 13px;
|
||||
font-family: "Microsoft YaHei";
|
||||
font-size: 13px;
|
||||
font-family: "Microsoft YaHei";
|
||||
}
|
||||
|
||||
.query-form-item {
|
||||
display: block !important;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 5px;
|
||||
display: block !important;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 5px;
|
||||
}
|
||||
|
||||
.el-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.el-col {
|
||||
border-radius: 4px;
|
||||
flex-wrap: wrap;
|
||||
border-radius: 4px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
@ -0,0 +1,221 @@
|
||||
<template>
|
||||
<el-form :model="newProductData" label-width="120px">
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" type="flex">
|
||||
<el-form-item label="第三方系统" prop="thirdSysFk">
|
||||
<el-select
|
||||
style="width: 90%"
|
||||
disabled
|
||||
v-model="newProductData.thirdSysFk" placeholder="请选择第三方系统"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in thirdSys"
|
||||
:key="item.value"
|
||||
:label="item.thirdName"
|
||||
:value="item.thirdId">
|
||||
<span style="float: left">{{ item.thirdName }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px">{{
|
||||
item.thirdId
|
||||
}}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" type="flex">
|
||||
<el-form-item label="产品编码:" prop="code">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入产品编码"
|
||||
disabled
|
||||
v-model.trim="newProductData.code"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" type="flex">
|
||||
<el-form-item label="产品名称:" prop="name">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入产品名称" v-model.trim="newProductData.name"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="规格型号:" prop="spec">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入规格型号" v-model.trim="newProductData.spec"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="计量单位:" prop="measname">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入计量单位"
|
||||
v-model.trim="newProductData.measname"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="生产企业:" prop="manufactory">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入生产企业"
|
||||
v-model.trim="newProductData.manufactory"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="注册证号:" prop="registerNo">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入注册证号"
|
||||
v-model.trim="newProductData.registerNo"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="医疗器械注册人:" prop="ylqxzcrbarmc">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入医疗器械注册人"
|
||||
v-model.trim="newProductData.ylqxzcrbarmc"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="注册人英文名称:" prop="ylqxzcrbarywmc">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入注册人英文名称"
|
||||
v-model.trim="newProductData.ylqxzcrbarywmc"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="产品类别:" prop="cplb">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入产品类别" v-model.trim="newProductData.cplb"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="分类编码:" prop="flbm">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入分类编码" v-model.trim="newProductData.flbm"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="商品条码:" prop="sptm">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入商品条码" v-model.trim="newProductData.sptm"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="医保编码:" prop="ybbm">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入医保编码" v-model.trim="newProductData.ybbm"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row type="flex">
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="统一社会信用号:" prop="tyshxydm">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
|
||||
v-model.trim="newProductData.tyshxydm"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="11" class="el-col">
|
||||
<el-form-item label="器械类别:" prop="qxlb">
|
||||
<el-input style="width: 90%" size="small" placeholder="请输入器械类别" v-model.trim="newProductData.qxlb"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row type="flex">
|
||||
<el-col :span="23" class="el-col">
|
||||
<el-form-item label="产品描述:" prop="cpms">
|
||||
<el-input style="width: 92%" type="textarea" size="mini" rows="3" placeholder="请输入产品描述"
|
||||
v-model.trim="newProductData.cpms"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div style='text-align: center; margin-bottom: 10px;'>
|
||||
<el-button type="primary" @click="saveNewProduct">提交</el-button>
|
||||
<el-button type="primary" @click="closeAddDialog">取消</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {updateProduct} from "@/api/thrsys/thrProducts";
|
||||
|
||||
|
||||
import {getBasicThirdSys} from "@/api/thrsys/basicThirdSys";
|
||||
|
||||
export default {
|
||||
name: "thrProductsEdit",
|
||||
props: {
|
||||
newProductData: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
closeAddDialog: {
|
||||
type: Function,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
thirdSys: [],
|
||||
}
|
||||
|
||||
},
|
||||
methods: {
|
||||
saveNewProduct() {
|
||||
this.addProductVisible = false;
|
||||
if (this.$isBlank(this.newProductData.thirdSysFk)) {
|
||||
this.$message.warning("第三方系统不能为空！");
|
||||
return;
|
||||
}
|
||||
if (this.$isBlank(this.newProductData.code)) {
|
||||
this.$message.warning("产品编码为空！");
|
||||
return;
|
||||
}
|
||||
if (this.$isBlank(this.newProductData.name)) {
|
||||
this.$message.warning("产品名称不能为空！");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.$isBlank(this.newProductData.spec)) {
|
||||
this.$message.warning("规格型号不能为空");
|
||||
return;
|
||||
}
|
||||
if (this.$isBlank(this.newProductData.measname)) {
|
||||
this.$message.warning("计量单位不能为空！");
|
||||
return;
|
||||
}
|
||||
if (this.$isBlank(this.newProductData.manufactory)) {
|
||||
this.$message.warning("生产企业不能为空！");
|
||||
return;
|
||||
}
|
||||
if (this.$isBlank(this.newProductData.registerNo)) {
|
||||
this.$message.warning("注册证号不能为空！");
|
||||
return;
|
||||
}
|
||||
updateProduct(this.newProductData).then((res) => {
|
||||
if (res.code == 20000) {
|
||||
this.$message.success("添加成功");
|
||||
this.closeAddDialog(true);
|
||||
} else {
|
||||
this.$message.error(res.message);
|
||||
}
|
||||
}).catch((error) => {
|
||||
})
|
||||
|
||||
},
|
||||
getBasicThirdSys() {
|
||||
let query = {
|
||||
enabled: true,
|
||||
};
|
||||
getBasicThirdSys(query)
|
||||
.then((response) => {
|
||||
this.thirdSys = response.data.list || [];
|
||||
})
|
||||
.catch(() => {
|
||||
this.loading = false;
|
||||
this.list = [];
|
||||
});
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.getBasicThirdSys();
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
</style>
|
||||
Loading…
Reference in New Issue