| jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/lineInfo/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/processes/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/technologyRoute/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/workshop/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/om/workReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-main/src/main/java/com/jcdm/main/bs/lineInfo/service/impl/BsLineInfoServiceImpl.java
@@ -8,6 +8,8 @@ import com.jcdm.main.bs.lineInfo.domain.BsLineInfo; import com.jcdm.main.bs.lineInfo.service.IBsLineInfoService; import static org.apache.commons.lang3.SystemUtils.getUserName; /** * 产线信息Service业务层处理 * @@ -54,6 +56,7 @@ public int insertBsLineInfo(BsLineInfo bsLineInfo) { bsLineInfo.setCreateTime(DateUtils.getNowDate()); bsLineInfo.setCreateUser(getUserName()); return bsLineInfoMapper.insertBsLineInfo(bsLineInfo); } @@ -67,6 +70,7 @@ public int updateBsLineInfo(BsLineInfo bsLineInfo) { bsLineInfo.setUpdateTime(DateUtils.getNowDate()); bsLineInfo.setUpdateUser(getUserName()); return bsLineInfoMapper.updateBsLineInfo(bsLineInfo); }
@@ -18,13 +18,6 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"> <el-form-item label="车间编号" prop="workshopCode"> <el-input v-model="queryParams.workshopCode" @@ -41,7 +34,13 @@ @keyup.enter.native="handleQuery" /> </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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>--> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"/> </el-card> <el-card style="margin-top: 10px" class="box-card"> @@ -54,7 +53,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['main:lineInfo:add']" v-hasPermi="['bs:lineInfo:add']" >新增</el-button> </el-col> <el-col :span="1.5"> @@ -65,7 +64,7 @@ size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['main:lineInfo:edit']" v-hasPermi="['bs:lineInfo:edit']" >修改</el-button> </el-col> <el-col :span="1.5"> @@ -76,7 +75,7 @@ size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['main:lineInfo:remove']" v-hasPermi="['bs:lineInfo:remove']" >删除</el-button> </el-col> <el-col :span="1.5"> @@ -86,7 +85,7 @@ icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['main:lineInfo:export']" v-hasPermi="['bs:lineInfo:export']" >导出</el-button> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> @@ -95,7 +94,7 @@ <el-table-column type="selection" width="55" align="center" /> <el-table-column label="产线编号" align="center" prop="lineCode"> </el-table-column> <el-table-column label="产线名称" align="center" prop="lineName"> <el-table-column :show-overflow-tooltip='true' label="产线名称" align="center" prop="lineName"> </el-table-column> <el-table-column label="车间编码" align="center" prop="workshopCode"> </el-table-column> @@ -103,7 +102,7 @@ </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser" width="80"> <el-table-column label="创建人" align="center" prop="createUser" width="80"> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="170"> </el-table-column> @@ -113,18 +112,25 @@ </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" type="text" type="success" plain icon="el-icon-edit" @click="handleUpdate(scope.row)" style="width: 72px" :disabled="single" @click="handleUpdate" v-hasPermi="['bs:lineInfo:edit']" >修改</el-button> <el-button size="mini" type="text" type="danger" plain icon="el-icon-delete" @click="handleDelete(scope.row)" style="width: 72px" :disabled="multiple" @click="handleDelete" v-hasPermi="['bs:lineInfo:remove']" >删除</el-button> </template> @@ -170,6 +176,10 @@ <!-- 添加或修改产线信息对话框 --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <span slot="title"> <i class="el-icon-s-order"></i> {{titleName}} </span> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="产线编号" prop="lineCode"> <el-input v-model="form.lineCode" placeholder="请输入产线编号" /> @@ -216,6 +226,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -321,7 +332,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加产线信息"; this.titleName = "添加产线信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -330,7 +341,7 @@ getLineInfo(id).then(response => { this.form = response.data; this.open = true; this.title = "修改产线信息"; this.titleName = "修改产线信息"; }); }, /** 提交按钮 */ @@ -372,3 +383,9 @@ } }; </script> <style> .el-dialog__header{ /*background-color: #f8f8f8;*/ background-color: #f8f8f9; } </style> jcdm-ui/src/views/main/bs/processes/index.vue
@@ -1,7 +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="processesCode"> <el-input @@ -19,31 +18,12 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label="工序类型" prop="processesType">--> <!-- <el-select v-model="queryParams.processesType" placeholder="请选择工序类型" clearable>--> <!-- <el-option--> <!-- v-for="dict in dict.type.${dictType}"--> <!-- :key="dict.value"--> <!-- :label="dict.label"--> <!-- :value="dict.value"--> <!-- />--> <!-- </el-select>--> <!-- </el-form-item>--> <!-- <el-form-item label="状态" prop="status">--> <!-- <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>--> <!-- <el-option--> <!-- v-for="dict in dict.type.${dictType}"--> <!-- :key="dict.value"--> <!-- :label="dict.label"--> <!-- :value="dict.value"--> <!-- />--> <!-- </el-select>--> <!-- </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-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"/> </el-card> <el-card style="margin-top: 10px" class="box-card"> @@ -93,8 +73,7 @@ </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" border :data="processesList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="processesList" @selection-change="handleSelectionChange" v-if="processesList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="工序编号" align="center" prop="processesCode"> </el-table-column> @@ -102,16 +81,16 @@ </el-table-column> <el-table-column label="工序类型" align="center" prop="processesType"> </el-table-column> <el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status" width="80"> <template slot-scope="scope"> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> </template> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> <el-table-column label="创建人" align="center" prop="createUser" width="80"> </el-table-column> <el-table-column label="创建时间" width="160" align="center" prop="createTime"> </el-table-column> <el-table-column label="更改用户" align="center" prop="updateUser"> <el-table-column label="更新人" align="center" prop="updateUser" width="80"> </el-table-column> <el-table-column label="更改时间" width="160" align="center" prop="updateTime"> </el-table-column> @@ -121,21 +100,30 @@ <template slot-scope="scope"> <el-button size="mini" type="text" type="success" plain icon="el-icon-edit" @click="handleUpdate(scope.row)" style="width: 72px" :disabled="single" @click="handleUpdate" v-hasPermi="['bs:processes:edit']" >修改</el-button> <el-button size="mini" type="text" type="danger" plain icon="el-icon-delete" @click="handleDelete(scope.row)" style="width: 72px" :disabled="multiple" @click="handleDelete" v-hasPermi="['bs:processes:remove']" >删除</el-button> </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> @@ -219,6 +207,7 @@ title: "", // 是否显示弹出层 open: false, advancedShowSearch: false, // 查询参数 queryParams: { pageNum: 1, @@ -238,6 +227,9 @@ processesCode: [ { required: true, message: "工序编号不能为空", trigger: "blur" } ], processesName: [ { required: true, message: "工序名称不能为空", trigger: "blur" } ], processesType: [ { required: true, message: "工序类型不能为空", trigger: "change" } ], @@ -248,6 +240,9 @@ this.getList(); }, methods: { advancedQuery(){ this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true; }, /** 查询工序信息列表 */ getList() { this.loading = true; @@ -355,3 +350,9 @@ } }; </script> <style> .el-dialog__header{ /*background-color: #f8f8f8;*/ background-color: #f8f8f9; } </style> jcdm-ui/src/views/main/bs/technologyRoute/index.vue
@@ -115,7 +115,7 @@ </router-link> </template> </el-table-column> <el-table-column label="工艺流程名称" width="130" align="center" prop="routeName"> <el-table-column :show-overflow-tooltip='true' label="工艺流程名称" width="130" align="center" prop="routeName"> </el-table-column> <el-table-column label="产品编码" width="130" align="center" prop="productCode"> </el-table-column> jcdm-ui/src/views/main/bs/workshop/index.vue
@@ -18,13 +18,6 @@ @keyup.enter.native="handleQuery" /> </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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"> <el-form-item label="备注" prop="remarks"> <el-input v-model="queryParams.remarks" @@ -41,6 +34,13 @@ @keyup.enter.native="handleQuery" /> </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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>--> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="advancedShowSearch" label-width="68px"> </el-form> </el-card> @@ -95,22 +95,15 @@ <!-- <el-table-column label="id" align="center" prop="id" />--> <el-table-column label="车间编码" align="center" prop="workshopCode"> </el-table-column> <el-table-column label="车间名称" align="center" prop="workshopName"> <el-table-column :show-overflow-tooltip='true' label="车间名称" align="center" prop="workshopName"> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> <!-- <el-table-column label="创建人" align="center" prop="createUser">--> <!-- </el-table-column>--> <el-table-column label="创建人" > <template slot-scope="scope"> <el-tag size="medium">{{ scope.row.createUser }}</el-tag> </template> <el-table-column label="创建人" align="center" prop="createUser" width="80"> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> </el-table-column> <el-table-column label="更新人" align="center" prop="updateUser"> <el-table-column label="更新人" align="center" prop="updateUser" width="80"> </el-table-column> <el-table-column label="更新时间" align="center" prop="updateTime" width="180"> </el-table-column> @@ -221,6 +214,12 @@ id: [ { required: true, message: "id不能为空", trigger: "blur" } ], workshopCode: [ { required: true, message: "车间编码不能为空", trigger: "blur" } ], workshopName: [ { required: true, message: "车间名称不能为空", trigger: "blur" } ], } }; }, jcdm-ui/src/views/main/om/workReport/index.vue
@@ -18,7 +18,7 @@ @keyup.enter.native="handleQuery" /> </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 type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> @@ -116,22 +116,27 @@ <el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" type="text" type="success" plain icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['om:workReport:edit']" >修改</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['om:workReport:remove']" >删除</el-button> </template> style="width: 72px" :disabled="single" @click="handleUpdate" v-hasPermi="['om:' + '']" >修改</el-button> <el-button type="danger" plain icon="el-icon-delete" size="mini" style="width: 72px" :disabled="multiple" @click="handleDelete" v-hasPermi="['om:workReport:remove']" >删除</el-button> </el-table-column> </el-table> </el-card> @@ -145,6 +150,10 @@ <!-- 添加或修改报工记录表对话框 --> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <span slot="title"> <i class="el-icon-s-order"></i> {{titleName}} </span> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form-item label="工单编号" prop="workOrderCode"> <el-input v-model="form.workOrderCode" placeholder="请输入工单编号" /> @@ -193,6 +202,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -319,7 +329,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加报工记录表"; this.titleName = "添加报工记录表"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -328,7 +338,7 @@ getWorkReport(id).then(response => { this.form = response.data; this.open = true; this.title = "修改报工记录表"; this.titleName = "修改报工记录表"; }); }, /** 提交按钮 */
