Commit 9287be0d authored by 沈翠玲's avatar 沈翠玲

车间异常单

parent 17152b8e
...@@ -252,18 +252,15 @@ ...@@ -252,18 +252,15 @@
</el-row> </el-row>
<el-row v-else-if="form.abnormalType === 'MATERIAL'"> <el-row v-else-if="form.abnormalType === 'MATERIAL'">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="原物料" prop="originalMaterialName"> <el-form-item label="原物料" prop="originalMaterialId">
<el-input <el-select v-model="form.originalMaterialId" placeholder="请选择原物料" filterable @change="changenewMaterialId">
v-model="form.originalMaterialName" <el-option
readonly v-for="item in MaterialList"
placeholder="请选择原物料" :key="item.itemId"
> :label="item.itemName"
<el-button :value="item.itemId"
slot="append" ></el-option>
icon="el-icon-search" </el-select>
@click="$refs['oldItemSelectRef'].showFlag = true"
></el-button>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -323,7 +320,6 @@ ...@@ -323,7 +320,6 @@
</div> </div>
</el-dialog> </el-dialog>
<ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" /> <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
<oldItemSelect ref="oldItemSelectRef" :batchNumber="form.batchNumber" @onSelected="onoldItemSelectRef" />
</div> </div>
</template> </template>
...@@ -333,11 +329,12 @@ import { listReport, getReport, delReport, addReport, updateReport,completeRepor ...@@ -333,11 +329,12 @@ import { listReport, getReport, delReport, addReport, updateReport,completeRepor
import {listAllProcess} from "@/api/mes/pro/process"; import {listAllProcess} from "@/api/mes/pro/process";
import dayjs from 'dayjs' import dayjs from 'dayjs'
import ItemSelect from "@/components/itemSelect/single.vue"; import ItemSelect from "@/components/itemSelect/single.vue";
import oldItemSelect from "./single.vue"; import {
getAllBomMaterial
} from "@/api/mes/qc/report";
export default { export default {
dicts: ['qc_submit_status','pc_abnormal_type'], dicts: ['qc_submit_status','pc_abnormal_type'],
components: {ItemSelect, oldItemSelect}, components: {ItemSelect},
name: "Report", name: "Report",
data() { data() {
return { return {
...@@ -355,6 +352,7 @@ export default { ...@@ -355,6 +352,7 @@ export default {
total: 0, total: 0,
// 车间异常单表格数据 // 车间异常单表格数据
reportList: [], reportList: [],
MaterialList: [],
processOptions: [], processOptions: [],
oldprocessOptions: [], oldprocessOptions: [],
daterangePurchaseDate: [dayjs().startOf('month').format('YYYY-MM-DD'), dayjs().endOf('month').format('YYYY-MM-DD')], daterangePurchaseDate: [dayjs().startOf('month').format('YYYY-MM-DD'), dayjs().endOf('month').format('YYYY-MM-DD')],
...@@ -397,6 +395,11 @@ export default { ...@@ -397,6 +395,11 @@ export default {
} }
}) })
}, },
getAllBomMaterial(){
getAllBomMaterial(this.form.batchNumber).then( response =>{
this.MaterialList = response.rows;
});
},
//查询工序信息 //查询工序信息
getProcess(){ getProcess(){
listAllProcess().then( response =>{ listAllProcess().then( response =>{
...@@ -451,11 +454,11 @@ export default { ...@@ -451,11 +454,11 @@ export default {
this.form.newMaterialCode = row.itemCode; this.form.newMaterialCode = row.itemCode;
} }
}, },
onoldItemSelectRef(row) { changenewMaterialId() {
if (row != undefined && row != null) { const item = this.MaterialList.find(v => v.itemId === this.form.originalMaterialId)
this.form.originalMaterialId = row.itemId; if(item) {
this.form.originalMaterialName = row.itemName; this.form.originalMaterialCode = item.itemCode
this.form.originalMaterialCode = row.itemCode; this.form.originalMaterialName = item.itemName
} }
}, },
// 表单重置 // 表单重置
...@@ -524,6 +527,7 @@ export default { ...@@ -524,6 +527,7 @@ export default {
this.open = true; this.open = true;
this.getoldProcess() this.getoldProcess()
this.getProcess() this.getProcess()
this.getAllBomMaterial()
this.title = "修改车间异常单"; this.title = "修改车间异常单";
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment