jcdm-ui/src/components/itemSelect/single.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/bs/ProductBomChild/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/em/equipmentAlarm/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
jcdm-ui/src/views/main/om/productionOrde/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-ui/src/components/itemSelect/single.vue
@@ -49,17 +49,11 @@ </el-table-column> <el-table-column label="单位" align="center" prop="unit"> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> </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 label="创建时间" align="center" prop="createTime"> </el-table-column> <el-table-column label="状态" align="center" prop="status"> </el-table-column> <el-table-column label="厂商" align="center" prop="supplier"> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> </el-table> jcdm-ui/src/views/main/bs/ProductBomChild/index.vue
@@ -168,11 +168,20 @@ <el-form-item label="BOM编码" prop="bomCode"> <el-input v-model="querybomCode" :disabled="true" /> </el-form-item> <el-form-item label="物料编码" prop="materialCode"> <el-input v-model="form.materialCode" placeholder="请输入物料编码" /> <!-- <el-form-item label="物料编码" prop="materialCode">--> <!-- <el-input v-model="form.materialCode" placeholder="请输入物料编码" />--> <!-- </el-form-item>--> <!-- <el-form-item label="物料名称" prop="materialName">--> <!-- <el-input v-model="form.materialName" placeholder="请输入物料名称" />--> <!-- </el-form-item>--> <el-form-item label="物料编码" prop="productCode"> <el-input v-model="form.materialCode" placeholder="请选择产品" > <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> </el-input> <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect> </el-form-item> <el-form-item label="物料名称" prop="materialName"> <el-input v-model="form.materialName" placeholder="请输入物料名称" /> <el-input disabled v-model="form.materialName" placeholder="请输入物料名称" /> </el-form-item> <el-form-item label="单耗" prop="costQty"> <el-input v-model="form.costQty" placeholder="请输入单耗" /> @@ -214,9 +223,14 @@ import { listProductBomChild, getProductBomChild, delProductBomChild, addProductBomChild, updateProductBomChild } from "@/api/main/bs/ProductBomChild/ProductBomChild"; import {listProcesses} from "@/api/main/bs/processes/processes"; import {listProductBom} from "@/api/main/bs/ProductBom/ProductBom"; import {listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute"; import ItemSelect from "@/components/itemSelect/single.vue"; export default { name: "ProductBomChild", components: { ItemSelect , }, data() { return { // 遮罩层 @@ -281,7 +295,16 @@ this.getProcesses(); }, methods: { //物料选择弹出框 onItemSelected(obj){ if(obj !== undefined && obj !== null){ this.form.materialCode = obj.materialCode; this.form.materialName = obj.materialName; } }, handleSelectProduct(){ this.$refs.itemSelect.showFlag = true; }, getProcesses() { listProcesses(null).then(response => { this.options = response.rows; jcdm-ui/src/views/main/em/equipmentAlarm/index.vue
@@ -36,7 +36,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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> </el-form-item> jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -146,7 +146,7 @@ icon="el-icon-upload2" :disabled="move" size="mini" @click="moveUp" @click="moveUp(val => val, 'up')" >上移</el-button> </el-col> <el-col :span="1.5"> @@ -156,7 +156,7 @@ icon="el-icon-download" size="mini" :disabled="move" @click="down" @click="moveUp(val => val, 'down')" >下移</el-button> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> @@ -458,25 +458,14 @@ this.initWorkshop(); }, methods: { moveUp(row){ moveUp(row, val){ console.log(val) const ids = row.id || this.ids let str = JSON.stringify(ids); let num = BigInt(str.replace(/[\[\]]/g, '')); this.queryParams.frontEndId = num this.queryParams.idNums = ids this.queryParams.flag = 'up' upDownMove(this.queryParams).then(response => { this.$modal.msgSuccess("移动成功"); this.getList(); }); }, down(row){ const ids = row.id || this.ids let str = JSON.stringify(ids); let num = BigInt(str.replace(/[\[\]]/g, '')); this.queryParams.frontEndId = num this.queryParams.idNums = ids this.queryParams.flag = 'down' this.queryParams.flag = val upDownMove(this.queryParams).then(response => { this.$modal.msgSuccess("移动成功"); this.getList(); @@ -529,6 +518,7 @@ getList() { this.loading = true; listProductionOrde(this.queryParams).then(response => { console.log(response) this.productionOrdeList = response.rows; this.total = response.total; this.loading = false;