|
@@ -1,152 +1,164 @@
|
|
|
<template>
|
|
|
- <div class="body">
|
|
|
- <!-- 返工 -->
|
|
|
- <el-scrollbar class="containerBox">
|
|
|
- <div
|
|
|
- style="margin-bottom: 10px; display: flex"
|
|
|
- :style="{ justifyContent: !formStatus ? 'center' : '' }"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- style="font-size: 16px"
|
|
|
- v-if="formStatus"
|
|
|
- @click="toAdd"
|
|
|
- >新增</el-button
|
|
|
+ <el-drawer
|
|
|
+ v-model="removeVisible"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ destroy-on-close
|
|
|
+ direction="rtl"
|
|
|
+ size="990px"
|
|
|
+ style="background-color: #f1f3f5"
|
|
|
+ >
|
|
|
+ <template #header>
|
|
|
+ <div class="drawerTitle">返工</div>
|
|
|
+ </template>
|
|
|
+ <div class="body">
|
|
|
+ <!-- 返工 -->
|
|
|
+ <el-scrollbar class="containerBox">
|
|
|
+ <div
|
|
|
+ style="margin-bottom: 10px; display: flex"
|
|
|
+ :style="{ justifyContent: !formStatus ? 'center' : '' }"
|
|
|
>
|
|
|
- <el-button type="primary" v-else @click="toList">返回</el-button>
|
|
|
- </div>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ style="font-size: 16px"
|
|
|
+ v-if="formStatus"
|
|
|
+ @click="toAdd"
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
+ <el-button type="primary" v-else @click="toList">返回</el-button>
|
|
|
+ </div>
|
|
|
|
|
|
- <template v-if="formStatus">
|
|
|
- <el-table class="table" :data="tableData">
|
|
|
- <el-table-column label="物料名称" prop="materialName" />
|
|
|
- <el-table-column label="管号" prop="seqNos" />
|
|
|
- <el-table-column label="数量" prop="num" />
|
|
|
- <el-table-column label="返工原因" prop="reason" />
|
|
|
- <el-table-column label="返工内容" prop="remark" />
|
|
|
- <el-table-column label="状态" prop="flowState">
|
|
|
- <template #default="scope">
|
|
|
- <span v-if="scope.row.flowState == '0'">待处理</span>
|
|
|
- <span v-else-if="scope.row.flowState == '1'">已完成</span>
|
|
|
- <span v-else-if="scope.row.flowState == '-1'">审核驳回</span>
|
|
|
- <span v-else-if="scope.row.flowState == '3'">审核中</span>
|
|
|
- <span v-else-if="scope.row.flowState == '2'">撤销</span>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
- <Pagination
|
|
|
- v-model:limit="limit"
|
|
|
- v-model:page="page"
|
|
|
- :position="'right'"
|
|
|
- :total="total"
|
|
|
- @pagination="getPagination"
|
|
|
- />
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- <el-scrollbar class="form">
|
|
|
- <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules">
|
|
|
- <el-form-item
|
|
|
- :label="`流转卡号数量[${ruleForm.seqList.length}]`"
|
|
|
- prop="seqList"
|
|
|
- :rules="{
|
|
|
- required: true,
|
|
|
- trigger: 'change',
|
|
|
- }"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="ruleForm.seqList"
|
|
|
- multiple
|
|
|
- placeholder="请选择"
|
|
|
- value-key="value"
|
|
|
- @change="selectProcessWorkSeqChange"
|
|
|
+ <template v-if="formStatus">
|
|
|
+ <el-table class="table" :data="tableData">
|
|
|
+ <el-table-column label="物料名称" prop="materialName" />
|
|
|
+ <el-table-column label="管号" prop="seqNos" />
|
|
|
+ <el-table-column label="数量" prop="num" />
|
|
|
+ <el-table-column label="返工原因" prop="reason" />
|
|
|
+ <el-table-column label="返工内容" prop="remark" />
|
|
|
+ <el-table-column label="状态" prop="flowState">
|
|
|
+ <template #default="scope">
|
|
|
+ <span v-if="scope.row.flowState == '0'">待处理</span>
|
|
|
+ <span v-else-if="scope.row.flowState == '1'">已完成</span>
|
|
|
+ <span v-else-if="scope.row.flowState == '-1'">审核驳回</span>
|
|
|
+ <span v-else-if="scope.row.flowState == '3'">审核中</span>
|
|
|
+ <span v-else-if="scope.row.flowState == '2'">撤销</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <Pagination
|
|
|
+ v-model:limit="limit"
|
|
|
+ v-model:page="page"
|
|
|
+ :position="'right'"
|
|
|
+ :total="total"
|
|
|
+ @pagination="getPagination"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <el-scrollbar class="form">
|
|
|
+ <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules">
|
|
|
+ <el-form-item
|
|
|
+ :label="`流转卡号数量[${ruleForm.seqList.length}]`"
|
|
|
+ prop="seqList"
|
|
|
+ :rules="{
|
|
|
+ required: true,
|
|
|
+ trigger: 'change',
|
|
|
+ }"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in processList"
|
|
|
- :key="item"
|
|
|
- :label="item"
|
|
|
- :value="item"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="返工工序"
|
|
|
- prop="itemList"
|
|
|
- :rules="{
|
|
|
- required: true,
|
|
|
- trigger: 'burl',
|
|
|
- }"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-model="ruleForm.itemList"
|
|
|
- multiple
|
|
|
- placeholder="请选择"
|
|
|
- value-key="operationId"
|
|
|
+ <el-select
|
|
|
+ v-model="ruleForm.seqList"
|
|
|
+ multiple
|
|
|
+ placeholder="请选择"
|
|
|
+ value-key="value"
|
|
|
+ @change="selectProcessWorkSeqChange"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in processList"
|
|
|
+ :key="item"
|
|
|
+ :label="item"
|
|
|
+ :value="item"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="返工工序"
|
|
|
+ prop="itemList"
|
|
|
+ :rules="{
|
|
|
+ required: true,
|
|
|
+ trigger: 'burl',
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ v-model="ruleForm.itemList"
|
|
|
+ multiple
|
|
|
+ placeholder="请选择"
|
|
|
+ value-key="operationId"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in operationList"
|
|
|
+ :key="item.operationId"
|
|
|
+ :label="item.operationName"
|
|
|
+ :value="item"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="选择返工信息(可选)">
|
|
|
+ <el-select v-model="infoIndex" placeholder="请选择" filterable>
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in ReworkTempList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.code"
|
|
|
+ :value="index"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="返工原因"
|
|
|
+ prop="reason"
|
|
|
+ :rules="{
|
|
|
+ required: true,
|
|
|
+ trigger: 'change',
|
|
|
+ }"
|
|
|
>
|
|
|
- <el-option
|
|
|
- v-for="item in operationList"
|
|
|
- :key="item.operationId"
|
|
|
- :label="item.operationName"
|
|
|
- :value="item"
|
|
|
+ <el-input v-model="ruleForm.reason" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="返工内容"
|
|
|
+ prop="remark"
|
|
|
+ :rules="{
|
|
|
+ required: true,
|
|
|
+ trigger: 'change',
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ <el-input v-model="ruleForm.remark" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <el-form ref="flowFormRef" v-model="flowForm" label-width="100px">
|
|
|
+ <el-form-item label="选择流程模板">
|
|
|
+ <el-tree-select
|
|
|
+ v-model="flowForm.definitionId"
|
|
|
+ :data="flowDataList"
|
|
|
+ filterable
|
|
|
+ :props="{ label: 'flowName', value: 'id' }"
|
|
|
+ @change="whenSelectFlow"
|
|
|
/>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="选择返工信息(可选)">
|
|
|
- <el-select v-model="infoIndex" placeholder="请选择" filterable>
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in ReworkTempList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.code"
|
|
|
- :value="index"
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item :label="name" v-if="name">
|
|
|
+ <el-tree-select
|
|
|
+ v-model="flowForm.users"
|
|
|
+ :data="nextUserList"
|
|
|
+ filterable
|
|
|
+ :props="{ label: 'userName', value: 'userName' }"
|
|
|
/>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="返工原因"
|
|
|
- prop="reason"
|
|
|
- :rules="{
|
|
|
- required: true,
|
|
|
- trigger: 'change',
|
|
|
- }"
|
|
|
- >
|
|
|
- <el-input v-model="ruleForm.reason" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="返工内容"
|
|
|
- prop="remark"
|
|
|
- :rules="{
|
|
|
- required: true,
|
|
|
- trigger: 'change',
|
|
|
- }"
|
|
|
- >
|
|
|
- <el-input v-model="ruleForm.remark" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
-
|
|
|
- <el-form ref="flowFormRef" v-model="flowForm" label-width="100px">
|
|
|
- <el-form-item label="选择流程模板">
|
|
|
- <el-tree-select
|
|
|
- v-model="flowForm.definitionId"
|
|
|
- :data="flowDataList"
|
|
|
- filterable
|
|
|
- :props="{ label: 'flowName', value: 'id' }"
|
|
|
- @change="whenSelectFlow"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item :label="name" v-if="name">
|
|
|
- <el-tree-select
|
|
|
- v-model="flowForm.users"
|
|
|
- :data="nextUserList"
|
|
|
- filterable
|
|
|
- :props="{ label: 'userName', value: 'userName' }"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </el-scrollbar>
|
|
|
- <div class="btns">
|
|
|
- <el-button type="primary" @click="submit">提交</el-button>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- </el-scrollbar>
|
|
|
- </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </el-scrollbar>
|
|
|
+ <div class="btns">
|
|
|
+ <el-button type="primary" @click="submit">提交</el-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-scrollbar>
|
|
|
+ </div>
|
|
|
+ </el-drawer>
|
|
|
</template>
|
|
|
|
|
|
<script setup lang="ts">
|
|
@@ -171,6 +183,7 @@ import {
|
|
|
queryFlowDataList,
|
|
|
} from "@/api/prosteps/index.js";
|
|
|
const dictStroe = useDictionaryStore();
|
|
|
+const removeVisible = ref(false);
|
|
|
const processStore = useProcessStore();
|
|
|
const infoIndex = ref(null);
|
|
|
const ruleForm = ref({
|
|
@@ -307,10 +320,17 @@ watch(infoIndex, (val) => {
|
|
|
}
|
|
|
});
|
|
|
onMounted(() => {
|
|
|
+ // getPagination();
|
|
|
+ // getReworkTempList();
|
|
|
+});
|
|
|
+const openDrawer = () => {
|
|
|
+ removeVisible.value = true;
|
|
|
getPagination();
|
|
|
getReworkTempList();
|
|
|
+};
|
|
|
+defineExpose({
|
|
|
+ openDrawer,
|
|
|
});
|
|
|
-
|
|
|
// 流程定义的列表
|
|
|
const flowDataList = ref<any[]>([]);
|
|
|
const getFlowList = () => {
|