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

src/api/business/sj/sj.js

@@ -117,7 +117,6 @@ export function sj_jy(data) {
   })
 }
 
-
 // 查询试剂库存-稽查轨迹列表
 export function jcgjList(query) {
   return request({
@@ -134,4 +133,29 @@ export function tzList(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 分装
+export function sj_subpackage(data) {
+  return request({
+    url: '/system/business/sj/subpackage',
+    method: 'post',
+    data: data
+  })
+}
+// 开始配置
+export function sj_startConfiguration(data) {
+  return request({
+    url: '/system/business/sj/startConfiguration',
+    method: 'post',
+    data: data
+  })
+}
+// 完成配置
+export function sj_configurationCompleted(data) {
+  return request({
+    url: '/system/business/sj/configurationCompleted',
+    method: 'post',
+    data: data
+  })
+}

src/utils/calUnitTools.js

@@ -0,0 +1,21 @@
+//体积不同单位相加
+export function addTj(valueArr, unitArr) {
+  let unit = ['pL', 'nL', 'uL', 'mL', 'L']
+
+  //计算最小单位
+  let mixIndex = unit.length - 1
+  for (let i = 0; i < unitArr.length; i++) {
+    let thisIndex = unit.indexOf(unitArr[i])
+    mixIndex = thisIndex < mixIndex ? thisIndex : mixIndex
+  }
+
+  let total = 0
+  for (let i = 0; i < unitArr.length; i++) {
+    let thisIndex = unit.indexOf(unitArr[i])
+    total += parseFloat(valueArr[i]) * Math.pow(1000, thisIndex - mixIndex)
+  }
+  return {
+    total: total,
+    unit: unit[mixIndex]
+  }
+}

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

@@ -8,15 +8,17 @@
 				<div class="content">
 					<LineLabel label="template.gsp.MJYLQSQD.jbxx" />
 					<div class="template-form-item">
-						<BaseInfoFormPcakge @clickable="onClickSybh" ref="baseInfoRef" :formConfig="baseInfoFormConfig"
-							:formData="formData" />
+						<BaseInfoFormPcakge @select="onSelectBlur" @clickable="onClickSybh" ref="baseInfoRef"
+							:formConfig="baseInfoFormConfig" :formData="formData" />
 					</div>
-					<BaseInfoFormPcakge label="template.common.remark" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPcakge label="template.common.remark" ref="remarkRef" :formConfig="remarkConig"
+						:formData="formData" />
 				</div>
 			</div>
 		</div>
-		<SelectReagentDialog type="MJYLQSQD" selectedCode="sn" title="template.gsp.MJYLQSQD.qxzsyhbm" :searchForm="searchForm"
-			:columns="columns" @submit="onDialogSubmit" :listApi="public_studyList" ref="selectReagentDialogRef">
+		<SelectReagentDialog type="MJYLQSQD" selectedCode="sn" title="template.gsp.MJYLQSQD.qxzsyhbm"
+			:searchForm="searchForm" :columns="columns" @submit="onDialogSubmit" :listApi="public_studyList"
+			ref="selectReagentDialogRef">
 		</SelectReagentDialog>
 	</div>
 </template>
@@ -29,6 +31,7 @@ import CustomTable from '@/components/Template/CustomTable.vue';
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
 import SelectReagentDialog from "../../dialog/SelectReagentDialog.vue";
 import { public_studyList } from '@/api/business/public/public';
+import { listData } from "@/api/system/dict/data"
 
 export default {
 	name: "MJYLQSQD",
@@ -60,7 +63,6 @@ export default {
 		},
 	},
 	computed: {
-
 		// 备注表单配置
 		remarkConig() {
 			return [
@@ -94,28 +96,28 @@ export default {
 						SD: {
 							label: "template.gsp.MJYLQSQD.sd",
 							type: "input",
+							disabled:true,
 							fillType: "actFill",
 						},
 						sywzmc: {
 							label: "template.gsp.MJYLQSQD.sywzmc",
 							type: "select",
 							fillType: "actFill",
-							otherCode: "sywzmcOther",
 							options: this.getDictOptions('business_sywzmc'),
 						},
 						gyjl: {
 							label: "template.gsp.MJYLQSQD.gyjl",
 							type: "select",
-							fillType: "actFill",
 							otherCode: "gyjlOther",
-							options: this.getDictOptions('business_gyjl'),
+							fillType: "actFill",
+							options: this.gyjlOptions,
 						},
 						xynd: {
 							label: "template.gsp.MJYLQSQD.xynd",
 							type: "select",
-							fillType: "actFill",
 							otherCode: "xyndOther",
-							options: this.getDictOptions('business_gynd'),
+							fillType: "actFill",
+							options: this.gyndOptions,
 						},
 						xyl: {
 							label: "template.gsp.MJYLQSQD.xyl",
@@ -162,13 +164,10 @@ export default {
 					}
 				},
 			]
-		},
+		}
 	},
 	data() {
 		return {
-			syId: null,
-			bmId: null,
-			sdId: null,
 			public_studyList: public_studyList,
 			searchForm: {
 				name: {
@@ -202,12 +201,76 @@ export default {
 					prop: 'createTime',
 					label: 'page.business.study.study.createDate',
 				}
-			]
+			],
+			gyjlOptionsOld: [],
+			gyndOptionsOld: [],
+			gyjlOptions: [],
+			gyndOptions: []
 		};
 	},
+	created() {
+		this.getGyjl()
+		this.getGynd()
+	},
 	mounted() {
 	},
 	methods: {
+		onSelectBlur(val) {
+			if (val.key == 'sywzmc') {
+				let tmp = []
+				_.forEach(_.filter(this.gyjlOptionsOld, function (o) {
+					return o.remark.indexOf(val.value) > -1;
+				}), function (item) {
+					tmp.push({ label: item.dictLabel, value: item.dictValue })
+				})
+				this.gyjlOptions = tmp
+				this.gyndOptions = []
+				this.$refs.baseInfoRef.batchUpdateFormData({
+					gyjl: '',
+					xynd: '',
+				});
+			}
+			if (val.key == 'gyjl') {
+				let tmp = []
+				_.forEach(_.filter(this.gyndOptionsOld, function (o) {
+					return o.remark.indexOf(val.value) > -1;
+				}), function (item) {
+					tmp.push({ label: item.dictLabel, value: item.dictValue })
+				})
+				this.gyndOptions = tmp
+				this.$refs.baseInfoRef.batchUpdateFormData({
+					xynd: '',
+				});
+			}
+		},
+		//获取给药剂量
+		getGyjl() {
+			listData({
+				pageNum: 1,
+				pageSize: 999999,
+				dictType: 'business_gyjl',
+				status: 0
+			}).then(response => {
+				this.gyjlOptionsOld = response.rows
+				if (this.formData.sywzmc && this.formData.sywzmc !== '') {
+					this.onSelectBlur({ key: 'sywzmc', value: this.formData.sywzmc })
+				}
+			})
+		},
+		//获取给药浓度
+		getGynd() {
+			listData({
+				pageNum: 1,
+				pageSize: 999999,
+				dictType: 'business_gynd',
+				status: 0
+			}).then(response => {
+				this.gyndOptionsOld = response.rows
+				if (this.formData.gyjl && this.formData.gyjl !== '') {
+					this.onSelectBlur({ key: 'gyjl', value: this.formData.gyjl })
+				}
+			})
+		},
 		onDialogSubmit(selectedId, currentRow) {
 			console.log(JSON.stringify(currentRow))
 			//试验
@@ -216,9 +279,9 @@ export default {
 					syNo: currentRow.sn,
 					SD: currentRow.leaderName,
 				});
-				this.syId = currentRow.id
-				this.bmId = currentRow.deptId
-				this.sdId = currentRow.leader
+				this.formData.syId = currentRow.id
+				this.formData.bmId = currentRow.deptId
+				this.formData.sdId = currentRow.leader
 			}
 			//部门
 			if (currentRow.type == 2) {
@@ -226,9 +289,9 @@ export default {
 					syNo: currentRow.deptName,
 					SD: currentRow.nickName,
 				});
-				this.syId = ''
-				this.bmId = currentRow.deptId
-				this.sdId = currentRow.userId
+				this.formData.syId = ''
+				this.formData.bmId = currentRow.deptId
+				this.formData.sdId = currentRow.userId
 			}
 			this.$refs.selectReagentDialogRef.onCancel()
 		},
@@ -240,23 +303,18 @@ export default {
 		//获取已填写的表单数据
 		getFilledFormData() {
 			let content = this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "stepFormPackageRef", "stepRef", "remarkRef"])
-			content.syId = this.syId
-			content.bmId = this.bmId
-			content.sdId = this.sdId
+			content.syId = this.formData.syId
+			content.bmId = this.formData.bmId
+			content.sdId = this.formData.sdId
 			return content;
 		},
 		async getFormData() {
 			let content = await this.validFormFields(["baseInfoRef", "remarkRef"]);
-			content.syId = this.syId
-			content.bmId = this.bmId
-			content.sdId = this.sdId
+			content.syId = this.formData.syId
+			content.bmId = this.formData.bmId
+			content.sdId = this.formData.sdId
 			return content;
-		},
-		async onSave() {
-			const formData = await this.getFormData();
-			// const formData = await this.$refs.stepTableRef.getFormData();
-			console.log(formData, "formData")
-		},
+		}
 	}
 };
 </script>

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "CBYDB",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "CBYHGZYWDX",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue

@@ -33,6 +33,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -65,6 +68,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "JZXY",
@@ -359,6 +363,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "QXWDX",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "RXJZXY",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue

@@ -25,7 +25,11 @@
 							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
-									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
+								></TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -40,7 +44,11 @@
 							fieldItemLabel="template.common.operationSteps">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
-									@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
+									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
+								></TableOpertaion>
 							</template>
 						</CustomTable>
 					</div>
@@ -69,6 +77,7 @@ import { getSWYPFXFFXYPZBBTableConfig, getSWYPFXFFXYPZBBTQHSLTableConfig } from
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 export default {
 	name: "SWYPFXRYPZB",
 	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@@ -475,6 +484,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 
 	}
 };

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "XSKKX",
@@ -372,6 +376,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "XZXHTYX",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "ZDYBS",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../../formConfig/SWYPFXFFXYPZBBTa
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "ZQDYJMD",
@@ -371,6 +375,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

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

@@ -35,6 +35,9 @@
 									:rowIndex="rowIndex"
 									:columns="columns"
 									@deleteRow="(rowIndex) => deleteRow(rowIndex)"
+									@subPackageSubmit="subPackageSubmit"
+									@startConfig="startConfig"
+									@configComplete="configComplete"
 								></TableOpertaion>
 							</template>
 						</CustomTable>
@@ -67,6 +70,7 @@ import {getSWYPFXFFXYPZBBTableConfig} from "../../formConfig/SWYPFXFFXYPZBBTable
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
+import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
 
 export default {
 	name: "CBYDB",
@@ -225,7 +229,7 @@ export default {
 			]
 		},
 		tableStepColumns() {
-			return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_cbydb');
+			return getSWYPFXFFXYPZBBTableConfig(this,'business_sp_zkgzy');
 		},
 	},
 	data() {
@@ -372,6 +376,63 @@ export default {
 				tableRef.deleteRow(rowIndex);
 			}
 		},
+		subPackageSubmit(val){
+			console.log("分装数据："+JSON.stringify(val))
+			if(val.fzsj.fzList && val.fzsj.fzList.length>0){
+				let list = []
+				for(let i=0;i<val.fzsj.fzList.length;i++){
+					let item = val.fzsj.fzList[i]
+					list.push({
+						bh:val.fzsj.mybh+item.subCode,
+						kc:item.num,
+						kcdw:val.fzsj.dw,
+					})
+				}
+				let postData = {
+					studyId:this.formData.studyId,
+					studyFormId:this.formData.id,
+					bh:val.fzsj.mybh,
+					nd:val.rowData.hhwznd,
+					nddw:val.headerSelectFields.hhwzndUnit,
+					list:list
+				}
+				console.log("分装提交数据："+JSON.stringify(postData))
+				sj_subpackage(postData).then(() => {
+				}).catch(() => {
+				})
+				.finally(() => {
+				})
+			}
+		},
+		startConfig(val){
+			console.log("开始配置数据："+JSON.stringify(val))
+			let postData = {
+				bh:val.rowData.bh+val.rowData.bhCode,
+			}
+			console.log("开始配置提交数据："+JSON.stringify(postData))
+			sj_startConfiguration(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
+		configComplete(val){
+			console.log("完成配置数据："+JSON.stringify(val))
+			let postData = {
+				mc:null,
+				bh:val.rowData.bh+val.rowData.bhCode,
+				nd:val.rowData.hhwznd,
+				nddw:val.headerSelectFields.hhwzndUnit,
+				kc: val.rowData.sjjzxql+val.rowData.sjryxql,//todo 单位不一致-计算
+				kcdw: val.headerSelectFields.sjryxqlUnit || val.headerSelectFields.sjjzxqlUnit,//todo 单位不一致-计算-按最小算
+			}
+			console.log("完成配置提交数据："+JSON.stringify(postData))
+			sj_configurationCompleted(postData).then(() => {
+			}).catch(() => {
+			})
+			.finally(() => {
+			})
+		},
 		
 
 	}

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

@@ -20,7 +20,9 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodySubKey: 'bhCode',
       bodyFillType: 'preFill',
       width: 280,
-      myCodeFields: ['bh', 'bhOther', 'bhCode']
+      myCodeFields: ['bh', 'bhOther', 'bhCode'],
+      maxVolumeField: 'sjryxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',
@@ -119,7 +121,10 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       bodySubType: 'span',
       bodySubKey: 'bhCode',
       bodyFillType: 'preFill',
-      width: 280
+      width: 280,
+      myCodeFields: ['bh', 'bhCode'],
+      maxVolumeField: 'sjryxql', //分装的最大量字段
+      maxVolumeFieldUnit: 'sjryxqlUnit' //分装的最大量单位字段
     },
     {
       label: 'template.sp.sp008.ysry',

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

@@ -1,5 +1,5 @@
-import moment from 'moment';
-import { getLatestSn } from '@/api/template';
+import moment from 'moment'
+import { getLatestSn } from '@/api/template'
 export default {
   dicts: [
     'business_pztj',
@@ -37,6 +37,7 @@ export default {
       handler(v) {
         if (v) {
           const {
+            studyId,
             studyMc,
             studySn,
             templateMc,
@@ -54,6 +55,7 @@ export default {
           if (v.bdnr) {
             this.formData = {
               ...JSON.parse(v.bdnr),
+              studyId,
               studyMc,
               studySn,
               templateMc,
@@ -66,6 +68,7 @@ export default {
             }
           } else {
             this.formData = {
+              studyId,
               studyMc,
               studySn,
               templateMc,
@@ -87,8 +90,8 @@ export default {
             effectivePeriodUnit &&
             !expireDate
           ) {
-            const start = moment(startDate);
-            const unit = effectivePeriodUnit === '天' ? 'days' : 'hours';
+            const start = moment(startDate)
+            const unit = effectivePeriodUnit === '天' ? 'days' : 'hours'
             const end = start
               .add(Number(effectivePeriod), unit)
               .format('YYYY-MM-DD HH:mm:ss')
@@ -126,10 +129,10 @@ export default {
     this.setTemplateData({})
   },
   methods: {
-    async getLatestSn(count = 1){
-      const res = await getLatestSn({count})
-      if(res.code === 200){
-        return res.data;
+    async getLatestSn(count = 1) {
+      const res = await getLatestSn({ count })
+      if (res.code === 200) {
+        return res.data
       }
       return null
     },
@@ -142,15 +145,18 @@ export default {
       refArr.map((ref) => {
         const refData = this.$refs[ref]?.getFilledFormData() || {}
         for (const [key, value] of Object.entries(refData)) {
-          let index = 0;
+          let index = 0
           // 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀
-          if ((key === 'headerSelectFields' || key === 'stepTableFormData') && result.hasOwnProperty(key)) {
+          if (
+            (key === 'headerSelectFields' || key === 'stepTableFormData') &&
+            result.hasOwnProperty(key)
+          ) {
             // 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀）
-            const newKey = `${key}_${++index}`;
-            result[newKey] = value;
+            const newKey = `${key}_${++index}`
+            result[newKey] = value
           } else {
             // 正常合并其他字段
-            result[key] = value;
+            result[key] = value
           }
         }
       })

src/views/business/form/drug/comp/sqbdList.vue

@@ -110,7 +110,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:drugFormApply:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3&&id != scope.row.userId" @click="fh(scope.row)"
                 v-hasPermi="['business:drugFormApply:fh']">{{
                   $t('page.business.study.studyFormApply.fh') }}</el-button>
               <!-- 加签 -->
@@ -127,7 +127,7 @@
                 v-hasPermi="['business:drugFormApply:sy']">{{
                   $t('page.business.study.studyFormApply.sy') }}</el-button>
               <!-- 审核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 5" @click="sh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 5&&id != scope.row.userId" @click="sh(scope.row)"
                 v-hasPermi="['business:drugFormApply:sh']">{{
                   $t('page.business.study.studyFormApply.sh') }}</el-button>
               <!-- 废止 -->

src/views/business/resource/gyzj/comps/ffjl/SelectList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-table :data="selectList" border>
-       <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+       <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc"
           :show-overflow-tooltip="true" />
         <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
           :show-overflow-tooltip="true" />

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

@@ -3,15 +3,15 @@
     <!-- 处置容器弹窗 -->
     <el-dialog :title="isBatch?$t('page.business.resource.gyzj.plczrqt'):$t('page.business.resource.gyzj.czrqt')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  v-if="open" :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
@@ -256,6 +256,17 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+                //循环验证
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs||params.list[i].czfs=='') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy||params.list[i].czyy=='') {
+                this.$modal.msgError(params.list[i].mc  + "处置原因不能为空")
+                return
+              }
+            }
               this.$modal.loading()
               plczrq(params).then(response => {
                 this.open = false

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

@@ -3,15 +3,15 @@
     <!-- 处置药剂弹窗 -->
     <el-dialog :title="isBatch?$t('page.business.resource.gyzj.plczyjt'):$t('page.business.resource.gyzj.czyjt')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules" v-if="open" :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
@@ -280,6 +280,20 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+               for (var i = 0; i < params.list.length; i++) {
+                if (!params.list[i].czfs || params.list[i].czfs == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                  return
+                }
+                if (!params.list[i].czyy || params.list[i].czyy == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                  return
+                }
+                if (!params.list[i].czl || params.list[i].czl == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                  return
+                }
+              }
               this.$modal.loading()
               plczyj(params).then(response => {
                 this.open = false

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

@@ -3,17 +3,17 @@
     <!-- 发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.fafang')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.nd')" align="center">
+                <el-table-column :label="$t('page.business.resource.gyzj.nd')" align="center" width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.nd }}{{ scope.row.nddw }}
                   </template>
@@ -21,10 +21,10 @@
                 <el-table-column :label="$t('page.business.resource.gyzj.sxrq')" align="center" prop="sxrq"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.cctj')" align="center" prop="cctj"
-                  width="130px" />
+                  width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.ccwz')" align="center" prop="ccwz"
-                  width="130px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center">
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.kc }}{{ scope.row.kcdw }}
                   </template>
@@ -205,7 +205,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -414,6 +414,26 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+               for (var i = 0; i < params.list.length; i++) {
+                if (!params.list[i].zytj || params.list[i].zytj == '') {
+                  this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
+                  return
+                }
+                if (!params.list[i].ckmz || params.list[i].ckmz == '') {
+                  this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
+                  return
+                }
+                if (!params.list[i].mdMcs || params.list[i].mdMcs == '') {
+                  if (!params.list[i].mdOther || params.list[i].mdOther == '') {
+                    this.$modal.msgError(params.list[i].mc + "目的不能为空")
+                  }
+                  return
+                }
+                if (!params.list[i].remark || params.list[i].remark == '') {
+                  this.$modal.msgError(params.list[i].mc + "备注不能为空")
+                  return
+                }
+              }
               this.$modal.loading()
               plff(params).then(response => {
                 this.open = false

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

@@ -1,9 +1,9 @@
 <template>
   <div>
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.guidang')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gyzj.guidang')" :visible.sync="open" width="700px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">

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

@@ -1,9 +1,9 @@
 <template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gyzj.lock')" :visible.sync="open" width="700px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-table :data="selectList" border>
-      <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh" :show-overflow-tooltip="true" />
        <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>

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

@@ -3,23 +3,23 @@
     <!-- 钥匙发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.ysff')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN'?'140px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center">
+                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.ckl }}{{ scope.row.ckldw }}
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.ffzytj')" align="center" prop="ffzytj"
-                  width="150px" />
+                  width="250px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"

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

@@ -111,7 +111,7 @@
           <el-table-column :label="$t('page.business.resource.gyzj.cctj')" align="center" prop="cctj" width="140px" />
           <el-table-column :label="$t('page.business.resource.gyzj.ccwz')" align="center" prop="ccwz" width="130px" />
 
-          <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center"  fixed="right"  :width="$i18n.locale === 'zh_CN'?'100px':'150px'">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1"><span class="status-circle rk"></span>{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
               <span v-if="scope.row.zjzt == 2"><span class="status-circle wrk"></span>{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>

src/views/business/resource/mjy/comps/ffjl/SelectList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-table :data="selectList" border>
-       <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+       <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc"
           :show-overflow-tooltip="true" />
         <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
           :show-overflow-tooltip="true" />

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

@@ -1,17 +1,17 @@
 <template>
   <div>
     <!-- 处置容器弹窗 -->
-    <el-dialog :title="isBatch?$t('page.business.resource.mjy.plczrqt'):$t('page.business.resource.mjy.czrqt')" :visible.sync="open" width="1200px" append-to-body
-      :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+    <el-dialog :title="isBatch ? $t('page.business.resource.mjy.plczrqt') : $t('page.business.resource.mjy.czrqt')"
+      :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules"  v-if="open" :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
@@ -50,7 +50,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
+                <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
@@ -114,7 +114,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm')
+          }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -129,7 +130,7 @@ import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Czrq",
-  components: { SelectDeptUser ,BusinessSelect},
+  components: { SelectDeptUser, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -183,7 +184,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -252,15 +253,25 @@ export default {
           let params = this.form
           if (this.isBatch) {
             params.list = this.selectList
-             //循环验证
-              this.$modal.loading()
-              plczrq(params).then(response => {
-                this.open = false
-                this.$emit('callback')
-                this.$modal.closeLoading()
-              }).finally(() => {
-                this.$modal.closeLoading()
-              })
+            //循环验证
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs||params.list[i].czfs=='') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy||params.list[i].czyy=='') {
+                this.$modal.msgError(params.list[i].mc  + "处置原因不能为空")
+                return
+              }
+            }
+            this.$modal.loading()
+            plczrq(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
           } else {
             this.$modal.loading()
             czrq(params).then(response => {

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

@@ -1,17 +1,17 @@
 <template>
   <div>
     <!-- 处置药剂弹窗 -->
-    <el-dialog :title="isBatch?$t('page.business.resource.mjy.plczyjt'):$t('page.business.resource.mjy.czyjt')" :visible.sync="open" width="1200px" append-to-body
-      :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+    <el-dialog :title="isBatch ? $t('page.business.resource.mjy.plczyjt') : $t('page.business.resource.mjy.czyjt')"
+      :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules"  v-if="open" :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="120px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="120px" />
                 <el-table-column :label="$t('page.business.resource.mjy.czfs')" align="center" width="250px">
                   <template slot-scope="scope">
@@ -28,7 +28,7 @@
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.czl" maxlength="50"
                       :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw
-                        }}</template>
+                      }}</template>
                     </el-input>
                   </template>
                 </el-table-column>
@@ -58,15 +58,15 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czfs')" prop="czfs">
-                    <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
+                <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czl')" prop="czl">
-                 <el-input type="text" v-model="form.czl" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ form.kcdw
-                        }}</template>
-                    </el-input>
+                <el-input type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.kcdw
+                  }}</template>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -131,7 +131,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save" :disabled="isBatch&&selectList.length==0">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm')
+          }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -146,7 +147,7 @@ import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Czyj",
-  components: { SelectDeptUser,BusinessSelect },
+  components: { SelectDeptUser, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -205,7 +206,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -282,6 +283,21 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的麻精药")
             } else {
+              //循环验证
+              for (var i = 0; i < params.list.length; i++) {
+                if (!params.list[i].czfs || params.list[i].czfs == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                  return
+                }
+                if (!params.list[i].czyy || params.list[i].czyy == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                  return
+                }
+                if (!params.list[i].czl || params.list[i].czl == '') {
+                  this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                  return
+                }
+              }
               this.$modal.loading()
               plczyj(params).then(response => {
                 this.open = false

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

@@ -3,17 +3,18 @@
     <!-- 发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.mjy.fafang')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN' ? '120px' : '170px'"
+        v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" width="100px" />
-                <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center">
+                <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center" width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.nd }}{{ scope.row.nddw }}
                   </template>
@@ -21,10 +22,10 @@
                 <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxrq"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj"
-                  width="130px" />
+                  width="150px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz"
-                  width="130px" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center" width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.kc }}{{ scope.row.kcdw }}
                   </template>
@@ -87,7 +88,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -108,7 +109,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -172,7 +173,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr1')">
-                <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
                 disabled />
             </el-form-item>
           </el-col>
@@ -206,7 +207,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm') }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -223,7 +224,7 @@ import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser, SelectStudy,BusinessSelect },
+  components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -305,7 +306,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -315,7 +316,7 @@ export default {
       this.form.mdMcs = val.name
       this.form.mdOther = val.mdOther
     },
-     selectStudyChangeBatch(val) {
+    selectStudyChangeBatch(val) {
       if (val && val.id && val.id !== '') {
         const _index = _.findIndex(this.selectList, function (o) { return o.id + '' === val.key })
         if (_index > -1) {
@@ -350,7 +351,7 @@ export default {
           cctj: item.cctj,
           sxrq: item.sxrq,
           ccwz: item.ccwz,
-          ckmzdw:item.kcdw,
+          ckmzdw: item.kcdw,
           zytj: null,
           ckmz: null,
           mdIds: null,
@@ -419,6 +420,26 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的麻精药")
             } else {
+              for (var i = 0; i < params.list.length; i++) {
+                if (!params.list[i].zytj || params.list[i].zytj == '') {
+                  this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
+                  return
+                }
+                if (!params.list[i].ckmz || params.list[i].ckmz == '') {
+                  this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
+                  return
+                }
+                if (!params.list[i].mdMcs || params.list[i].mdMcs == '') {
+                  if (!params.list[i].mdOther || params.list[i].mdOther == '') {
+                    this.$modal.msgError(params.list[i].mc + "目的不能为空")
+                  }
+                  return
+                }
+                if (!params.list[i].remark || params.list[i].remark == '') {
+                  this.$modal.msgError(params.list[i].mc + "备注不能为空")
+                  return
+                }
+              }
               this.$modal.loading()
               plff(params).then(response => {
                 this.open = false

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

@@ -1,9 +1,9 @@
 <template>
   <div>
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.guidang')" :visible.sync="open" width="700px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">

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

@@ -1,9 +1,9 @@
 <template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.lock')" :visible.sync="open" width="700px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row>

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

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-table :data="selectList" border>
-      <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh" :show-overflow-tooltip="true" />
        <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>

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

@@ -3,39 +3,38 @@
     <!-- 钥匙发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="140px" v-if="open">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN'?'140px':'170px'" v-if="open">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
         <div>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="center" prop="mc"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
+                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center"  width="150px">
                   <template slot-scope="scope">
                     {{ scope.row.ckl }}{{ scope.row.ckldw }}
                   </template>
                 </el-table-column>
 
                 <el-table-column :label="$t('page.business.resource.mjy.ffzytj')" align="center" prop="ffzytj"
-                  width="150px" />
+                  width="250px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz"
-                  width="150px" />
+                  width="200px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ckmzdw')" align="center" prop="ckmzdw"
-                  width="150px" />
+                  width="250px" />
                 <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
-                  width="150px" />
+                  width="200px" />
                 <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
-                  width="150px" />
+                  width="200px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ffr1')" align="center" prop="ffr1Mc"
-                  width="150px" />
+                  width="200px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ffr2')" align="center" prop="ffr2Mc"
-                  width="150px" />
+                  width="200px" />
                 <el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
-                <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="ffxmMc"
-                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="ffxmMc" />
               </el-table>
             </el-col>
           </el-row>

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

@@ -111,7 +111,7 @@
           <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj" width="140px" />
           <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
 
-          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
+          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center"  fixed="right" :width="$i18n.locale === 'zh_CN'?'100px':'150px'">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1"><span class="status-circle rk"></span>{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
               <span v-if="scope.row.zjzt == 2"><span class="status-circle wrk"></span>{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>

src/views/business/study/comp/sqbd/Qrfz.vue

@@ -88,7 +88,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyymc: $t('page.business.study.studyFormApply.fztgjj'),
+        qmyymc: this.$t('page.business.study.studyFormApply.fztgjj'),
         qmyy: null,
         remark: null,
         qmrmm: null