jcdm-ui/src/views/main/bs/ProductBom/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/bs/ProductBomChild/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/bs/lineInfo/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/bs/material/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/technologyRouteChild/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/om/workReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-ui/src/views/main/bs/ProductBom/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-width="120" label="BOM编码" prop="bomCode"> <el-input @@ -33,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-item label="数据来源" prop="dataSource"> <el-input v-model="queryParams.dataSource" @@ -40,13 +48,11 @@ clearable @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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> </el-form> </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 @@ -93,9 +99,8 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="ProductBomList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ProductBomList" @selection-change="handleSelectionChange" v-if="ProductBomList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="主键id" align="center" prop="id" /> <el-table-column label="BOM编码" align="center" prop="bomCode"> <template slot-scope="scope"> <router-link :to="{path: '/main/bom-data/index/', query: {bomCode: scope.row.bomCode} }" class="link-type"> @@ -104,72 +109,42 @@ </template> </el-table-column> <el-table-column label="BOM名称" align="center" prop="bomName"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.bomName"/> </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="productName"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productName"/> </template>--> </el-table-column> <el-table-column label="版本" align="center" prop="version"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.version"/> </template>--> </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"/> </template> </el-table-column> <el-table-column label="预留字段1" align="center" prop="spareField1"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.spareField1"/> </template>--> </el-table-column> <el-table-column label="预留字段2" align="center" prop="spareField2"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.spareField2"/> </template>--> </el-table-column> <el-table-column label="备注" align="center" prop="remark"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remark"/> </template>--> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createUser"/> </template>--> </el-table-column> <el-table-column label="更改用户" align="center" prop="updateUser"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateUser"/> </template>--> </el-table-column> <el-table-column label="数据来源" align="center" prop="dataSource"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.dataSource"/> </template>--> </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 style="width: 72px" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bs:ProductBom:edit']" >修改</el-button> <el-button size="mini" type="text" plain style="width: 72px" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:ProductBom:remove']" @@ -177,6 +152,10 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination v-show="total>0" @@ -188,6 +167,10 @@ <!-- 添加或修改基础BOM对话框 --> <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="100px"> <el-form-item label="BOM编码" prop="bomCode"> <el-input v-model="form.bomCode" placeholder="请输入BOM编码" /> @@ -201,9 +184,9 @@ <el-form-item label="产品名称" prop="productName"> <el-input v-model="form.productName" placeholder="请输入产品名称" /> </el-form-item> <el-form-item label="版本" prop="version"> <el-input v-model="form.version" placeholder="请输入版本" /> </el-form-item> <!-- <el-form-item label="版本" prop="version">--> <!-- <el-input v-model="form.version" placeholder="请输入版本" />--> <!-- </el-form-item>--> <el-form-item label="状态" prop="status"> <el-radio-group v-model="form.status"> <el-radio @@ -213,21 +196,16 @@ >{{dict.label}}</el-radio> </el-radio-group> </el-form-item> <el-form-item label="预留字段1" prop="spareField1"> <el-input v-model="form.spareField1" placeholder="请输入预留字段1" /> </el-form-item> <el-form-item label="预留字段2" prop="spareField2"> <el-input v-model="form.spareField2" placeholder="请输入预留字段2" /> </el-form-item> <!-- <el-form-item label="创建用户" prop="createUser">--> <!-- <el-input v-model="form.createUser" placeholder="请输入创建用户" />--> <!-- <el-form-item label="预留字段1" prop="spareField1">--> <!-- <el-input v-model="form.spareField1" placeholder="请输入预留字段1" />--> <!-- </el-form-item>--> <!-- <el-form-item label="更改用户" prop="updateUser">--> <!-- <el-input v-model="form.updateUser" placeholder="请输入更改用户" />--> <!-- <el-form-item label="预留字段2" prop="spareField2">--> <!-- <el-input v-model="form.spareField2" placeholder="请输入预留字段2" />--> <!-- </el-form-item>--> <el-form-item label="数据来源" prop="dataSource"> <el-input v-model="form.dataSource" placeholder="请输入数据来源" /> </el-form-item> <!-- <el-form-item label="数据来源" prop="dataSource">--> <!-- <el-input v-model="form.dataSource" placeholder="请输入数据来源" />--> <!-- </el-form-item>--> <el-form-item label="备注" prop="remark"> <el-input v-model="form.remark" placeholder="请输入备注" /> </el-form-item> @@ -250,6 +228,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -266,6 +245,7 @@ title: "", // 是否显示弹出层 open: false, advancedShowSearch: false, // 查询参数 queryParams: { pageNum: 1, @@ -299,6 +279,9 @@ this.getList(); }, methods: { advancedQuery(){ this.advancedShowSearch = (this.advancedShowSearch) ? this.advancedShowSearch = false : this.advancedShowSearch = true; }, /** 查询基础BOM列表 */ getList() { this.loading = true; @@ -355,7 +338,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加基础BOM"; this.titleName = "添加基础BOM"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -364,7 +347,7 @@ getProductBom(id).then(response => { this.form = response.data; this.open = true; this.title = "修改基础BOM"; this.titleName = "修改基础BOM"; }); }, /** 提交按钮 */ jcdm-ui/src/views/main/bs/ProductBomChild/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="materialCode"> <el-input @@ -17,11 +18,14 @@ @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 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"> @@ -100,76 +104,40 @@ </el-descriptions-item> </el-descriptions> <el-table v-loading="loading" :data="ProductBomChildList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ProductBomChildList" @selection-change="handleSelectionChange" v-if="ProductBomChildList.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="opCode"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.opCode"/> </template>--> </el-table-column> <el-table-column label="工序名称" align="center" prop="opName"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.opName"/> </template>--> </el-table-column> <el-table-column label="物料编码" align="center" prop="materialCode"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.materialCode"/> </template>--> </el-table-column> <el-table-column label="物料名称" align="center" prop="materialName"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.materialName"/> </template>--> </el-table-column> <el-table-column label="单耗" align="center" prop="costQty"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.costQty"/> </template>--> </el-table-column> <el-table-column label="单位" align="center" prop="unit"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.unit"/> </template>--> </el-table-column> <el-table-column label="预留字段1" align="center" prop="spareField1"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.spareField1"/> </template>--> </el-table-column> <el-table-column label="预留字段2" align="center" prop="spareField2"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.spareField2"/> </template>--> </el-table-column> <el-table-column label="预留字段3" align="center" prop="spareField3"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.spareField3"/> </template>--> </el-table-column> <el-table-column label="备注" align="center" prop="remark"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remark"/> </template>--> </el-table-column> <el-table-column label="BOM编码" align="center" prop="bomCode"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.bomCode"/> </template>--> </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 style="width: 72px" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bs:ProductBomChild:edit']" >修改</el-button> <el-button size="mini" type="text" plain style="width: 72px" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:ProductBomChild:remove']" @@ -177,6 +145,10 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination v-show="total>0" @@ -188,6 +160,10 @@ <!-- 添加或修改基础BOM子信息对话框 --> <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="120px"> <el-form-item label="BOM编码" prop="bomCode"> <el-input v-model="querybomCode" :disabled="true" /> @@ -245,6 +221,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -375,7 +352,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加BOM子信息"; this.titleName = "添加BOM子信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -384,7 +361,7 @@ getProductBomChild(id).then(response => { this.form = response.data; this.open = true; this.title = "修改基础BOM子信息"; this.titleName = "修改基础BOM子信息"; }); }, /** 提交按钮 */ jcdm-ui/src/views/main/bs/lineInfo/index.vue
@@ -112,25 +112,22 @@ </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button size="mini" type="success" plain icon="el-icon-edit" style="width: 72px" :disabled="single" @click="handleUpdate" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bs:lineInfo:edit']" >修改</el-button> <el-button size="mini" type="danger" plain icon="el-icon-delete" style="width: 72px" :disabled="multiple" @click="handleDelete" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:lineInfo:remove']" >删除</el-button> </template> jcdm-ui/src/views/main/bs/material/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="materialCode"> <el-input @@ -17,38 +18,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label="视图" prop="materialView">--> <!-- <el-input--> <!-- v-model="queryParams.materialView"--> <!-- placeholder="请输入视图"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="种类" prop="typeZ">--> <!-- <el-input--> <!-- v-model="queryParams.typeZ"--> <!-- placeholder="请输入种类"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <el-form-item label="类型" prop="typeL"> <el-input v-model="queryParams.typeL" placeholder="请输入类型" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label="单位" prop="unit">--> <!-- <el-input--> <!-- v-model="queryParams.unit"--> <!-- placeholder="请输入单位"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <el-form-item label="版本" prop="matterVersion"> <el-input v-model="queryParams.matterVersion" @@ -57,86 +27,18 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label="备注" prop="remarks">--> <!-- <el-input--> <!-- v-model="queryParams.remarks"--> <!-- placeholder="请输入备注"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="创建用户" prop="createUser">--> <!-- <el-input--> <!-- v-model="queryParams.createUser"--> <!-- placeholder="请输入创建用户"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="创建时间" prop="createTime">--> <!-- <el-date-picker clearable--> <!-- v-model="queryParams.createTime"--> <!-- type="date"--> <!-- value-format="yyyy-MM-dd"--> <!-- placeholder="请选择创建时间">--> <!-- </el-date-picker>--> <!-- </el-form-item>--> <!-- <el-form-item label="更改用户" prop="updateUser">--> <!-- <el-input--> <!-- v-model="queryParams.updateUser"--> <!-- placeholder="请输入更改用户"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="ERP规格" prop="erpSpec">--> <!-- <el-input--> <!-- v-model="queryParams.erpSpec"--> <!-- placeholder="请输入ERP规格"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="数据来源" prop="dataSource">--> <!-- <el-input--> <!-- v-model="queryParams.dataSource"--> <!-- placeholder="请输入数据来源"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <!-- <el-form-item label="版本" prop="version">--> <!-- <el-input--> <!-- v-model="queryParams.version"--> <!-- placeholder="请输入版本"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </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 label="厂商" prop="supplier">--> <!-- <el-input--> <!-- v-model="queryParams.supplier"--> <!-- placeholder="请输入厂商"--> <!-- clearable--> <!-- @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 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 @@ -183,101 +85,53 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.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="materialCode"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.materialCode"/> </template>--> </el-table-column> <el-table-column label="物料名称" align="center" prop="materialName"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.materialName"/> </template>--> </el-table-column> <!-- <el-table-column label="视图" align="center" prop="materialView">--> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.materialView"/> </template>--> <!-- </el-table-column>--> <el-table-column label="种类" align="center" prop="typeZ"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.typeZ"/> </template>--> </el-table-column> <el-table-column label="类型" align="center" prop="typeL"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.typeL"/> </template>--> </el-table-column> <el-table-column label="单位" align="center" prop="unit"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.unit"/> </template>--> </el-table-column> <!-- <el-table-column label="版本" align="center" prop="matterVersion">--> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.matterVersion"/>--> <!-- </template>--> <!-- </el-table-column>--> <!-- <el-table-column label="创建用户" align="center" prop="createUser">--> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createUser"/> </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="更改用户" align="center" prop="updateUser">--> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateUser"/>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column label="ERP规格" align="center" prop="erpSpec"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.erpSpec"/> </template>--> </el-table-column> <el-table-column label="数据来源" align="center" prop="dataSource"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.dataSource"/> </template>--> </el-table-column> <!-- <el-table-column label="版本" align="center" prop="version">--> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.version"/>--> <!-- </template>--> <!-- </el-table-column>--> <el-table-column label="状态" align="center" prop="status"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.status"/> </template>--> <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="supplier"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.supplier"/> </template>--> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> <!-- <template slot-scope="scope"> <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remarks"/> </template>--> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <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 style="width: 72px" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bs:material:edit']" >修改</el-button> <el-button size="mini" type="text" plain style="width: 72px" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:material:remove']" @@ -285,7 +139,10 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination v-show="total>0" :total="total" @@ -296,6 +153,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="materialCode"> <el-input v-model="form.materialCode" placeholder="请输入物料编号" /> @@ -315,27 +176,12 @@ <el-form-item label="单位" prop="unit"> <el-input v-model="form.unit" placeholder="请输入单位" /> </el-form-item> <!-- <el-form-item label="版本" prop="matterVersion">--> <!-- <el-input v-model="form.matterVersion" placeholder="请输入版本" />--> <!-- </el-form-item>--> <el-form-item label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> </el-form-item> <!-- <el-form-item label="创建用户" prop="createUser">--> <!-- <el-input v-model="form.createUser" placeholder="请输入创建用户" />--> <!-- </el-form-item>--> <!-- <el-form-item label="更改用户" prop="updateUser">--> <!-- <el-input v-model="form.updateUser" placeholder="请输入更改用户" />--> <!-- </el-form-item>--> <el-form-item label="ERP规格" prop="erpSpec"> <el-input v-model="form.erpSpec" placeholder="请输入ERP规格" /> </el-form-item> <el-form-item label="数据来源" prop="dataSource"> <el-input v-model="form.dataSource" placeholder="请输入数据来源" /> </el-form-item> <!-- <el-form-item label="版本" prop="version">--> <!-- <el-input v-model="form.version" placeholder="请输入版本" />--> <!-- </el-form-item>--> <el-form-item label="状态" prop="status"> <el-radio-group v-model="form.status"> <el-radio @@ -367,6 +213,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -411,6 +258,18 @@ id: [ { required: true, message: "主键id不能为空", trigger: "blur" } ], materialCode: [ { required: true, message: "物料编码不能为空", trigger: "blur" } ], materialName: [ { required: true, message: "物料名称不能为空", trigger: "blur" } ], typeZ: [ { required: true, message: "种类不能为空", trigger: "blur" } ], typeL: [ { required: true, message: "类型不能为空", trigger: "blur" } ], } }; }, @@ -451,7 +310,7 @@ erpSpec: null, dataSource: null, version: null, status: null, status: '0', supplier: null }; this.resetForm("form"); @@ -476,7 +335,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加物料信息"; this.titleName = "添加物料信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -485,7 +344,7 @@ getMaterial(id).then(response => { this.form = response.data; this.open = true; this.title = "修改物料信息"; this.titleName = "修改物料信息"; }); }, /** 提交按钮 */ jcdm-ui/src/views/main/bs/processes/index.vue
@@ -98,24 +98,43 @@ </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <!-- <el-button--> <!-- type="success"--> <!-- plain--> <!-- icon="el-icon-edit"--> <!-- size="mini"--> <!-- 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-button size="mini" type="success" plain icon="el-icon-edit" style="width: 72px" :disabled="single" @click="handleUpdate" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['bs:processes:edit']" >修改</el-button> <el-button size="mini" type="danger" plain icon="el-icon-delete" style="width: 72px" :disabled="multiple" @click="handleDelete" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:processes:remove']" >删除</el-button> </template> @@ -137,6 +156,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="processesCode"> <el-input v-model="form.processesCode" placeholder="请输入工序编号" /> @@ -191,6 +214,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -299,7 +323,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加工序信息"; this.titleName = "添加工序信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -308,7 +332,7 @@ getProcesses(id).then(response => { this.form = response.data; this.open = true; this.title = "修改工序信息"; this.titleName = "修改工序信息"; }); }, /** 提交按钮 */ jcdm-ui/src/views/main/bs/technologyRoute/index.vue
@@ -106,7 +106,7 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table border v-loading="loading" :data="technologyRouteList" @selection-change="handleSelectionChange"> <el-table border v-loading="loading" :data="technologyRouteList" @selection-change="handleSelectionChange" v-if="technologyRouteList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="工艺流程编码" width="130" align="center"> <template slot-scope="scope"> @@ -144,14 +144,18 @@ <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="['bs:technologyRoute:edit']" >修改</el-button> <el-button size="mini" type="text" plain style="width: 72px" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:technologyRoute:remove']" @@ -159,6 +163,9 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination @@ -171,6 +178,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="routeCode"> <el-input v-model="form.routeCode" placeholder="请输入工艺流程编码" /> @@ -219,6 +230,7 @@ return { // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -324,7 +336,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加工艺流程"; this.titleName = "添加工艺流程"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -333,7 +345,7 @@ getTechnologyRoute(id).then(response => { this.form = response.data; this.open = true; this.title = "修改工艺流程"; this.titleName = "修改工艺流程"; }); }, /** 提交按钮 */ @@ -375,3 +387,9 @@ } }; </script> <style> .el-dialog__header{ /*background-color: #f8f8f8;*/ background-color: #f8f8f9; } </style> jcdm-ui/src/views/main/bs/technologyRouteChild/index.vue
@@ -118,7 +118,7 @@ {{headerInformationData.productName}} </el-descriptions-item> </el-descriptions> <el-table v-loading="loading" :width="tableWidth" style="width: auto;" border :data="technologyRouteChildList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :width="tableWidth" style="width: auto;" border :data="technologyRouteChildList" @selection-change="handleSelectionChange" v-if="technologyRouteChildList.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="processesCode"> @@ -127,16 +127,11 @@ </el-table-column> <el-table-column label="加工顺序" align="center" prop="stepNo"> </el-table-column> <!-- <el-table-column label="下一道工序" align="center" prop="nextProcess">--> <!-- </el-table-column>--> <!-- <el-table-column label="与下一道工序关系" align="center" prop="nextProcessBond">--> <!-- </el-table-column>--> <el-table-column label="是否关键工序" align="center" prop="keyProcessesFlag"> <template slot-scope="scope"> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.keyProcessesFlag"/> </template> </el-table-column> <!-- <el-table-column label="准备时间" align="center" prop="preparationTime">--> <!-- </el-table-column>--> <!-- <el-table-column label="等待时间" align="center" prop="waitTime">--> <!-- </el-table-column>--> <el-table-column label="创建用户" align="center" prop="createUser"> </el-table-column> <el-table-column width="160" :show-overflow-tooltip='true' label="创建时间" align="center" prop="createTime"> @@ -153,14 +148,18 @@ <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="['bs:technologyRouteChild:edit']" >修改</el-button> <el-button size="mini" type="text" plain style="width: 72px" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['bs:technologyRouteChild:remove']" @@ -168,6 +167,9 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> @@ -181,6 +183,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="流程编码"> <el-input v-model="queryRouteCode" :disabled="true" /> @@ -220,8 +226,15 @@ <!-- <el-form-item label="与下一道工序关系" prop="nextProcessBond">--> <!-- <el-input v-model="form.nextProcessBond" placeholder="请输入与下一道工序关系" />--> <!-- </el-form-item>--> <el-form-item label="是否关键工序" prop="keyProcessesFlag"> <el-input v-model="form.keyProcessesFlag" placeholder="请输入是否关键工序" /> <el-form-item label="是否关键工序" prop="keyProcessesFlag" label-width="180"> <el-radio-group v-model="form.keyProcessesFlag"> <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value" >{{dict.label}}</el-radio> </el-radio-group> </el-form-item> <!-- <el-form-item label="准备时间" prop="preparationTime">--> <!-- <el-input v-model="form.preparationTime" placeholder="请输入准备时间" />--> @@ -248,12 +261,14 @@ export default { name: "TechnologyRouteChild", dicts: ['sys_yes_no'], data() { return { tableWidth: '100%', // 初始宽度设置为100% options: [], // 遮罩层 loading: true, titleName: 'test', // 选中数组 ids: [], // 非单个禁用 @@ -293,8 +308,11 @@ id: [ { required: true, message: "主键id不能为空", trigger: "blur" } ], processesCode: [ { required: true, message: "工序编码不能为空", trigger: "blur" } processesName: [ { required: true, message: "工序名称不能为空", trigger: "blur" } ], stepNo: [ { required: true, message: "加工工序不能为空", trigger: "blur" } ], } }; @@ -347,7 +365,7 @@ stepNo: null, nextProcess: null, nextProcessBond: null, keyProcessesFlag: null, keyProcessesFlag: 'Y', preparationTime: null, waitTime: null, createUser: null, @@ -383,7 +401,7 @@ handleAdd() { this.reset(); this.open = true; this.title = "添加工艺路线子信息"; this.titleName = "添加工艺路线子信息"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -392,7 +410,7 @@ getTechnologyRouteChild(id).then(response => { this.form = response.data; this.open = true; this.title = "修改工艺路线子信息"; this.titleName = "修改工艺路线子信息"; }); }, /** 提交按钮 */ jcdm-ui/src/views/main/om/workReport/index.vue
@@ -71,8 +71,7 @@ size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['om:' + '']" v-hasPermi="['om:workReport:edit']" >修改</el-button> </el-col> <el-col :span="1.5"> @@ -99,9 +98,8 @@ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" :data="workReportList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="workReportList" @selection-change="handleSelectionChange" v-if="workReportList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column label="工单编号" align="center" prop="workOrderCode" />--> <el-table-column label="工单编号" width="130" align="center" prop="workOrderCode"/> <el-table-column label="SFC总成序列号" align="center" prop="sfcCode" /> <el-table-column label="产品编号" align="center" prop="productCode" /> @@ -124,8 +122,7 @@ style="width: 72px" :disabled="single" @click="handleUpdate" v-hasPermi="['om:' + '']" v-hasPermi="['om:workReport:edit']" >修改</el-button> <el-button type="danger" @@ -139,6 +136,9 @@ >删除</el-button> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card> <pagination v-show="total>0" @@ -296,7 +296,7 @@ productName: null, upTime: null, offlineTime: null, status: null, status: "Y", createUser: null, createTime: null, updateUser: null,