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

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

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',
 }

src/lang/zh/business/resource/yq.js

@@ -11,4 +11,7 @@ export default {
     xgnr: '修改内容',
     xzyq: '新增仪器',
     bjyq: '编辑仪器',
+    sfbx: '是否是冰箱',
+    yes: '是',
+    no: '否',
 }

src/utils/calUnitTools.js

@@ -28,8 +28,11 @@ export function addTj(valueArr, unitArr) {
 }
 
 export function addDecimals(a, b) {
-  if (Number.isNaN(a) || Number.isNaN(b)) {
-    return 0
+  if (Number.isNaN(a)) {
+    a = 0
+  }
+  if (Number.isNaN(b)) {
+    b = 0
   }
   const strA = a.toString()
   const strB = b.toString()
@@ -77,23 +80,58 @@ export function multiplyDecimals(a, b) {
       absStr.substring(absStr.length - totalDecimals)
   }
 
-  result = result.replace(/\.?0+$/, '') || '0'
+  result = result.replace(/(\.\d*?)0+$/, '$1').replace(/\.$/, '')
   return (isNegative ? '-' : '') + result
 }
 
 //模板物资去重
-export function uniqeResource(oldList,newList) {
-   for(var i=0;i<newList.length;i++){
-      let _index= _.findIndex(oldList,function(item){
-          return item.bh==newList[i].bh&&(item.type==newList[i].type||item.elnType==newList[i].type)
-      })
-      if(_index>-1){
-          const { total, unit }=addTj([oldList[_index].syl,newList[i].syl],[oldList[_index].syldw,newList[i].syldw])
-          oldList[_index].syl=total
-          oldList[_index].syldw=unit
-      }else{
-        oldList.push(newList[i])
-      }
-   }
-   return  oldList;
+export function uniqeResource(oldList, newList) {
+  for (var i = 0; i < newList.length; i++) {
+    let _index = _.findIndex(oldList, function (item) {
+      return (
+        item.bh == newList[i].bh &&
+        (item.type == newList[i].type ||
+          item.elnType == newList[i].type ||
+          item.elnType == newList[i].elnType ||
+          item.type == newList[i].elnType)
+      )
+    })
+    if (_index > -1) {
+      const { total, unit } = addTj(
+        [oldList[_index].syl, newList[i].syl],
+        [oldList[_index].syldw, newList[i].syldw]
+      )
+      oldList[_index].syl = total
+      oldList[_index].syldw = unit
+    } else {
+      oldList.push(newList[i])
+    }
+  }
+  return oldList
+}
+//模板物资去重
+export function uniqeResourceOne(newList) {
+  let resultList = []
+  for (var i = 0; i < newList.length; i++) {
+    let _index = _.findIndex(resultList, function (item) {
+      return (
+        item.bh == newList[i].bh &&
+        (item.type == newList[i].type ||
+          item.elnType == newList[i].type ||
+          item.elnType == newList[i].elnType ||
+          item.type == newList[i].elnType)
+      )
+    })
+    if (_index > -1) {
+      const { total, unit } = addTj(
+        [resultList[_index].syl, newList[i].syl],
+        [resultList[_index].syldw, newList[i].syldw]
+      )
+      resultList[_index].syl = total
+      resultList[_index].syldw = unit
+    } else {
+      resultList.push(newList[i])
+    }
+  }
+  return resultList
 }

src/views/business/comps/select/SelectFridge.vue

@@ -0,0 +1,96 @@
+<!-- 冰箱选择器 -->
+<template>
+  <div>
+    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')" :disabled="readonly"
+      :multiple="multiple" @change="handleChange" :filterable="filterable">
+      <el-option v-for="item in list" :key="item.id" :label="item.mc" :value="item.id" />
+    </el-select>
+  </div>
+</template>
+
+<script>
+import { public_fridgeList } from "@/api/business/public/public";
+export default {
+  name: "SelectFridge",
+  components: {},
+  props: {
+    value: {
+      type: [Number, String, Array],
+      default: '',
+    },
+
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    filterable: {
+      type: Boolean,
+      default: true
+    },
+    placeholder: {
+      type: String,
+      default: ''
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        if (!this.multiple) {
+          this.selected = v ? v : ''
+        } else {
+          if (v) {
+            //默认传的,分割的字符串，有传数组再改造
+            let arr = v.split(',')
+            let s = []
+            _.forEach(arr, a => {
+              s.push(a)
+            })
+            this.selected = s
+          } else {
+            this.selected = []
+          }
+        }
+        this.getList();
+      }
+    }
+  },
+  data() {
+    return {
+      selected: '',
+      list: [],
+      queryParam: {
+
+      }
+    };
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.list = []
+      public_fridgeList().then(response => {
+        this.list = response.data || []
+      })
+    },
+    handleChange(val) {
+      this.$emit('input', this.multiple ? (val && val.length>0 ? val.join(','): ''):(val || ''))
+      //默认传的,分割的字符串，有传数组再改造
+      let res;
+      if(this.multiple){
+        res = this.list.filter(item=> {
+          return  val.includes(item.id)
+        })
+      }else {
+        res = this.list.find(item=> item.id === val)
+      }
+      this.$emit('change', res)
+    },
+  }
+};
+</script>

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

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,

src/views/business/resource/yq/list.vue

@@ -17,6 +17,12 @@
       <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmMc">
         <el-input v-model="queryParams.bmMc" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('page.business.resource.yq.sfbx') + '：'" prop="fridge">
+        <el-select v-model="queryParams.fridge" :placeholder="$t('form.placeholderSelect')" clearable @change="handleQuery">
+          <el-option key="1" :label="$t('page.business.resource.yq.yes')" value="1" />
+          <el-option key="10" :label="$t('page.business.resource.yq.no')" value="10" />
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search')
@@ -106,6 +112,14 @@
               <BusinessSelect v-model="form.wc" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.yq.sfbx')" prop="fridge">
+              <el-select v-model="form.fridge" :placeholder="$t('form.placeholderSelect')">
+                <el-option key="1" :label="$t('page.business.resource.yq.yes')" value="1" />
+                <el-option key="10" :label="$t('page.business.resource.yq.no')" value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -130,8 +144,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" type="password"
-                maxlength="20" />
+              <el-input v-model="form.qmrmm" autocomplete="off" auto-complete="new-password" show-password
+                :placeholder="$t('form.placeholderInput')" type="password" maxlength="20" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -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')

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: {