Browse Source

fix:[资源库管理][供试品]

ouqian
HanLong 1 month ago
parent
commit
1b6101d3d4
7 changed files with 135 additions and 76 deletions
  1. +8
    -0
      src/api/business/gsp/gspFfjl.js
  2. +8
    -0
      src/api/business/gsp/gspRkjl.js
  3. +45
    -14
      src/views/business/resource/gsp/comps/ffjlList.vue
  4. +3
    -2
      src/views/business/resource/gsp/comps/gsp/Ff.vue
  5. +30
    -31
      src/views/business/resource/gsp/comps/gsp/Ysff.vue
  6. +1
    -0
      src/views/business/resource/gsp/comps/gspList.vue
  7. +40
    -29
      src/views/business/resource/gsp/comps/rkjlList.vue

+ 8
- 0
src/api/business/gsp/gspFfjl.js View File

@ -88,4 +88,12 @@ export function jq(data) {
method: 'post',
data: data
})
}
export function statistics(query) {
return request({
url: '/system/business/gspFfjl/statistics',
method: 'get',
params: query
})
}

+ 8
- 0
src/api/business/gsp/gspRkjl.js View File

@ -104,4 +104,12 @@ export function jq(data) {
method: 'post',
data: data
})
}
//入库量统计
export function sumRkl(query) {
return request({
url: '/system/business/gspRkjl/sumRkl',
method: 'get',
params: query
})
}

+ 45
- 14
src/views/business/resource/gsp/comps/ffjlList.vue View File

@ -7,22 +7,22 @@
<el-row>
<el-col :span="24">
<!-- 名称 -->
<el-form-item :label="$t('page.business.resource.gsp.mc') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.mc') + ':'" prop="mc">
<el-input v-model="queryParams.mc" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- 编号 -->
<el-form-item :label="$t('page.business.resource.gsp.bh') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.bh') + ':'" prop="bh">
<el-input v-model="queryParams.bh" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- 目的 -->
<el-form-item :label="$t('page.business.resource.gsp.md') + ':'">
<el-input v-model="queryParams.mdId" clearable @change="handleQuery"
<el-form-item :label="$t('page.business.resource.gsp.md') + ':'" prop="md">
<el-input v-model="queryParams.md" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- 记录状态 -->
<el-form-item :label="$t('page.business.resource.gsp.jlzt') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.jlzt') + ':'" prop="jlzt">
<el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
@change="handleQuery">
<el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
@ -33,7 +33,7 @@
</el-select>
</el-form-item>
<!-- 借阅状态 -->
<el-form-item :label="$t('page.business.resource.gsp.jyzt') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.jyzt') + ':'" prop="jyzt">
<el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
@change="handleQuery">
<el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
@ -42,13 +42,13 @@
</el-select>
</el-form-item>
<!-- 出库日期 -->
<el-form-item :label="$t('page.business.resource.mjy.cksj') + ':'">
<el-form-item :label="$t('page.business.resource.mjy.cksj') + ':'" prop="daterangeCk">
<el-date-picker v-model="daterangeCk" class="chat-histogram-daterange" type="daterange"
range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
</el-form-item>
<!-- 入库日期 -->
<el-form-item :label="$t('page.business.resource.mjy.rksj') + ':'">
<el-form-item :label="$t('page.business.resource.mjy.rksj') + ':'" prop="daterangeRk">
<el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
@ -78,6 +78,14 @@
<el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gsp:ffjldc']">{{
$t('form.export') }}</el-button>
</el-col>
<el-col :span="14" v-if="rkl">
<div class="tv_rkl">
<span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.rkl') }}{{ rkl }}</span>
<span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.ckl') }}{{ ckl }}</span>
<span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.syl') }}{{ syl }}</span>
</div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@ -195,7 +203,7 @@
</template>
<script>
import { list } from "@/api/business/gsp/gspFfjl"
import { list, statistics } from "@/api/business/gsp/gspFfjl"
import Sd from "./ffjl/Sd";
import Jy from "./ffjl/Jy";
import Js from "./ffjl/Js";
@ -217,6 +225,9 @@ export default {
single: true,
multiple: true,
total: 0,
rkl: null,
ckl: null,
syl: null,
list: [],
//
selectList: [],
@ -225,7 +236,7 @@ export default {
pageNum: 1,
pageSize: 10,
mc: null,
mdId: null,
md: null,
jlzt: null,
jyzt: null,
bh: null,
@ -436,15 +447,15 @@ export default {
//
getList() {
if (this.daterangeCk != null && this.daterangeCk.length > 0) {
this.queryParams.startDateCk = this.daterangeCk[0]
this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
this.queryParams.startDateCk = this.daterangeCk[0] + ' 00:00:00'
this.queryParams.endDateCk = this.daterangeCk[1] + ' 23:59:59'
} else {
this.queryParams.startDateCk = ''
this.queryParams.endDateCk = ''
}
if (this.daterangeRk != null && this.daterangeRk.length > 0) {
this.queryParams.startDateRk = this.daterangeRk[0]
this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
this.queryParams.startDateRk = this.daterangeRk[0] + ' 00:00:00'
this.queryParams.endDateRk = this.daterangeRk[1] + ' 23:59:59'
} else {
this.queryParams.startDateRk = ''
this.queryParams.endDateRk = ''
@ -455,6 +466,18 @@ export default {
this.total = response.total
this.loading = false
})
if (this.queryParams.startDateCk || this.queryParams.startDateRk || this.queryParams.mc || this.queryParams.ph
|| this.queryParams.gg || this.queryParams.jlzt || this.queryParams.jyzt || this.queryParams.md) {
statistics(this.queryParams).then(response => {
this.rkl = response.data.rkl
this.ckl = response.data.rkl
this.syl = response.data.rkl
})
} else {
this.rkl = null
this.ckl = null
this.syl = null
}
},
//
handleQuery() {
@ -464,6 +487,8 @@ export default {
//
resetQuery() {
this.resetForm("queryForm")
this.daterangeCk = []
this.daterangeRk = []
this.handleQuery()
},
//
@ -480,4 +505,10 @@ export default {
background: #fff;
padding: 10px 10px;
}
.tv_rkl {
color: #515a6e;
font-size: 13px;
margin-top: 5px;
}
</style>

+ 3
- 2
src/views/business/resource/gsp/comps/gsp/Ff.vue View File

@ -123,7 +123,7 @@
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="zytj">
<el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
<BusinessSelect v-model="form.zytj" dictType="business_zytj"></BusinessSelect>
</el-form-item>
</el-col>
<el-col :span="12">
@ -222,9 +222,10 @@ import { mapGetters } from 'vuex'
import SelectList from "./SelectList";
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
import SelectStudy from '@/views/business/comps/select/SelectStudy';
import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
export default {
name: "Ff",
components: { SelectList, SelectDeptUser, SelectStudy },
components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect },
data() {
return {
isBatch: false,

+ 30
- 31
src/views/business/resource/gsp/comps/gsp/Ysff.vue View File

@ -4,26 +4,30 @@
<el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="1200px" append-to-body
:close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
<div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
<div>
<el-row style="margin:10px 0px;">
<el-col :span="24">
<el-table :data="selectList" border>
<el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
<el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
<el-table-column :label="$t('page.business.resource.gsp.bh')" align="left" prop="bh"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
<el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" />
<el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
<template slot-scope="scope">
{{ scope.row.ckl }}{{ scope.row.ckldw }}
{{ scope.row.gg }}{{ scope.row.ggdw }}
</template>
</el-table-column>
<el-table-column :label="$t('page.business.resource.mjy.ffzytj')" align="center" prop="ffzytj"
<el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq"
width="150px" />
<el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz" width="150px" />
<el-table-column :label="$t('page.business.resource.mjy.ckmzdw')" align="center" prop="ckmzdw"
<el-table-column :label="$t('page.business.resource.gsp.cksj')" align="center" prop="ffrq"
width="150px" />
<el-table-column :label="$t('page.business.resource.gsp.ckjz')" align="center" prop="kc" width="150px">
<template slot-scope="scope">
{{ scope.row.kc }}{{ scope.row.kcdw }}
</template>
</el-table-column>
<el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
width="150px" />
<el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
@ -33,16 +37,14 @@
<el-table-column :label="$t('page.business.resource.mjy.ffr2')" align="center" prop="ffr2Mc"
width="150px" />
<el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
<el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="ffxmMc"
width="150px" />
</el-table>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.mjy.zcg')" prop="zcgId">
<el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
<el-form-item :label="$t('page.business.resource.gyzj.zcg')" prop="zcgId">
<SelectZcg v-model="form.zcgId" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -55,8 +57,7 @@
<el-row>
<el-col :span="24">
<el-form-item :label="$t('form.remark')" prop="remark">
<el-input type="text" v-model="form.remark" maxlength="20"
:placeholder="$t('form.placeholderInput')">
<el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
</el-input>
</el-form-item>
</el-col>
@ -64,13 +65,12 @@
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
<SelectDeptUser v-model="form.lqr1Id" key="lqr1Id"/>
<SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('form.password')" prop="lqr1mm">
<el-input type="text" v-model="form.lqr1mm" maxlength="20"
:placeholder="$t('form.placeholderInput')">
<el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
</el-input>
</el-form-item>
</el-col>
@ -78,13 +78,12 @@
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
<SelectDeptUser v-model="form.lqr2Id" key="lqr2Id"/>
<SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('form.password')" prop="lqr2mm">
<el-input type="text" v-model="form.lqr2mm" maxlength="20"
:placeholder="$t('form.placeholderInput')">
<el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
</el-input>
</el-form-item>
</el-col>
@ -92,14 +91,14 @@
<el-row>
<el-col :span="12">
<el-form-item :label="$t('page.business.resource.mjy.ffr')">
<el-input type="text" v-model="nickName" maxlength="50"
:placeholder="$t('form.placeholderInput')" disabled/>
<el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('form.password')" prop="ffrmm">
<div class="sbzdtcma"> <input type="text"></div>
<el-input type="password" v-model="form.ffrmm" show-password maxlength="20"
<el-input type="password" v-model="form.ffrmm" show-password maxlength="20"
:placeholder="$t('form.placeholderInput')">
</el-input>
</el-form-item>
@ -118,10 +117,10 @@
import { ysff } from "@/api/business/mjy/mjy"
import { mapGetters } from 'vuex'
import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
import SelectZcg from '@/views/business/comps/select/SelectZcg';
export default {
name: "Ysff",
components: {SelectDeptUser},
components: { SelectDeptUser, SelectZcg },
data() {
return {
ids: [],
@ -139,27 +138,27 @@ export default {
message: ' ',
trigger: 'blur'
}],
lqr2mm:[{
lqr2mm: [{
required: true,
message: ' ',
trigger: 'blur'
}],
lqr1mm:[{
lqr1mm: [{
required: true,
message: ' ',
trigger: 'blur'
}],
lqr1Id:[{
lqr1Id: [{
required: true,
message: ' ',
trigger: 'blur'
}],
lqr2Id:[{
lqr2Id: [{
required: true,
message: ' ',
trigger: 'blur'
}],
ffrmm:[{
ffrmm: [{
required: true,
message: ' ',
trigger: 'blur'

+ 1
- 0
src/views/business/resource/gsp/comps/gspList.vue View File

@ -113,6 +113,7 @@
</el-table-column>
<el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" width="150px" />
<el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq" width="150px" />
<el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq" width="150px" />
<el-table-column :label="$t('page.business.resource.gsp.cctj')" align="center" prop="cctj" width="130px" />
<el-table-column :label="$t('page.business.resource.gsp.zjzt')" align="center" width="100px" fixed="right">

+ 40
- 29
src/views/business/resource/gsp/comps/rkjlList.vue View File

@ -7,22 +7,22 @@
<el-row>
<el-col :span="24">
<!-- 名称 -->
<el-form-item :label="$t('page.business.resource.gsp.mc') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.mc') + ':'" prop="mc">
<el-input v-model="queryParams.mc" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- -->
<el-form-item :label="$t('page.business.resource.gsp.bh') + ':'">
<el-input v-model="queryParams.bh" clearable @change="handleQuery"
<!-- -->
<el-form-item :label="$t('page.business.resource.gsp.ph') + ':'" prop="ph">
<el-input v-model="queryParams.ph" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- 规格 -->
<el-form-item :label="$t('page.business.resource.gsp.gg') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.gg') + ':'" prop="gg">
<el-input v-model="queryParams.gg" clearable @change="handleQuery"
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
<!-- 记录状态 -->
<el-form-item :label="$t('page.business.resource.gsp.jlzt') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.jlzt') + ':'" prop="jlzt">
<el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
@change="handleQuery">
<el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
@ -33,7 +33,7 @@
</el-select>
</el-form-item>
<!-- 借阅状态 -->
<el-form-item :label="$t('page.business.resource.gsp.jyzt') + ':'">
<el-form-item :label="$t('page.business.resource.gsp.jyzt') + ':'" prop="jyzt">
<el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
@change="handleQuery">
<el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
@ -42,8 +42,8 @@
</el-select>
</el-form-item>
<!-- 入库日期 -->
<el-form-item :label="$t('page.business.resource.mjy.rksj') + ':'">
<el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
<el-form-item :label="$t('page.business.resource.mjy.rksj') + ':'" prop="daterange">
<el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange"
range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
</el-form-item>
@ -82,6 +82,9 @@
<el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gsp:rkdc']">{{
$t('form.export') }}</el-button>
</el-col>
<el-col :span="14" v-if="rkl">
<div class="tv_rkl">{{ $t('page.business.resource.gsp.rkl') }}{{ rkl }}</div>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@ -185,7 +188,7 @@
</template>
<script>
import { list } from "@/api/business/gsp/gspRkjl"
import { list, sumRkl } from "@/api/business/gsp/gspRkjl"
import Sd from "./rkjl/Sd";
import Jy from "./rkjl/Jy";
import Js from "./rkjl/Js";
@ -202,8 +205,7 @@ export default {
components: { Sd, Js, Gd, Jd, Jy, Xq, Xz, Bj, RkjlImport },
data() {
return {
daterangeCk: [],
daterangeRk: [],
daterange: [],
loading: true,
showDetail: false,
single: true,
@ -212,6 +214,7 @@ export default {
list: [],
//
selectList: [],
rkl: '',
//
queryParams: {
pageNum: 1,
@ -220,11 +223,9 @@ export default {
mdId: null,
jlzt: null,
jyzt: null,
bh: null,
startDateCk: null,
endDateCk: null,
startDateRk: null,
endDateRk: null,
ph: null,
startDate: null,
endDate: null
},
}
},
@ -408,19 +409,12 @@ export default {
},
//
getList() {
if (this.daterangeCk != null && this.daterangeCk.length > 0) {
this.queryParams.startDateCk = this.daterangeCk[0]
this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
} else {
this.queryParams.startDateCk = ''
this.queryParams.endDateCk = ''
}
if (this.daterangeRk != null && this.daterangeRk.length > 0) {
this.queryParams.startDateRk = this.daterangeRk[0]
this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0] + ' 00:00:00'
this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
} else {
this.queryParams.startDateRk = ''
this.queryParams.endDateRk = ''
this.queryParams.startDate = ''
this.queryParams.endDate = ''
}
this.loading = true
list(this.queryParams).then(response => {
@ -428,6 +422,16 @@ export default {
this.total = response.total
this.loading = false
})
if (this.queryParams.startDate || this.queryParams.endDate || this.queryParams.mc || this.queryParams.ph
|| this.queryParams.gg || this.queryParams.jlzt || this.queryParams.jyzt) {
sumRkl(this.queryParams).then(response => {
this.rkl = response.data.rkl
})
} else {
this.rkl = null
}
},
//
handleQuery() {
@ -453,4 +457,11 @@ export default {
background: #fff;
padding: 10px 10px;
}
.tv_rkl {
color: #515a6e;
display: flex;
font-size: 13px;
margin-top: 5px;
}
</style>

Loading…
Cancel
Save