| jcdm-ui/src/views/main/bs/ProductBomChild/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/material/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/da/collectionParamConf/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/da/passingStationCollection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/em/equipmentArchives/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-ui/src/views/main/bs/ProductBomChild/index.vue
@@ -70,6 +70,15 @@ v-hasPermi="['bs:ProductBomChild:export']" >导出</el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose" >关闭</el-button> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> @@ -319,7 +328,7 @@ }, /** 返回按钮操作 */ handleClose() { const obj = { path: "/main/ProductBom" }; const obj = { path: "/main/pm/ProductBom" }; this.$tab.closeOpenPage(obj); }, /** 查询基础BOM子信息列表 */ jcdm-ui/src/views/main/bs/material/index.vue
@@ -108,16 +108,10 @@ <dict-tag :options="dict.type.unit" :value="scope.row.unit"/> </template> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> </template> </el-table-column> <el-table-column label="ERP规格" align="center" prop="erpSpec"> </el-table-column> <el-table-column label="数据来源" align="center" prop="dataSource"> </el-table-column> <el-table-column label="状态" align="center" prop="status"> <template slot-scope="scope"> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> @@ -126,6 +120,11 @@ <el-table-column label="厂商" align="center" prop="supplier"> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> <template slot-scope="scope"> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> </template> </el-table-column> <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> @@ -287,6 +286,9 @@ typeL: [ { required: true, message: "类型不能为空", trigger: "blur" } ], unit: [ { required: true, message: "单位不能为空", trigger: "blur" } ], } }; }, jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -204,7 +204,7 @@ <i class="el-icon-s-order"></i> {{titleName}} </span> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form-item label="工序编号" prop="processesCode"> <el-input v-model="form.processesCode" placeholder="请输入工序编号" /> </el-form-item> jcdm-ui/src/views/main/da/passingStationCollection/index.vue
@@ -1,5 +1,6 @@ <template> <div class="app-container"> <el-card class="box-card"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label="入站时间" prop="inboundTime"> <el-date-picker clearable @@ -17,12 +18,13 @@ placeholder="请选择出站时间"> </el-date-picker> </el-form-item> <el-form-item> <el-form-item style="float: right"> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> </el-card> <el-card style="margin-top: 10px" class="box-card"> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -69,38 +71,19 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="passingStationCollectionList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="passingStationCollectionList" @selection-change="handleSelectionChange" v-if="passingStationCollectionList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column label="主键id" align="center" prop="id" />--> <el-table-column label="工单编号" align="center" prop="workOrderNo"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workOrderNo"/>--> <!-- </template>--> </el-table-column> <el-table-column label="总成序列号" align="center" prop="sfcCode"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.sfcCode"/>--> <!-- </template>--> </el-table-column> <el-table-column label="产品编号" align="center" prop="productCode"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productCode"/>--> <!-- </template>--> </el-table-column> <el-table-column label="产线编号" align="center" prop="productionLine"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productionLine"/>--> <!-- </template>--> </el-table-column> <el-table-column label="工位编号" align="center" prop="locationCode"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.locationCode"/>--> <!-- </template>--> </el-table-column> <el-table-column label="设备编号" align="center" prop="equipmentNo"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.equipmentNo"/>--> <!-- </template>--> </el-table-column> <el-table-column label="入站时间" align="center" prop="inboundTime" width="100"> <template slot-scope="scope"> @@ -113,24 +96,12 @@ </template> </el-table-column> <el-table-column label="入站是否合格" align="center" prop="inRsSign"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inRsSign"/>--> <!-- </template>--> </el-table-column> <el-table-column label="入站NG原因" align="center" prop="inMsgSign"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.inMsgSign"/>--> <!-- </template>--> </el-table-column> <el-table-column label="出站是否合格" align="center" prop="outRsSign"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outRsSign"/>--> <!-- </template>--> </el-table-column> <el-table-column label="出站NG原因" align="center" prop="outMsgSign"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.outMsgSign"/>--> <!-- </template>--> </el-table-column> <el-table-column label="采集时间" align="center" prop="collectionTime" width="180"> <template slot-scope="scope"> @@ -138,22 +109,23 @@ </template> </el-table-column> <el-table-column label="节拍时间" align="center" prop="beatTime"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.beatTime"/>--> <!-- </template>--> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column fixed="right" label="操作" width="200" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" type="text" type="success" plain style="width: 72px" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['da:passingStationCollection:edit']" >修改</el-button> <el-button size="mini" type="text" type="danger" plain style="width: 72px" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['da:passingStationCollection:remove']" @@ -161,6 +133,10 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination v-show="total>0" jcdm-ui/src/views/main/em/equipmentArchives/index.vue
@@ -79,6 +79,7 @@ <el-table-column label="品牌" align="center" prop="equipmentBrand"/> <el-table-column label="规格型号" align="center" prop="equipmentSpec"/> <el-table-column label="车间编码" align="center" prop="workshopCode"/> <el-table-column label="产线编码" align="center" prop="lineCode"/> <el-table-column label="设备状态" align="center" prop="status"/> <el-table-column label="创建时间" width="160" align="center" prop="createTime"/> <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width"> @@ -130,14 +131,34 @@ <el-form-item label="品牌" prop="equipmentBrand"> <el-input v-model="form.equipmentBrand" placeholder="请输入品牌" /> </el-form-item> <el-form-item label="设备类型名称" prop="equipmentTypeName"> <el-form-item label="设备类型" prop="equipmentTypeName"> <el-input v-model="form.equipmentTypeName" placeholder="请输入设备类型名称" /> </el-form-item> <el-form-item label="规格型号" prop="equipmentSpec"> <el-input v-model="form.equipmentSpec" placeholder="请输入规格型号" /> </el-form-item> <el-form-item label="车间编码" prop="workshopCode"> <el-input v-model="form.workshopCode" placeholder="请输入车间编码" /> <el-form-item label="车间编号" prop="workshopCode"> <el-select style="width: 100%" @change="handleSelectChange(form.processesCode)" v-model="form.workshopCode" placeholder="请选择车间编号"> <el-option v-for="item in options" :key="item.workshopCode" :label="item.workshopCode" :value="item.workshopCode"> </el-option> </el-select> </el-form-item> <!-- <el-form-item label="产线编码" prop="lineCode">--> <!-- <el-input v-model="form.lineCode" placeholder="请输入产线编码" />--> <!-- </el-form-item>--> <el-form-item label="产线编码" prop="lineCode"> <el-select style="width: 100%" @change="handleSelectChangelineCode(form.processesCode)" v-model="form.lineCode" placeholder="请输入产线编码"> <el-option v-for="item in options" :key="item.lineCode" :label="item.lineCode" :value="item.lineCode"> </el-option> </el-select> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input v-model="form.remark" placeholder="请输入备注" /> @@ -186,6 +207,8 @@ <script> import { listEquipmentArchives, getEquipmentArchives, delEquipmentArchives, addEquipmentArchives, updateEquipmentArchives } from "@/api/main/em/equipmentArchives/equipmentArchives"; import {listWorkshop} from "@/api/main/bs/workshop/workshop"; import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo"; export default { name: "EquipmentArchives", @@ -196,6 +219,7 @@ titleName: "", // 选中数组 ids: [], options: [], // 非单个禁用 single: true, // 非多个禁用 @@ -232,6 +256,12 @@ spareField3: null, spareField4: null }, equipmentArchivesQueryParams: { pageNum: 1, pageSize: 10, workshopCode: null, lineCode: null, }, // 表单参数 form: {}, // 表单校验 @@ -253,9 +283,34 @@ }, created() { this.getList(); this.initWorkshop(); this.initLineInfo(); }, methods: { /** 查询设备档案列表 */ handleSelectChange(selectedOption) { this.equipmentArchivesQueryParams.workshopCode = selectedOption; listWorkshop(this.equipmentArchivesQueryParams).then(response => { this.form.workshopName = response.rows[0].workshopName; }); }, handleSelectChangelineCode(selectedOption) { this.equipmentArchivesQueryParams.lineCode = selectedOption; listLineInfo(this.equipmentArchivesQueryParams).then(response => { this.form.lineCode = response.rows[0].lineCode; }); }, initWorkshop(){ listWorkshop(this.queryParams).then(response => { this.options = response.rows; }); }, initLineInfo(){ listLineInfo(this.queryParams).then(response => { this.options = response.rows; }); }, getList() { this.loading = true; listEquipmentArchives(this.queryParams).then(response => {
