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

src/lang/en/template/commonTemplate.js

@@ -13,6 +13,8 @@ export default {
   remark: 'Comments',
   step: 'Step',
   bqdy: 'Label Print',
+  dayji: 'Printer',
+  label: 'Label',
 
   //平行配制,阶梯配制
   xzpxpz:'新增平行配制',

src/lang/en/template/gsp.js

@@ -16,17 +16,17 @@ export default {
   MJYLQSQD: {
     jbxx: 'Basic Information',
     qxzsyhbm: 'Please Select Study/Department',
-    sybhhbmmc: 'Study Number/Department',
-    sd: 'Study Director/Manager',
-    sywzmc: 'Study Material Name',
-    gyjl: 'Dosage',
-    xynd: 'Required Concentration',
-    xyl: 'Required Volume',
-    xysj: 'Required Time',
-    yjghsj: 'Expected Return Time',
-    dwzs: 'Species',
+    sybhhbmmc: 'Study No. or Dept.',
+    sd: 'SD/Manager',
+    sywzmc: 'Drug Name',
+    gyjl: 'Dose',
+    xynd: 'Concentration',
+    xyl: 'Amount',
+    xysj: 'Need Time',
+    yjghsj: 'Anticipate Return Time',
+    dwzs: 'Animal Species',
     dwpjtz: 'Average Body Weight',
-    dwsl: 'Number'
+    dwsl: 'Animal No'
   },
   // 毒麻药品配制记录表
   DMYPPZJLB: {

src/lang/zh/template/commonTemplate.js

@@ -19,6 +19,8 @@ export default {
   step: '步骤',
   remark: '备注',
   bqdy: '标签打印',
+  dayji: '打印机',
+  label: '标签',
 
   //平行配制,阶梯配制
   xzpxpz:'新增平行配制',

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

@@ -27,16 +27,15 @@
 									type="danger" @click="handleDeleteFormConfig(ladderIndex)">{{
 										$t('template.common.deleteBtn')
 									}}</el-button>
-								<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
-									@click="printTag">{{ $t('template.common.bqdy') }}</el-button>
+								<!-- <el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
+									@click="printTag">{{ $t('template.common.bqdy') }}</el-button> -->
 							</div>
 							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 								:ref="`formConfigStepFormPackageRef_${ladderIndex}`" :formConfig="stepFormConfig"
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
-								:formIndex="ladderIndex"
-								:prefixKey="'form_' + ladderIndex"></Step>
+								:formIndex="ladderIndex" :prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
 					<!-- 备注 -->
@@ -79,9 +78,10 @@ export default {
 		return {
 			getMybhByIndex: (index) => {
 				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
-				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit,
-					nd:data.targetActConcentration,ndz:`${data.targetActConcentration}${data.targetActConcentrationUnit}`,nddw:data.targetActConcentrationUnit,sxrq:data.expireDate,elnType:this.product,yxzq:data.effectivePeriod,yxzqdw:data.effectivePeriodUnit 
-				 }
+				return {
+					mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit,
+					nd: data.targetActConcentration, ndz: `${data.targetActConcentration}${data.targetActConcentrationUnit}`, nddw: data.targetActConcentrationUnit, sxrq: data.expireDate, elnType: this.product, yxzq: data.effectivePeriod, yxzqdw: data.effectivePeriodUnit
+				}
 			}
 		}
 	},
@@ -125,7 +125,7 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			return this.sn==='GG005'?[
+			return this.sn === 'GG005' ? [
 				{
 					type: "cardItem",
 					config: {
@@ -179,7 +179,7 @@ export default {
 						},
 					}
 				}
-			]:[
+			] : [
 				{
 					type: "cardItem",
 					config: {

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

@@ -28,6 +28,9 @@
             <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormFill.next') }}</el-button>
           </template>
           <template v-else>
+            <el-button @click="showDy" v-if="form.templateShowDy == 10">{{
+              $t('template.common.bqdy')
+            }}</el-button>
             <el-button @click="showYjcc" v-if="form.templateShowYjcc == 10">{{
               $t('page.business.study.studyFormFill.yjcc')
             }}</el-button>
@@ -427,6 +430,37 @@
         <el-button @click="openTjsh = false">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="$t('template.common.bqdy')" :visible.sync="openBqdy" width="1200px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="formBqdy" :model="formBqdy" :rules="rulesBqdy" label-width="120px" v-if="openBqdy">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('template.common.dayji')" prop="dyj">
+              <el-select v-model="formBqdy.dyj" placeholder="请选择">
+                <el-option label="打印机" value="打印机">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('template.common.label')" prop="printList">
+              <!-- {{ JSON.stringify(formBqdy) }} -->
+              <el-checkbox-group v-model="printCheck" @change="printCheckChange">
+                <el-checkbox :label="item.bh" v-for="item in resourcePrint" :key="'print' + item.bh"></el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="printbq">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openBqdy = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -448,6 +482,7 @@ export default {
   data() {
     return {
       showIndex: 1,
+      printCheck: [],
       form: {},
       rules: {
         bdmc: [{
@@ -473,12 +508,17 @@ export default {
       openSave: false,
       openTjsh: false,
       openApprove: false,
+      openBqdy: false,
       openYjcc: false,
       formSave: {
         qmyy: this.$t('page.business.study.studyFormFill.txbbc'),
         remark: '',
         qmrmm: '',
       },
+      formBqdy: {
+        dyj: null,
+        printList: null
+      },
       formApprove: {
         id: null,
         qmyy: this.$t('page.business.study.studyFormFill.txbtjjl'),
@@ -528,6 +568,18 @@ export default {
       jcbList: [],
       xbxj: [],
       bdmbTitle: this.$t('page.business.form.bdmb'),
+      rulesBqdy: {
+        dyj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        printList: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
       rulesApprove: {
         qmrmm: [{
           required: true,
@@ -561,6 +613,7 @@ export default {
       studyFormType: null,
       ccwzlist: [],
       selectedDeptId: null,
+      resourcePrint: []
     }
   },
   computed: {
@@ -573,6 +626,13 @@ export default {
     this.getCcwz()
   },
   methods: {
+    printCheckChange() {
+      if (this.printCheck && this.printCheck.length > 0) {
+        this.formBqdy.printList = this.printCheck.join(',')
+      } else {
+        this.formBqdy.printList = null
+      }
+    },
     validForm() {
       this.$refs["form"].validate(valid => {
         if (valid) { }
@@ -813,6 +873,31 @@ export default {
         that.$modal.msgError("没有可存储的药剂")
       }
     },
+    async showDy() {
+      let that = this
+      that.resetYjcc()
+      that.formYjcc.id = that.form.id
+      that.cclistYj = []
+      that.addCcYj()
+      that.$refs.templateTable.getFilledFormData()
+      that.resourcePrint = _.filter(that.$refs.templateTable.getResource(), function (item) { return item.type == null || item.elnType && item.elnType != '' })
+      if (that.resourcePrint.length > 0) {
+        that.formBqdy.dyj=null
+        that.formBqdy.printList=null
+        that.printCheck=[]
+        that.openBqdy = true
+      } else {
+        that.$modal.msgError("没有可打印的标签")
+      }
+    },
+    printbq() {
+      let that = this
+      this.$refs["formBqdy"].validate(valid => {
+        if (valid) {
+          that.$modal.msgError("todo")
+        }
+      })
+    },
     async showTjsh(qmyy) {
       let that = this
       let content = await this.$refs.templateTable.getFormData()
@@ -1005,7 +1090,7 @@ export default {
                 this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
                 return
               }
-              if (that.cclistYj[i].cctj == '其他'&& that.cclistYj[i].cctjqt == '') {
+              if (that.cclistYj[i].cctj == '其他' && that.cclistYj[i].cctjqt == '') {
                 this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
                 return
               }
@@ -1043,7 +1128,7 @@ export default {
               this.$modal.msgError('第' + (i + 1) + "个处置,处置方式不能为空")
               return
             }
-            if (that.czlist[i].czfs == '其他'&& that.czlist[i].czfsqt == '') {
+            if (that.czlist[i].czfs == '其他' && that.czlist[i].czfsqt == '') {
               this.$modal.msgError('第' + (i + 1) + "个存储,处置方式不能为空")
               return
             }
@@ -1057,7 +1142,7 @@ export default {
               this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
               return
             }
-            if (that.cclist[i].cctj=='其他' && that.cclist[i].cctjqt == '') {
+            if (that.cclist[i].cctj == '其他' && that.cclist[i].cctjqt == '') {
               this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
               return
             }