|
|
@@ -5,119 +5,126 @@
|
|
|
:close-on-click-modal="false"
|
|
|
custom-class="ele-dialog-form"
|
|
|
:maxable="true"
|
|
|
- :title="'详情'"
|
|
|
+ :title="'信息'"
|
|
|
append-to-body
|
|
|
:before-close="cancelDetails"
|
|
|
>
|
|
|
<div class="form-wrapper">
|
|
|
- <el-form
|
|
|
- ref="form"
|
|
|
- :model="form"
|
|
|
- label-position="right"
|
|
|
- label-width="107px"
|
|
|
+ <el-tabs
|
|
|
+ v-model="dotLineActiveTab"
|
|
|
+ type="border-card"
|
|
|
+ class="dot-line-tabs"
|
|
|
>
|
|
|
- <el-row
|
|
|
- :gutter="10"
|
|
|
- class="basic"
|
|
|
- type="flex"
|
|
|
- style="flex-wrap: wrap"
|
|
|
- v-for="(el, index) in fieldList"
|
|
|
- :key="index"
|
|
|
- >
|
|
|
- <el-col
|
|
|
- :xs="6"
|
|
|
- :sm="6"
|
|
|
- :md="6"
|
|
|
- :lg="6"
|
|
|
- :xl="6"
|
|
|
- v-for="item in el"
|
|
|
- :key="item.prop"
|
|
|
+ <el-tab-pane label="详情" name="detail">
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ :model="form"
|
|
|
+ label-position="right"
|
|
|
+ label-width="107px"
|
|
|
>
|
|
|
- <el-form-item :label="item.label">
|
|
|
- <!-- <div class="item_label">{{ current[item.prop] }}</div> -->
|
|
|
- <el-input :value="fieldValue(item.prop)" readonly />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row :gutter="10">
|
|
|
- <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
- <el-form-item label="所属工厂:">
|
|
|
- <el-input v-model="form.factoryName" :readonly="true"> </el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
- <el-form-item label="所属工作中心:">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="form.workCenterId"
|
|
|
- placeholder="请选择"
|
|
|
- @change="changeWork"
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in workCenterList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
- <el-form-item label="所属班组:" required>
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="form.teamId"
|
|
|
- placeholder="请选择"
|
|
|
- @change="changeGroups"
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in teamList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-form-item label="报工类型:" required>
|
|
|
- <el-radio-group v-model="form.singleReport" disabled>
|
|
|
- <!-- v-if="clientEnvironmentId != 2" -->
|
|
|
- <el-radio :label="1">单件报工</el-radio>
|
|
|
- <el-radio :label="0">批量报工</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-form-item label="派单方式:" prop="taskAss">
|
|
|
- <!-- @change="changeDispatch" -->
|
|
|
- <el-radio-group v-model="form.taskAss" disabled>
|
|
|
- <el-radio :label="1">生产订单派单</el-radio>
|
|
|
- <el-radio :label="0">工序任务派单</el-radio>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- </el-row>
|
|
|
- <el-row v-if="form.taskAss == 1">
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item label="指派:" prop="assignType">
|
|
|
- <el-radio-group
|
|
|
- v-model="form.assignType"
|
|
|
- size="mini"
|
|
|
- @change="assignRadio"
|
|
|
- disabled
|
|
|
+ <el-row
|
|
|
+ :gutter="10"
|
|
|
+ class="basic"
|
|
|
+ type="flex"
|
|
|
+ style="flex-wrap: wrap"
|
|
|
+ v-for="(el, index) in fieldList"
|
|
|
+ :key="index"
|
|
|
+ >
|
|
|
+ <el-col
|
|
|
+ :xs="6"
|
|
|
+ :sm="6"
|
|
|
+ :md="6"
|
|
|
+ :lg="6"
|
|
|
+ :xl="6"
|
|
|
+ v-for="item in el"
|
|
|
+ :key="item.prop"
|
|
|
>
|
|
|
- <el-radio-button :label="1">工位</el-radio-button>
|
|
|
- <!-- <el-radio-button :label="2">人员</el-radio-button> -->
|
|
|
- <el-radio-button :label="3">产线</el-radio-button>
|
|
|
- </el-radio-group>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <!-- <el-form-item label="工位:" v-if="form.assignType == 1">
|
|
|
+ <el-form-item :label="item.label">
|
|
|
+ <!-- <div class="item_label">{{ current[item.prop] }}</div> -->
|
|
|
+ <el-input :value="fieldValue(item.prop)" readonly />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row :gutter="10">
|
|
|
+ <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
+ <el-form-item label="所属工厂:">
|
|
|
+ <el-input v-model="form.factoryName" :readonly="true">
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
+ <el-form-item label="所属工作中心:">
|
|
|
+ <el-select
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="form.workCenterId"
|
|
|
+ placeholder="请选择"
|
|
|
+ @change="changeWork"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in workCenterList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :xs="6" :sm="6" :md="6" :lg="6" :xl="6">
|
|
|
+ <el-form-item label="所属班组:" required>
|
|
|
+ <el-select
|
|
|
+ style="width: 100%"
|
|
|
+ v-model="form.teamId"
|
|
|
+ placeholder="请选择"
|
|
|
+ @change="changeGroups"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in teamList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-form-item label="报工类型:" required>
|
|
|
+ <el-radio-group v-model="form.singleReport" disabled>
|
|
|
+ <!-- v-if="clientEnvironmentId != 2" -->
|
|
|
+ <el-radio :label="1">单件报工</el-radio>
|
|
|
+ <el-radio :label="0">批量报工</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-form-item label="派单方式:" prop="taskAss">
|
|
|
+ <!-- @change="changeDispatch" -->
|
|
|
+ <el-radio-group v-model="form.taskAss" disabled>
|
|
|
+ <el-radio :label="1">生产订单派单</el-radio>
|
|
|
+ <el-radio :label="0">工序任务派单</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-row>
|
|
|
+ <el-row v-if="form.taskAss == 1">
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="指派:" prop="assignType">
|
|
|
+ <el-radio-group
|
|
|
+ v-model="form.assignType"
|
|
|
+ size="mini"
|
|
|
+ @change="assignRadio"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-radio-button :label="1">工位</el-radio-button>
|
|
|
+ <!-- <el-radio-button :label="2">人员</el-radio-button> -->
|
|
|
+ <el-radio-button :label="3">产线</el-radio-button>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-form-item label="工位:" v-if="form.assignType == 1">
|
|
|
<el-select
|
|
|
class="ele-block"
|
|
|
v-model="form.workstationIds"
|
|
|
@@ -137,39 +144,39 @@
|
|
|
</el-select>
|
|
|
</el-form-item> -->
|
|
|
|
|
|
- <el-form-item label="工位:" v-if="form.assignType == 1">
|
|
|
- <el-input
|
|
|
- :value="
|
|
|
- stationList
|
|
|
- .filter((s) => form.workstationIds?.includes(s.id))
|
|
|
- .map((s) => s.name)
|
|
|
- .join('、')
|
|
|
- "
|
|
|
- disabled
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="工位:" v-if="form.assignType == 1">
|
|
|
+ <el-input
|
|
|
+ :value="
|
|
|
+ stationList
|
|
|
+ .filter((s) => form.workstationIds?.includes(s.id))
|
|
|
+ .map((s) => s.name)
|
|
|
+ .join('、')
|
|
|
+ "
|
|
|
+ disabled
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <el-form-item label="人员:" v-if="form.assignType == 2">
|
|
|
- <el-select
|
|
|
- class="ele-block"
|
|
|
- v-model="form.crewIds"
|
|
|
- placeholder="请选择人员"
|
|
|
- size="mini"
|
|
|
- filterable
|
|
|
- multiple
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in crewList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- >
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="人员:" v-if="form.assignType == 2">
|
|
|
+ <el-select
|
|
|
+ class="ele-block"
|
|
|
+ v-model="form.crewIds"
|
|
|
+ placeholder="请选择人员"
|
|
|
+ size="mini"
|
|
|
+ filterable
|
|
|
+ multiple
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in crewList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <!-- <el-form-item label="产线:" v-if="form.assignType == 3" required>
|
|
|
+ <!-- <el-form-item label="产线:" v-if="form.assignType == 3" required>
|
|
|
<el-select
|
|
|
class="ele-block"
|
|
|
v-model="form.factoryLineIds"
|
|
|
@@ -188,46 +195,46 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item> -->
|
|
|
- <el-form-item label="工位:" v-if="form.assignType == 3">
|
|
|
- <el-input
|
|
|
- :value="
|
|
|
- productionList
|
|
|
- .filter((s) => form.factoryLineIds?.includes(s.id))
|
|
|
- .map((s) => s.name)
|
|
|
- .join('、')
|
|
|
- "
|
|
|
- disabled
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-row>
|
|
|
-
|
|
|
- <el-tabs
|
|
|
- class="process_list"
|
|
|
- v-model="processId"
|
|
|
- type="border-card"
|
|
|
- @tab-click="handleClick"
|
|
|
- v-show="form.taskAss == 0"
|
|
|
- v-loading="tabsLoading"
|
|
|
- >
|
|
|
- <el-tab-pane
|
|
|
- v-for="(item, index) in processList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :name="item.id"
|
|
|
- >
|
|
|
- <ele-pro-table
|
|
|
- class="table"
|
|
|
- :ref="`tableRef${index}`"
|
|
|
- :columns="columns"
|
|
|
- :datasource="item.list"
|
|
|
- cache-key="systemRoleTable"
|
|
|
- :pageSize="20"
|
|
|
- v-loading="tabLoading"
|
|
|
- :selection.sync="item.selection"
|
|
|
- row-key="id"
|
|
|
+ <el-form-item label="工位:" v-if="form.assignType == 3">
|
|
|
+ <el-input
|
|
|
+ :value="
|
|
|
+ productionList
|
|
|
+ .filter((s) => form.factoryLineIds?.includes(s.id))
|
|
|
+ .map((s) => s.name)
|
|
|
+ .join('、')
|
|
|
+ "
|
|
|
+ disabled
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ <el-tabs
|
|
|
+ class="process_list"
|
|
|
+ v-model="processId"
|
|
|
+ type="border-card"
|
|
|
+ @tab-click="handleClick"
|
|
|
+ v-show="form.taskAss == 0"
|
|
|
+ v-loading="tabsLoading"
|
|
|
>
|
|
|
- <template v-slot:toolbar>
|
|
|
- <!-- <el-button
|
|
|
+ <el-tab-pane
|
|
|
+ v-for="(item, index) in processList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :name="item.id"
|
|
|
+ >
|
|
|
+ <ele-pro-table
|
|
|
+ class="table"
|
|
|
+ :ref="`tableRef${index}`"
|
|
|
+ :columns="columns"
|
|
|
+ :datasource="item.list"
|
|
|
+ cache-key="systemRoleTable"
|
|
|
+ :pageSize="20"
|
|
|
+ v-loading="tabLoading"
|
|
|
+ :selection.sync="item.selection"
|
|
|
+ row-key="id"
|
|
|
+ >
|
|
|
+ <template v-slot:toolbar>
|
|
|
+ <!-- <el-button
|
|
|
type="primary"
|
|
|
@click="dispatch(item, 1)"
|
|
|
:loading="toolbarLoading"
|
|
|
@@ -249,120 +256,223 @@
|
|
|
保存
|
|
|
</el-button> -->
|
|
|
|
|
|
- <div style="display: inline-block">
|
|
|
- <span
|
|
|
- class="text"
|
|
|
- style="
|
|
|
- font-weight: bold;
|
|
|
- font-size: 14px;
|
|
|
- margin-right: 8px;
|
|
|
- "
|
|
|
- >指派:</span
|
|
|
- >
|
|
|
- <el-radio-group
|
|
|
- v-model="item.assignType"
|
|
|
- size="mini"
|
|
|
- @change="(e) => changeRadio(e, index)"
|
|
|
- >
|
|
|
- <el-radio-button
|
|
|
- :label="1"
|
|
|
- :disabled="radioBun(item, 'stationDis')"
|
|
|
- >工位</el-radio-button
|
|
|
- >
|
|
|
- <!-- <el-radio-button
|
|
|
+ <div style="display: inline-block">
|
|
|
+ <span
|
|
|
+ class="text"
|
|
|
+ style="
|
|
|
+ font-weight: bold;
|
|
|
+ font-size: 14px;
|
|
|
+ margin-right: 8px;
|
|
|
+ "
|
|
|
+ >指派:</span
|
|
|
+ >
|
|
|
+ <el-radio-group
|
|
|
+ v-model="item.assignType"
|
|
|
+ size="mini"
|
|
|
+ @change="(e) => changeRadio(e, index)"
|
|
|
+ >
|
|
|
+ <el-radio-button
|
|
|
+ :label="1"
|
|
|
+ :disabled="radioBun(item, 'stationDis')"
|
|
|
+ >工位</el-radio-button
|
|
|
+ >
|
|
|
+ <!-- <el-radio-button
|
|
|
:label="2"
|
|
|
:disabled="radioBun(item, 'staffDis')"
|
|
|
>人员</el-radio-button
|
|
|
> -->
|
|
|
- <el-radio-button
|
|
|
- :label="3"
|
|
|
- :disabled="radioBun(item, 'lineDis')"
|
|
|
- >产线</el-radio-button
|
|
|
+ <el-radio-button
|
|
|
+ :label="3"
|
|
|
+ :disabled="radioBun(item, 'lineDis')"
|
|
|
+ >产线</el-radio-button
|
|
|
+ >
|
|
|
+ </el-radio-group>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div
|
|
|
+ style="margin-left: 50px; display: inline-block"
|
|
|
+ v-if="timeSlot(item)"
|
|
|
>
|
|
|
- </el-radio-group>
|
|
|
- </div>
|
|
|
+ 时间段: {{ item.startDate }} ----- {{ item.endDate }}
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <template v-slot:quantity="{ row }">
|
|
|
+ <el-input
|
|
|
+ :readonly="permissions(row)"
|
|
|
+ type="number"
|
|
|
+ v-model="row.quantity"
|
|
|
+ placeholder="请输入数量"
|
|
|
+ @input="(e) => handleQuantityInput(e, row, item)"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ <template v-slot:weight="{ row }">
|
|
|
+ <el-input
|
|
|
+ :readonly="permissions(row)"
|
|
|
+ type="number"
|
|
|
+ v-model="row.weight"
|
|
|
+ placeholder="请输入重量"
|
|
|
+ @input="(e) => handleWeightInput(e, row, item)"
|
|
|
+ ></el-input>
|
|
|
+ </template>
|
|
|
+ <template v-slot:teamTimeIds="{ row }">
|
|
|
+ <el-select
|
|
|
+ :disabled="permissions(row)"
|
|
|
+ multiple
|
|
|
+ v-model="row.teamTimeIds"
|
|
|
+ placeholder="班次"
|
|
|
+ @change="(e) => shiftSelection(e, row, item)"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in shiftList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.dutyName"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ <template v-slot:startTime="{ row }">
|
|
|
+ <el-date-picker
|
|
|
+ :readonly="permissions(row)"
|
|
|
+ class="w100"
|
|
|
+ v-model="row.startTime"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ placeholder="开始时间"
|
|
|
+ @change="handleStartTimeChange(row, item)"
|
|
|
+ ></el-date-picker>
|
|
|
+ </template>
|
|
|
+ <template v-slot:endTime="{ row }">
|
|
|
+ <el-date-picker
|
|
|
+ :readonly="permissions(row)"
|
|
|
+ class="w100"
|
|
|
+ v-model="row.endTime"
|
|
|
+ type="datetime"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ @change="handleEndTimeChange(row, item)"
|
|
|
+ placeholder="完成时间"
|
|
|
+ ></el-date-picker>
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <template v-slot:action="{ row }">
|
|
|
+ <!-- :readonly="resetBtnDis(row)" -->
|
|
|
+ <el-popconfirm
|
|
|
+ title="确定要重置该条数据吗？"
|
|
|
+ @confirm="resetData(row, item)"
|
|
|
+ v-if="resetBtnDis(row)"
|
|
|
+ >
|
|
|
+ <template v-slot:reference>
|
|
|
+ <el-link type="primary" :underline="false">
|
|
|
+ 重置
|
|
|
+ </el-link>
|
|
|
+ </template>
|
|
|
+ </el-popconfirm>
|
|
|
+ </template>
|
|
|
+ </ele-pro-table>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
+ </el-form>
|
|
|
+ </el-tab-pane>
|
|
|
|
|
|
+ <el-tab-pane label="布点详情" name="dotLine" v-if="hasDotLineDetail">
|
|
|
+ <div class="plan-dot-line">
|
|
|
+ <div class="top-route">
|
|
|
+ <div class="panel-title">工艺路线</div>
|
|
|
+ <el-empty
|
|
|
+ v-if="dotLineTaskList.length === 0"
|
|
|
+ description="暂无工艺路线"
|
|
|
+ ></el-empty>
|
|
|
+ <div v-else class="route-line">
|
|
|
<div
|
|
|
- style="margin-left: 50px; display: inline-block"
|
|
|
- v-if="timeSlot(item)"
|
|
|
+ v-for="(item, index) in dotLineTaskList"
|
|
|
+ :key="`route-seg-${item._taskKey}`"
|
|
|
+ class="route-segment"
|
|
|
>
|
|
|
- 时间段: {{ item.startDate }} ----- {{ item.endDate }}
|
|
|
+ <span
|
|
|
+ class="route-node"
|
|
|
+ :class="{
|
|
|
+ 'route-node--done':
|
|
|
+ item.executionType != null && item.executionType !== ''
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ {{ item.taskName || item.name || `工艺${index + 1}` }}
|
|
|
+ </span>
|
|
|
+ <span
|
|
|
+ v-if="index < dotLineTaskList.length - 1"
|
|
|
+ class="route-arrow"
|
|
|
+ aria-hidden="true"
|
|
|
+ >→</span
|
|
|
+ >
|
|
|
</div>
|
|
|
- </template>
|
|
|
- <template v-slot:quantity="{ row }">
|
|
|
- <el-input
|
|
|
- :readonly="permissions(row)"
|
|
|
- type="number"
|
|
|
- v-model="row.quantity"
|
|
|
- placeholder="请输入数量"
|
|
|
- @input="(e) => handleQuantityInput(e, row, item)"
|
|
|
- ></el-input>
|
|
|
- </template>
|
|
|
- <template v-slot:weight="{ row }">
|
|
|
- <el-input
|
|
|
- :readonly="permissions(row)"
|
|
|
- type="number"
|
|
|
- v-model="row.weight"
|
|
|
- placeholder="请输入重量"
|
|
|
- @input="(e) => handleWeightInput(e, row, item)"
|
|
|
- ></el-input>
|
|
|
- </template>
|
|
|
- <template v-slot:teamTimeIds="{ row }">
|
|
|
- <el-select
|
|
|
- :disabled="permissions(row)"
|
|
|
- multiple
|
|
|
- v-model="row.teamTimeIds"
|
|
|
- placeholder="班次"
|
|
|
- @change="(e) => shiftSelection(e, row, item)"
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="config-panel">
|
|
|
+ <div class="panel-title">工艺配置</div>
|
|
|
+ <el-empty
|
|
|
+ v-if="dotLineTaskList.length === 0"
|
|
|
+ description="暂无工艺"
|
|
|
+ ></el-empty>
|
|
|
+ <div v-else class="task-config-table-wrap">
|
|
|
+ <el-table
|
|
|
+ :data="dotLineTaskList"
|
|
|
+ border
|
|
|
+ size="small"
|
|
|
+ row-key="_taskKey"
|
|
|
+ max-height="420"
|
|
|
+ class="config-table"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in shiftList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.dutyName"
|
|
|
- :value="item.id"
|
|
|
+ <el-table-column
|
|
|
+ type="index"
|
|
|
+ label="序号"
|
|
|
+ width="48"
|
|
|
+ align="center"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="工序名称"
|
|
|
+ min-width="100"
|
|
|
+ show-overflow-tooltip
|
|
|
+ class-name="task-name-cell"
|
|
|
+ align="center"
|
|
|
>
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </template>
|
|
|
- <template v-slot:startTime="{ row }">
|
|
|
- <el-date-picker
|
|
|
- :readonly="permissions(row)"
|
|
|
- class="w100"
|
|
|
- v-model="row.startTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="开始时间"
|
|
|
- @change="handleStartTimeChange(row, item)"
|
|
|
- ></el-date-picker>
|
|
|
- </template>
|
|
|
- <template v-slot:endTime="{ row }">
|
|
|
- <el-date-picker
|
|
|
- :readonly="permissions(row)"
|
|
|
- class="w100"
|
|
|
- v-model="row.endTime"
|
|
|
- type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- @change="handleEndTimeChange(row, item)"
|
|
|
- placeholder="完成时间"
|
|
|
- ></el-date-picker>
|
|
|
- </template>
|
|
|
-
|
|
|
- <template v-slot:action="{ row }">
|
|
|
- <!-- :readonly="resetBtnDis(row)" -->
|
|
|
- <el-popconfirm
|
|
|
- title="确定要重置该条数据吗？"
|
|
|
- @confirm="resetData(row, item)"
|
|
|
- v-if="resetBtnDis(row)"
|
|
|
- >
|
|
|
- <template v-slot:reference>
|
|
|
- <el-link type="primary" :underline="false"> 重置 </el-link>
|
|
|
- </template>
|
|
|
- </el-popconfirm>
|
|
|
- </template>
|
|
|
- </ele-pro-table>
|
|
|
- </el-tab-pane>
|
|
|
- </el-tabs>
|
|
|
- </el-form>
|
|
|
+ <template slot-scope="{ row, $index }">
|
|
|
+ <span class="task-name-text">{{
|
|
|
+ row.taskName || row.name || `工艺${$index + 1}`
|
|
|
+ }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="执行模式"
|
|
|
+ min-width="100"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ <template slot-scope="{ row }">
|
|
|
+ {{ executionTypeLabel(row.executionType) }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="执行班组"
|
|
|
+ min-width="130"
|
|
|
+ align="center"
|
|
|
+ prop="executionTeamName"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="执行开始时间"
|
|
|
+ min-width="168"
|
|
|
+ align="center"
|
|
|
+ prop="executionStartTime"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="执行结束时间"
|
|
|
+ min-width="168"
|
|
|
+ align="center"
|
|
|
+ prop="executionEndTime"
|
|
|
+ />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
</div>
|
|
|
|
|
|
<div slot="footer">
|
|
|
@@ -374,6 +484,10 @@
|
|
|
<script>
|
|
|
import releaseMixin from '../mixins/release';
|
|
|
import { parameterGetByCode } from '@/api/mainData/index';
|
|
|
+ import { getPlanDotLine } from '@/api/productionPlan/planDotLine';
|
|
|
+
|
|
|
+ const EXEC_TYPE_MAP = { 0: '自制', 1: '请托', 2: '委外' };
|
|
|
+
|
|
|
export default {
|
|
|
components: {},
|
|
|
props: {
|
|
|
@@ -454,7 +568,10 @@
|
|
|
batchDis: false, // 批量报工
|
|
|
isDispatchRow: {}, // 查询是否派单数据
|
|
|
time_calc_code: '0', // 是否进行时间赋值 0 否 1 是
|
|
|
- isTask: true
|
|
|
+ isTask: true,
|
|
|
+ dotLineTaskList: [],
|
|
|
+ hasDotLineDetail: false,
|
|
|
+ dotLineActiveTab: 'detail'
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -523,6 +640,9 @@
|
|
|
return true;
|
|
|
};
|
|
|
},
|
|
|
+ executionTypeLabel() {
|
|
|
+ return (val) => EXEC_TYPE_MAP[val] ?? '';
|
|
|
+ },
|
|
|
columns() {
|
|
|
return [
|
|
|
{
|
|
|
@@ -621,6 +741,7 @@
|
|
|
this.queryCheckExists(); // 查询是否派单
|
|
|
// this.form.singleReport = this.clientEnvironmentId == 2 ? 0 : '';
|
|
|
this.dateValue = this.getFormattedDate();
|
|
|
+ this.loadDotLineData();
|
|
|
},
|
|
|
methods: {
|
|
|
getCode() {
|
|
|
@@ -652,6 +773,51 @@
|
|
|
|
|
|
cancelDetails() {
|
|
|
this.$emit('update:detailsVisible', false);
|
|
|
+ },
|
|
|
+
|
|
|
+ async loadDotLineData() {
|
|
|
+ if (!this.form.productionPlanId) return;
|
|
|
+ try {
|
|
|
+ const planData = await getPlanDotLine({
|
|
|
+ planId: this.form.productionPlanId
|
|
|
+ });
|
|
|
+ const details = planData?.detailList;
|
|
|
+ if (details && details.length > 0) {
|
|
|
+ this.hasDotLineDetail = true;
|
|
|
+ this.dotLineTaskList = [...details]
|
|
|
+ .sort((a, b) => (a.taskSort ?? 0) - (b.taskSort ?? 0))
|
|
|
+ .map((item, i) => ({
|
|
|
+ ...item,
|
|
|
+ _taskKey: item.id ?? `detail-${item.taskId ?? i}`,
|
|
|
+ executionStartTime: this.formatDotLineTime(
|
|
|
+ item.executionStartTime
|
|
|
+ ),
|
|
|
+ executionEndTime: this.formatDotLineTime(item.executionEndTime),
|
|
|
+ executionType:
|
|
|
+ item.executionType != null
|
|
|
+ ? Number(item.executionType)
|
|
|
+ : undefined
|
|
|
+ }));
|
|
|
+ } else {
|
|
|
+ this.hasDotLineDetail = false;
|
|
|
+ this.dotLineTaskList = [];
|
|
|
+ }
|
|
|
+ } catch {
|
|
|
+ this.hasDotLineDetail = false;
|
|
|
+ this.dotLineTaskList = [];
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ formatDotLineTime(val) {
|
|
|
+ if (val == null || val === '') return '';
|
|
|
+ const str = String(val).trim();
|
|
|
+ if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(str)) return str;
|
|
|
+ const d = new Date(val);
|
|
|
+ if (Number.isNaN(d.getTime())) return '';
|
|
|
+ const p = (n) => String(n).padStart(2, '0');
|
|
|
+ return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(
|
|
|
+ d.getHours()
|
|
|
+ )}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -681,4 +847,110 @@
|
|
|
::v-deep .el-input.is-disabled .el-input__inner {
|
|
|
color: #ab7777;
|
|
|
}
|
|
|
+
|
|
|
+ // .dot-line-tabs {
|
|
|
+ // margin-top: 16px;
|
|
|
+ // }
|
|
|
+
|
|
|
+ .plan-dot-line,
|
|
|
+ .top-route,
|
|
|
+ .config-panel,
|
|
|
+ .route-line {
|
|
|
+ width: 100%;
|
|
|
+ max-width: 100%;
|
|
|
+ min-width: 0;
|
|
|
+ box-sizing: border-box;
|
|
|
+ }
|
|
|
+
|
|
|
+ .plan-dot-line {
|
|
|
+ min-height: 200px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .top-route,
|
|
|
+ .config-panel {
|
|
|
+ border: 1px solid #ebeef5;
|
|
|
+ border-radius: 4px;
|
|
|
+ padding: 12px;
|
|
|
+ background: #fff;
|
|
|
+ }
|
|
|
+
|
|
|
+ .config-panel {
|
|
|
+ margin-top: 12px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .panel-title {
|
|
|
+ font-size: 14px;
|
|
|
+ font-weight: 600;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ }
|
|
|
+
|
|
|
+ .route-line {
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ align-items: stretch;
|
|
|
+ color: #303133;
|
|
|
+ }
|
|
|
+
|
|
|
+ .route-segment {
|
|
|
+ flex: 1 1 0;
|
|
|
+ min-width: 0;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ }
|
|
|
+
|
|
|
+ .route-node {
|
|
|
+ flex: 0 1 auto;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ min-width: 0;
|
|
|
+ min-height: 22px;
|
|
|
+ border-radius: 4px;
|
|
|
+ padding: 2px 10px;
|
|
|
+ color: #fff;
|
|
|
+ background: #909399;
|
|
|
+ font-size: clamp(10px, 2.6vw, 12px);
|
|
|
+ font-weight: 600;
|
|
|
+ line-height: 1.2;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow: ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+
|
|
|
+ .route-node--done {
|
|
|
+ background: #56bf1d;
|
|
|
+ }
|
|
|
+
|
|
|
+ .route-arrow {
|
|
|
+ flex: 1 1 0;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ color: #909399;
|
|
|
+ font-size: clamp(14px, 2.5vw, 18px);
|
|
|
+ line-height: 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ .task-config-table-wrap {
|
|
|
+ width: 100%;
|
|
|
+ }
|
|
|
+
|
|
|
+ .config-table ::v-deep {
|
|
|
+ .el-table th > .cell,
|
|
|
+ .el-table td > .cell {
|
|
|
+ font-size: 14px;
|
|
|
+ text-align: center;
|
|
|
+ }
|
|
|
+ .el-table__body .cell {
|
|
|
+ padding-left: 6px;
|
|
|
+ padding-right: 6px;
|
|
|
+ }
|
|
|
+ td.task-name-cell .task-name-text {
|
|
|
+ font-size: 14px;
|
|
|
+ font-weight: 500;
|
|
|
+ line-height: 1.4;
|
|
|
+ }
|
|
|
+ }
|
|
|
</style>
|
695593266@qq.com