diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index babc904..12642a9 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -115,3 +115,11 @@ export function public_templateStepList(query) {
params: query
})
}
+// 冰箱列表
+export function public_fridgeList(query) {
+ return request({
+ url: '/system/business/public/fridgeList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/lang/en/business/resource/yq.js b/src/lang/en/business/resource/yq.js
index 3515c24..cd11baf 100644
--- a/src/lang/en/business/resource/yq.js
+++ b/src/lang/en/business/resource/yq.js
@@ -9,5 +9,8 @@ export default {
yqly: 'Source',
wc: 'Compartment',
xzyq: 'Add Instrument',
- bjyq: 'Edit Instrument Information'
+ bjyq: 'Edit Instrument Information',
+ sfbx: '是否是冰箱',
+ yes: 'Yes',
+ no: 'No',
}
diff --git a/src/lang/zh/business/resource/yq.js b/src/lang/zh/business/resource/yq.js
index a5ebc04..0175734 100644
--- a/src/lang/zh/business/resource/yq.js
+++ b/src/lang/zh/business/resource/yq.js
@@ -11,4 +11,7 @@ export default {
xgnr: '修改内容',
xzyq: '新增仪器',
bjyq: '编辑仪器',
+ sfbx: '是否是冰箱',
+ yes: '是',
+ no: '否',
}
\ No newline at end of file
diff --git a/src/views/business/comps/select/SelectFridge.vue b/src/views/business/comps/select/SelectFridge.vue
new file mode 100644
index 0000000..4cac181
--- /dev/null
+++ b/src/views/business/comps/select/SelectFridge.vue
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
index f058dbe..bbd378d 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
index a5a59f5..88b40f9 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
index 133bc44..954ad02 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
@@ -378,7 +378,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -398,7 +398,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -418,7 +418,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
index 3c9b76a..16a43c7 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
@@ -241,7 +241,7 @@ export default {
rowIndex:0,//当前表格点击的行数
resource: [],
-
+
formData: {}
};
},
@@ -391,7 +391,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -411,7 +411,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -431,7 +431,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
index d52f57f..08e19df 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index 1b3a6b2..dfa3cd1 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
@@ -509,7 +509,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -529,7 +529,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -561,7 +561,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
index 74e1607..648fd36 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -434,7 +434,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
index 9a92c36..67206b6 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
index 82ba37f..4a0d0d2 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
index 40881ca..10abc71 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index 76bdc87..a70aa50 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -390,7 +390,7 @@ export default {
let postData = {
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.fzsj.mybh,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
@@ -410,7 +410,7 @@ export default {
bh:val.rowData.bh+val.rowData.bhCode,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
}
console.log("开始配置提交数据:"+JSON.stringify(postData))
sj_startConfiguration(postData).then(() => {
@@ -430,7 +430,7 @@ export default {
mc:null,
studyId:this.formData.studyId,
studyFormId:this.formData.id,
- deptId: this.formData.studySubjectId,
+ studySubjectId: this.formData.studySubjectId,
bh:val.rowData.bh+val.rowData.bhCode,
nd:val.rowData.hhwznd,
nddw:val.headerSelectFields.hhwzndUnit,
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index cee213a..c077226 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -17,6 +17,12 @@
+
+
+
+
+
+
{{ $t('form.search')
@@ -106,6 +112,14 @@
+
+
+
+
+
+
+
+
@@ -130,8 +144,8 @@
-
+
@@ -188,7 +202,8 @@ export default {
ly: null,
jzrq: null,
bmMc: null,
- wc: null
+ wc: null,
+ fridge: null,
},
// 表单参数
form: {
@@ -221,6 +236,9 @@ export default {
wc: [
{ required: true, message: this.$t('page.business.resource.yq.wc') + this.$t('form.notEmpty'), trigger: "change" },
],
+ fridge: [
+ { required: true, message: '', trigger: "change" },
+ ],
qmrmm: [
{ required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
{ min: 0, max: 20, message: this.$t('form.signerPsw') + this.$t('form.lengthLimit') + '20', trigger: 'blur' }
@@ -264,6 +282,7 @@ export default {
jzrq: null,
bmId: null,
wc: null,
+ fridge: null,
qmyy: this.$t('page.business.resource.yq.xzyq'),
}
this.resetForm('form')
diff --git a/vue.config.js b/vue.config.js
index 79b422b..bf3ddf1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://localhost:8080`,
+ // target: `http://localhost:8080`,
target: `http://39.99.251.173:8080`,
changeOrigin: true,
pathRewrite: {