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

src/utils/calUnitTools.js

@@ -8,6 +8,14 @@ export function addTj(valueArr, unitArr) {
     let thisIndex = unit.indexOf(unitArr[i])
     mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex
   }
+
+  if (mixIndex === -1) {
+    return {
+      total: 0,
+      unit: 'mL'
+    }
+  }
+
   let total = 0
   for (let i = 0; i < unitArr.length; i++) {
     let thisIndex = unit.indexOf(unitArr[i])
@@ -37,6 +45,13 @@ export function subTj(valueArr, unitArr) {
     mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex
   }
 
+  if (mixIndex === -1) {
+    return {
+      total: 0,
+      unit: 'mL'
+    }
+  }
+
   let total = multiplyDecimals(
     parseFloat(valueArr[0]),
     Math.pow(1000, unit.indexOf(unitArr[0]) - mixIndex)

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

@@ -2,9 +2,11 @@
 
 <template>
   <div>
-    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled"
+    <el-input v-model="selected.name" v-if="!showSn" :placeholder="$t('form.placeholderSelect')" :disabled="disabled"
       @click.native="showStudy" />
-    <SelectStudyDialog ref="selectStudyDialog" @callback="handleChange" />
+    <el-input v-model="selected.sn" v-if="showSn" :placeholder="$t('form.placeholderSelect')" :disabled="disabled"
+      @click.native="showStudy" />
+    <SelectStudyDialog ref="selectStudyDialog"  @callback="handleChange" />
   </div>
 </template>
 
@@ -30,6 +32,10 @@ export default {
       type: Number,
       default: 0
     },
+    showSn: {
+      type: Boolean,
+      default: false
+    }
   },
   watch: {
     value: {
@@ -43,7 +49,8 @@ export default {
     return {
       selected: {
         id: '',
-        name: ''
+        name: '',
+        sn: ''
       },
     };
   },
@@ -60,6 +67,7 @@ export default {
     handleChange(obj) {
       this.selected.name = obj.name
       this.selected.id = obj.id
+      this.selected.sn = obj.sn
       this.$emit('change', _.merge({}, obj, { key: this.selectkey }))
       this.$emit('input', obj.id)
     },

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

@@ -68,6 +68,10 @@ export default {
   name: "SelectStudyDialog",
   components: { SelectDeptUser },
   props: {
+    showSn: {
+      type: Boolean,
+      default: false
+    }
   },
   watch: {
   },
@@ -106,11 +110,13 @@ export default {
       this.selectList = selection
       this.selectedId = _.map(this.selectList, 'id').join(',')
       this.selectedName = _.map(this.selectList, 'name').join(',')
+      this.selectedSn = _.map(this.selectList, 'sn').join(',')
     },
     show(val) {
       this.searchForm = _.merge({}, this.searchForm, val)
       this.selectedId = ''
       this.selectedName = ''
+      this.selectedSn = ''
       this.checkedOther = false
       this.others = ''
       this.$emit('callback', { id: '', name: '', other: '' })
@@ -121,6 +127,7 @@ export default {
       this.open = true
       this.selectedId = ''
       this.selectedName = ''
+      this.selectedSn = ''
       this.checkedOther = false
       this.others = ''
       this.$emit('callback', { id: '', name: '', other: '' })
@@ -146,12 +153,15 @@ export default {
     },
     handleSelect() {
       let name=''
+      let sn = ''
       if(this.selectedName!=''&&this.others!=''){
         name=this.selectedName+','+this.others
+        sn=this.selectedSn+','+this.others
       }else{
         name=this.selectedName+this.others
+        sn=this.selectedSn+this.others
       }
-      this.$emit('callback', { id: this.selectedId, name: name, mdOther: this.others })
+      this.$emit('callback', { id: this.selectedId, name: name, mdOther: this.others, sn: sn })
       this.open = false
     }
   }

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

@@ -78,12 +78,11 @@
             <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 :span="1.5" style="float: right;">
+
+            {{ $t('page.business.resource.gsp.ckl') }}：{{ ckl !== '' ? ckl : '--' }}；
+            {{ $t('page.business.resource.gsp.rkl') }}：{{ rkl != '' ? rkl : '--' }}；
+            {{ $t('page.business.resource.gsp.syl') }}：{{ syl != '' ? syl : '--' }}；
 
           </el-col>
         </el-row>
@@ -225,9 +224,9 @@ export default {
       single: true,
       multiple: true,
       total: 0,
-      rkl: null,
-      ckl: null,
-      syl: null,
+      ckl: '',
+      rkl: '',
+      syl: '',
       list: [],
       //勾选列表
       selectList: [],
@@ -466,19 +465,16 @@ 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
-      }
+      this.getStatistics()
     },
+    getStatistics() {
+      statistics(this.queryParams).then(response => {
+        this.syl = response.data.syl
+        this.ckl = response.data.ckl
+        this.rkl = response.data.rkl
+      })
+    },
+
     //查询
     handleQuery() {
       this.queryParams.pageNum = 1

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

@@ -26,16 +26,16 @@
             </el-form-item>
           </el-col>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <!-- 有效期 -->
@@ -53,8 +53,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <!-- 接收日期 -->
+        <!-- 接收日期 -->
+        <!-- <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
               <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
@@ -62,7 +62,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <!-- 注意事项 -->
           <el-col :span="24">
@@ -156,11 +156,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        jsrq: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
+        // jsrq: [{
+        //   required: true,
+        //   message: ' ',
+        //   trigger: 'blur'
+        // }],
         cctj: [{
           required: true,
           message: ' ',

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

@@ -17,7 +17,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center" prop="gg">
                   <template slot-scope="scope">
-                    {{ scope.row.gg }}{{ scope.row.ggdw }}
+                    {{ scope.row.gg }}
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq"
@@ -39,7 +39,7 @@
                 <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" width="250px">
                   <template slot-scope="scope">
                     <SelectStudy v-model="scope.row.mdIds" :selectkey="scope.row.id + ''"
-                      @change="selectStudyChangeBatch" />
+                      @change="selectStudyChangeBatch" :showSn="true"/>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('form.remark')" align="center" width="250px">
@@ -80,8 +80,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gsp.gg')">
-                <el-input type="text" v-model="form.gg" maxlength="50" disabled> <template slot="append">{{ form.ggdw
-                }}</template>
+                <el-input type="text" v-model="form.gg" maxlength="50" disabled>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -127,7 +126,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gsp.md')" prop="mdIds">
-                <SelectStudy v-model="form.mdIds" @change="selectStudyChange" />
+                <SelectStudy v-model="form.mdIds" @change="selectStudyChange" :showSn="true" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -301,8 +300,7 @@ export default {
   methods: {
     selectStudyChange(val) {
       console.log(val)
-
-      this.form.mdMcs = val.name
+      this.form.mdMcs = val.sn
       this.form.mdOther = val.mdOther
     },
     selectStudyChangeBatch(val) {
@@ -310,7 +308,7 @@ export default {
       if (val && val.id && val.id !== '') {
         const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
         if (_index > -1) {
-          that.selectList[_index].mdMcs = val.name
+          that.selectList[_index].mdMcs = val.sn
           that.selectList[_index].mdOther = val.mdOther
         }
       }

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

@@ -26,8 +26,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')">
-              <el-input type="text" v-model="form.gg" maxlength="50" disabled> <template slot="append">{{ form.ggdw
-                  }}</template>
+              <el-input type="text" v-model="form.gg" maxlength="50" disabled>
               </el-input>
             </el-form-item>
           </el-col>
@@ -74,7 +73,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rkl')" prop="rkl">
+            <el-form-item :label="$t('page.business.resource.gsp.rkmz')" prop="rkl">
               <el-input type="text" v-model="form.rkl" maxlength="50" :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.kcdw }}</template>
               </el-input>

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

@@ -26,7 +26,7 @@
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="nddw">
               <el-input type="text" v-model="form.gg" maxlength="50" disabled >
-                <template slot="append">{{ form.ggdw }}</template>
+                <!-- <template slot="append">{{ form.ggdw }}</template> -->
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -38,14 +38,17 @@
               </div>
               <div class="right">
                 <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
-                <el-input type="text" :value="form.gg" maxlength="50" disabled> <template slot="append">{{
-                  form.ggdw }}</template> </el-input>
+                <el-input type="text" :value="form.gg" maxlength="50" disabled>  </el-input>
               </div>
             </div>
             <div class="pal">
-              <div class="left">
+              <!-- <div class="left">
                 <div class="left-title">{{ $t('page.business.resource.gsp.jsrq') }}</div>
                 <el-input type="text" :value="form.jsrq" maxlength="50" disabled />
+              </div> -->
+              <div class="left">
+                <div class="left-title">{{ $t('page.business.resource.gsp.yxq') }}</div>
+                <el-input type="text" :value="form.yxq" maxlength="50" disabled />
               </div>
               <div class="right">
                 <div class="right-title">{{ $t('page.business.resource.gsp.kcl') }}</div>
@@ -54,12 +57,9 @@
               </div>
             </div>
             <div class="pal">
+
               <div class="left">
-                <div class="left-title">{{ $t('page.business.resource.gsp.yxq') }}</div>
-                <el-input type="text" :value="form.yxq" maxlength="50" disabled />
-              </div>
-              <div class="right">
-                <div class="right-title">{{ $t('page.business.resource.gsp.zjzt') }}</div>
+                <div class="left-title">{{ $t('page.business.resource.gsp.zjzt') }}</div>
                 <el-select v-model="form.zjzt" disabled style="width: 100%;">
                   <el-option key="1" :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
                   <el-option key="3" :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />

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

@@ -26,16 +26,16 @@
             </el-form-item>
           </el-col>
           <!-- 规格 -->
-          <el-col :span="8">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
               <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <!-- 规格单位 -->
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <BusinessSelect v-model="form.ggdw"
               dictType="business_nddw,business_zldw,business_tjdw"></BusinessSelect>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <!-- 库存量 -->
@@ -47,7 +47,7 @@
           <!-- 库存量单位 -->
           <el-col :span="4">
             <BusinessSelect v-model="form.kcdw"
-              dictType="business_zldw,business_tjdw"></BusinessSelect>
+              dictType="business_zldw,business_tjdw,business_kcdw_other"></BusinessSelect>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
@@ -65,13 +65,13 @@
             </el-form-item>
           </el-col>
           <!-- 接收日期 -->
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
               <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
                 value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
           <!-- 注意事项 -->
@@ -166,11 +166,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        jsrq: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
+        // jsrq: [{
+        //   required: true,
+        //   message: ' ',
+        //   trigger: 'blur'
+        // }],
         cctj: [{
           required: true,
           message: ' ',

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

@@ -104,7 +104,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
             <template slot-scope="scope">
-              {{ scope.row.gg }}{{ scope.row.ggdw }}
+              {{ scope.row.gg }}
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.kcl')" align="center">
@@ -113,7 +113,7 @@
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" width="150px" sortable="custom" />
-          <el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq" width="150px" sortable="custom" />
+          <!-- <el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq" width="150px" sortable="custom" /> -->
           <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq" width="150px" sortable="custom" />
           <el-table-column :label="$t('page.business.resource.gsp.cctj')" align="center" prop="cctj" width="130px" />
 
@@ -315,7 +315,7 @@ export default {
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.gg') + '</th>' +
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.kcl') + '</th>' +
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.ph') + '</th>' +
-          '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.jsrq') + '</th>' +
+          // '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.jsrq') + '</th>' +
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.cctj') + '</th>' +
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.zjzt') + '</th>' +
           '<th style="text-align: center;">' + this.$t('page.business.resource.gsp.jyzt') + '</th>' +
@@ -370,16 +370,14 @@ export default {
             '&nbsp;'+value.bh +
             '</td>' +
             ' <td>' +
-            value.gg + value.ggdw +
+            value.gg +
             '</td>' +
             ' <td>' +
             value.kc + value.kcdw +
             '</td>' +
             ' <td>' +
             value.ph +
-            '</td>' +
-            ' <td>' +
-            value.jsrq +
+
             '</td>' +
             ' <td>' +
             value.cctj +
@@ -513,8 +511,8 @@ export default {
     //获取列表
     getList() {
       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'
+        this.queryParams.startDate = this.daterange[0]
+        this.queryParams.endDate = this.daterange[1]
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''

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

@@ -82,8 +82,8 @@
             <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 :span="1.5" style="float: right;">
+            {{ $t('page.business.resource.gsp.rkl') }}：{{ rkl != '' ? rkl : '--' }} ；
           </el-col>
         </el-row>
 
@@ -423,15 +423,12 @@ export default {
         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.getStatistics()
+    },
+    getStatistics() {
+      sumRkl(this.queryParams).then(response => {
           this.rkl = response.data.rkl
-        })
-      } else {
-        this.rkl = null
-      }
-
+      })
     },
     //查询
     handleQuery() {