Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

.env.development

@@ -1,5 +1,6 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻实验室电子记录系统
+VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0
+VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,6 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻实验室电子记录系统
+VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0
+VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook
 
 # 生产环境配置
 ENV = 'production'

src/components/Template/StepComponents/ry/ym.vue

@@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"actFill",
                         },
                         text3:{
-                            label:"仪器，吸取",
+                            label:"仪器，加入",
                             type:"text",
                         },
                         ry1:{

src/lang/en/template/dj.js

@@ -3,8 +3,8 @@ export default {
   dj001: {
     syts: '试验天数',
     fhfw: '复核范围',
-    fhlr: '复核内容',
-  }, 
+    fhlr: '复核内容'
+  },
   //dj002复用dj003
   dj003: {
     yplx: '样品类型',
@@ -13,7 +13,7 @@ export default {
     cyd: '采样点',
     ypmc: '样品名称',
     dwbh: '动物编号',
-    cysj: '采样时间',
+    cysj: '采样开始时间',
     sjbd: '时间比对',
     sjbd: '时间比对',
     yps: '样品数',
@@ -21,6 +21,6 @@ export default {
     yjczxx: '移交处置信息',
     yjsj: '移交时间',
     hqsj: '获取时间',
-    dsfs: '递送方式',
-  }, 
+    dsfs: '递送方式'
+  }
 }

src/lang/en/template/xb.js

@@ -1,7 +1,7 @@
 //细胞
 export default {
   xb001: {
-    jcsj: '检测时间',
+    jcsj: '操作时间',
     czbz: 'Operation Workflow',
     qtbz: '其他步骤',
     fj: 'Attachment',
@@ -11,6 +11,5 @@ export default {
     ks: 'Start',
     js: 'End',
     fysc: '孵育时长（hr: min）'
-  }, 
- 
+  }
 }

src/lang/zh/template/dj.js

@@ -3,8 +3,8 @@ export default {
   dj001: {
     syts: '试验天数',
     fhfw: '复核范围',
-    fhlr: '复核内容',
-  }, 
+    fhlr: '复核内容'
+  },
   //dj002复用dj003
   dj003: {
     yplx: '样品类型',
@@ -13,7 +13,7 @@ export default {
     cyd: '采样点',
     ypmc: '样品名称',
     dwbh: '动物编号',
-    cysj: '采样时间',
+    cysj: '采样开始时间',
     sjbd: '时间比对',
     sjbd: '时间比对',
     yps: '样品数',
@@ -21,6 +21,6 @@ export default {
     yjczxx: '移交处置信息',
     yjsj: '移交时间',
     hqsj: '获取时间',
-    dsfs: '递送方式',
-  }, 
+    dsfs: '递送方式'
+  }
 }

src/lang/zh/template/xb.js

@@ -1,7 +1,7 @@
 //细胞
 export default {
   xb001: {
-    jcsj: '检测时间',
+    jcsj: '操作时间',
     czbz: '操作步骤',
     qtbz: '其他步骤',
     fj: '附件',
@@ -11,6 +11,5 @@ export default {
     ks: '开始',
     js: '结束',
     fysc: '孵育时长（hr: min）'
-  }, 
- 
+  }
 }

src/utils/request.js

@@ -245,7 +245,7 @@ service.interceptors.response.use(
     console.log('err' + error)
     let { message } = error
     if (message == 'Network Error') {
-      message = '后端接口连接异常'
+      message = '网络异常，请检查网络'
     } else if (message.includes('timeout')) {
       message = '系统接口请求超时'
     } else if (message.includes('Request failed with status code')) {

src/views/business/comps/template/comps/dl/DL022.vue

@@ -304,6 +304,7 @@ export default {
 		onAddRow() {
 			this.$refs.tableRef.addRow({
 				jblx: [{ value: undefined }],
+				id: getuuid(),
 			})
 		},
 		onFormSelect(fields) {

src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue

@@ -134,19 +134,6 @@ export default {
 							type: "input",
 							disabled: true,
 						},
-						methodCode: {
-							label: 'template.common.methodCode',
-							type: "input",
-							fillType: "preFill",
-							maxlength: 50
-						},
-						versionNum: {
-							label: 'template.common.versionNumber',
-							type: "inputNumber",
-							fillType: "preFill",
-							prepend: "V",
-							maxlength: 50
-						},
 
 					}
 				},

src/views/business/comps/template/comps/gsp/GSP001.vue

@@ -70,6 +70,10 @@ export default {
 			type: String,
 			default: 'preFill',
 		},
+		sn: {
+			type: String,
+			default: '',
+		},
 	},
 	provide() {
 		return {
@@ -119,7 +123,61 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			return [
+			return this.sn==='GG005'?[
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.testConfigurationConditions',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]:[
 				{
 					type: "cardItem",
 					config: {

src/views/business/comps/template/comps/gsp/GSP002.vue

@@ -126,7 +126,74 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			return [
+			return this.sn==='GG006'?[
+				{
+					type: 'cardItem',
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: 'input',
+							disabled: true
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: 'input',
+							disabled: true
+						},
+					}
+				},
+				{
+					type: 'conditionItem',
+					label: 'template.common.testConfigurationConditions',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: 'select',
+							multiple: true,
+							fillType: 'preFill',
+							options: this.getDictOptions('business_pztj'),
+							otherCode: 'preOther'
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: 'select',
+							fillType: 'actFill',
+							otherCode: 'actOther',
+							multiple: true,
+							options: this.getDictOptions('business_pztj'),
+							compareTo: 'pre'
+						}
+					}
+				},
+				{
+					type: 'conditionItem',
+					label: 'template.sp.sp00456.rqcz',
+					config: {
+						containerMaterial: {
+							label: 'template.sp.sp00456.rqcz',
+							type: 'select',
+							options: this.getDictOptions('business_rqcz'),
+							fillType: 'actFill',
+							multiple: true,
+							otherCode: 'containerMaterialOther'
+						}
+					}
+				},
+				{
+					type: 'cellItem',
+					label: 'template.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: 'input'
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: 'input'
+						}
+					}
+				}
+			]:[
 				{
 					type: 'cardItem',
 					config: {
@@ -206,7 +273,7 @@ export default {
 						}
 					}
 				}
-			];
+			]
 		},
 		paralleStepFormConfig() {
 			return [

src/views/business/comps/template/comps/gsp/GSP015.vue

@@ -216,6 +216,7 @@ export default {
 			refConfig,
 			currentIndex: -1,
 			appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
 			baseUrl: process.env.VUE_APP_FILE_DOMAIN,
 			uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
 		};

src/views/business/comps/template/comps/sp/SP001.vue

@@ -104,8 +104,8 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			//毒理002没得方法编号和版本号
-			let baseConfig = this.sn=='DL002'?
+			//毒理002+GG003+GG004没得方法编号和版本号
+			let baseConfig = this.sn=='DL002' || this.sn=='GG003' || this.sn=='GG004'?
 			{
 				studyMc: {
 					label: 'template.common.testName',

src/views/business/comps/template/formConfig/formConfig.js

@@ -67,6 +67,13 @@ export const getSjColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'nd',
       label: 'page.business.resource.sj.sjnd'
     },
@@ -96,6 +103,13 @@ export const getGspColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'yxq',
       label: '有效期'
     },
@@ -117,6 +131,13 @@ export const getGyzjColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'nd',
       label: 'page.business.resource.sj.sjnd'
     },

src/views/business/resource/gsp/comps/gsp/Xq.vue

@@ -136,6 +136,7 @@ export default {
   data() {
     return {
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       form: {},
       tzList: [],
       totalTz: 0,
@@ -160,7 +161,7 @@ export default {
   methods: {
     exportPDF() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'供试品导出',jcmcEn:'Test Item Export'})
         this.$modal.closeLoading()

src/views/business/resource/gyzj/comps/gyzj/Xq.vue

@@ -163,6 +163,7 @@ export default {
     return {
       form: {},
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       tzList: [],
       totalTz: 0,
       loadingTz: true,
@@ -186,7 +187,7 @@ export default {
   methods: {
    exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {

src/views/business/resource/mjy/comps/mjy/Xq.vue

@@ -161,6 +161,7 @@ export default {
     return {
       form: {},
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       tzList: [],
       totalTz: 0,
       loadingTz: true,
@@ -184,7 +185,7 @@ export default {
   methods: {
     exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle  }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn  }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN  +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {

src/views/business/resource/sj/comps/Xq.vue

@@ -190,7 +190,7 @@ export default {
   methods: {
     exportPDF() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'试剂导出',jcmcEn:'Reagent Export'})
         this.$modal.closeLoading()

src/views/business/study/comp/tbbd/Xq.vue

@@ -183,6 +183,7 @@ export default {
     return {
       watermarkText: '',
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       baseUrl: process.env.VUE_APP_FILE_DOMAIN,
       uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
       opacity: 0.8,
@@ -403,7 +404,7 @@ export default {
               url: data.data.url,
               studyFormFillId: this.form.id,
               jcgjlx: this.jcgjlxExport,
-              version:this.appTitle,
+              version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn,
               lang: this.$store.getters.language.split("_")[0]
             }
           ).then(response => {

src/views/business/study/comp/ytbd/Xq.vue

@@ -56,7 +56,7 @@
     <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px" v-if="openApprove">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" style="margin-bottom: 10px;"
           type="success">
         </el-alert>
@@ -88,8 +88,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formApprove.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formApprove.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -177,12 +177,15 @@ export default {
   },
   methods: {
     showTianbao() {
+
       if (this.searchForm.studySubjectId && this.searchForm.studySubjectId !== '') {
         this.$modal.loading()
         studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => {
           if (response.data.toUrl) {
             this.toRead(response.data)
           } else {
+            this.formApprove.remark = null
+            this.formApprove.qmrmm = null
             this.openApprove = true
           }
         }).finally(() => {