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

src/App.vue

@@ -375,6 +375,7 @@ export default {
     background: #ffffff;
     padding: 10px 10px;
     margin-top: 10px;
+    width: 100%;
      display: flex;
     justify-content: center;
     .content-right {

src/api/business/study/studyMethod.js

@@ -42,7 +42,7 @@ export function studyMethod_readList(query) {
 // 方法阅读导出
 export function studyMethod_export(query) {
   return request({
-    url: '/system/business/studyMethod/test',
+    url: '/system/business/studyMethod/download',
     method: 'get',
     params: query
   })

src/lang/en/business/resource/gsp.js

@@ -1,117 +1,114 @@
 export default {
-  gspgl: '供试品管理',
-  gsprkjl: '供试品入库记录',
-  ffhsjl: '发放回收记录',
-  gspxq: '供试品详情',
-  gxwzk: '更新物资库',
-  mc: '名称',
-  bh: '编号',
-  ph: '批号',
-  gg: '规格',
-  jyzt: '借阅状态',
-  zjzt: '制剂状态',
-  jlzt: '记录状态',
-  sxrq: '失效日期',
-  yxq: '有效期',
-  jsrq: '接收日期',
-  zysx: '注意事项',
-  nd: '浓度',
-  nddw: '浓度单位',
-  kcl: '库存量',
-  kc: '库存',
-  kcdw: '库存单位',
-  zcg: '暂存柜',
-  cctj: '存储条件',
-  ccwz: '存储位置',
-  cksj: '出库时间',
-  rksj: '入库时间',
-  ckjz: '出库净重',
-  rkjz: '入库净重',
-  syl: '使用量',
-  lqr1: '领取人1',
-  lqr2: '领取人2',
-  kgy1: '库管员1',
-  kgy2: '库管员2',
+  gspgl: 'Test',
+  gsprkjl: 'Test Item Reception Record',
+  ffhsjl: 'In-and-Out Record',
+  gspxq: 'Detail',
+  gxwzk: 'Refresh',
+  mc: 'Name',
+  bh: 'ID',
+  ph: 'Batch Number',
+  gg: 'Specification',
+  jyzt: 'Check-out Status',
+  zjzt: 'Status',
+  jlzt: 'Status',
+  sxrq: 'Expiration',
+  yxq: 'Validity Period',
+  jsrq: 'Date Received',
+  zysx: 'Notification',
+  nd: 'Concentration',
+  nddw: 'Concentration Unit',
+  kcl: 'Amount',
+  kc: 'Amount',
+  kcdw: 'Amount Unit',
+  zcg: 'Locker',
+  cctj: 'Storage Condition',
+  ccwz: 'Storage Location',
+  cksj: 'Out of Storage Date',
+  rksj: 'Into Storage Date',
+  ckjz: 'Amount out',
+  rkjz: 'Amount In',
+  syl: 'Usage Amount',
+  lqr1: 'Recipient',
+  lqr2: 'Recipient 2',
+  kgy1: 'Warehouse Keeper',
+  kgy2: 'Warehouse Keeper 2',
 
-  plff: '批量发放',
-  plcz: '批量处置',
-  ysff: '钥匙发放',
-  plsd: '批量锁定',
-  plgd: '批量归档',
-  lock: '锁定',
-  unlock: '解锁',
-  detail: '详情',
-  guidang: '归档',
-  jiedang: '解档',
-  jieyue: '借阅',
-  guihuan: '归还',
-  fafang: '发放',
-  ysff: '钥匙发放',
-  cz: '处置',
-  czrq: '处置容器',
-  czyj: '处置药剂',
-  yuanyin: '原因',
-  xgkc: '修改库存',
-  shxgkc: '审核修改库存',
-  shbj: '审核编辑',
-  xgqkc: '修改前库存',
-  xghkc: '修改后库存',
-  clr: '处理人',
-  czfs: '处置方式',
-  fhr: '复核人',
-  xgbz: '修改备注',
-  jdr: '监督人',
-  xgr: '修改人',
-  czl: '处置量',
-  ffr: '发放人',
-  ffr1: '发放人1',
-  ffr2: '发放人2',
-  zytj: '转移条件',
-  md: '目的',
-  ckmz: '出库毛重',
-  ckl: '出库量',
-  ckldw: '出库单位',
-  ffzytj: '发放转移条件',
-  ghzytj: '归还转移条件',
-  ckmz: '出库毛重',
-  ckmzdw: '出库毛重单位',
-  ys1lrq: '钥匙1领取人',
-  ys2lrq: '钥匙2领取人',
-  sssy: '所属试验',
-  ssbd: '所属表单',
-  bdssr: '表单所属人',
-  syr: '使用人',
+  plff: 'Batch Distribution',
+  plcz: 'Batch Disposal',
+  ysff: 'Key Distribution',
+  plsd: 'Batch Lock',
+  plgd: 'Batch Archive',
+  lock: 'Lock',
+  unlock: 'Unlock',
+  detail: 'Detail',
+  guidang: 'Archived',
+  jiedang: 'De-archiving',
+  jieyue: 'Check-out',
+  guihuan: 'Return',
+  fafang: 'Distribute',
+  cz: 'Dispose',
+  yuanyin: 'Reason',
+  xgkc: 'Change Inventory',
+  shxgkc: 'Approve Inventory Change',
+  shbj: 'Approve Edit',
+  xgqkc: 'Inventory before Change',
+  xghkc: 'Inventory After Change',
+  clr: 'Editor',
+  czfs: 'Dispose Method',
+  fhr: 'Reviewer',
+  xgbz: 'Remark',
+  jdr: 'Supervisor',
+  xgr: 'Editor',
+  czl: 'Amount',
+  ffr: 'Issuer',
+  ffr1: 'Issuer',
+  ffr2: 'Issuer 2',
+  zytj: 'Transfer Condition',
+  md: 'Purpose',
+  ckmz: 'Out Amount',
+  ckl: 'Out Amount',
+  ckldw: 'Out Amount Unit',
+  ffzytj: 'Transfer Condition',
+  ghzytj: 'Transfer Condition',
+  ckmz: 'Out Amount',
+  ckmzdw: 'Out Amount Unit',
+  ys1lrq: 'Key Recipient',
+  ys2lrq: 'Key Recipient 2',
+  sssy: 'From Study',
+  ssbd: 'In Record',
+  bdssr: 'By User',
+  syr: 'User',
   lqghr: '领取/归还人',
   ffjsr: '发放/接收人',
-  czlx: '操作类型',
-  czl: '操作量',
-  bzyy: '备注/原因',
-  ccsj: '操作时间',
-  cksj: '出库时间',
-  rksj: '入库时间',
-  jiaqian: '加签',
+  czlx: 'Action',
+  czl: 'Amount',
+  bzyy: 'Comment/Reason',
+  ccsj: 'Datetime',
+  cksj: 'Out of Storage Date',
+  rksj: 'Into Storage Date',
+  jiaqian: 'Sign',
 
-  rkwz: '入库位置',
-  rktj: '入库条件',
-  zytj: '转移条件',
+  rkwz: 'Storage Location',
+  rktj: 'Storage Condition',
+  zytj: 'Storage Condition',
   rkmz: '入库毛重',
   jsl: '减少量',
-  syl: '使用量',
-  ghr1Id: '归还人1',
-  ghr2Id: '归还人2',
-  jsr1Id: '库管员1',
-  jsr2Id: '库管员2',
-  tz: '台账',
+  syl: 'Usage Amount',
+  ghr1Id: 'Returner',
+  ghr2Id: 'Returner 2',
+  jsr1Id: 'Warehouse Keeper',
+  jsr2Id: 'Warehouse Keeper 2',
+  tz: 'Table',
   lqsj: '领取时间',
-  jcgj: '稽查轨迹',
+  jcgj: 'Track Record',
   ffbz: '发放备注',
   ghbz: '归还备注',
   gdsqr: '归档申请人',
-  cjsj: '创建时间',
-  rkl: '入库量',
+  cjsj: 'Created On',
+  rkl: 'Total Amount',
   jysj: '借阅时间',
   mjyxq: '麻精药详情',
   ffjlxq: '发放回收记录详情',
-  dr: '导入',
+  dr: 'Import',
   gd: '归档',
 }

src/lang/en/business/study/studyMethod.js

@@ -1,20 +1,20 @@
 export default {
-    ffmc: '方法名称',
-    cjr: '创建人',
-    cjsj: '创建时间',
-    scff: '上传方法',
-    scwj: '上传文件',
-    wjm:'支持扩展名：pdf',
-    zt: '状态',
-    yuedu: '阅读',
-    daochu: '导出',
-    mc: '名称',
-    ff: '方法',
+    ffmc: 'Name',
+    cjr: 'Creator',
+    cjsj: 'Creation Date',
+    scff: 'Upload',
+    scwj: 'Upload File',
+    wjm:'Allowed Format: .pdf',
+    zt: 'Status',
+    yuedu: 'Read',
+    daochu: 'Download',
+    mc: 'Name',
+    ff: 'Method',
     qmhz: '签名汇总',
-    yidu: '已读',
-    weidu: '未读',
-    qmr: '签名人',
-    qmsj: '签名时间',
-    qmyy: '签名意义',
-    remark: '备注',
+    yidu: 'Read',
+    weidu: 'Unread',
+    qmr: 'Signed By',
+    qmsj: 'Date',
+    qmyy: 'Purpose',
+    remark: 'Comment',
 }

src/lang/en/business/study/studyRoom.js

@@ -1,18 +1,18 @@
 export default {
-    qysyj: '启用饲养间',
-    xzqy: '新增启用',
+    qysyj: 'Start Usage',
+    xzqy: 'Start Usage',
 
-    syqy: '试验区域',
-    syjh: '饲养间号',
-    dwzs: '动物种属',
-    longju: '笼具',
-    kssyyl: '开始使用原因',
-    qyr: '启用人',
-    kssj: '开始时间',
-    jssyyl: '结束使用原因',
-    jsr: '结束人',
-    jssj: '结束时间',
-    zt: '状态',
+    syqy: 'Area',
+    syjh: 'Room ID',
+    dwzs: 'Species',
+    longju: 'Cage',
+    kssyyl: 'Start Reason',
+    qyr: 'Start by',
+    kssj: 'Start Date',
+    jssyyl: 'End Reason',
+    jsr: 'End by',
+    jssj: 'End Date',
+    zt: 'Status',
     syz: '使用中',
     yjs: '已结束',
     ghlj: '更换笼具',

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

@@ -2,28 +2,30 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{formData.templateMc || $t('template.common.pageTitle')}}<img
-					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.templateMc ||
+				$t('template.common.pageTitle') }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
-					<BaseInfoFormPcakge :label="$t('template.common.baseInfo')" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
-						:formData="formData" />
-					<TableList :label="$t('template.common.reagentInfo')" :columns="sysjColumns" :dataSource="resource" />
-					<TableList :label="$t('template.common.instrumentInfo')" :columns="yqsColumns" :dataSource="resource" />
-					<BaseInfoFormPcakge :label="$t('template.common.storageCondition')" ref="storageConditionRef" :formConfig="storageFormConfig"
-						:formData="formData" />
+					<BaseInfoFormPcakge :label="$t('template.common.baseInfo')" ref="baseInfoRef"
+						:formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList :label="$t('template.common.reagentInfo')" :columns="sysjColumns"
+						:dataSource="resource" />
+					<TableList :label="$t('template.common.instrumentInfo')" :columns="yqsColumns"
+						:dataSource="resource" />
+					<BaseInfoFormPcakge :label="$t('template.common.storageCondition')" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel :label="$t('template.common.operationSteps')" />
 					<div class="template-form-item">
-						<BaseInfoFormPcakge ref="stepFormPackageRef" :formConfig="stepFormConfig"
-							@blur = "onHandleBlur"
+						<BaseInfoFormPcakge ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
 							:formData="formData" />
 					</div>
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPcakge :label="$t('template.common.remark')" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPcakge :label="$t('template.common.remark')" ref="remarkRef" :formConfig="remarkConig"
+						:formData="formData" />
 
 				</div>
 			</div>
-			<button @click = "onSave">{{ $t('template.common.saveBtn') }}</button>
+			<button @click="onSave">{{ $t('template.common.saveBtn') }}</button>
 		</div>
 	</div>
 </template>
@@ -101,13 +103,13 @@ export default {
 							label: this.$t('template.common.methodCode'),
 							type: "input",
 							fillType: "preFill",
-							maxlength:50
+							maxlength: 50
 						},
 						versionNum: {
 							label: this.$t('template.common.versionNumber'),
 							type: "input",
 							fillType: "actFill",
-							maxlength:50
+							maxlength: 50
 						},
 
 					}
@@ -159,7 +161,7 @@ export default {
 							label: this.$t('template.common.targetSolutionName'),
 							type: "input",
 							fillType: "preFill",
-							maxlength:50
+							maxlength: 50
 						},
 						targetCode: {
 							label: this.$t('template.common.targetSolutionCode'),
@@ -167,7 +169,7 @@ export default {
 							subType: "span",
 							fillType: "preFill",
 							subKey: "targetCode1",
-							maxlength:20
+							maxlength: 20
 						},
 						targetPreConcentration: {
 							label: this.$t('template.common.targetPreConcentration'),
@@ -176,7 +178,7 @@ export default {
 							subKey: "targetPreConcentrationUnit",
 							fillType: "preFill",
 							subOptions: this.getDictOptions('business_nddw'),
-							maxlength:10
+							maxlength: 10
 						},
 						targetActConcentration: {
 							label: this.$t('template.common.targetActConcentration'),
@@ -188,7 +190,7 @@ export default {
 							subFillType: "preFill",
 							subOptions: this.getDictOptions('business_nddw'),
 							copyFrom: "targetPreConcentration",//复制哪个字段
-							maxlength:10
+							maxlength: 10
 						},
 						targetPreVolume: {
 							label: this.$t('template.common.targetPreVolume'),
@@ -197,7 +199,7 @@ export default {
 							subKey: "targetPreVolumeUnit",
 							subOptions: this.getDictOptions('business_tjdw'),
 							fillType: "preFill",
-							maxlength:10
+							maxlength: 10
 						},
 						targetActVolume: {
 							label: this.$t('template.common.targetActVolume'),
@@ -209,7 +211,7 @@ export default {
 							subOptions: this.getDictOptions('business_tjdw'),
 							compareTo: "targetPreVolume",//与哪个字段比较
 							copyFrom: "targetPreVolume",//复制哪个字段
-							maxlength:10
+							maxlength: 10
 						},
 						effectivePeriod: {
 							label: this.$t('template.common.effectivePeriod'),
@@ -218,7 +220,7 @@ export default {
 							subKey: "effectivePeriodUnit",
 							fillType: "preFill",
 							subOptions: this.getDictOptions('business_yxqdw'),
-							maxlength:10
+							maxlength: 10
 						},
 						expireDate: {
 							label: this.$t('template.common.expireDate'),
@@ -234,12 +236,12 @@ export default {
 			resource: [],
 			resourceData1: [],
 			sysjColumns: [
-				{ label: this.$t('template.common.reagentName'), prop: "reagentName" },
-				{ label: this.$t('template.common.reagentCode'), prop: "reagentCode" },
-				{ label: this.$t('template.common.reagentNo'), prop: "reagentNo" },
-				{ label: this.$t('template.common.concentration'), prop: "concentration" },
-				{ label: this.$t('template.common.source'), prop: "source" },
-				{ label: this.$t('template.common.reagentExpireDate'), prop: "expireDate" },
+				{ label: this.$t('template.common.reagentName'), prop: "mc" },//名称
+				{ label: this.$t('template.common.reagentCode'), prop: "bh" },//编号
+				{ label: this.$t('template.common.reagentNo'), prop: "ph" },//批号 试剂，供试品才有
+				{ label: this.$t('template.common.concentration'), prop: "nd" },//浓度
+				{ label: this.$t('template.common.source'), prop: "source" },//来源 
+				{ label: this.$t('template.common.reagentExpireDate'), prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
 				{ label: this.$t('template.common.instrumentName'), prop: "instrumentName" },
@@ -251,18 +253,44 @@ export default {
 		};
 	},
 	mounted() {
-		
+
 	},
 	methods: {
 		async getFormData() {
-			return await this.validFormFields(["baseInfoRef", "storageConditionRef","stepFormPackageRef","stepRef","remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"]);
+			//生成resource todo 已经提交，再次编辑需要合并,通过编号关联 
+			// type（1：试剂；3：供试品；5：给药制剂；7：麻精药）,syl（使用量）syldw（使用量单位）
+			let tmpResource = []
+
+			//配置的试剂
+			tmpResource.push({
+				mc: content.targetName,
+				bh: content.targetCode,
+				ph: '',
+				nd: content.targetActConcentration + content.targetActConcentrationUnit,
+				source: '配置',
+				type: 1,
+
+				sxrq: content.expireDate,
+				ndz: content.targetActConcentration,
+				nddw: content.targetActConcentrationUnit,
+				kc: content.targetActVolume,
+				kcdw: content.targetActVolumeUnit,
+				syl: null,
+				syldw: content.targetActVolumeUnit,
+			})
+			//使用的试剂
+			this.resource=tmpResource
+			
+			console.log(this.resource, "resource")
+			return content;
 		},
 		async onSave() {
 			const formData = await this.getFormData();
-			
+
 			console.log(formData, "formData")
 		},
-	
+
 	}
 };
 </script>

src/views/business/comps/template/mixins/templateMixin.js

@@ -14,9 +14,9 @@ export default {
       handler(v) {
         if (v) {
           let n = { ...v };
-          this.formData = n;
-          if (v.resource) {//试验试剂信息
-            this.resource = v.resource;
+          this.formData =n;
+          if(v.resource){//试验试剂信息
+              this.resource = JSON.parse(v.resource);
           }
           if (v.bdnr) {
             this.formData = { ...n, ...JSON.parse(v.bdnr) };

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

@@ -64,19 +64,19 @@
           <el-col :span="1.5">
             <!-- 批量归档 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlgd"
-              v-hasPermi="['business:resource:mjy:ffjlgd']">{{
+              v-hasPermi="['business:resource:gsp:ffjlgd']">{{
                 $t('page.business.resource.mjy.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
             <el-button type="primary" :disabled="multiple" @click="handlePlsd"
-              v-hasPermi="['business:resource:mjy:ffjlsd']">{{
+              v-hasPermi="['business:resource:gsp:ffjlsd']">{{
                 $t('page.business.resource.mjy.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
             <el-button type="primary" :disabled="multiple" @click="handleDc"
-              v-hasPermi="['business:resource:mjy:ffjldc']">{{
+              v-hasPermi="['business:resource:gsp:ffjldc']">{{
                 $t('form.export') }}</el-button>
           </el-col>
         </el-row>
@@ -138,26 +138,32 @@
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
               <!-- 加签 -->
-              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleJq(scope.row)">{{
+              <el-button v-if="scope.row.jlzt == 1" type="text" v-hasPermi="['business:resource:gsp:ffjljq']" @click="handleJq(scope.row)">{{
                   $t('page.business.resource.gsp.jiaqian') }}</el-button>
               <!-- 详情 -->
               <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jlzt == 7" type="text"
+              v-hasPermi="['business:resource:gsp:ffjlxq']"
                 @click="handleXq(scope.row)" >{{
                   $t('page.business.resource.gsp.detail') }}</el-button>
               <!-- 锁定 -->
-              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
+              v-hasPermi="['business:resource:gsp:ffjlsd']">{{
                   $t('page.business.resource.gsp.lock') }}</el-button>
               <!-- 解锁 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
+              v-hasPermi="['business:resource:gsp:ffjljs']">{{
                   $t('page.business.resource.gsp.unlock') }}</el-button>
               <!-- 归档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
+              v-hasPermi="['business:resource:gsp:ffjlgd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+              v-hasPermi="['business:resource:gsp:ffjljd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)"
+              v-hasPermi="['business:resource:gsp:ffjljy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
           </el-table-column>

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

@@ -55,42 +55,42 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <!-- 更新物资库 -->
-            <el-button type="primary" @click="handlePlff">{{
+            <el-button type="primary" @click="handlePlff" v-hasPermi="['business:resource:gsp:gxwzk']">{{
               $t('page.business.resource.gsp.gxwzk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 新增 -->
-            <el-button type="primary" @click="handleXz">{{
+            <el-button type="primary" @click="handleXz" v-hasPermi="['business:resource:gsp:xz']">{{
               $t('form.add') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlff">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlff" v-hasPermi="['business:resource:gsp:ff']">{{
               $t('page.business.resource.gsp.plff') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量处置 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlcz">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlcz" v-hasPermi="['business:resource:gsp:cz']">{{
               $t('page.business.resource.gsp.plcz') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 钥匙发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handleYsff">{{
+            <el-button type="primary" :disabled="multiple" @click="handleYsff" v-hasPermi="['business:resource:gsp:ff']">{{
               $t('page.business.resource.gsp.ysff') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlsd">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd" v-hasPermi="['business:resource:gsp:ysff']">{{
               $t('page.business.resource.gsp.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量归档 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlgd">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd" v-hasPermi="['business:resource:gsp:gd']">{{
               $t('page.business.resource.gsp.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
-            <el-button type="primary" @click="handleDc">{{
+            <el-button type="primary" @click="handleDc" v-hasPermi="['business:resource:gsp:dc']">{{
               $t('form.export') }}</el-button>
           </el-col>
         </el-row>
@@ -138,55 +138,56 @@
               <template
                 v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || (scope.row.zjzt == 9 && scope.row.jyzt == 5)">
                 <!-- 详情 -->
-                <el-button type="text" @click="handleXq(scope.row)">{{
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:gsp:xq']">{{
                   $t('page.business.resource.gsp.detail') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 1">
                 <!-- 发放 -->
-                <el-button type="text" @click="handleFf(scope.row)">{{
+                <el-button type="text" @click="handleFf(scope.row)" v-hasPermi="['business:resource:gsp:ff']">{{
                   $t('page.business.resource.gsp.fafang') }}</el-button>
                 <!-- 处置 -->
-                <el-button type="text" @click="handleCz(scope.row)">{{
+                <el-button type="text" @click="handleCz(scope.row)" v-hasPermi="['business:resource:gsp:cz']">{{
                   $t('page.business.resource.gsp.cz') }}</el-button>
                 <!-- 编辑 -->
-                <el-button v-if="scope.row.bjzt == 1 && scope.row.zjzt == 1" type="text" @click="handleBj(scope.row)">{{
+                <el-button v-if="scope.row.bjzt == 1 && scope.row.zjzt == 1" type="text" @click="handleBj(scope.row)"
+                v-hasPermi="['business:resource:gsp:bj']">{{
                   $t('form.edit') }}</el-button>
                 <!-- 修改库存 -->
-                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)" >{{
+                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)" v-hasPermi="['business:resource:gsp:xgkc']" >{{
                     $t('page.business.resource.gsp.xgkc') }}</el-button>
                 <!-- 锁定 -->
-                <el-button type="text" @click="handleSd(scope.row)">{{
+                <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:gsp:sd']">{{
                   $t('page.business.resource.gsp.lock') }}</el-button>
               </template>
               <template v-if="scope.row.bjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核编辑 -->
-                <el-button type="text" @click="handleShbj(scope.row)" >{{
+                <el-button type="text" @click="handleShbj(scope.row)" v-hasPermi="['business:resource:gsp:shbj']" >{{
                   $t('page.business.resource.gsp.shbj') }}</el-button>
               </template>
               <template v-if="scope.row.kcbjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核修改库存 -->
-                <el-button type="text" @click="handleShxgkc(scope.row)">{{
+                <el-button type="text" @click="handleShxgkc(scope.row)" v-hasPermi="['business:resource:gsp:xgkc']">{{
                   $t('page.business.resource.gsp.shxgkc') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 5">
                 <!-- 解锁 -->
-                <el-button type="text" @click="handleJs(scope.row)">{{
+                <el-button type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:gsp:js']">{{
                   $t('page.business.resource.gsp.unlock') }}</el-button>
                 <!-- 归档 -->
-                <el-button type="text" @click="handleGd(scope.row)">{{
+                <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:gsp:gd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 3">
                 <!-- 归还 -->
-                <el-button type="text" @click="handleGh(scope.row)" >{{
+                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gsp:gh']">{{
                   $t('page.business.resource.gsp.guihuan') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 9 && scope.row.jyzt == 1">
                 <!-- 解档 -->
-                <el-button type="text" @click="handleJd(scope.row)" >{{
+                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gsp:jd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
                   <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)" >{{
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gsp:jy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
               </template>
             </template>

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

@@ -57,28 +57,27 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <!-- 新增 -->
-            <el-button type="primary"  @click="handleXz" >{{
+            <el-button type="primary"  @click="handleXz" v-hasPermi="['business:resource:gsp:rkxz']">{{
                 $t('form.add') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导入 -->
-            <el-button type="primary"  @click="handleXz" >{{
+            <el-button type="primary"  @click="handleXz" v-hasPermi="['business:resource:gsp:rkdr']">{{
                 $t('page.business.resource.gsp.dr') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量归档 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlgd">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd" v-hasPermi="['business:resource:gsp:rkgd']">{{
                 $t('page.business.resource.gsp.plgd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlsd">{{
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd" v-hasPermi="['business:resource:gsp:rksd']">{{
                 $t('page.business.resource.gsp.plsd') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
-            <el-button type="primary" :disabled="multiple" @click="handleDc"
-              v-hasPermi="['business:resource:mjy:ffjldc']">{{
+            <el-button type="primary" :disabled="multiple" @click="handleDc" v-hasPermi="['business:resource:gsp:rkdc']">{{
                 $t('form.export') }}</el-button>
           </el-col>
         </el-row>
@@ -124,26 +123,26 @@
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
               <!-- 编辑 -->
-              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleBj(scope.row)">{{
+              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleBj(scope.row)" v-hasPermi="['business:resource:gsp:rkbj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 详情 -->
               <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jlzt == 7" type="text"
-                @click="handleXq(scope.row)" >{{
+                @click="handleXq(scope.row)" v-hasPermi="['business:resource:gsp:rkxq']">{{
                   $t('page.business.resource.gsp.detail') }}</el-button>
               <!-- 锁定 -->
-              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)" v-hasPermi="['business:resource:gsp:rksd']">{{
                   $t('page.business.resource.gsp.lock') }}</el-button>
               <!-- 解锁 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)" v-hasPermi="['business:resource:gsp:rkjs']">{{
                   $t('page.business.resource.gsp.unlock') }}</el-button>
               <!-- 归档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)" v-hasPermi="['business:resource:gsp:rkgd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gsp:rkjd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)">{{
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gsp:rkjy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
           </el-table-column>

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

@@ -151,8 +151,9 @@ export default {
     },
 
     handleExport() {
-      studyMethod_export({studyMethodId:6}).then(response => {
-
+      studyMethod_export({studyMethodId: this.form.id}).then(response => {
+        let fileUrl = response.data.fileUrl
+        this.$download.saveAs(process.env.VUE_APP_FILE_DOMAIN + fileUrl, this.form.ffmc + ".pdf");
       })
     }
 

src/views/business/study/comp/syffList.vue

@@ -42,7 +42,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyMethod:upload']">{{
               $t('page.business.study.studyMethod.scff') }}</el-button>
           </el-col>
         </el-row>
@@ -60,10 +60,10 @@
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 阅读 -->
-              <el-button type="text" @click="detail(scope.row)">{{
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyMethod:read']">{{
                 $t('page.business.study.studyMethod.yuedu') }}</el-button>
               <!-- 导出 -->
-              <el-button type="text" @click="showExport(scope.row)">{{
+              <el-button type="text" @click="showExport(scope.row)" v-hasPermi="['business:studyMethod:download']">{{
                 $t('page.business.study.studyMethod.daochu') }}</el-button>
             </template>
           </el-table-column>

src/views/business/study/comp/syjList.vue

@@ -44,7 +44,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyRoom:add']">{{
               $t('page.business.study.studyRoom.xzqy') }}</el-button>
           </el-col>
         </el-row>
@@ -69,13 +69,13 @@
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 笼具记录 -->
-              <el-button type="text" @click="detail(scope.row)">{{
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyRoom:ljjl']">{{
                 $t('page.business.study.studyRoom.ljjl') }}</el-button>
               <!-- 更换笼具 -->
-              <el-button type="text" v-if="scope.row.zt === 1" @click="edit(scope.row)">{{
+              <el-button type="text" v-if="scope.row.zt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyRoom:update']">{{
                 $t('page.business.study.studyRoom.ghlj') }}</el-button>
               <!-- 结束 -->
-              <el-button type="text" v-if="scope.row.zt === 1" @click="end(scope.row)">{{
+              <el-button type="text" v-if="scope.row.zt === 1" @click="end(scope.row)" v-hasPermi="['business:studyRoom:js']">{{
                 $t('page.business.study.studyRoom.js') }}</el-button>
             </template>
           </el-table-column>

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

@@ -89,6 +89,7 @@
           <el-col :psna="24">
             <el-form-item>
               <el-checkbox v-model="showCz">处置</el-checkbox>
+              {{ formApprove.resource }}
             </el-form-item>
           </el-col>
           <el-col :psna="24">
@@ -229,12 +230,14 @@ export default {
       }
     },
     async showApprove() {
-      let content = await this.$refs.templateTable.getFormData()
+      let that=this
+      let content = await that.$refs.templateTable.getFormData()
       if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.resetApprove()
-        this.formApprove.id = this.form.id
-        this.openApprove = true
+        that.resetApprove()
+        that.formApprove.id = that.form.id
+        that.formApprove.bdnr = JSON.stringify(content)
+        that.formApprove.resource = JSON.stringify(that.$refs.templateTable.getResource())
+        that.openApprove = true
       }
     },
     resetApprove() {