H5/leshan-laboratory.git

			@@ -204,18 +204,18 @@
			const userType = userInfo.userType;

			switch (userType) {
			case 2: // 审批人
			return 'layout-4';
			case 3: // 工艺工程师
			return 'layout-4';
			// case 4: // 化验师
			// case 2: // 审批人
			// return 'layout-4';
			case 5: // 实验员
			return 'layout-5';
			case 6: // 超级管理员
			return 'layout-6';
			// case 3: // 工艺工程师
			// return 'layout-4';
			// // case 4: // 化验师
			// // return 'layout-4';
			// case 5: // 实验员
			// return 'layout-5';
			// case 6: // 超级管理员
			// return 'layout-6';
			default:
			return 'layout-6'; // 默认返回化验师的布局
			return 'layout-4'; // 默认返回化验师的布局
			}
			}
			}

			@@ -255,8 +255,8 @@
			@confirm="handleConfirmPreserveSubmit" />
			<div class="end-btn" style="margin-top: 20px;" v-if="!$route.query.isDetail&& [3, 4].includes(roleType)">
			<el-button type="primary" @click="handleSubmit(1)">提交</el-button>
			<el-button type="primary" @click="handleSubmit(3)">同步给保藏人</el-button>
			<el-button type="default" @click="handleSubmit(2)">存草稿</el-button>
			<el-button type="primary" @click="handleSubmit(2)">同步给保藏人</el-button>
			<el-button type="default" @click="handleSubmit(3)">存草稿</el-button>
			</div>
			</el-form>
			</Card>
			@@ -460,9 +460,9 @@
			if (type == 1) {
			this.form.status = 1
			} else if (type == 3) {
			this.form.isDraft = 2
			this.form.status = 2
			} else {
			this.form.isDraft = 3
			this.form.status = 3
			}

			this.$refs.form.validate(async (valid) => {

			@@ -357,7 +357,7 @@
			.filter(item => {
			const status = String(item.status);
			console.log('过滤待接收样品:', item.id, status);
			return status === '2';
			return status == '2';
			})
			.map(item => ({
			...item,
			@@ -367,7 +367,7 @@
			this.pendingSamplesTotal = this.pendingSamples.length;

			this.receivedSamples = detail.samplingRecordOperations
			.filter(item => String(item.status) === '3')
			.filter(item => String(item.status) == '3')
			.map(item => ({
			...item,
			status: String(item.status)
			@@ -591,7 +591,7 @@
			isSelectable(row) {
			console.log('isSelectable row:', row);
			console.log('row status:', row.status, typeof row.status);
			const result = String(row.status) === '2';
			const result = String(row.status) == '2';
			console.log('isSelectable result:', result);
			return result;
			},

	culture/src/views/middleground/index.vue	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	culture/src/views/strain-library/breeding-record/add.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	laboratory/src/views/dataManagement/sampleManage/addSample.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史