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

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

@@ -42,6 +42,7 @@
 								:ref="`formZlConfigFormPackageRef_${zlIndex}`" :formConfig="formZlConfig"
 								@beforeReagentSubmit="(data) => onTableBeforeReagentZlSubmit(data, zlIndex, formZlConfig)"
 								@onRegentSubmit="(data) => onTableRegentZlSubmit(zlIndex, data)"
+								@clickButton="(data) => onClickButtonZl(zlIndex, data)"
 								:formData="formzlConfig" />
 							<Step class="mt-0 s-container" :ref="`formZlStepRef_${zlIndex}`"
 								:formData="formzlConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
@@ -346,10 +347,12 @@ export default {
 							thirdFillType: "preFill",
 							fillType: "actFill",
 							subFillType: "actFill",
+							subDisabled: true,
 							fourthType: "button",
 							fourthKey: "sywzsjclzButtonValue",
 							fourthFillType: "actFill",
 							fourthButtonName:"获取值",
+							isClearForm: true,
 							thirdOptions: this.getDictOptions('business_zldw'),
 							maxlength: 10
 						},
@@ -626,6 +629,9 @@ export default {
 		}
 	},
 	methods: {
+		onClickButtonZl(zlIndex, data){
+             alert('todo')
+		},
 		//溶液开始配置
 		ryKspz(zlIndex) {
 			this.$refs[`formRyConfigFormPackageRef_${zlIndex}`][0].updateFormData('pzkssj', moment().format("YYYY-MM-DD HH:mm:ss"))

src/views/business/comps/template/comps/xb/XB001.vue

@@ -49,6 +49,7 @@
 							<StepFormPackage ref = "stepFormPackageFivthRef" prefixKey="xb_czdwb"  :form-config="stepFivthConfig" :formData = "formData" />
 							<CustomTable
 								:ref="`tableSecondRef`"
+								@clickButton="handleClickButton"
 								:columns="tableSecondColumns"
 								:formData="{stepTableFormData:formData.stepTableFormData_1,headerSelectFields:{}}"
 								:prefixKey = "`tableSecond`"
@@ -96,6 +97,7 @@ import { debounce } from 'lodash-es'
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 import StepFormPackage from "@/components/Template/StepFormPackage.vue"
 import { getStepSecond, getStepThird, getStepFourth, getStepFivth, getStepSixth} from "../../formConfig/xb/xb001.js";
+import moment from 'moment'
 
 export default {
 	name: "XB001",
@@ -256,10 +258,11 @@ export default {
 					bodyType: 'input',
 					bodySubType: 'button',
 					bodySubButtonName: 'template.xb.xb001.ks',
-					bodySubKey: 'startTime',
+					bodySubKey: 'startTime1',
 					bodySubFillType: 'actFill',
 					bodyFillType: 'actFill',
 					width: 280,
+					bodyDisabled: true,
 					bodyMaxlength: 50,
 				},
 				{
@@ -268,9 +271,10 @@ export default {
 					bodyType: 'input',
 					bodySubType: 'button',
 					bodySubButtonName: 'template.xb.xb001.js',
-					bodySubKey: 'endTime',
+					bodySubKey: 'endTime1',
 					bodySubFillType: 'actFill',
 					bodyFillType: 'actFill',
+					bodyDisabled: true,
 					width: 280,
 					bodyMaxlength: 50,
 				},
@@ -338,6 +342,22 @@ export default {
 				tableRef2.deleteRow(rowIndex);
 			}
 		},
+		//第五步表格按钮点击
+		handleClickButton(e, rowIndex) {
+			const arrStr = typeof e === 'string' ? e.slice(0, -1) : '';
+			const updateData = { [arrStr]: moment().format('YYYY/MM/DD HH:mm') };
+			this.$refs.tableSecondRef?.updateDataSourceByRowIndex(rowIndex, updateData);
+			let { stepTableFormData_1 = [] } =  this.getFilledFormData()
+			stepTableFormData_1?.map((item,index)=>{
+				if(item.startTime && item.endTime){
+					const m1 = moment(item.startTime);
+					const m2 = moment(item.endTime);
+					const diffMinutes = m2.diff(m1, 'minutes');
+					this.$refs.tableSecondRef?.updateDataSourceByRowIndex(index, { fysc: diffMinutes  });
+				}
+			})
+			console.log(this.getFilledFormData())
+		},
 	}
 };
 </script>

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

@@ -276,7 +276,7 @@ export default {
     edit(row) {
       this.reset()
       this.studyType = row.studyType || null
-      this.studyFormType = row.studyFormType || null
+      this.studyFormType = row.studyFormType || 10
       this.form.qmyy = this.$t('page.business.study.studyFormPlan.cjjl')
       if (row && row.id) {
         this.showIndex = 2

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

@@ -279,7 +279,7 @@ export default {
     edit(row) {
       this.reset()
       this.studyType = row.studyType || null
-      this.studyFormType = row.studyFormType || null
+      this.studyFormType = row.studyFormType || 15
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()

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

@@ -124,7 +124,7 @@
               </template>
             </el-form-item>
           </el-col>
-          <el-col :psna="24">
+          <el-col :psna="24" v-if="form.product !== 9 && form.product !== 11">
             <el-form-item>
               <div><el-checkbox v-model="formApprove.sfcc" @change="sfccChange">{{
                 $t('page.business.study.studyFormFill.cc') }}</el-checkbox>
@@ -582,7 +582,7 @@ export default {
         try {
           params = JSON.parse(caesarDecipher(this.$route.params.key))
           this.studyType = params.studyType || null
-          this.studyFormType = params.studyFormType || null
+          this.studyFormType = params.studyFormType || 5
           this.selectedDeptId = params.selectedDeptId || null
         } catch (e) {
           console.log('参数错误')

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

@@ -280,7 +280,7 @@ export default {
       this.reset()
       this.permitForSecectUser = row.permitForSecectUser
       this.studyType = row.studyType || null
-      this.studyFormType = row.studyFormType || null
+      this.studyFormType = row.studyFormType || 1
       this.selectedDeptId = row.selectedDeptId || null
       if (row && row.id) {
         this.showIndex = 2

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

@@ -452,6 +452,7 @@ export default {
         studyId: this.searchForm.studyId,
         selectedDeptId: this.selectedDeptId,
         studyType: 1,
+        studyFormType: 1,
         studySubjectId: this.searchForm.studySubjectId,
         permitForSecectUser: 'business:studyFormPre:sh'
       })