From e950c38ba82e5e6bc8b0c50c35e5dbb6a180165a Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期二, 20 五月 2025 16:43:06 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/dispatching/addDispatch.vue | 226 ++++++++++++++++++++++++++++----------------------------
1 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/laboratory/src/views/dataManagement/dispatching/addDispatch.vue b/laboratory/src/views/dataManagement/dispatching/addDispatch.vue
index 8923947..472d9e4 100644
--- a/laboratory/src/views/dataManagement/dispatching/addDispatch.vue
+++ b/laboratory/src/views/dataManagement/dispatching/addDispatch.vue
@@ -64,134 +64,134 @@
</el-form-item>
</div>
- <div class="header-title" style="margin-bottom: 38px">
- <div class="header-title-left">
- <img src="@/assets/public/headercard.png" />
- <span>二 、实验信息</span>
- </div>
+ <div class="header-title" style="margin-bottom: 38px">
+ <div class="header-title-left">
+ <img src="@/assets/public/headercard.png" />
+ <span>二 、实验信息</span>
</div>
- <div style="padding-left: 25px">
- <el-form-item prop="experimentDate" label="试验日期">
- <el-date-picker
- name="data-test"
- v-model="form.experimentDate"
- type="date"
- placeholder="选择日期"
- @change="handleDateChange"
- ></el-date-picker>
- </el-form-item>
- <el-form-item prop="experimentName" label="实验名称">
- <el-input v-model="form.experimentName" placeholder="请输入" />
- </el-form-item>
- <el-form-item prop="experimentCode" label="实验编号">
- <el-input v-model="form.experimentCode" placeholder="请输入" disabled/>
- </el-form-item>
- </div>
+ </div>
+ <div style="padding-left: 25px">
+ <el-form-item prop="experimentDate" label="试验日期">
+ <el-date-picker
+ name="data-test"
+ v-model="form.experimentDate"
+ type="date"
+ placeholder="选择日期"
+ @change="handleDateChange"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item prop="experimentName" label="实验名称">
+ <el-input v-model="form.experimentName" placeholder="请输入" />
+ </el-form-item>
+ <el-form-item prop="experimentCode" label="实验编号">
+ <el-input v-model="form.experimentCode" placeholder="请输入" disabled/>
+ </el-form-item>
+ </div>
- <div class="add-group">
- <span>实验分组</span>
- <el-button type="primary" class="el-icon-plus" @click="handleAddGroup">添加组别</el-button>
- </div>
- <Table
- :data="groupTableData"
- :total="0"
- :height="null"
- class="groupTable"
- >
- <el-table-column type="index" label="序号" width="80"></el-table-column>
- <el-table-column prop="groupName" label="组别"></el-table-column>
- <el-table-column prop="remark" label="备注"></el-table-column>
- <el-table-column label="操作" width="200">
- <template slot-scope="scope">
- <el-button type="text" @click="handleEditGroup(scope.row)">编辑</el-button>
- <el-button type="text" @click="handleDeleteGroup(scope.row)">移除</el-button>
- </template>
- </el-table-column>
- </Table>
+ <div class="add-group">
+ <span>实验分组</span>
+ <el-button type="primary" class="el-icon-plus" @click="handleAddGroup">添加组别</el-button>
+ </div>
+ <Table
+ :data="groupTableData"
+ :total="0"
+ :height="null"
+ class="groupTable"
+ >
+ <el-table-column type="index" label="序号" width="80"></el-table-column>
+ <el-table-column prop="groupName" label="组别"></el-table-column>
+ <el-table-column prop="remark" label="备注"></el-table-column>
+ <el-table-column label="操作" width="200">
+ <template slot-scope="scope">
+ <el-button type="text" @click="handleEditGroup(scope.row)">编辑</el-button>
+ <el-button type="text" @click="handleDeleteGroup(scope.row)">移除</el-button>
+ </template>
+ </el-table-column>
+ </Table>
- <div class="header-title" style="margin-bottom: 38px">
- <div class="header-title-left">
- <img src="@/assets/public/headercard.png" />
- <span>三 、计划时间及人员</span>
- </div>
+ <div class="header-title" style="margin-bottom: 38px">
+ <div class="header-title-left">
+ <img src="@/assets/public/headercard.png" />
+ <span>三 、计划时间及人员</span>
</div>
- <div style="padding-left: 25px">
- <el-form-item prop="experimentTime" label="试验时间">
- <el-date-picker
- style="width: 100%"
- v-model="form.experimentTime"
- type="datetimerange"
- range-separator="至"
- start-placeholder="开始时间"
- end-placeholder="结束时间"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- @change="handleTimeRangeChange"
- ></el-date-picker>
- </el-form-item>
- </div>
- <div class="add-group">
- <div>*</div>
- <span>参加人员</span>
- <el-button type="primary" class="el-icon-plus" @click="addMember">选择参加人员</el-button>
- </div>
- <div class="member-list">
- <div v-for="item in [3,4,5]" :key="item" class="member-list-card">
- <div class="member-item">
- <div class="member-title">
- {{ ["工艺工程师", "化验师","实验员"][item - 3] }}
- </div>
+ </div>
+ <div style="padding-left: 25px">
+ <el-form-item prop="experimentTime" label="试验时间">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.experimentTime"
+ type="datetimerange"
+ range-separator="至"
+ start-placeholder="开始时间"
+ end-placeholder="结束时间"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ :default-time="['00:00:00', '23:59:59']"
+ @change="handleTimeRangeChange"
+ ></el-date-picker>
+ </el-form-item>
+ </div>
+ <div class="add-group">
+ <div>*</div>
+ <span>参加人员</span>
+ <el-button type="primary" class="el-icon-plus" @click="addMember">选择参加人员</el-button>
+ </div>
+ <div class="member-list">
+ <div v-for="item in [3,4,5]" :key="item" class="member-list-card">
+ <div class="member-item">
+ <div class="member-title">
+ {{ ["工艺工程师", "化验师","实验员"][item - 3] }}
+ </div>
+ <div
+ :class="item == 3 ? 'member-name-box' : 'flex1'"
+ >
<div
- :class="item == 3 ? 'member-name-box' : 'flex1'"
+ :class="
+ item == 3
+ ? 'member-name-box'
+ : 'member-name-box-2'
+ "
>
<div
- :class="
- item == 3
- ? 'member-name-box'
- : 'member-name-box-2'
- "
+ v-for="i in memberList(item)"
+ :key="i.userId"
+ class="member-name"
>
- <div
- v-for="i in memberList(item)"
- :key="i.userId"
- class="member-name"
- >
- {{ i.nickName }}
- </div>
+ {{ i.nickName }}
</div>
</div>
- <div class="member-change">
- <div class="member-change-btn" @click="editUserList(item)" v-if="item == 4 || item == 5">修改</div>
- </div>
+ </div>
+ <div class="member-change">
+ <div class="member-change-btn" @click="editUserList(item)" v-if="item == 4 || item == 5">修改</div>
</div>
</div>
</div>
+ </div>
- <div class="header-title" style="margin-bottom: 38px">
- <div class="header-title-left">
- <img src="@/assets/public/headercard.png" />
- <span>四 、任务分解</span>
- </div>
- <el-button type="primary" class="el-icon-plus" @click="handleAddTask">新增任务</el-button>
+ <div class="header-title" style="margin-bottom: 38px">
+ <div class="header-title-left">
+ <img src="@/assets/public/headercard.png" />
+ <span>四 、任务分解</span>
</div>
+ <el-button type="primary" class="el-icon-plus" @click="handleAddTask">新增任务</el-button>
+ </div>
- <Table
- :data="taskTableData"
- :total="0"
- :height="null"
- class="rwuTable"
- >
- <el-table-column type="index" label="序号" width="80"></el-table-column>
- <el-table-column prop="taskName" label="任务名称"></el-table-column>
- <el-table-column prop="personCharge" label="负责人"></el-table-column>
- <el-table-column prop="startTime" label="开始时间"></el-table-column>
- <el-table-column label="操作" width="200">
- <template slot-scope="scope">
- <el-button type="text" @click="handleEditTask(scope.row)">编辑</el-button>
- <el-button type="text" @click="handleDeleteTask(scope.row)">移除</el-button>
- </template>
- </el-table-column>
- </Table>
+ <Table
+ :data="taskTableData"
+ :total="0"
+ :height="null"
+ class="rwuTable"
+ >
+ <el-table-column type="index" label="序号" width="80"></el-table-column>
+ <el-table-column prop="taskName" label="任务名称"></el-table-column>
+ <el-table-column prop="personCharge" label="负责人"></el-table-column>
+ <el-table-column prop="startTime" label="开始时间"></el-table-column>
+ <el-table-column label="操作" width="200">
+ <template slot-scope="scope">
+ <el-button type="text" @click="handleEditTask(scope.row)">编辑</el-button>
+ <el-button type="text" @click="handleDeleteTask(scope.row)">移除</el-button>
+ </template>
+ </el-table-column>
+ </Table>
<div class="header-title">
<div class="header-title-left">
@@ -221,7 +221,7 @@
</template>
<script>
-import SelectMember from '@/components/SelectMember'
+import SelectMember from '@/components/SelectMember/index.vue'
import AddGroupDialog from './components/AddGroupDialog'
import AddTaskDialog from './components/AddTaskDialog'
import AIEditor from '@/components/AiEditor'
--
Gitblit v1.7.1