| jcdm-ui/src/components/itemSelect/single.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/material/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/om/productionOrde/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-ui/src/components/itemSelect/single.vue
@@ -43,15 +43,22 @@ </el-table-column> <el-table-column label="物料名称" align="center" prop="materialName"> </el-table-column> <el-table-column label="种类" align="center" prop="typeZ"> </el-table-column> <el-table-column label="类型" align="center" prop="typeL"> <template slot-scope="scope"> <dict-tag :options="dict.type.material_type" :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.unit" :value="scope.row.unit"/> </template> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime"> </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="厂商" align="center" prop="supplier"> </el-table-column> @@ -74,11 +81,11 @@ </template> <script> import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/main/bs/material/material"; import { listMaterial} from "@/api/main/bs/material/material"; export default { name: "MdItemSingle", dicts: ['sys_yes_no','mes_item_product'], dicts: ['sys_yes_no','mes_item_product','material_type','unit','sys_normal_disable'], data() { return { showFlag:false, @@ -109,7 +116,8 @@ pageSize: 10, itemCode: undefined, itemName: undefined, itemTypeId: 0 itemTypeId: 0, typeL: 1, }, // 列信息 columns: [ jcdm-ui/src/views/main/bs/material/index.vue
@@ -18,16 +18,6 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="版本" prop="matterVersion"> <el-input v-model="queryParams.matterVersion" 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 @@ -93,23 +83,26 @@ <el-table v-loading="loading" border :data="materialList" @selection-change="handleSelectionChange" v-if="materialList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="物料编号" align="center" prop="materialCode"> <el-table-column label="物料编号" width="130" align="center" prop="materialCode"> </el-table-column> <el-table-column label="物料名称" align="center" prop="materialName"> </el-table-column> <el-table-column label="视图" align="center" prop="materialView"> </el-table-column> <el-table-column label="种类" align="center" prop="typeZ"> </el-table-column> <!-- <el-table-column label="种类" align="center" prop="typeZ">--> <!-- </el-table-column>--> <el-table-column label="类型" align="center" prop="typeL"> <template slot-scope="scope"> <dict-tag :options="dict.type.material_type" :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.unit" :value="scope.row.unit"/> </template> </el-table-column> <el-table-column label="ERP规格" align="center" prop="erpSpec"> </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"> @@ -177,15 +170,23 @@ <el-form-item label="视图" prop="materialView"> <el-input v-model="form.materialView" placeholder="请输入视图" /> </el-form-item> <el-form-item label="种类" prop="typeZ"> <el-input v-model="form.typeZ" placeholder="请输入种类" /> </el-form-item> <!-- <el-form-item label="种类" prop="typeZ">--> <!-- <el-input v-model="form.typeZ" placeholder="请输入种类" />--> <!-- </el-form-item>--> <el-form-item label="类型" prop="typeL"> <el-input v-model="form.typeL" placeholder="请输入类型" /> <!-- <el-input v-model="form.typeL" placeholder="请输入类型" />--> <el-select v-model="form.typeL" style="width: 204px;" placeholder="请选择单位" clearable> <el-option v-for="dict in dict.type.material_type" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="单位" prop="unit"> <!-- <el-input v-model="form.unit" placeholder="请输入单位" />--> <el-select v-model="form.unit" placeholder="请选择单位" clearable> <el-select v-model="form.unit" style="width: 204px;" placeholder="请选择单位" clearable> <el-option v-for="dict in dict.type.unit" :key="dict.value" @@ -227,7 +228,7 @@ export default { name: "Material", dicts: ['sys_normal_disable','unit'], dicts: ['sys_normal_disable','unit','material_type'], data() { return { // 遮罩层 jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -287,7 +287,7 @@ <el-input v-model="form.productName" disabled placeholder="请输入产品名称" /> </el-form-item> <el-form-item label="车间编号" prop="workshopCode"> <el-select style="width: 93%" @change="handleSelectChange(form.processesCode)" v-model="form.workshopCode" placeholder="请选择车间编号"> <el-select style="width: 93%" @change="handleSelectChange(form.workshopCode)" v-model="form.workshopCode" placeholder="请选择车间编号"> <el-option v-for="item in options" :key="item.workshopCode" @@ -318,9 +318,6 @@ <el-form-item label="计划数量" prop="planQty"> <el-input v-model="form.planQty" placeholder="请输入计划数量" /> </el-form-item> <!-- <el-form-item label="实际数量" prop="actualQty">--> <!-- <el-input v-model="form.actualQty" placeholder="请输入实际数量" />--> <!-- </el-form-item>--> <el-form-item label="需求日期" prop="demandDate"> <el-date-picker style="width: 88%" clearable v-model="form.demandDate" @@ -329,34 +326,27 @@ placeholder="请选择需求日期"> </el-date-picker> </el-form-item> <!-- <el-form-item style="margin-left: -30px" label="流水号" prop="streamNumber">--> <!-- <el-input v-model="form.streamNumber" placeholder="请输入流水号" />--> <!-- </el-form-item>--> <el-form-item style="margin-left: -30px" label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> </el-form-item> <!-- <el-form-item label="客户" prop="custom">--> <!-- <el-input v-model="form.custom" placeholder="请输入客户" />--> <!-- </el-form-item>--> <el-row> <el-col :span="12"> <el-form-item style="margin-left: 10px" label-width="120" label="计划开始时间" prop="planStartTime"> <el-date-picker clearable v-model="form.planStartTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择计划开始时间"> v-model="form.planStartTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择计划开始时间"> </el-date-picker> </el-form-item> </el-col> <el-col :span="12"> <el-form-item style="margin-left: 76px" label-width="120" label="计划结束时间" prop="planEndTime"> <el-date-picker clearable v-model="form.planEndTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择计划结束时间"> v-model="form.planEndTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择计划结束时间"> </el-date-picker> </el-form-item> </el-col> @@ -478,6 +468,7 @@ }, // 在这里编写处理选中事件的逻辑 handleSelectChange(selectedOption) { this.form.lineCode = null; this.queryParams.workshopCode = selectedOption; listLineInfo(this.queryParams).then(response => { this.lineOptions = response.rows;
