|
|
@@ -3,151 +3,156 @@
|
|
|
<el-container>
|
|
|
<el-aside width="340px">
|
|
|
<div class="JKWTree-tree">
|
|
|
- <h3> 组织列表</h3>
|
|
|
- <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
|
|
|
+<!-- <h3> 组织列表</h3>-->
|
|
|
+ <el-tree :data="sctreeData" :props="defaultProps" @node-click="schandleNodeClick"></el-tree>
|
|
|
+ <el-tree
|
|
|
+ :data="treeData"
|
|
|
+ :props="defaultProps"
|
|
|
+ @node-click="handleNodeClick"></el-tree>
|
|
|
</div>
|
|
|
</el-aside>
|
|
|
<el-container>
|
|
|
-<!-- <el-header>dd</el-header>-->
|
|
|
+ <!-- <el-header>dd</el-header>-->
|
|
|
<el-main>
|
|
|
-
|
|
|
- <!-- 搜索框 -->
|
|
|
- <div class="gva-search-box">
|
|
|
- <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
|
|
|
-
|
|
|
- <!-- 左侧查询输入框 -->
|
|
|
- <el-form-item>
|
|
|
- <el-input v-model="searchInfo.keyword" placeholder="" clearable style="width: 300px;"></el-input>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <!-- 查询和重置按钮 -->
|
|
|
- <el-form-item>
|
|
|
- <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
|
|
|
- <el-button icon="refresh" @click="onReset">重置</el-button>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
-
|
|
|
+
|
|
|
+ <!-- 搜索框 -->
|
|
|
+ <div class="gva-search-box">
|
|
|
+ <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
|
|
|
+
|
|
|
+ <!-- 左侧查询输入框 -->
|
|
|
+ <el-form-item>
|
|
|
+ <el-input v-model="searchInfo.keyword" placeholder="" clearable style="width: 300px;"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <!-- 查询和重置按钮 -->
|
|
|
+ <el-form-item>
|
|
|
+ <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
|
|
|
+ <el-button icon="refresh" @click="onReset">重置</el-button>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div class="gva-table-box">
|
|
|
<div class="gva-btn-list">
|
|
|
<el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
|
|
|
-<!-- <el-button type="primary" style="width: 110px;" >查找工单</el-button>-->
|
|
|
-<!-- <el-button type="primary" style="width: 110px;" >工单状态设置</el-button>-->
|
|
|
-<!-- <el-button type="primary" style="width: 110px;" >工单状态更正</el-button>-->
|
|
|
-<!-- <el-button type="primary" style="width: 110px;" >引用实际参数</el-button>-->
|
|
|
-<!-- <el-button type="primary" style="width: 110px;" >排程参数维护</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >排程参数复制</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >编辑生产计划</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >工单打印</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >工序产量核查</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >流程单查询</el-button>-->
|
|
|
-<!-- <el-button type="primary" icon="plus" style="width: 110px;" >工单筛选</el-button>-->
|
|
|
+ <!-- <el-button type="primary" style="width: 110px;" >查找工单</el-button>-->
|
|
|
+ <!-- <el-button type="primary" style="width: 110px;" >工单状态设置</el-button>-->
|
|
|
+ <!-- <el-button type="primary" style="width: 110px;" >工单状态更正</el-button>-->
|
|
|
+ <!-- <el-button type="primary" style="width: 110px;" >引用实际参数</el-button>-->
|
|
|
+ <!-- <el-button type="primary" style="width: 110px;" >排程参数维护</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >排程参数复制</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >编辑生产计划</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >工单打印</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >工序产量核查</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >流程单查询</el-button>-->
|
|
|
+ <!-- <el-button type="primary" icon="plus" style="width: 110px;" >工单筛选</el-button>-->
|
|
|
</div>
|
|
|
-
|
|
|
- <el-table ref="multipleTable" style="width: 100%" border tooltip-effect="dark" :data="tableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
- <el-table-column type="selection" width="55" />
|
|
|
- <el-table-column align="left" label="工单编号" prop="employeenumber" width="120" />
|
|
|
- <el-table-column align="left" label="销售订单号" prop="employeename" width="120" />
|
|
|
- <el-table-column align="left" label="印件名称" prop="gender" width="120" />
|
|
|
- <el-table-column align="left" label="印件工序及名称" prop="EmploymentDate" width="130" />
|
|
|
- <el-table-column align="left" label="工序产量" prop="Confirmation" width="120" />
|
|
|
- <el-table-column align="left" label="已完成产量" prop="department" width="120" />
|
|
|
- <el-table-column align="left" label="产品名称" prop="Professional" width="120" />
|
|
|
- <el-table-column align="left" label="订单数量" prop="IDCard" width="120" />
|
|
|
- <el-table-column align="left" label="订量单位" prop="birthday" width="120" />
|
|
|
- <el-table-column align="left" label="交货日期" prop="properties" width="120" />
|
|
|
- <el-table-column align="left" label="产品代号" prop="category" width="120" />
|
|
|
- <el-table-column align="left" label="工序名称" prop="bctype" width="120" />
|
|
|
- <el-table-column align="left" label="机组" prop="Salary" width="120" />
|
|
|
- <el-table-column align="left" label="设备编号" prop="accounting" width="120" />
|
|
|
- <el-table-column align="left" label="车间名称" prop="MESbe" width="120" />
|
|
|
- <el-table-column align="left" label="UNIWID" prop="MESbe" width="120" />
|
|
|
- <el-table-column align="left" label="印件号" prop="MESbe" width="120" />
|
|
|
- <el-table-column align="left" label="工序号" prop="MESbe" width="120" />
|
|
|
+
|
|
|
+ <el-table ref="multipleTable"
|
|
|
+ style="width: 100%"
|
|
|
+ border
|
|
|
+ tooltip-effect="dark"
|
|
|
+ :data="tableData"
|
|
|
+ row-key="ID"
|
|
|
+ highlight-current-row="true"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ :show-overflow-tooltip="true">
|
|
|
+ <el-table-column type="selection" width="55"/>
|
|
|
+ <el-table-column align="left" label="生产分类" prop="生产分类" width="120" />
|
|
|
+ <el-table-column align="left" label="工单编号" prop="工单编号" width="120" />
|
|
|
+ <el-table-column align="left" label="产品代号" prop="产品代号" width="120" />
|
|
|
+ <el-table-column align="left" label="产品名称" prop="产品名称" width="340" />
|
|
|
+ <el-table-column align="left" label="接单日期" prop="接单日期" width="160" />
|
|
|
+ <el-table-column align="left" label="交货日期" prop="交货日期" width="160" />
|
|
|
+ <el-table-column align="left" label="订单数量" prop="订单数量" width="120" />
|
|
|
+ <el-table-column align="left" label="计量单位" prop="计量单位" width="120" />
|
|
|
+ <el-table-column align="left" label="客户名称" prop="客户名称" width="200" />
|
|
|
+ <el-table-column align="left" label="客户编号" prop="客户编号" width="120" />
|
|
|
+ <el-table-column align="left" label="备注" prop="备注" width="400" />
|
|
|
+ <el-table-column align="left" label="客户料号" prop="客户料号" width="120" />
|
|
|
+ <el-table-column align="left" label="创建用户" prop="创建用户" width="160" />
|
|
|
+ <el-table-column align="left" label="创建时间" prop="创建时间" width="160" />
|
|
|
+ <el-table-column align="left" label="修改时间" prop="修改时间" width="160" />
|
|
|
+ <el-table-column align="left" label="UNIQID" prop="UNIQID" width="120" />
|
|
|
+ <el-table-column align="left" label="投料率" prop="投料率" width="120" />
|
|
|
+ <el-table-column align="left" label="销售订单号" prop="销售订单号" width="120" />
|
|
|
<el-table-column align="left" label="操作" min-width="120" fixed='right'>
|
|
|
<template #default="scope">
|
|
|
- <!-- <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
|
|
|
- <el-icon style="margin-right: 5px"><InfoFilled /></el-icon>
|
|
|
- 查看详情
|
|
|
- </el-button> -->
|
|
|
<el-button type="primary" link icon="edit" class="table-button" @click="updateCompanyFunc(scope.row)">变更</el-button>
|
|
|
- <!-- <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
</el-table>
|
|
|
-
|
|
|
- <div class="gva-pagination">
|
|
|
- <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[5,10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>
|
|
|
- </div>
|
|
|
+ <!-- <div class="gva-pagination">-->
|
|
|
+ <!-- <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[5,10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>-->
|
|
|
+ <!-- </div>-->
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<!-- 弹窗 -->
|
|
|
<el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加产品资料':'修改产品资料'" destroy-on-close>
|
|
|
- <el-row>
|
|
|
- <!-- 左侧表单 -->
|
|
|
- <el-col :span="8">
|
|
|
- <el-scrollbar height="500px">
|
|
|
- <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
|
|
|
- <el-form-item label="客户料号:" prop="address">
|
|
|
- <el-input v-model="formData.address" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="产品编号:" prop="gender">
|
|
|
- <el-input v-model="formData.gender" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="产品名称:" prop="idCard">
|
|
|
- <el-input v-model="formData.idCard" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="版本号:" prop="department">
|
|
|
- <el-input v-model="formData.department" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="成品规格:" prop="joinDate">
|
|
|
- <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="单位:" prop="joinDate">
|
|
|
- <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="产品分类:" prop="joinDate">
|
|
|
- <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </el-scrollbar>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <!-- 中间表单 -->
|
|
|
- <el-col :span="8">
|
|
|
- <el-scrollbar height="500px">
|
|
|
- <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
|
|
|
- <el-form-item label="最近接单日期:" prop="name">
|
|
|
- <el-input v-model="formData.name" :clearable="true" placeholder=":" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="最近引用日期:" prop="birthDate">
|
|
|
- <el-input v-model="formData.birthDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="印件数:" prop="position">
|
|
|
- <el-input v-model="formData.position" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="工艺:" prop="departmentId">
|
|
|
- <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="当前状态:" prop="departmentId">
|
|
|
- <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="最后修改:" prop="departmentId">
|
|
|
- <el-input v-model="formData.departmentId" :clearable="true" placeholder=":" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="建档时间:" prop="departmentId">
|
|
|
- <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="更新时间:" prop="departmentId">
|
|
|
- <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </el-scrollbar>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- </el-row>
|
|
|
-
|
|
|
+ <el-row>
|
|
|
+ <!-- 左侧表单 -->
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-scrollbar height="500px">
|
|
|
+ <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
|
|
|
+ <el-form-item label="客户料号:" prop="address">
|
|
|
+ <el-input v-model="formData.address" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="产品编号:" prop="gender">
|
|
|
+ <el-input v-model="formData.gender" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="产品名称:" prop="idCard">
|
|
|
+ <el-input v-model="formData.idCard" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="版本号:" prop="department">
|
|
|
+ <el-input v-model="formData.department" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="成品规格:" prop="joinDate">
|
|
|
+ <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="单位:" prop="joinDate">
|
|
|
+ <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="产品分类:" prop="joinDate">
|
|
|
+ <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </el-scrollbar>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <!-- 中间表单 -->
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-scrollbar height="500px">
|
|
|
+ <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
|
|
|
+ <el-form-item label="最近接单日期:" prop="name">
|
|
|
+ <el-input v-model="formData.name" :clearable="true" placeholder=":" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="最近引用日期:" prop="birthDate">
|
|
|
+ <el-input v-model="formData.birthDate" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="印件数:" prop="position">
|
|
|
+ <el-input v-model="formData.position" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="工艺:" prop="departmentId">
|
|
|
+ <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="当前状态:" prop="departmentId">
|
|
|
+ <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="最后修改:" prop="departmentId">
|
|
|
+ <el-input v-model="formData.departmentId" :clearable="true" placeholder=":" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="建档时间:" prop="departmentId">
|
|
|
+ <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="更新时间:" prop="departmentId">
|
|
|
+ <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </el-scrollbar>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
<el-button @click="closeDialog">取 消</el-button>
|
|
|
@@ -155,62 +160,62 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
-
|
|
|
- <!-- 详情展示弹窗 -->
|
|
|
+
|
|
|
+ <!-- 详情展示弹窗 -->
|
|
|
<el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="员工基本资料管理" destroy-on-close>
|
|
|
- <el-scrollbar height="550px">
|
|
|
- <el-descriptions column="2" border>
|
|
|
- <!-- 左侧部分 -->
|
|
|
- <el-descriptions-item label="客户料号" :min-width="labelMinWidth">
|
|
|
- {{ formData.employeeId }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="产品编号" :min-width="labelMinWidth">
|
|
|
- {{ formData.gender }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="产品名称" :min-width="labelMinWidth">
|
|
|
- {{ formData.idCard }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="版本号" :min-width="labelMinWidth">
|
|
|
- {{ formData.sectionName }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="成品规格" :min-width="labelMinWidth">
|
|
|
- {{ formData.employeeId }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="单位" :min-width="labelMinWidth">
|
|
|
- {{ formData.gender }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="产品分类" :min-width="labelMinWidth">
|
|
|
- {{ formData.idCard }}
|
|
|
- </el-descriptions-item>
|
|
|
-
|
|
|
- <!-- 右侧部分 -->
|
|
|
- <el-descriptions-item label="最近接单日期" :min-width="labelMinWidth">
|
|
|
- {{ formData.name }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="最近引用日期" :min-width="labelMinWidth">
|
|
|
- {{ formData.birthdate }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="印件数" :min-width="labelMinWidth">
|
|
|
- {{ formData.position }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="工艺" :min-width="labelMinWidth">
|
|
|
- {{ formData.departmentId }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="当前状态" :min-width="labelMinWidth">
|
|
|
- {{ formData.name }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="最后修改" :min-width="labelMinWidth">
|
|
|
- {{ formData.birthdate }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="建档时间" :min-width="labelMinWidth">
|
|
|
- {{ formData.position }}
|
|
|
- </el-descriptions-item>
|
|
|
- <el-descriptions-item label="更新时间" :min-width="labelMinWidth">
|
|
|
- {{ formData.departmentId }}
|
|
|
- </el-descriptions-item>
|
|
|
- </el-descriptions>
|
|
|
- </el-scrollbar>
|
|
|
-
|
|
|
+ <el-scrollbar height="550px">
|
|
|
+ <el-descriptions column="2" border>
|
|
|
+ <!-- 左侧部分 -->
|
|
|
+ <el-descriptions-item label="客户料号" :min-width="labelMinWidth">
|
|
|
+ {{ formData.employeeId }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="产品编号" :min-width="labelMinWidth">
|
|
|
+ {{ formData.gender }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="产品名称" :min-width="labelMinWidth">
|
|
|
+ {{ formData.idCard }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="版本号" :min-width="labelMinWidth">
|
|
|
+ {{ formData.sectionName }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="成品规格" :min-width="labelMinWidth">
|
|
|
+ {{ formData.employeeId }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="单位" :min-width="labelMinWidth">
|
|
|
+ {{ formData.gender }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="产品分类" :min-width="labelMinWidth">
|
|
|
+ {{ formData.idCard }}
|
|
|
+ </el-descriptions-item>
|
|
|
+
|
|
|
+ <!-- 右侧部分 -->
|
|
|
+ <el-descriptions-item label="最近接单日期" :min-width="labelMinWidth">
|
|
|
+ {{ formData.name }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="最近引用日期" :min-width="labelMinWidth">
|
|
|
+ {{ formData.birthdate }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="印件数" :min-width="labelMinWidth">
|
|
|
+ {{ formData.position }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="工艺" :min-width="labelMinWidth">
|
|
|
+ {{ formData.departmentId }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="当前状态" :min-width="labelMinWidth">
|
|
|
+ {{ formData.name }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="最后修改" :min-width="labelMinWidth">
|
|
|
+ {{ formData.birthdate }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="建档时间" :min-width="labelMinWidth">
|
|
|
+ {{ formData.position }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ <el-descriptions-item label="更新时间" :min-width="labelMinWidth">
|
|
|
+ {{ formData.departmentId }}
|
|
|
+ </el-descriptions-item>
|
|
|
+ </el-descriptions>
|
|
|
+ </el-scrollbar>
|
|
|
+
|
|
|
</el-dialog>
|
|
|
</el-main>
|
|
|
</el-container>
|
|
|
@@ -224,11 +229,45 @@ import {createCompany, deleteCompany, deleteCompanyByIds, updateCompany, findCom
|
|
|
import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
|
|
|
import { ElMessage, ElMessageBox } from 'element-plus'
|
|
|
import { ref, reactive } from 'vue'
|
|
|
-import {DataList, getProduct, workbench} from "@/api/yunyin/yunying";
|
|
|
+import {DataList, getProduct, Project, workbench} from "@/api/yunyin/yunying";
|
|
|
defineOptions({name: 'Company'})
|
|
|
|
|
|
// =========== 左侧树侧形结构 ===========
|
|
|
+const sctreeData = ref([
|
|
|
+ {
|
|
|
+ label: '排产进程及参数设置',
|
|
|
+ children:[
|
|
|
+ {label: '1.计划中工单', number: 1 },
|
|
|
+ {label: '2.排程中工单', number: 2 },
|
|
|
+ {label: '3.制程中工单', number: 3 },
|
|
|
+ {label: '4.已完工工单', number: 4 }
|
|
|
+ ],
|
|
|
+ }
|
|
|
+]);
|
|
|
+
|
|
|
const treeData = ref([]);
|
|
|
+//点击 设备定额及分配参数设置
|
|
|
+const schandleNodeClick = async (node) => {
|
|
|
+ switch (node.number) {
|
|
|
+ case 1:
|
|
|
+ const Projectdata = await Project();
|
|
|
+ tableData.value = Projectdata.data
|
|
|
+ // const productCountMap = tableData.value.reduce((countMap, item) => {
|
|
|
+ // const productName = item.产品名称;
|
|
|
+ // countMap[productName] = (countMap[productName] || 0) + 1;
|
|
|
+ // return countMap;
|
|
|
+ // }, {});
|
|
|
+ // const productCountMapLength = Object.keys(productCountMap).length;
|
|
|
+ // console.log(`产品名称总数量:${productCountMapLength}`);
|
|
|
+ break;
|
|
|
+ case 2:
|
|
|
+ break;
|
|
|
+ case 3:
|
|
|
+ break;
|
|
|
+ case 4:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+};
|
|
|
const workbenchdata = async () => {
|
|
|
try {
|
|
|
const data = await workbench();
|
|
|
@@ -250,33 +289,43 @@ const workbenchdata = async () => {
|
|
|
};
|
|
|
workbenchdata();
|
|
|
|
|
|
-
|
|
|
//点击左侧树形获取列表
|
|
|
-const tableData = reactive([])
|
|
|
+const tableData = ref([])
|
|
|
const handleNodeClick = async (node) => {
|
|
|
- // //通过 custom_code 客户编号 获取列表数据
|
|
|
- // const custom_code = node;
|
|
|
- console.log(node)
|
|
|
- // try {
|
|
|
- // const WorkListdata = await getProduct({ custom_code:custom_code, limit: pageSize.value, page: page.value });
|
|
|
- // tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
|
|
|
- // total.value = tableData.length;//共多少条
|
|
|
- // } catch (error) {
|
|
|
- // console.error(error);
|
|
|
- // }
|
|
|
+ const custom_code = node.label; // 假设你想使用节点的 label 作为 custom_code
|
|
|
+ console.log(custom_code);
|
|
|
+
|
|
|
+ // 通过 custom_code 客户编号获取列表数据
|
|
|
+ try {
|
|
|
+ const WorkListdata = await getProduct({ custom_code, limit: pageSize.value, page: page.value });
|
|
|
+ console.log(WorkListdata)
|
|
|
+ tableData.splice(0, tableData.length, ...WorkListdata.data.data);
|
|
|
+ // total.value = tableData.length;
|
|
|
+ } catch (error) {
|
|
|
+ console.error(error);
|
|
|
+ }
|
|
|
+
|
|
|
+ // 检查并设置子节点的 expanded 属性,以确保它们能够正确展开
|
|
|
+ if (node.children && node.children.length > 0) {
|
|
|
+ node.children.forEach((child) => {
|
|
|
+ this.$set(child, 'expanded', false);
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
// 自动化生成的字典(可能为空)以及字段
|
|
|
const formData = ref({
|
|
|
- address: '',
|
|
|
- image: '',
|
|
|
- name: '',
|
|
|
- })
|
|
|
-
|
|
|
+ address: '',
|
|
|
+ image: '',
|
|
|
+ name: '',
|
|
|
+})
|
|
|
|
|
|
// 验证规则
|
|
|
const rule = reactive({
|
|
|
@@ -285,16 +334,16 @@ const rule = reactive({
|
|
|
const searchRule = reactive({
|
|
|
createdAt: [
|
|
|
{ validator: (rule, value, callback) => {
|
|
|
- if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
|
|
|
- callback(new Error('请填写结束日期'))
|
|
|
- } else if (!searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt) {
|
|
|
- callback(new Error('请填写开始日期'))
|
|
|
- } else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt.getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime())) {
|
|
|
- callback(new Error('开始日期应当早于结束日期'))
|
|
|
- } else {
|
|
|
- callback()
|
|
|
- }
|
|
|
- }, trigger: 'change' }
|
|
|
+ if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
|
|
|
+ callback(new Error('请填写结束日期'))
|
|
|
+ } else if (!searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt) {
|
|
|
+ callback(new Error('请填写开始日期'))
|
|
|
+ } else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt.getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime())) {
|
|
|
+ callback(new Error('开始日期应当早于结束日期'))
|
|
|
+ } else {
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ }, trigger: 'change' }
|
|
|
],
|
|
|
})
|
|
|
|
|
|
@@ -362,19 +411,19 @@ setOptions()
|
|
|
const multipleSelection = ref([])
|
|
|
// 多选
|
|
|
const handleSelectionChange = (val) => {
|
|
|
- multipleSelection.value = val
|
|
|
+ multipleSelection.value = val
|
|
|
}
|
|
|
|
|
|
// 删除行
|
|
|
const deleteRow = (row) => {
|
|
|
- ElMessageBox.confirm('确定要删除吗?', '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- cancelButtonText: '取消',
|
|
|
- type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- deleteCompanyFunc(row)
|
|
|
- })
|
|
|
- }
|
|
|
+ ElMessageBox.confirm('确定要删除吗?', '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ deleteCompanyFunc(row)
|
|
|
+ })
|
|
|
+}
|
|
|
|
|
|
|
|
|
// 批量删除控制标记
|
|
|
@@ -382,60 +431,60 @@ const deleteVisible = ref(false)
|
|
|
|
|
|
// 多选删除
|
|
|
const onDelete = async() => {
|
|
|
- const ids = []
|
|
|
- if (multipleSelection.value.length === 0) {
|
|
|
- ElMessage({
|
|
|
- type: 'warning',
|
|
|
- message: '请选择要删除的数据'
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- multipleSelection.value &&
|
|
|
- multipleSelection.value.map(item => {
|
|
|
- ids.push(item.ID)
|
|
|
- })
|
|
|
- const res = await deleteCompanyByIds({ ids })
|
|
|
- if (res.code === 0) {
|
|
|
- ElMessage({
|
|
|
- type: 'success',
|
|
|
- message: '删除成功'
|
|
|
- })
|
|
|
- if (tableData.value.length === ids.length && page.value > 1) {
|
|
|
- page.value--
|
|
|
- }
|
|
|
- deleteVisible.value = false
|
|
|
- getTableData()
|
|
|
- }
|
|
|
+ const ids = []
|
|
|
+ if (multipleSelection.value.length === 0) {
|
|
|
+ ElMessage({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请选择要删除的数据'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ multipleSelection.value &&
|
|
|
+ multipleSelection.value.map(item => {
|
|
|
+ ids.push(item.ID)
|
|
|
+ })
|
|
|
+ const res = await deleteCompanyByIds({ ids })
|
|
|
+ if (res.code === 0) {
|
|
|
+ ElMessage({
|
|
|
+ type: 'success',
|
|
|
+ message: '删除成功'
|
|
|
+ })
|
|
|
+ if (tableData.value.length === ids.length && page.value > 1) {
|
|
|
+ page.value--
|
|
|
}
|
|
|
+ deleteVisible.value = false
|
|
|
+ getTableData()
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
// 行为控制标记(弹窗内部需要增还是改)
|
|
|
const type = ref('')
|
|
|
|
|
|
// 更新行
|
|
|
const updateCompanyFunc = async(row) => {
|
|
|
- // const res = await findCompany({ ID: row.ID })
|
|
|
- // type.value = 'update'
|
|
|
- // if (res.code === 0) {
|
|
|
- // formData.value = res.data.recompany
|
|
|
- // dialogFormVisible.value = true
|
|
|
- // }
|
|
|
- dialogFormVisible.value = true
|
|
|
+ // const res = await findCompany({ ID: row.ID })
|
|
|
+ // type.value = 'update'
|
|
|
+ // if (res.code === 0) {
|
|
|
+ // formData.value = res.data.recompany
|
|
|
+ // dialogFormVisible.value = true
|
|
|
+ // }
|
|
|
+ dialogFormVisible.value = true
|
|
|
}
|
|
|
|
|
|
|
|
|
// 删除行
|
|
|
const deleteCompanyFunc = async (row) => {
|
|
|
- const res = await deleteCompany({ ID: row.ID })
|
|
|
- if (res.code === 0) {
|
|
|
- ElMessage({
|
|
|
- type: 'success',
|
|
|
- message: '删除成功'
|
|
|
- })
|
|
|
- if (tableData.value.length === 1 && page.value > 1) {
|
|
|
- page.value--
|
|
|
- }
|
|
|
- getTableData()
|
|
|
+ const res = await deleteCompany({ ID: row.ID })
|
|
|
+ if (res.code === 0) {
|
|
|
+ ElMessage({
|
|
|
+ type: 'success',
|
|
|
+ message: '删除成功'
|
|
|
+ })
|
|
|
+ if (tableData.value.length === 1 && page.value > 1) {
|
|
|
+ page.value--
|
|
|
}
|
|
|
+ getTableData()
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 弹窗控制标记
|
|
|
@@ -467,53 +516,53 @@ const getDetails = async (row) => {
|
|
|
const closeDetailShow = () => {
|
|
|
detailShow.value = false
|
|
|
formData.value = {
|
|
|
- address: '',
|
|
|
- image: '',
|
|
|
- name: '',
|
|
|
- }
|
|
|
+ address: '',
|
|
|
+ image: '',
|
|
|
+ name: '',
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
// 打开弹窗
|
|
|
const openDialog = () => {
|
|
|
- type.value = 'create'
|
|
|
- dialogFormVisible.value = true
|
|
|
+ type.value = 'create'
|
|
|
+ dialogFormVisible.value = true
|
|
|
}
|
|
|
|
|
|
// 关闭弹窗
|
|
|
const closeDialog = () => {
|
|
|
- dialogFormVisible.value = false
|
|
|
- formData.value = {
|
|
|
- address: '',
|
|
|
- image: '',
|
|
|
- name: '',
|
|
|
- }
|
|
|
+ dialogFormVisible.value = false
|
|
|
+ formData.value = {
|
|
|
+ address: '',
|
|
|
+ image: '',
|
|
|
+ name: '',
|
|
|
+ }
|
|
|
}
|
|
|
// 弹窗确定
|
|
|
const enterDialog = async () => {
|
|
|
- elFormRef.value?.validate( async (valid) => {
|
|
|
- if (!valid) return
|
|
|
- let res
|
|
|
- switch (type.value) {
|
|
|
- case 'create':
|
|
|
- res = await createCompany(formData.value)
|
|
|
- break
|
|
|
- case 'update':
|
|
|
- res = await updateCompany(formData.value)
|
|
|
- break
|
|
|
- default:
|
|
|
- res = await createCompany(formData.value)
|
|
|
- break
|
|
|
- }
|
|
|
- if (res.code === 0) {
|
|
|
- ElMessage({
|
|
|
- type: 'success',
|
|
|
- message: '创建/更改成功'
|
|
|
- })
|
|
|
- closeDialog()
|
|
|
- getTableData()
|
|
|
- }
|
|
|
+ elFormRef.value?.validate( async (valid) => {
|
|
|
+ if (!valid) return
|
|
|
+ let res
|
|
|
+ switch (type.value) {
|
|
|
+ case 'create':
|
|
|
+ res = await createCompany(formData.value)
|
|
|
+ break
|
|
|
+ case 'update':
|
|
|
+ res = await updateCompany(formData.value)
|
|
|
+ break
|
|
|
+ default:
|
|
|
+ res = await createCompany(formData.value)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ if (res.code === 0) {
|
|
|
+ ElMessage({
|
|
|
+ type: 'success',
|
|
|
+ message: '创建/更改成功'
|
|
|
})
|
|
|
+ closeDialog()
|
|
|
+ getTableData()
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
</script>
|
|
|
@@ -539,4 +588,8 @@ const enterDialog = async () => {
|
|
|
.JKWTree-content {
|
|
|
flex: 1;
|
|
|
}
|
|
|
-</style>
|
|
|
+/* 选中某行时的背景色*/
|
|
|
+.el-table__body tr.current-row>td {
|
|
|
+ background: #ff80ff !important;
|
|
|
+}
|
|
|
+</style>
|