Merge remote-tracking branch 'origin/master'

master
chj 1 year ago
commit e77cd53df3

@ -51,3 +51,29 @@ export function delProcess(processId) {
method: 'delete' method: 'delete'
}) })
} }
// 查询设备管理列表
export function listEquipment(query) {
return request({
url: '/technology/pro/process/selectEquipmentList',
method: 'get',
params: query
});
}
// 查询设备管理详细
export function getEquipment(equipmentId) {
return request({
url: '/technology/pro/process/e/' + equipmentId,
method: 'get'
});
}
// 查询BOM物料管理列表
export function listBom(query) {
return request({
url: '/technology/pro/process/bomList',
method: 'get',
params: query
});
}

@ -427,7 +427,7 @@ export default {
attr4: null, attr4: null,
prodType: null, prodType: null,
factoryCode: null, factoryCode: null,
isEnd: null endFlag: null
}, },
// //
form: {}, form: {},
@ -589,7 +589,7 @@ export default {
/** 查询生产工单列表 */ /** 查询生产工单列表 */
getList() { getList() {
this.loading = true; this.loading = true;
this.queryParams.isEnd = '1';// this.queryParams.endFlag = '1';//
if(this.queryParams.productDateArray!=null){ if(this.queryParams.productDateArray!=null){
this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD'); this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD');
this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD'); this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD');
@ -639,7 +639,7 @@ export default {
updateTime: null, updateTime: null,
prodType: null, prodType: null,
factoryCode: null, factoryCode: null,
isEnd: null endFlag: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -673,6 +673,14 @@ export default {
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
//
if (this.selectWork.status == "w1"){
this.$message({
message:'工单已派发!不可修改!',
type:'warning'
})
return;
}
// //
checkWorkOrder(this.selectWork.workorderId).then(response => { checkWorkOrder(this.selectWork.workorderId).then(response => {
if (response.code == 500){ if (response.code == 500){

@ -224,6 +224,23 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="参数1温度" prop="param1">
<el-input v-model="form.param1" type="input" placeholder="请输入温度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参数2湿度" prop="param2">
<el-input v-model="form.param2" type="input" placeholder="请输入湿度" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="参数3" prop="param3">
<el-input v-model="form.param3" type="input" placeholder="请输入参数3" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="工序SOP" prop="fileList"> <el-form-item label="工序SOP" prop="fileList">
@ -334,8 +351,7 @@
</template> </template>
<script> <script>
import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process"; import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
import Processcontent from "./content.vue"; import Processcontent from "./content.vue";
import ItemSelect from "./single.vue"; import ItemSelect from "./single.vue";

@ -80,7 +80,7 @@
</template> </template>
<script> <script>
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment"; import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
import { treeselect } from "@/api/wms/equipment"; import { treeselect } from "@/api/wms/equipment";
// import Treeselect from "@riophae/vue-treeselect"; // import Treeselect from "@riophae/vue-treeselect";
// import "@riophae/vue-treeselect/dist/vue-treeselect.css"; // import "@riophae/vue-treeselect/dist/vue-treeselect.css";

@ -78,10 +78,7 @@
</template> </template>
<script> <script>
import { listBom, getBom, delBom, addBom, updateBom } from "@/api/wms/bom"; import {listBom} from "@/api/technology/process";
// import Treeselect from "@riophae/vue-treeselect";
// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "ItemSingleBom", name: "ItemSingleBom",
// components: { Treeselect }, // components: { Treeselect },

Loading…
Cancel
Save