diff --git a/src/api/business/bacteria/bacteria.js b/src/api/business/bacteria/bacteria.js
new file mode 100644
index 0000000..409f2a6
--- /dev/null
+++ b/src/api/business/bacteria/bacteria.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询试验-细菌列表
+export function bacteria_studyList(query) {
+ return request({
+ url: '/system/business/bacteria/studyList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/business/cell/cell.js b/src/api/business/cell/cell.js
new file mode 100644
index 0000000..1cfed85
--- /dev/null
+++ b/src/api/business/cell/cell.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询试验-细胞列表
+export function cell_studyList(query) {
+ return request({
+ url: '/system/business/cell/studyList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/lang/en.js b/src/lang/en.js
index 9942552..271b94b 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -31,6 +31,8 @@ import studyFormApply from './en/business/study/studyFormApply'
import studyRoom from './en/business/study/studyRoom'
//试验方法
import studyMethod from './en/business/study/studyMethod'
+//物资列表-细胞、细菌
+import cell from './en/business/study/cell'
//表单
import form from './en/business/form/form'
@@ -152,7 +154,8 @@ export default {
studyRoom: studyRoom,
studyMethod: studyMethod,
nonTrial: nonTrial,
- drug: drug
+ drug: drug,
+ cell: cell
},
form: form
}
diff --git a/src/lang/en/business/study/cell.js b/src/lang/en/business/study/cell.js
new file mode 100644
index 0000000..f0fc398
--- /dev/null
+++ b/src/lang/en/business/study/cell.js
@@ -0,0 +1,9 @@
+export default {
+ mc: 'Name',
+ bh: 'ID',
+ ly: 'Source',
+ sssy: 'From Study',
+ sxr: 'Expiration',
+ tj: '体积',
+ cz: 'Dispose'
+}
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 7dcabc2..bc2a80f 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -31,7 +31,8 @@ import studyFormApply from './zh/business/study/studyFormApply'
import studyRoom from './zh/business/study/studyRoom'
//试验方法
import studyMethod from './zh/business/study/studyMethod'
-
+//物资列表-细胞、细菌
+import cell from './zh/business/study/cell'
//表单
import form from './zh/business/form/form'
@@ -148,7 +149,8 @@ export default {
studyRoom: studyRoom,
studyMethod: studyMethod,
nonTrial: nonTrial,
- drug: drug
+ drug: drug,
+ cell: cell
},
form: form
}
diff --git a/src/lang/zh/business/study/cell.js b/src/lang/zh/business/study/cell.js
new file mode 100644
index 0000000..a98c724
--- /dev/null
+++ b/src/lang/zh/business/study/cell.js
@@ -0,0 +1,9 @@
+export default {
+ mc: '名称',
+ bh: '编号',
+ ly: '来源',
+ sssy: '所属试验',
+ sxr: '失效日',
+ tj: '体积',
+ cz: '处置'
+}
diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue
index 5790412..3a05ba8 100644
--- a/src/views/business/study/comp/wzlb.vue
+++ b/src/views/business/study/comp/wzlb.vue
@@ -42,6 +42,8 @@
+
+
@@ -54,6 +56,8 @@ import { study_info } from "@/api/business/study/study"
import gyzjList from './wzlb/gyzjList.vue'
import sjList from './wzlb/sjList.vue'
import gspList from './wzlb/gspList.vue'
+import cellList from './wzlb/cellList.vue'
+import bacteriaList from './wzlb/bacteriaList.vue'
export default {
name: 'StudyWzlb',
props: {
@@ -73,7 +77,7 @@ export default {
}
},
},
- components: {gyzjList, sjList, gspList},
+ components: {gyzjList, sjList, gspList, cellList, bacteriaList},
data() {
return {
showDetail: false,
diff --git a/src/views/business/study/comp/wzlb/bacteriaList.vue b/src/views/business/study/comp/wzlb/bacteriaList.vue
new file mode 100644
index 0000000..84049ae
--- /dev/null
+++ b/src/views/business/study/comp/wzlb/bacteriaList.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('form.search') }}
+ {{ $t('form.reset') }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.tj }}{{ scope.row.tjdw }}
+
+
+
+
+
+
+
+
+
+ {{
+ $t('page.business.study.cell.cz') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/business/study/comp/wzlb/cellList.vue b/src/views/business/study/comp/wzlb/cellList.vue
new file mode 100644
index 0000000..ce30ba6
--- /dev/null
+++ b/src/views/business/study/comp/wzlb/cellList.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('form.search') }}
+ {{ $t('form.reset') }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.tj }}{{ scope.row.tjdw }}
+
+
+
+
+
+
+
+
+
+ {{
+ $t('page.business.study.cell.cz') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/business/study/comp/wzlb/gspList.vue b/src/views/business/study/comp/wzlb/gspList.vue
index 52a57b4..1f3323c 100644
--- a/src/views/business/study/comp/wzlb/gspList.vue
+++ b/src/views/business/study/comp/wzlb/gspList.vue
@@ -196,8 +196,8 @@ 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.startDate = this.daterange[0] + ' 00:00:00'
+ this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''
@@ -216,6 +216,7 @@ export default {
},
//重置
resetQuery() {
+ this.daterange = []
this.resetForm("queryForm")
this.handleQuery()
}
diff --git a/src/views/business/study/comp/wzlb/sjList.vue b/src/views/business/study/comp/wzlb/sjList.vue
index fc4f621..f916229 100644
--- a/src/views/business/study/comp/wzlb/sjList.vue
+++ b/src/views/business/study/comp/wzlb/sjList.vue
@@ -190,8 +190,8 @@ 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.startDate = this.daterange[0] + ' 00:00:00'
+ this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
} else {
this.queryParams.startDate = ''
this.queryParams.endDate = ''
@@ -210,6 +210,7 @@ export default {
},
//重置
resetQuery() {
+ this.daterange = []
this.resetForm("queryForm")
this.handleQuery()
}
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..56dd747 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://localhost:8080`,
- target: `http://39.99.251.173:8080`,
+ target: `http://localhost:8080`,
+ // target: `http://39.99.251.173:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''