diff --git a/src/api/basic/basicHospType.js b/src/api/basic/basicHospType.js
index b7a7d02a..d58b869a 100644
--- a/src/api/basic/basicHospType.js
+++ b/src/api/basic/basicHospType.js
@@ -18,6 +18,15 @@ export function getListMenu(query) {
});
}
+export function menuAllList(query) {
+ return axios({
+ url: "/udiwms/basic/hosp/type/menuAllList",
+ method: "post",
+ data: query
+ });
+}
+
+
export function getOneName(query) {
return axios({
url: "/udiwms/basic/hosp/type/getOneName",
diff --git a/src/api/sync/spsSyncStatus.js b/src/api/sync/spsSyncStatus.js
index d3425b4a..a822d6c2 100644
--- a/src/api/sync/spsSyncStatus.js
+++ b/src/api/sync/spsSyncStatus.js
@@ -9,6 +9,13 @@ export function filterLog(query) {
});
}
+export function testConnect(query) {
+ return axios({
+ url: "/spssync/basic/connect/test",
+ method: "get",
+ params: query
+ });
+}
export function deleteLog(query) {
return axios({
diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue
index 8223c74a..c37bddf9 100644
--- a/src/views/basic/busType/bussinessType.vue
+++ b/src/views/basic/busType/bussinessType.vue
@@ -366,8 +366,21 @@ export default {
this.$message.error('请选择预验收退库单据类型！')
return
}
+ }
+ if (isBlank(this.inputQuery.sortNum)) {
+ this.$message.error("排序不能为空！");
+ return;
+ } else {
+ if (this.inputQuery.sortNum < 0) {
+ this.$message.error("排序不能小于0！");
+ return;
+ } else if (this.inputQuery.sortNum > 999) {
+ this.$message.error("排序不能大于999！");
+ return;
+ }
}
+
// if (isBlank(this.inputQuery.busType)) {
// this.$message.error("请选择特定页面！");
// return;
@@ -384,7 +397,7 @@ export default {
})
.catch(() => {
this.loading = false
- })
+ });
},
onModifySubmit() {
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index caa73594..d2e94e3a 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -349,7 +349,7 @@ export default {
hideForm() {
// 更改值
this.formVisible = !this.formVisible;
- // this.getList();
+ this.getList();
return true;
},
// 显示表单
diff --git a/src/views/basic/locUdi/UdiInfoDb.vue b/src/views/basic/locUdi/UdiInfoDb.vue
index 88d445c0..f92fb878 100644
--- a/src/views/basic/locUdi/UdiInfoDb.vue
+++ b/src/views/basic/locUdi/UdiInfoDb.vue
@@ -67,7 +67,7 @@
<el-form-item label="规格型号:" class="query-form-item">
<el-input
v-model="unionQuery.ggxh" clearable="true"
- :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+ :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
placeholder="规格型号"
size="mini"
></el-input>
@@ -77,7 +77,7 @@
<el-form-item label="注册证/备案号:" class="query-form-item">
<el-input
v-model="unionQuery.zczbhhzbapzbh" clearable="true"
- :disabled="(unionQuery.cpmctymc=='' && unionQuery.nameCode=='' && unionQuery.ylqxzcrbarmc==null)"
+ :disabled="unionQuery.ylqxzcrbarmc==null || unionQuery.ylqxzcrbarmc==''"
placeholder="注册证/备案号"
size="mini"
></el-input>
@@ -97,7 +97,7 @@
</el-button-group>
- <el-upload
+ <!--<el-upload
:action="uploadFileUrl"
multiple
@@ -111,7 +111,7 @@
:file-list="fileList"
>
<el-button type="primary" icon="el-icon-bottom-right" style="margin-left: 15px">导入器械信息</el-button>
- </el-upload>
+ </el-upload>-->
</div>
<el-table
:data="udidlList"
@@ -254,6 +254,7 @@ export default {
zczbhhzbapzbh: "",
isCheck: 1
};
+ this.udidlList=[];
},
searchList() {
this.unionQuery.page = 1;
diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue
index 1d1c4a4f..7ab642de 100644
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@@ -134,7 +134,15 @@
<script>
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect";
-import {getBasicHospType, getListMenu, saveBasicHospType,uodateBasicHospType,deleteBasicHospType,getOneName} from "@/api/basic/basicHospType";
+import {
+ getBasicHospType,
+ getListMenu,
+ saveBasicHospType,
+ uodateBasicHospType,
+ deleteBasicHospType,
+ getOneName,
+ menuAllList
+} from "@/api/basic/basicHospType";
import selectHospProduct from "@/views/basic/product/bindHospProduct";
import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
@@ -292,12 +300,22 @@ export default {
}
getOneName().then(res =>{
const menu = {id: res.data.id,code:res.data.code, name: res.data.name, children: []};
- getListMenu(data).then(response => {
- this.fromDeptOptions = [];
- menu.children = this.handleTree(response.data,"code", "parentCode");
- console.log(menu)
- this.fromDeptOptions.push(menu);
- });
+ if(this.formName == 'edit'){
+ //排除自己和自己下级
+ getListMenu(data).then(response => {
+ this.fromDeptOptions = [];
+ menu.children = this.handleTree(response.data,"code", "parentCode");
+ this.fromDeptOptions.push(menu);
+ });
+ }else {
+ //查询全部
+ debugger
+ menuAllList(data).then(response => {
+ this.fromDeptOptions = [];
+ menu.children = this.handleTree(response.data,"code", "parentCode");
+ this.fromDeptOptions.push(menu);
+ });
+ }
})
},
/** 转换菜单数据结构 */
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 935734ea..5fd6ce7a 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -91,6 +91,7 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+ <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
<el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine">锁定</el-button>
<el-button type="primary" icon="search" @click="lockProducts('1')" v-if="isSpCombine">退回</el-button>
</el-button-group>
@@ -145,7 +146,20 @@
</selectDetail>
</el-dialog>
-
+ <el-dialog
+ title="选入产品信息"
+ :visible.sync="selectProductVisible"
+ width="85%"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ v-if="selectProductVisible"
+ >
+ <selectProduct
+ :closeSelDialog="closeDialog"
+ :uuid="uuid"
+ :unitFk="filterQuery.unitFk"
+ ></selectProduct>
+ </el-dialog>
<pagination
v-show="total>0"
@@ -173,6 +187,7 @@ import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterByUuid, filterCompany} from "@/api/basic/udiInfo";
import {filterCompanyProductRelevance, deleteCompanyProductRelevance} from "@/api/basic/udiRlSuptRelevance";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain"
+import selectProduct from "./basicCompanyProductsImport";
import selectUdi from "./udiInfoRelevance.vue";
import selectErp from "./udiInfoselectErpUdi";
import selectLocalUdi from "./UdiInfoSelectLocalUdi";
@@ -335,7 +350,13 @@ export default {
.catch(() => {
});
},
-
+ selectProduct() {
+ if (this.$isBlank(this.filterQuery.unitFk)) {
+ this.$message.error("请先选择供应商！");
+ return;
+ }
+ this.selectProductVisible = true;
+ },
intentDetail() {
this.isImportUdi = false;
this.selectUdiDialogVisible = true;
@@ -550,6 +571,7 @@ export default {
this.selectErpDialogVisible = false;
this.selectLocalVisible = false;
this.selectVersionVisible = false;
+ this.selectProductVisible = false;
},
onAddSubmit() {
if (this.checked == true) {
@@ -643,6 +665,7 @@ export default {
selectUdi,
selectErp,
selectLocalUdi,
+ selectProduct,
selectDetail
}
,
diff --git a/src/views/inout/codeRel/ioCodeRelEdit.vue b/src/views/inout/codeRel/ioCodeRelEdit.vue
index d3ec5bc6..3f7553b9 100644
--- a/src/views/inout/codeRel/ioCodeRelEdit.vue
+++ b/src/views/inout/codeRel/ioCodeRelEdit.vue
@@ -4,18 +4,18 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" >
<el-row>
- <el-col :span="10">
+ <el-col :span="12">
<el-form-item label="上级产品">
- <el-input v-model="filterQuery.upProduct " :disabled="isUp" style="width: 90%" placeholder="请输入多级产品" clearable></el-input>
+ <el-input v-model="filterQuery.upProduct " :disabled="isUp" style="width: 80%" placeholder="请输入多级产品" clearable></el-input>
<el-button style="margin-left: 10px" :disabled="isUp" type="primary" @click="addUpProduct()">添加</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="10">
+ <el-col :span="12">
<el-form-item label="下级产品">
- <el-input v-model="filterQuery.lowProduct" style="width: 90%" placeholder="请输入下级产品" clearable></el-input>
+ <el-input v-model="filterQuery.lowProduct" style="width: 80%" placeholder="请输入下级产品" clearable></el-input>
<el-button style="margin-left: 10px" :disabled="isLow" type="primary" @click="addLowProduct()">添加</el-button>
</el-form-item>
</el-col>
diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index 5f60fe54..923132ce 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -33,10 +33,10 @@
>查询
</el-button
>
- <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+ <!--<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>汇总
</el-button
- >
+ >-->
</el-button-group>
</el-form-item>
</el-form>
@@ -247,6 +247,7 @@ export default {
page: 1,
limit: 10,
};
+ this.actDateRange = [];
this.getList();
},
onSubmit() {
diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue
index 7f524d8f..8ef45075 100644
--- a/src/views/inout/stat/IoStatMonthSearch.vue
+++ b/src/views/inout/stat/IoStatMonthSearch.vue
@@ -242,6 +242,7 @@ export default {
page: 1,
limit: 10,
};
+ this.actDateRange = [];
this.getList();
},
onSubmit() {
diff --git a/src/views/inout/stat/IoStatQuarterSearch.vue b/src/views/inout/stat/IoStatQuarterSearch.vue
index 75c014c6..e75dbf90 100644
--- a/src/views/inout/stat/IoStatQuarterSearch.vue
+++ b/src/views/inout/stat/IoStatQuarterSearch.vue
@@ -242,6 +242,7 @@ export default {
page: 1,
limit: 10,
};
+ this.actDateRange = [];
this.getList();
},
onSubmit() {
diff --git a/src/views/inout/stat/IoStatYearSearch.vue b/src/views/inout/stat/IoStatYearSearch.vue
index 826aa634..5d032c1e 100644
--- a/src/views/inout/stat/IoStatYearSearch.vue
+++ b/src/views/inout/stat/IoStatYearSearch.vue
@@ -242,6 +242,7 @@ export default {
page: 1,
limit: 10,
};
+ this.actDateRange = [];
this.getList();
},
onSubmit() {
diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue
index 6db75ce4..78916358 100644
--- a/src/views/inventory/DeviceReceiveOrderModify.vue
+++ b/src/views/inventory/DeviceReceiveOrderModify.vue
@@ -243,7 +243,7 @@
</el-form-item>
<el-form-item>
<el-button-group>
- <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+ <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="search" @click="queryInvProductsList"
>查询
</el-button
diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue
index b48f20ab..9558921c 100644
--- a/src/views/inventory/InvCountOrderModify.vue
+++ b/src/views/inventory/InvCountOrderModify.vue
@@ -170,7 +170,7 @@
</el-form-item>
<el-form-item>
<el-button-group>
- <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+ <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="search" @click="queryInvProductsList"
>查询
</el-button
diff --git a/src/views/inventory/InvCountOrderNew.vue b/src/views/inventory/InvCountOrderNew.vue
index fffebbfd..0fe973d0 100644
--- a/src/views/inventory/InvCountOrderNew.vue
+++ b/src/views/inventory/InvCountOrderNew.vue
@@ -239,8 +239,10 @@ export default {
addCountOrder(type) {
this.formVisible = true;
this.formName = 'add_' + type;
- this.countOrder = {};
this.countType = type;
+ this.countOrder = {
+ countType: this.countType
+ };
},
printOrder(row) {
let query = {moduleId: 6};
diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue
index afc3791a..b55192da 100644
--- a/src/views/inventory/InvSpaceManage.vue
+++ b/src/views/inventory/InvSpaceManage.vue
@@ -26,14 +26,13 @@
<!-- show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="所属分库" prop="invSubStorageName"-->
<!-- show-overflow-tooltip width="150"></el-table-column>-->
- <!-- <el-table-column label="状态" prop="status"-->
- <!-- show-overflow-tooltip width="150">-->
- <!-- <template slot-scope="scope">-->
- <!-- <el-tag>-->
- <!-- {{ statusMap[scope.row.status] }}-->
- <!-- </el-tag>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
+ <el-table-column label="状态" prop="status" show-overflow-tooltip width="150">
+ <template slot-scope="scope">
+ <el-tag>
+ {{ statusMap[scope.row.status] }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 483c9c18..10b070f6 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -3,28 +3,28 @@
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="供应商名称:">
<el-select
v-model="filterQuery.supId"
@@ -53,28 +53,28 @@
</el-row>
<el-row>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
- <el-col :span="4">
+ <el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index a5b1f3b7..ed979144 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -96,6 +96,7 @@
<el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column label="出入库时间" prop="auditTime" width="170" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
</el-table>
@@ -191,6 +192,7 @@ export default {
startAduditTime: null,
endAduditTime: null,
};
+ this.actDateRange=[]
this.getList();
},
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index b3dedd64..bb193f4e 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -6,12 +6,12 @@
<el-row>
<el-col span="6">
<el-form-item label="企业名称:">
- <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
+ <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="社会信用号:">
- <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号"></el-input>
+ <el-input v-model="filterQuery.creditCode" style="width: 90%" placeholder="请输入社会信用号" clearable></el-input>
</el-form-item>
</el-col>
<el-col span="6">
diff --git a/src/views/purchase/company/supCompanyAdd.vue b/src/views/purchase/company/supCompanyAdd.vue
index 248f4348..0b5d4c20 100644
--- a/src/views/purchase/company/supCompanyAdd.vue
+++ b/src/views/purchase/company/supCompanyAdd.vue
@@ -5,12 +5,12 @@
<el-row>
<el-col span="6">
<el-form-item label="企业名称">
- <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称"></el-input>
+ <el-input v-model="filterQuery.companyName" style="width: 90%" placeholder="请输入企业名称" clearable></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="社会信用号">
- <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入社会信用号"></el-input>
+ <el-input v-model="filterQuery.creditNum" style="width: 90%" placeholder="请输入社会信用号" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index dc3098b3..82b69796 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -11,7 +11,7 @@
<el-col :span="8">
<el-form-item label="采购部门">
- <el-select v-model="filterQuery.targetDeptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
+ <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@@ -176,7 +176,7 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- targetDeptCode:'',
+ deptCode:'',
},
formName: null,
invCodebe:null,
@@ -259,7 +259,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- targetDeptCode: this.invCodebe,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -402,7 +402,7 @@ export default {
},
getInvList() {
var query={
- parentId:this.filterQuery.targetDeptCode
+ parentId:this.filterQuery.deptCode
}
filterSubAll(query).then((res) => {
this.invList = res.data || [];
@@ -412,8 +412,8 @@ export default {
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.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
}
this.getList();
this. getInvList();
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 917897b3..cc48b686 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -3,14 +3,15 @@
<el-card class="el-card">
<el-form :model="filterQuery" class="query-form" label-width="100px" v-show="showSearch">
<el-row>
- <el-col :span="10">
- <el-form-item label="采购订单单号">
+ <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="10">
+
+ <el-col :span="8">
<el-form-item label="采购部门">
- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" style="width: 90%">
+ <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@@ -23,12 +24,9 @@
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
- <el-col :span="10">
+ <el-col :span="8">
<el-form-item label="采购仓库">
- <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+ <el-select v-model="filterQuery.targetInvCode" clearable style="width: 90%" placeholder="请选择所属仓库">
<el-option
v-for="item in invList"
:key="item.name"
@@ -39,7 +37,19 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="10">
+ </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"
@@ -70,8 +80,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@current-change="handleDetail">
<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="createTime"></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="emergency">
@@ -79,17 +88,15 @@
{{ emergencyMap[scope.row.emergency] }}
</template>
</el-table-column>
- <el-table-column label="到货时间" prop="arrivalTime"></el-table-column>
- <el-table-column label="采购说明" prop="remark"></el-table-column>
- <el-table-column label="状态" prop="status">
+ <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="createTime"></el-table-column>
<el-table-column label="操作" width="60px">
<template slot-scope="scope">
<el-button type="text" :disabled="scope.row.status!=2"
@@ -112,15 +119,15 @@
</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="120"></el-table-column>
+ <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="count"></el-table-column>
- <el-table-column label="计量单位" prop="measname"></el-table-column>
- <el-table-column label="供应商" prop="supName" 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="zczbhhzbapzbh" 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="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>
@@ -146,6 +153,7 @@ import purPlanEdit from "./purOrderDetailDialog";
import {delOrder, auditListOrder, listOrderDetail} from "@/api/purchase/purOrder";
import {getInvListByUser} from '@/api/system/invWarehouse'
import {getDeptListByUser} from '@/api/auth/authDept'
+import {filterSubAll} from "@/api/system/invSubWarehouse";
export default {
data() {
@@ -161,8 +169,11 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
+ emergency:'',
+ deptCode:'',
},
formName: null,
+ invCodebe:null,
formMap: {
add: "新增采购计划",
update: "采购计划审核",
@@ -173,10 +184,10 @@ export default {
3: "已审核",
4: "已拒绝"
},
- emergencyMap: {
- 1: "普通",
- 2: "紧急",
- 3: "不紧急",
+ emergencyMap:{
+ 1: "正常",
+ 2: "较急",
+ 3: "特急",
},
invList: {},
deptList: {},
@@ -243,6 +254,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -269,6 +281,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
+ this.detailList=[]
} else {
this.$message.error(response.message);
}
@@ -329,14 +342,22 @@ export default {
this.detailList = [];
},
getInvList() {
- getInvListByUser().then((res) => {
+ var query={
+ parentId:this.filterQuery.deptCode
+ }
+ filterSubAll(query).then((res) => {
this.invList = res.data || [];
- this.getBusType();
})
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
+ if(this.deptList.length>0){
+ this.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
+ }
+ this.getList();
+ this. getInvList();
});
},
@@ -372,8 +393,6 @@ export default {
}
,
created() {
- this.getList();
- this.getInvList();
this.getDeptList();
}
,
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index 3447a4ee..3b85c849 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -12,16 +12,17 @@
<el-card style="margin-top: -5px;">
<el-row>
<el-col :span="11">
- <el-form-item label="单据号:" prop="billNo">
+ <el-form-item label="采购单号:" prop="billNo">
<el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="单据日期:" prop="billdate">
+ <el-form-item label="创建时间:" prop="createTime">
<el-date-picker
- v-model="formData.billDate"
+ :disabled="true"
+ v-model="formData.createTime"
type="datetime"
- placeholder="选择日期" :disabled="true"
+ placeholder="选择日期"
style="width: 90%"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
@@ -32,16 +33,16 @@
</el-row>
<el-row style="margin-top: -10px">
<el-col :span="11">
- <el-form-item label="紧急程度：" prop="emergency">
+ <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="formData.emergency" :disabled="true" 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-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="11">
- <el-form-item label="到货时间：" prop="arrivalTime">
+ <el-form-item label="到货截止:" prop="arrivalTime">
<el-date-picker
:disabled="true"
v-model="formData.arrivalTime"
@@ -124,21 +125,24 @@
<el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
- <el-table-column label="序号" type="index" width="50"></el-table-column>
- <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
- <el-table-column label="规格型号" 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="单据数量">
- <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>
- </template>
- </el-table-column>
+ <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 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>
+ </template>
+ </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-form>
@@ -168,6 +172,7 @@ import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purOrd
import {filterAllByUser,selectByCode} from "@/api/system/invWarehouse";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import {getLocalJoinByUser} from "@/api/basic/busType";
+import {parseTime} from "@/utils/coTools";
export default {
name: "idQuery",
@@ -196,7 +201,7 @@ export default {
formData: {
id: null,
billNo: null,
- billDate: "",
+ createTime: "",
remark: "",
deptCode: null,
locStorageCode: null,
@@ -461,10 +466,10 @@ export default {
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
} else {
+ var date = new Date();
this.formData = {
id: null,
billNo: null,
- billDate: "",
remark: "",
deptCode: null,
locStorageCode: null,
@@ -474,6 +479,10 @@ export default {
targetInv: 1000,
targetSubInv: null,
targetBillAction: null,
+ createTime: parseTime(
+ date,
+ "{y}-{m}-{d} {h}:{i}:{s}"
+ ),
};
this.orderEditor = false;
}
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 6d642305..cc9781ff 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -11,14 +11,15 @@
<el-card style="margin-top: -5px;">
<el-row>
<el-col :span="11">
- <el-form-item label="单据号:" prop="billNo">
+ <el-form-item label="采购单号:" prop="billNo">
<el-input v-model="formData.billNo" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="单据时间:" prop="billdate">
+ <el-form-item label="创建时间:" prop="createTime">
<el-date-picker
- v-model="formData.billDate"
+ :disabled="true"
+ v-model="formData.createTime"
type="datetime"
placeholder="选择日期"
style="width: 100%"
@@ -30,6 +31,33 @@
</el-col>
</el-row>
+
+ <el-row style="margin-top: -10px">
+ <el-col :span="11">
+ <el-form-item label="紧急程度:" prop="emergency">
+ <el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 100%" 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="11">
+ <el-form-item label="到货截止:" prop="arrivalTime">
+ <el-date-picker
+ v-model="formData.arrivalTime"
+ type="datetime"
+ placeholder="选择日期"
+ style="width: 100%"
+ :clearable="false"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+
<el-row>
<el-col :span="11">
<el-form-item label="采购仓库:" prop="invCode">
@@ -53,30 +81,7 @@
</el-col>
</el-row>
- <el-row style="margin-top: -10px">
- <el-col :span="11">
- <el-form-item label="紧急程度：" prop="emergency">
- <el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 100%" 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="11">
- <el-form-item label="到货时间：" prop="arrivalTime">
- <el-date-picker
- v-model="formData.arrivalTime"
- type="datetime"
- placeholder="选择日期"
- style="width: 100%"
- :clearable="false"
- value-format="yyyy-MM-dd HH:mm:ss"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
+
<el-row>
<el-col :span="11" v-show="formData.status==4">
@@ -92,9 +97,8 @@
<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" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
- </el-button>
- <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>
+ <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
+<!-- <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>-->
</el-button-group>
@@ -102,10 +106,12 @@
</el-row>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
highlight-current-row max-height="300" height="300" ref="multipleTable">
- <el-table-column label="序号" type="index" width="50"></el-table-column>
- <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip></el-table-column>
- <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
- <el-table-column width="150" label="申购数量">
+ <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 width="150" label="采购数量">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.count"
placeholder="请输入数量" style="width: 80%"
@@ -115,10 +121,9 @@
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="注册/备案号" 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-column label="操作" width="120">
<template slot-scope="scope">
<el-button type="text" size="small" :disabled="scope.row.index === selectedIndex" @click.stop="true"
@@ -181,7 +186,7 @@ import {
} from "@/api/purchase/purOrder";
import {filterSubByInv} from "@/api/system/invSubWarehouse";
import SelectPlanListDialog from "@/views/purchase/purPlan/selectPlanListDialog";
-
+import {parseTime} from "@/utils/coTools";
export default {
name: "idQuery",
@@ -210,7 +215,7 @@ export default {
formData: {
id: null,
billNo: null,
- billDate: "",
+ createTime: "",
remark: "",
billType: "CGDD",
deptCode: null,
@@ -273,7 +278,7 @@ export default {
}
if (status === '2') {
- if (this.formData.billDate == "" || this.formData.billDate == null) {
+ if (this.formData.createTime == "" || this.formData.createTime == null) {
return this.$message.error("单据日期不能为空！");
}
// if (this.formData.billType == "" || this.formData.billType == null) {
@@ -496,14 +501,18 @@ export default {
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
} else {
+ var date = new Date();
this.formData = {
id: null,
billNo: null,
- billDate: "",
remark: "",
billType: "CGDD",
deptCode: null,
incCode: null,
+ createTime: parseTime(
+ date,
+ "{y}-{m}-{d} {h}:{i}:{s}"
+ ),
};
this.orderEditor = false;
}
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 234aa000..09ce2289 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -4,13 +4,13 @@
<el-form :model="filterQuery" class="query-form" label-width="100px" size="mini" v-show="showSearch">
<el-row>
<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-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="采购部门">
- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" style="width: 90%">
+ <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择采购部门" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@@ -24,7 +24,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="采购仓库">
- <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择所属仓库">
+ <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<el-option
v-for="item in invList"
:key="item.name"
@@ -38,6 +38,15 @@
</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
@@ -87,8 +96,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
@current-change="handleDetail">
<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="createTime"></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="emergency">
@@ -96,9 +104,7 @@
{{ emergencyMap[scope.row.emergency] }}
</template>
</el-table-column>
- <el-table-column label="到货时间" prop="arrivalTime"></el-table-column>
- <el-table-column label="采购说明" prop="remark"></el-table-column>
- <el-table-column label="审核时间" prop="auditTime"></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">
@@ -106,6 +112,8 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column label="创建时间" prop="createTime"></el-table-column>
+ <el-table-column label="审核时间" prop="auditTime"></el-table-column>
<el-table-column label="操作">
@@ -130,15 +138,15 @@
</el-card>
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
- <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="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="count"></el-table-column>
- <el-table-column label="计量单位" prop="measname"></el-table-column>
- <el-table-column label="供应商" prop="supName" 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="zczbhhzbapzbh" 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="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>
@@ -167,6 +175,7 @@ import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/pur
import {getInvListByUser} from '@/api/system/invWarehouse'
import {getDeptListByUser} from '@/api/auth/authDept'
import {selectAuthMenu} from "@/api/system/sysMenuHelp";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
export default {
@@ -183,6 +192,8 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
+ emergency:'',
+ deptCode:'',
},
Menustatus:null,
filePath:"",
@@ -209,6 +220,7 @@ export default {
editType: 1,
total: 0,
thirdSys: [],
+ invCodebe:null,
thirdSysDetail: null,
busTypes: [],
originTypes: [],
@@ -300,6 +312,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -338,6 +351,7 @@ export default {
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
+ this.detailList=[]
} else {
this.$message.error(response.message);
}
@@ -410,16 +424,25 @@ export default {
},
getInvList() {
- getInvListByUser().then((res) => {
+ var query={
+ parentId:this.filterQuery.deptCode
+ }
+ filterSubAll(query).then((res) => {
this.invList = res.data || [];
- this.getBusType();
})
},
getDeptList() {
getDeptListByUser().then((res) => {
this.deptList = res.data || [];
+ if(this.deptList.length>0){
+ this.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
+ }
+ this.getList();
+ this. getInvList();
});
},
+
newDistributionForm(index, row) {
this.idQuery.id = '';
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
@@ -454,8 +477,6 @@ export default {
,
created() {
this.selectAuthMenu();
- this.getList();
- this.getInvList();
this.getDeptList();
}
,
diff --git a/src/views/purchase/purPlan/purPlan.vue b/src/views/purchase/purPlan/purPlan.vue
index 1466489f..ee905824 100644
--- a/src/views/purchase/purPlan/purPlan.vue
+++ b/src/views/purchase/purPlan/purPlan.vue
@@ -11,7 +11,7 @@
<el-col :span="8">
<el-form-item label="采购部门">
- <el-select v-model="filterQuery.targetDeptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
+ <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@@ -178,7 +178,7 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- targetDeptCode:'',
+ deptCode:'',
},
invCodebe:null,
formName: null,
@@ -261,7 +261,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- targetDeptCode: this.invCodebe,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -403,7 +403,7 @@ export default {
},
getInvList() {
var query={
- parentId:this.filterQuery.targetDeptCode
+ parentId:this.filterQuery.deptCode
}
filterSubAll(query).then((res) => {
this.invList = res.data || [];
@@ -413,8 +413,8 @@ export default {
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.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
}
this.getList();
this. getInvList();
diff --git a/src/views/purchase/purPlan/purPlanAudit.vue b/src/views/purchase/purPlan/purPlanAudit.vue
index ed1bbefa..8fe86c55 100644
--- a/src/views/purchase/purPlan/purPlanAudit.vue
+++ b/src/views/purchase/purPlan/purPlanAudit.vue
@@ -11,7 +11,7 @@
<el-col :span="8">
<el-form-item label="采购部门">
- <el-select v-model="filterQuery.targetDeptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
+ <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" @change="getInvList" style="width: 90%">
<el-option
v-for="item in deptList"
:key="item.code"
@@ -172,7 +172,7 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- targetDeptCode:'',
+ deptCode:'',
},
formName: null,
formMap: {
@@ -256,7 +256,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- targetDeptCode: this.invCodebe,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -357,7 +357,7 @@ export default {
},
getInvList() {
var query={
- parentId:this.filterQuery.targetDeptCode
+ parentId:this.filterQuery.deptCode
}
filterSubAll(query).then((res) => {
this.invList = res.data || [];
@@ -367,8 +367,8 @@ export default {
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.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
}
this.getList();
this. getInvList();
diff --git a/src/views/purchase/purPlan/purPlanDetailDialog.vue b/src/views/purchase/purPlan/purPlanDetailDialog.vue
index fb3f59fe..4ea41493 100644
--- a/src/views/purchase/purPlan/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlan/purPlanDetailDialog.vue
@@ -33,7 +33,7 @@
</el-row>
<el-row style="margin-top: -10px">
<el-col :span="11">
- <el-form-item label="紧急程度：" prop="emergency">
+ <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable>
<el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="到货截止：" prop="arrivalTime">
+ <el-form-item label="到货截止:" prop="arrivalTime">
<el-date-picker
:disabled="true"
v-model="formData.arrivalTime"
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index 8a2487ea..a7af1471 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -33,7 +33,7 @@
<el-row style="margin-top: -10px">
<el-col :span="11">
- <el-form-item label="紧急程度：" prop="emergency">
+ <el-form-item label="紧急程度:" prop="emergency">
<el-select v-model="formData.emergency" placeholder="请选择紧急程度" style="width: 100%" clearable>
<el-option label="正常" :value=1></el-option>
<el-option label="较急" :value=2></el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="到货截止：" prop="arrivalTime">
+ <el-form-item label="到货截止:" prop="arrivalTime">
<el-date-picker
v-model="formData.arrivalTime"
type="datetime"
diff --git a/src/views/purchase/purPlan/purPlanSearch.vue b/src/views/purchase/purPlan/purPlanSearch.vue
index 7758f0fe..635a9de5 100644
--- a/src/views/purchase/purPlan/purPlanSearch.vue
+++ b/src/views/purchase/purPlan/purPlanSearch.vue
@@ -188,7 +188,7 @@ export default {
type: 1,
editStatus: 1,
emergency:'',
- targetDeptCode:'',
+ deptCode:'',
},
formName: null,
formMap: {
@@ -305,7 +305,7 @@ export default {
corpName: null,
type: 1,
editStatus: 1,
- targetDeptCode: this.invCodebe,
+ deptCode: this.invCodebe,
};
this.actDateRange = [];
this.getList();
@@ -403,7 +403,7 @@ export default {
},
getInvList() {
var query={
- parentId:this.filterQuery.targetDeptCode
+ parentId:this.filterQuery.deptCode
}
filterSubAll(query).then((res) => {
this.invList = res.data || [];
@@ -413,8 +413,8 @@ export default {
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.filterQuery.deptCode=this.deptList[0].code
+ this.invCodebe=this.filterQuery.deptCode
}
this.getList();
this. getInvList();
diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index bdb9f073..0842c8a8 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -9,14 +9,7 @@
placeholder="仓库名称"
></el-input>
</el-form-item>
- <!-- <el-form-item class="query-form-item" label="仓库类型:">
- <el-input
-
- clearable
- placeholder="仓库类型"
- ></el-input>
- </el-form-item> -->
- <el-form-item label="仓库类型" prop="advanceType">
+ <el-form-item label="仓库类型" prop="advanceType" class="query-form-item">
<el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
<el-option label="入账库" :value="1"/>
<el-option label="预验收库" :value="2"/>
@@ -33,6 +26,7 @@
</el-form>
<el-table
:data="list"
+ style="width: 100%"
border
highlight-current-row
@current-change="handSubInvCurrentChange"
@@ -237,7 +231,7 @@
</el-col>
</el-row>
- <el-table :data="sysSubList" style="width: 100%; margin-bottom: 30px;" border>
+ <el-table :data="sysSubList" style="width: 100%; margin-bottom: 30px;" border v-show="this.formName=='edit'">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="外部系统名称"
diff --git a/src/views/system/param/systemParamConfig.vue b/src/views/system/param/systemParamConfig.vue
index 7097385c..fe92b5a9 100644
--- a/src/views/system/param/systemParamConfig.vue
+++ b/src/views/system/param/systemParamConfig.vue
@@ -8,12 +8,12 @@
</el-form-item>
<el-form-item>
<el-button-group>
+ <el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
<el-button type="primary"
@click.native="search"
icon="el-icon-search">
搜索
</el-button>
- <el-button icon="el-icon-refresh" type="primary" @click="onReset">重置</el-button>
</el-button-group>
</el-form-item>
</el-row>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ec7e1626..b6a6f535 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -131,6 +131,7 @@
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-tree
+ props="menuOptions"
class="tree-border"
:data="menuOptions"
show-checkbox
@@ -210,6 +211,7 @@ import {
deptTreeSelect
} from "@/api/system/role";
import {treeselect as menuTreeselect, roleMenuTreeselect} from "@/api/system/menu";
+import {isBlank} from "@/utils/strUtil";
export default {
name: "Role",
@@ -291,6 +293,9 @@ export default {
// roleKey: [
// {required: true, message: "权限字符不能为空", trigger: "blur"}
// ],
+ menuOptions:[
+ {required: true, message: "角色列表不能为空", trigger: "blur"}
+ ],
roleSort: [
{required: true, message: "角色顺序不能为空", trigger: "blur"}
]
@@ -533,6 +538,10 @@ export default {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
+ if( this.form.menuIds.length==0){
+ this.$message.error("菜单权限不能为空");
+ return
+ }
updateRole(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
@@ -540,6 +549,10 @@ export default {
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
+ if(this.form.menuIds.length==0){
+ this.$message.error("菜单权限不能为空");
+ return
+ }
addRole(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;