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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
dev
薛宇 2 years ago
parent 5c76856bf0 e450b6f4c0
commit c4e3bd77df
4 changed files with 96 additions and 106 deletions
Show Stats Download Patch File Download Diff File

16
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -196,7 +196,7 @@
<el-form-item <el-form-item
prop="fromCorp" prop="fromCorp"
label="往来信息:" label="往来信息:"
v-if="curAction.corpType == 1 && curAction.genUnit" v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo ==''"
> >
<el-input <el-input
v-model="orderFormData.fromCorp" v-model="orderFormData.fromCorp"
@ -207,6 +207,20 @@
placeholder="请输入病人住院号" placeholder="请输入病人住院号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item
prop="fromCorp"
label="往来信息:"
v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"
>
<el-input
v-model="orderFormData.fromCorpName"
auto-complete="off"
clearable
style="width: 90%"
:disabled="corpOrderIdDisabled"
placeholder="请输入病人住院号"
></el-input>
</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="备注:">

3
src/views/inventory/InvOrderPlaceModify.vue
Unescape Escape View File

@ -44,7 +44,7 @@
v-model="formData.invSpaceName" v-model="formData.invSpaceName"
:fetch-suggestions="querySearchAsync" :fetch-suggestions="querySearchAsync"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="list.length > 0" :disabled="list.length > 0 || formData.invCode === ''"
ref="spaceInputRef" ref="spaceInputRef"
@select="handleSelect" @select="handleSelect"
@keypress.enter.native="spaceEnterKey($event)" @keypress.enter.native="spaceEnterKey($event)"
@ -53,6 +53,7 @@
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>

113
src/views/purchase/purApply/pureApplyAudit.vue
Unescape Escape View File

@ -9,37 +9,40 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">--> <el-col :span="8">
<!-- <el-form-item label="申购部门">--> <el-form-item label="申购部门">
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"--> <el-select v-model="filterQuery.deptCode" placeholder="请选择申购部门" style="width: 90%"
<!-- @change="getInvList"--> @change="getInvList"
<!-- >--> >
<!-- <el-option--> <el-option
<!-- v-for="item in deptList"--> v-for="item in deptList"
<!-- :key="item.code"--> :key="item.code"
<!-- :label="item.name"--> :label="item.name"
<!-- :value="item.code"--> :value="item.code"
<!-- >--> >
<!-- <span style="float: left">{{ item.name }}</span>--> <span style="float: left">{{ item.name }}</span>
<!-- </el-option>--> </el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="8">--> <el-col :span="8">
<!-- <el-form-item label="申购仓库">--> <el-form-item label="申购仓库">
<!-- <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable--> <el-select v-model="filterQuery.invCode" @change="getList" style="width: 90%" clearable
<!-- placeholder="请选择所属仓库">--> placeholder="请选择所属仓库">
<!-- <el-option--> <el-option
<!-- v-for="item in invList"--> v-for="item in invList"
<!-- :key="item.name"--> :key="item.name"
<!-- :label="item.name"--> :label="item.name"
<!-- :value="item.code">--> :value="item.code">
<!-- <span style="float: left">{{ item.name }}</span>--> <span style="float: left">{{ item.name }}</span>
<!-- </el-option>--> </el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度：" prop="emergency"> <el-form-item label="紧急程度：" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -52,48 +55,20 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="创建时间:"> <el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
style="width: 90%" style="width: 90%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </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"> <div class="top-right-btn">
@ -111,8 +86,8 @@
:default-sort="defaultSort" @sort-change="handleSortChange"> :default-sort="defaultSort" @sort-change="handleSortChange">
<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="billNo"></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="deptName"></el-table-column>
<el-table-column label="申购仓库" prop="targetInvName"></el-table-column> <el-table-column label="申购仓库" prop="invName"></el-table-column>
<el-table-column label="紧急程度" prop="emergency"> <el-table-column label="紧急程度" prop="emergency">
<template slot-scope="scope"> <template slot-scope="scope">
{{ emergencyMap[scope.row.emergency] }} {{ emergencyMap[scope.row.emergency] }}

70
src/views/purchase/purApply/pureApplySearch.vue
Unescape Escape View File

@ -9,33 +9,36 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8">--> <el-col :span="8">
<!-- <el-form-item label="申购部门">--> <el-form-item label="申购部门">
<!-- <el-select v-model="filterQuery.deptCode" @change="getInvList" placeholder="请选择申购部门" style="width: 90%">--> <el-select v-model="filterQuery.deptCode" clearable @change="getInvList" placeholder="请选择申购部门" style="width: 90%">
<!-- <el-option--> <el-option
<!-- v-for="item in deptList"--> v-for="item in deptList"
<!-- :key="item.code"--> :key="item.code"
<!-- :label="item.name"--> :label="item.name"
<!-- :value="item.code"--> :value="item.code"
<!-- >--> >
<!-- <span style="float: left">{{ item.name }}</span>--> <span style="float: left">{{ item.name }}</span>
<!-- </el-option>--> </el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
<!-- <el-col :span="8">--> <el-col :span="8">
<!-- <el-form-item label="申购仓库">--> <el-form-item label="申购仓库">
<!-- <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">--> <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">
<!-- <el-option--> <el-option
<!-- v-for="item in invList"--> v-for="item in invList"
<!-- :key="item.name"--> :key="item.name"
<!-- :label="item.name"--> :label="item.name"
<!-- :value="item.code">--> :value="item.code">
<!-- <span style="float: left">{{ item.name }}</span>--> <span style="float: left">{{ item.name }}</span>
<!-- </el-option>--> </el-option>
<!-- </el-select>--> </el-select>
<!-- </el-form-item>--> </el-form-item>
<!-- </el-col>--> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="紧急程度：" prop="emergency"> <el-form-item label="紧急程度：" prop="emergency">
<el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable> <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>
@ -61,9 +64,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="审核时间:"> <el-form-item label="审核时间:">
<el-date-picker <el-date-picker
@ -170,7 +170,7 @@
<script> <script>
import pureApplyDetail from "./pureApplyDetailDialog"; import pureApplyDetail from "./pureApplyDetailDialog";
import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply"; import {delApply, auditOrder, listApplyDetail, auditListApply} from "@/api/purchase/purApply";
import {getInvListByUser} from "@/api/system/invWarehouse"; import {filterAll, getInvListByUser} from "@/api/system/invWarehouse";
import {getDeptListByUser} from "@/api/auth/authDept"; import {getDeptListByUser} from "@/api/auth/authDept";
import {filterSubAll} from "@/api/system/invSubWarehouse"; import {filterSubAll} from "@/api/system/invSubWarehouse";
@ -463,11 +463,11 @@ export default {
}) })
}, },
getDeptList() { getDeptList() {
getDeptListByUser().then((res) => { filterAll().then((res) => {
this.deptList = res.data || []; this.deptList = res.data || [];
if (this.deptList.length > 0) { if (this.deptList.length > 0) {
this.filterQuery.targetDeptCode = this.deptList[0].code this.filterQuery.deptCode = this.deptList[0].code
this.invCodebe = this.filterQuery.targetDeptCode this.invCodebe = this.filterQuery.deptCode
} }
this.getList(); this.getList();
this.getInvList(); this.getInvList();
@ -495,7 +495,7 @@ export default {
} }
, ,
created() { created() {
this.getList(); this.getDeptList();
} }
, ,
} }

Write Preview
Loading…
Cancel
Save