luojie 1 month ago
parent
commit
ea0fd42f4d
42 changed files with 582 additions and 735 deletions
  1. +8
    -0
      src/api/business/gsp/gspFfjl.js
  2. +8
    -0
      src/api/business/gsp/gspRkjl.js
  3. +1
    -0
      src/lang/en/business/study/studyFormApply.js
  4. +1
    -1
      src/lang/zh/business/study/studyFormFill.js
  5. +1
    -11
      src/views/business/comps/template/comps/dl/DL007.vue
  6. +1
    -11
      src/views/business/comps/template/comps/dl/DL008.vue
  7. +1
    -11
      src/views/business/comps/template/comps/dl/DL009.vue
  8. +4
    -60
      src/views/business/comps/template/comps/dl/DL010.vue
  9. +76
    -81
      src/views/business/comps/template/comps/dl/DL011.vue
  10. +84
    -40
      src/views/business/comps/template/comps/dl/DL012.vue
  11. +1
    -16
      src/views/business/comps/template/comps/dl/DL013.vue
  12. +0
    -35
      src/views/business/comps/template/comps/dl/DL015.vue
  13. +0
    -13
      src/views/business/comps/template/comps/dl/DL016.vue
  14. +0
    -12
      src/views/business/comps/template/comps/dl/DL017.vue
  15. +0
    -13
      src/views/business/comps/template/comps/dl/DL018.vue
  16. +0
    -13
      src/views/business/comps/template/comps/dl/DL019.vue
  17. +21
    -3
      src/views/business/comps/template/comps/dl/DL021.vue
  18. +22
    -11
      src/views/business/comps/template/comps/dl/DL023.vue
  19. +3
    -9
      src/views/business/comps/template/comps/dl/DL024.vue
  20. +2
    -0
      src/views/business/comps/template/comps/yp/YP005.vue
  21. +8
    -5
      src/views/business/comps/template/mixins/templateMixin.js
  22. +47
    -17
      src/views/business/form/drug/comp/sqbdList.vue
  23. +38
    -60
      src/views/business/form/drug/comp/tbbdList.vue
  24. +29
    -46
      src/views/business/form/drug/comp/ytbdList.vue
  25. +38
    -60
      src/views/business/form/nonTrial/comp/tbbdList.vue
  26. +30
    -47
      src/views/business/form/nonTrial/comp/ytbdList.vue
  27. +45
    -14
      src/views/business/resource/gsp/comps/ffjlList.vue
  28. +3
    -2
      src/views/business/resource/gsp/comps/gsp/Ff.vue
  29. +30
    -31
      src/views/business/resource/gsp/comps/gsp/Ysff.vue
  30. +1
    -0
      src/views/business/resource/gsp/comps/gspList.vue
  31. +40
    -29
      src/views/business/resource/gsp/comps/rkjlList.vue
  32. +1
    -1
      src/views/business/resource/gyzj/comps/gyzjList.vue
  33. +1
    -1
      src/views/business/resource/mjy/comps/mjyList.vue
  34. +1
    -1
      src/views/business/study/comp/jhbd/Bj.vue
  35. +5
    -17
      src/views/business/study/comp/jhbdList.vue
  36. +1
    -1
      src/views/business/study/comp/sqbd/Bj.vue
  37. +2
    -2
      src/views/business/study/comp/tbbd/Bj.vue
  38. +16
    -33
      src/views/business/study/comp/tbbdList.vue
  39. +1
    -1
      src/views/business/study/comp/wzlb/gyzjList.vue
  40. +1
    -1
      src/views/business/study/comp/wzlb/mjyList.vue
  41. +1
    -1
      src/views/business/study/comp/ytbd/Bj.vue
  42. +9
    -25
      src/views/business/study/comp/ytbdList.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
})
}

+ 1
- 0
src/lang/en/business/study/studyFormApply.js View File

@ -65,4 +65,5 @@ export default {
sywzmc: 'Study Material Name',
xynd: 'Required Concentration',
xysj: 'Required Time',
bdzt:'Status'
}

+ 1
- 1
src/lang/zh/business/study/studyFormFill.js View File

@ -31,7 +31,7 @@ export default {
bzyy: '备注原因',
jcgj: '稽查轨迹',
cjjl: '创建记录',
sfbl: '是否补录',
sfbl: '是否补录',
yes: '是',
no: '否',
tjjl: '提交记录',

+ 1
- 11
src/views/business/comps/template/comps/dl/DL007.vue View File

@ -280,17 +280,7 @@ export default {
return await this.validFormFields(refNames)
},
getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = []
return this.resourceTmp
},

+ 1
- 11
src/views/business/comps/template/comps/dl/DL008.vue View File

@ -439,17 +439,7 @@ export default {
return await this.validFormFields(refNames)
},
getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = []
return this.resourceTmp
},

+ 1
- 11
src/views/business/comps/template/comps/dl/DL009.vue View File

@ -550,17 +550,7 @@ export default {
return await this.validFormFields(refNames)
},
getResource() {
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
bh: item.yqbh,
type: 'yq'
}))
this.yqResourceTmp = []
this.resourceTmp = []
return this.resourceTmp
},

+ 4
- 60
src/views/business/comps/template/comps/dl/DL010.vue View File

@ -485,66 +485,10 @@ export default {
return await this.validFormFields(refsToValidate)
},
getResource() {
const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource()
// 使
this.resourceTmp = sjxxStepResource.sjResource || []
this.yqResourceTmp = sjxxStepResource.yqResource || []
//
const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData()
const sjxxList = sjxxTableData?.stepTableFormData || []
const headerSelectFields = sjxxTableData?.headerSelectFields || {}
// 0.9%
//
const sjxxResource = []
sjxxList.forEach((item) => {
// 0.9%
if (item.sjlhnzsjyjrl) {
sjxxResource.push({
mc: '0.9%氯化钠注射液', //
bh: null, //
ph: null, //
nd: null, //
nddw: null, //
ndz: null, //
ly: null, //
sxrq: null, //
kc: null, //
kcdw: null, //
type: 1, // 1使
syl: item.sjlhnzsjyjrl, // 使
syldw: headerSelectFields.sjlhnUnit || '', // 使
yxzq: null, //
yxzqdw: null //
})
}
//
if (item.sjjrxq) {
sjxxResource.push({
mc: '血清', //
bh: null, //
ph: null, //
nd: null, //
nddw: null, //
ndz: null, //
ly: null, //
sxrq: null, //
kc: null, //
kcdw: null, //
type: 1, // 1使
syl: item.sjjrxq, // 使
syldw: headerSelectFields.sjjrxqUnit || '', // 使
yxzq: null, //
yxzqdw: null //
})
}
})
//
return [...this.resourceTmp, ...sjxxResource]
const stepResource = this.$refs.sjxxStepRef.getStepResource()
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
return this.resourceTmp;
},
onRegentSubmit(e) {
//

+ 76
- 81
src/views/business/comps/template/comps/dl/DL011.vue View File

@ -8,24 +8,11 @@
</div>
<div class="detail-content">
<div class="content">
<BaseInfoFormPackage
fieldItemLabel="template.common.baseInfo"
label="template.common.baseInfo"
:ref="refConf.base"
:formConfig="baseInfoFormConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
:ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
<TableList
label="template.common.reagentInfo"
:columns="sysjColumns"
:dataSource="resourceSj"
/>
<TableList
label="template.common.instrumentInfo"
:columns="yqColumns"
:dataSource="yqResource"
/>
<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
<!-- 细胞信息 -->
<LineLabel label="template.dl.dl011.xbxx" />
@ -35,13 +22,8 @@
$t('template.dl.dl011.bqdy')
}}</el-button>
</div>
<BaseInfoFormPackage
fieldItemLabel=""
label=""
:ref="refConf.xbxx"
:formConfig="xbxxConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
@onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
</div>
<LineLabel label="template.dl.dl011.fxbz" />
@ -50,23 +32,13 @@
<!-- 预留区域 - 培养信息 -->
<LineLabel label="template.dl.dl011.pyxx" />
<div class="template-form-item">
<BaseInfoFormPackage
fieldItemLabel=""
label=""
:ref="refConf.pyxx"
:formConfig="pyxxConfig"
:formData="formData"
@clickButton="handlePyxxClickButton"
/>
<BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
:formData="formData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
@clickButton="handlePyxxClickButton" />
</div>
<BaseInfoFormPackage
fieldItemLabel="template.dl.dl007.bz"
label="template.dl.dl007.bz"
:ref="refConf.remark"
:formConfig="remarkConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
:formConfig="remarkConfig" :formData="formData" />
</div>
</div>
</div>
@ -82,6 +54,7 @@ import TableList from '@/components/Template/Table'
import Step from '@/components/Template/Step'
import templateMixin from '../../mixins/templateMixin'
import moment from 'moment'
import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
const refConf = {
base: 'baseInfoRef',
@ -297,6 +270,17 @@ export default {
}
},
methods: {
onTableRegentSubmit(data) {
if (data.key === 'xbdcbh') {
this.$refs.xbxxRef.updateFormData('xbdcbh_tj', data.selectInfo.row.tj)
this.$refs.xbxxRef.updateFormData('xbdcbh_dw', data.selectInfo.row.tjdw)
}
if (data.key === 'pyxbh') {
this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
}
},
//
handlePyxxClickButton(_item, signData) {
this.$refs.pyxxRef.updateFormData(
@ -322,49 +306,59 @@ export default {
return await this.validFormFields(refNames)
},
getResource() {
const content = this.getFilledFormData()
let tmpResource = []
let tmpYq = []
//
tmpResource.push({
mc: content.xbmc,
bh: content.fshxbbh + content.fshxbbhCodeSn,
ph: '',
ndz: '',
nd: '',
nddw: '',
ly: 'ELN配制',
sxrq: null,
kc: content.fshxbsjtj,
kcdw: content.fshxbsjtjUnit,
syl: null,
type: null, //null
elnType: this.product, // his.product
syldw: content.fshxbsjtjUnit,
yxzq: null,
yxzqdw: null,
})
//使
tmpResource.push({
mc: null,
bh: content.xbdcbh,
ph: '',
ndz: '',
nd: '',
nddw: '',
ly: '',
sxrq: null,
kc: null,
kcdw: null,
syl: null,
type: 9, //使
elnType: null, //null
syldw: content.xbdcbh_dw,
yxzq: null,
yxzqdw: null,
})
//使
tmpYq.push({
mc: content.pyxbh_mc,
xh: content.pyxbh_xh,
bh: content.pyxbh,
jzrq: content.pyxbh_jzrq,
})
//使
const stepResource = this.$refs.stepRef.getStepResource()
// 使
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = [...(stepResource.yqResource || [])]
//
const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
//
if (xbxxData.xbdcbh) {
const xbInfo = xbxxData.selectInfo_xbdcbh || {}
// type StepFormPackage xb
this.xbxjTmp = [
{
value: xbxxData.xbdcbh,
bh: xbInfo.bh || xbxxData.xbdcbh,
mc: xbInfo.mc || '',
xh: xbInfo.xh || '',
jzrq: xbInfo.jzrq || ''
}
]
} else {
this.xbxjTmp = []
}
//
const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
//
if (pyxxData.pyxbh) {
const pyxInfo = pyxxData.selectInfo_pyxbh || {}
// type StepFormPackage yq
this.yqResourceTmp.push({
type: 'yq',
value: pyxxData.pyxbh,
bh: pyxInfo.bh || pyxxData.pyxbh,
mc: pyxInfo.mc || '',
xh: pyxInfo.xh || '',
jzrq: pyxInfo.jzrq || ''
})
}
return this.resourceTmp
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
return this.resourceTmp;
},
onRegentSubmit(e) {
//
@ -391,6 +385,7 @@ export default {
.print-btn {
margin-bottom: 20px;
}
.config-header-end {
display: flex;
justify-content: flex-end;

+ 84
- 40
src/views/business/comps/template/comps/dl/DL012.vue View File

@ -8,35 +8,17 @@
</div>
<div class="detail-content">
<div class="content">
<BaseInfoFormPackage
fieldItemLabel="template.common.baseInfo"
label="template.common.baseInfo"
:ref="refConf.base"
:formConfig="baseInfoFormConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
:ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
<TableList
label="template.common.reagentInfo"
:columns="sysjColumns"
:dataSource="resourceSj"
/>
<TableList
label="template.common.instrumentInfo"
:columns="yqColumns"
:dataSource="yqResource"
/>
<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
<!-- 细胞信息 -->
<LineLabel label="template.dl.dl012.xbxx" />
<div class="template-form-item">
<BaseInfoFormPackage
fieldItemLabel=""
label=""
:ref="refConf.xbxx"
:formConfig="xbxxConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
@onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
</div>
<LineLabel label="template.dl.dl012.zbbz" />
@ -45,23 +27,13 @@
<!-- 培养信息 -->
<LineLabel label="template.dl.dl012.pyxx" />
<div class="template-form-item">
<BaseInfoFormPackage
fieldItemLabel=""
label=""
:ref="refConf.pyxx"
:formConfig="pyxxConfig"
@clickButton="handleClickButton"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
@clickButton="handleClickButton" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
:formData="formData" />
</div>
<BaseInfoFormPackage
fieldItemLabel="template.dl.dl007.bz"
label="template.dl.dl007.bz"
:ref="refConf.remark"
:formConfig="remarkConfig"
:formData="formData"
/>
<BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
:formConfig="remarkConfig" :formData="formData" />
</div>
</div>
</div>
@ -77,6 +49,7 @@ import TableList from '@/components/Template/Table'
import Step from '@/components/Template/Step'
import templateMixin from '../../mixins/templateMixin'
import moment from 'moment'
import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
const refConf = {
base: 'baseInfoRef',
@ -339,6 +312,17 @@ export default {
}
},
methods: {
onTableRegentSubmit(data) {
if (data.key === 'xbzbqbh') {
this.$refs.xbxxRef.updateFormData('xbzbqbh_tj', data.selectInfo.row.tj)
this.$refs.xbxxRef.updateFormData('xbzbqbh_dw', data.selectInfo.row.tjdw)
}
if (data.key === 'pyxbh') {
this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
}
},
handleClickButton(e, signData) {
console.log(e)
const { subKey } = e || {}
@ -366,7 +350,7 @@ export default {
async validFields() {
return await this.validFormFields(refNames)
},
getResource() {
_getResource() {
const stepResource = this.$refs.stepRef.getStepResource()
// 使
this.resourceTmp = stepResource.sjResource || []
@ -411,6 +395,65 @@ export default {
return this.resourceTmp
},
getResource() {
const content = this.getFilledFormData()
let tmpResource = []
let tmpYq = []
debugger
//
for (var i = 0; i < parseInt(content.zbxbs); i++) {
tmpResource.push({
mc: content.xbmc,
bh: content['zbhxbbh_'+(i+1)] +content['zbhxbbhCodeSn_'+(i+1)],
ph: '',
ndz: '',
nd: '',
nddw: '',
ly: 'ELN配制',
sxrq: null,
kc: content.zbhxbsjtj,
kcdw: content.zbhxbsjtjUnit,
syl: null,
type: null, //null
elnType: this.product, // his.product
syldw: content.zbhxbsjtjUnit,
yxzq: null,
yxzqdw: null,
})
}
//使
tmpResource.push({
mc: null,
bh: content.xbzbqbh,
ph: '',
ndz: '',
nd: '',
nddw: '',
ly: '',
sxrq: null,
kc: null,
kcdw: null,
syl: null,
type: 9, //使
elnType: null, //null
syldw: content.xbzbqbh_dw,
yxzq: null,
yxzqdw: null,
})
//使
tmpYq.push({
mc: content.pyxbh_mc,
xh: content.pyxbh_xh,
bh: content.pyxbh,
jzrq: content.pyxbh_jzrq,
})
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
debugger
return this.resourceTmp;
},
onRegentSubmit(e) {
//
},
@ -430,6 +473,7 @@ export default {
.print-btn {
margin-bottom: 20px;
}
.config-header-end {
display: flex;
justify-content: flex-end;

+ 1
- 16
src/views/business/comps/template/comps/dl/DL013.vue View File

@ -614,22 +614,7 @@ export default {
return await this.validFormFields(refsToValidate)
},
getResource() {
// 使
const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
const yqsyList = yqsyData?.stepTableFormData || []
// 使
this.yqResourceTmp = yqsyList
.filter((item) => item.yqbh)
.map((item) => ({
type: 'yq',
value: item.yqbh,
bh: item.yqbh,
mc: item.yqmc,
xh: item.yqxh,
jzrq: item.xccsjzjdrq
}))
this.yqResourceTmp = []
this.resourceTmp = []
return this.resourceTmp
},

+ 0
- 35
src/views/business/comps/template/comps/dl/DL015.vue View File

@ -327,43 +327,8 @@ export default {
},
getResource() {
const stepResource = this.$refs.stepRef.getStepResource()
const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData()
const hyqkList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
//
// Set
const xybhSet = new Set()
const sjResourceFromHyqk = []
hyqkList.forEach((item) => {
if (item.xybh && !xybhSet.has(item.xybh)) {
xybhSet.add(item.xybh)
sjResourceFromHyqk.push({
mc: '细胞悬液',
bh: item.xybh,
ph: null,
nd: null,
nddw: null,
ndz: null,
ly: null,
sxrq: null,
kc: null,
kcdw: null,
type: 1,
syl: item.pyybrl || null,
syldw: item.pyybrl ? 'mL' : null,
yxzq: null,
yxzqdw: null
})
}
})
this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
return this.resourceTmp
},
onRegentSubmit(e) {

+ 0
- 13
src/views/business/comps/template/comps/dl/DL016.vue View File

@ -267,21 +267,8 @@ export default {
getResource() {
//使
const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
// const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
console.log('回显填写完成的表单数据==============',this.resourceTmp);
return this.resourceTmp;
},
//

+ 0
- 12
src/views/business/comps/template/comps/dl/DL017.vue View File

@ -369,20 +369,8 @@ export default {
getResource() {
//使
const stepResource = this.$refs.stepRef.getStepResource()
const hyqkData = this.$refs.stepTableRef?.getFilledFormData()
const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
const sjResourceFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
return this.resourceTmp;
},
//

+ 0
- 13
src/views/business/comps/template/comps/dl/DL018.vue View File

@ -331,22 +331,9 @@ export default {
return content;
},
getResource() {
//使
const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
return this.resourceTmp;
},
//

+ 0
- 13
src/views/business/comps/template/comps/dl/DL019.vue View File

@ -297,21 +297,8 @@ export default {
getResource() {
//使
const stepResource = this.$refs.stepRef.getStepResource()
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
// const tableList = hyqkData?.stepTableFormData || []
//
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
const tableFromHyqk = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
console.log('回显填写完成的表单数据==============',this.resourceTmp);
return this.resourceTmp;
},
//

+ 21
- 3
src/views/business/comps/template/comps/dl/DL021.vue View File

@ -187,6 +187,17 @@ export default {
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
console.log('选择显微镜预留===',row)
if (key == 'xwj') {
this.$refs.swypyjInfoRef.updateFormData('wxjmc', row.mc)
this.$refs.swypyjInfoRef.updateFormData('wxjxh', row.xh)
this.$refs.swypyjInfoRef.updateFormData('wxjjzrq', row.jzrq)
}
// if (key === 'yqbh' && this.$refs.yqsyTableRef) {
// const params = {
// yqmc: row.mc,
@ -273,10 +284,17 @@ export default {
return content;
},
getResource() {
//使
// stepRef
let content = this.getFilledFormData();
let tmpYq = []
tmpYq.push({
mc: content.wxjmc,
xh: content.wxjxh,
bh: content.xwj,
jzrq: content.wxjjzrq,
})
this.resourceTmp = []
this.yqResourceTmp = []
this.yqResourceTmp = tmpYq
return this.resourceTmp;
},
//

+ 22
- 11
src/views/business/comps/template/comps/dl/DL023.vue View File

@ -47,9 +47,6 @@ import moment from 'moment'
export default {
name: "dl023",
dicts: [
'business_dl_xbmc',"business_sydd"
],
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
mixins: [templateMixin],
props: {
@ -166,9 +163,10 @@ export default {
label: "template.dl.dl023.uvazsjl",
type: "input",
fillType: "actFill",
subType: "sj",
subType: "select",
subKey: "subUvazsjl",
subFillType: "actFill",
subOptions: this.getDictOptions('business_dl_uav'),
maxlength: 20,
},
zszsj: {
@ -187,6 +185,8 @@ export default {
subType: 'button',
subKey: 'zskssj',
buttonName: 'template.dl.dl023.ksButton',
disabled:true,
subDisabled:false
},
zsjssj: {
label: 'template.dl.dl023.zsjssj',
@ -196,6 +196,8 @@ export default {
subType: 'button',
subKey: 'zsjssj',
buttonName: 'template.dl.dl023.jsButton',
disabled:true,
subDisabled:false
},
}
}
@ -221,10 +223,7 @@ export default {
onSelect(e) {
const { key, value } = e
if (key === "dwzshxbx") {//
this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_xbmc') : [
{ label: "细胞系1", value: "细胞系1" },
{ label: "细胞系2", value: "细胞系2" },
]
this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_dwzs') : this.getDictOptions('business_dl_xbx')
}
},
@ -318,10 +317,22 @@ export default {
return content;
},
getResource() {
//使
// stepRef
let content = this.getFilledFormData();
let tmpYq = []
let table = content.stepTableFormData
if (table && table.length > 0) {
for (let i = 0; i < table.length; i++) {
let item = table[i]
tmpYq.push({
mc: item.yqmc,
xh: item.yqxh,
bh: item.yqbh,
jzrq: item.xcrq,
})
}
}
this.yqResourceTmp = tmpYq
this.resourceTmp = []
this.yqResourceTmp = []
return this.resourceTmp;
},
//

+ 3
- 9
src/views/business/comps/template/comps/dl/DL024.vue View File

@ -9,7 +9,7 @@
<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
<!-- 仪器使用信息 -->
<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
<LineLabel label="template.dl.dl024.xbpyxx" />
<!-- 操作记录 -->
@ -261,14 +261,8 @@ export default {
return content;
},
getResource() {
const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
//
this.resourceTmp = tableList
.filter(item => item.xybh)
.map(item => ({
bh: item.xybh,
type: 'cell'
}))
this.resourceTmp = []
this.yqResourceTmp = []
return this.resourceTmp;
},
//

+ 2
- 0
src/views/business/comps/template/comps/yp/YP005.vue View File

@ -173,6 +173,8 @@ export default {
bodySubKey:"startBtn",
showBodySub:this.fillType === "actFill",
width: 280,
bodyDisabled:true,
bodySubDisabled:false,
}]
},
},

+ 8
- 5
src/views/business/comps/template/mixins/templateMixin.js View File

@ -61,10 +61,13 @@ export default {
'business_cjbw', // 制片部位
'business_qywz', // 取样位置
'business_lba_ptjhbzqx_zkpx', // lba005
'business_lba_ptjhfxyp', // lba007
'business_ada_kyktzkyp', // ada005
'business_ada_kyktffxyp', // ada007
'business_lba_ptjhbzqx_zkpx', // LBA-编号-配体结合分析标准曲线LBA005-质控平行
'business_lba_bqpx', //LBA-编号-配体结合分析标准曲线LBA005-标曲平行
'business_lba_ptjhfxyp', // LBA-编号-配体结合分析方法学样品制备表LBA007
'business_ada_kyktzkyp', // ADA-编号-抗药抗体质控样品配制记录表ADA005
'business_ada_kyktffxyp', // ADA-编号-抗药抗体方法学样品制备表ADA007
'business_dl_uav', // 毒理-紫外照射操作记录表-UVA-DL023
'business_pcr_fxffypzbb', //PCR-编号-分析方法学样品制备表
],
props: {
templateData: {
@ -93,7 +96,7 @@ export default {
id
} = v
if (v.resource) {
//type 类型:1:试剂;3:给药制剂;5:麻精药;7:供试品
//type 类型:1:试剂;3:给药制剂;5:麻精药;7:供试品 9:细胞;11:细菌
//试验试剂信息 试剂
// this.resource = _.filter(JSON.parse(v.resource), function (o) {
// return o.type == 1 || o.elnType == 1

+ 47
- 17
src/views/business/form/drug/comp/sqbdList.vue View File

@ -22,7 +22,7 @@
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormApply.xysj')">
<el-date-picker v-model="daterange" clearable type="daterange" @change="search" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
@ -37,13 +37,13 @@
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormApply.sybhbm')" prop="templateName">
<el-input v-model="searchForm.sybhbm" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormApply.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
@change="search">
@ -61,7 +61,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-col :span="6">
<el-form-item :label="$t('page.business.form.status')">
<el-select v-model="searchForm.bdzt" :placeholder="$t('form.placeholderSelect')" clearable
@change="search">
@ -85,26 +85,29 @@
v-hasPermi="['business:drugFormApply:xz']">{{
$t('page.business.study.studyFormApply.xzbd') }}</el-button>
</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-col>
<el-col :span="12" style="text-align: right;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="list">
<el-table v-loading="loading" :data="list" :default-sort="{ prop: 'tjsj', order: 'descending' }"
@sort-change="sortChange">
<el-table-column :label="$t('page.business.form.bh')" prop="bdbh" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.sybhbm')" align="center"
width="140">
<el-table-column :label="$t('page.business.study.studyFormApply.sybhbm')" align="center" width="140">
<template slot-scope="scope">
{{ scope.row.sySn||'' }}
{{ scope.row.bmName||'' }}
{{ scope.row.sySn || '' }}
{{ scope.row.bmName || '' }}
</template>
</el-table-column>
<el-table-column :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sywzmc" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.xynd')" prop="xynd" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.xysj')" prop="xysj" :show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sywzmc"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.xynd')" prop="xynd"
:show-overflow-tooltip="true" />
<el-table-column :label="$t('page.business.study.studyFormApply.xysj')" prop="xysj"
:show-overflow-tooltip="true" sortable />
<!-- <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" /> -->
<el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
<el-table-column :label="$t('page.business.study.studyFormApply.sfbl')" align="center" prop="status"
@ -134,7 +137,7 @@
$t('page.business.study.studyFormApply.yfz') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
<el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" sortable />
<el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
<template slot-scope="scope">
<!-- 表单状态1填报中3已提交5已复核6未通过7已完成9待废止11已废止 -->
@ -277,6 +280,8 @@ export default {
sywzmc: '',
bdbh: '',
bdmc: '',
xyssort: null,
tjsjsort: 10,
userId: '',
userMc: '',
templateMc: '',
@ -297,6 +302,31 @@ export default {
},
created() { this.getIsQa() },
methods: {
sortChange(e, event) {
// column: {}
// order: "ascending"
// prop: "tjsj"
if (e.prop == 'tjsj') {
if (e.order == 'ascending') {
this.searchForm.tjsjsort = 1
} else {
this.searchForm.tjsjsort = 10
}
this.searchForm.xyssort = null
}
if (e.prop == 'xysj') {
if (e.order == 'ascending') {
this.searchForm.xyssort = 1
} else {
this.searchForm.xyssort = 10
}
this.searchForm.tjsjsort = null
}
this.search()
event.preventDefault()
event.stopPropagation()
return
},
checkPermi,
checkRole,
getIsQa() {

+ 38
- 60
src/views/business/form/drug/comp/tbbdList.vue View File

@ -3,65 +3,43 @@
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
@change="search">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable @change="search">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="tbbd-content">
@ -326,7 +304,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = ''

+ 29
- 46
src/views/business/form/drug/comp/ytbdList.vue View File

@ -2,48 +2,31 @@
<div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="ytbd-content">
@ -114,11 +97,11 @@
</template>
<template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
<el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
}}</el-button>
}}</el-button>
</template>
<template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
<el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
}}</el-button>
}}</el-button>
</template>
</template>
</template>
@ -396,7 +379,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.startDate = ''
this.searchForm.endDate = ''
@ -444,7 +427,7 @@ export default {
detail(row) {
this.showDetail = true
this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row, true,this.searchForm)
this.$refs.Xq.show(row, true, this.searchForm)
},
audit(row) {
this.showAudit = true

+ 38
- 60
src/views/business/form/nonTrial/comp/tbbdList.vue View File

@ -2,65 +2,43 @@
<div>
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable>
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="tbbd-content">
@ -391,7 +369,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = ''

+ 30
- 47
src/views/business/form/nonTrial/comp/ytbdList.vue View File

@ -2,48 +2,31 @@
<div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" style="width: 150px" @change="userChange" />
</el-form-item>
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" />
</el-form-item>
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="ytbd-content">
@ -113,11 +96,11 @@
</template>
<template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
<el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
}}</el-button>
}}</el-button>
</template>
<template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
<el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
}}</el-button>
}}</el-button>
</template>
</template>
</template>
@ -265,7 +248,7 @@ export default {
pageNum: 1,
pageSize: 10,
studyId: -1,
studyStatus:5,
studyStatus: 5,
studySn: '',
studyMc: '',
bdbh: '',
@ -424,7 +407,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.startDate = ''
this.searchForm.endDate = ''
@ -481,7 +464,7 @@ export default {
detail(row) {
this.showDetail = true
this.$emit('showDetail', this.showDetail)
this.$refs.Xq.show(row, true,this.searchForm)
this.$refs.Xq.show(row, true, this.searchForm)
},
audit(row) {
this.showAudit = true

+ 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>

+ 1
- 1
src/views/business/resource/gyzj/comps/gyzjList.vue View File

@ -522,7 +522,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''

+ 1
- 1
src/views/business/resource/mjy/comps/mjyList.vue View File

@ -521,7 +521,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''

+ 1
- 1
src/views/business/study/comp/jhbd/Bj.vue View File

@ -64,7 +64,7 @@
</el-row>
</el-form>
</div>
<div class="content" v-if="showIndex == 2">
<div class="content" v-if="showIndex == 2&&templateData.templateId">
<TemplateTable ref="templateTable" emitName="onPlanCallback" @onPlanCallback="onPlanCallback"
:sn="form.templateSn" :templateData="templateData" fillType="actFill" />
</div>

+ 5
- 17
src/views/business/study/comp/jhbdList.vue View File

@ -2,41 +2,29 @@
<div class="tbbd-list">
<div v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
<el-row>
<el-col :span="5">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name"
:label-width="$i18n.locale === 'zh_CN' ? '100px' : '120px'">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 160px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 160px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 160px" :name="searchForm.userMc" key="userId"
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div class="tbbd-content">
@ -239,7 +227,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = ''

+ 1
- 1
src/views/business/study/comp/sqbd/Bj.vue View File

@ -74,7 +74,7 @@
</el-row>
</el-form>
</div>
<div class="content" v-if="showIndex == 2">
<div class="content" v-if="showIndex == 2&&templateData.templateId">
<TemplateTable ref="templateTable" emitName="onApplyCallback" @onApplyCallback="onApplyCallback"
:sn="form.templateSn" :templateData="templateData" fillType="actFill" />
</div>

+ 2
- 2
src/views/business/study/comp/tbbd/Bj.vue View File

@ -78,7 +78,7 @@
</el-row>
</el-form>
</div>
<div class="content" v-if="showIndex == 2">
<div class="content" v-if="showIndex == 2&&templateData.templateId">
<TemplateTable emitName="onFillCallback" @onFillCallback="onFillCallback" ref="templateTable"
:sn="templateData.templateSn" :templateData="templateData" fillType="actFill" />
</div>
@ -757,7 +757,7 @@ export default {
this.$modal.loading()
studyFormFill_bcOnly(this.form).then(response => {
this.form = response.data
this.templateData.bdmc = this.form.bdmc
this.templateData = deepClone(this.form)
this.showIndex = 2
const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
this.$tab.updatePage(obj);

+ 16
- 33
src/views/business/study/comp/tbbdList.vue View File

@ -2,65 +2,48 @@
<div>
<div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
<div class="tbbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
<SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<div style="margin-left: 100px;">
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.tjsj')">
<el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
<el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable style="width: 150px">
<el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
<el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="tbbd-content">
@ -386,7 +369,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.cjsjks = this.daterange[0]
this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.cjsjks = ''
this.searchForm.cjsjjs = ''

+ 1
- 1
src/views/business/study/comp/wzlb/gyzjList.vue View File

@ -255,7 +255,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''

+ 1
- 1
src/views/business/study/comp/wzlb/mjyList.vue View File

@ -233,7 +233,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.queryParams.startDate = this.daterange[0]
this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''

+ 1
- 1
src/views/business/study/comp/ytbd/Bj.vue View File

@ -65,7 +65,7 @@
</el-row>
</el-form>
</div>
<div class="content" v-if="showIndex == 2">
<div class="content" v-if="showIndex == 2&&templateData.templateId">
<TemplateTable ref="templateTable" emitName="onPreCallback" @onPreCallback="onPreCallback"
:sn="form.templateSn" :templateData="templateData" fillType="preFill" />
</div>

+ 9
- 25
src/views/business/study/comp/ytbdList.vue View File

@ -2,48 +2,32 @@
<div>
<div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
<div class="ytbd-search">
<el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
<el-row>
<el-col :span="6">
<el-form :model="searchForm" ref="searchForm" :inline="true" >
<el-form-item :label="$t('page.business.form.bdmc')" prop="name">
<el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
<el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.gsr')" prop="userId">
<SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
@change="userChange" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
<el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
style="width: 200px" />
style="width: 150px" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('page.business.form.cjsj')">
<el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
:start-placeholder="$t('page.business.form.startDate')"
:end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
</el-form-item>
</el-col>
</el-row>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
</div>
<div class="ytbd-content">
@ -430,7 +414,7 @@ export default {
getList() {
if (this.daterange != null && this.daterange.length > 0) {
this.searchForm.startDate = this.daterange[0]
this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
} else {
this.searchForm.startDate = ''
this.searchForm.endDate = ''

Loading…
Cancel
Save