付津 / backstage-management · 提交

转到一个项目

作者 王勋
提交 48ec6a22ed00467bdb48baf5e4dc43b41a471b43 1 个父辈 16466346

修改

内嵌 并排对比
正在显示 6 个修改的文件 包含 102 行增加 和 44 行删除
... ... @@ -81,4 +81,14 @@ export function productidlist(id) { //产品系列列表
method: 'get',
id
})
}
\ No newline at end of file
}
export function getprocess(params){
return http({
url: 'dmm/engine/processdefine/getDeployList',
methodL:'get',
params
})
}
... ...
... ... @@ -39,7 +39,7 @@
label="可用数量"
:rules="[{ required: true, message: '不能为空' }]"
>
<el-input v-model="moldUsableNum"></el-input>
<el-input type="Number" min="0" v-model="moldUsableNum"></el-input>
</el-form-item>
</el-col>
... ...
... ... @@ -142,7 +142,9 @@
</sk-list-container>
</el-tab-pane>
<el-tab-pane label="审批流程图" name="second">
<process-preview :processData="{nodes:nodeList,lines:lineList}"></process-preview>
<process-preview
:processData="{nodes:nodeList,lines:lineList}">
</process-preview>
</el-tab-pane>
</sk-tabs>
<span slot="footer" class="dialog-footer">
... ... @@ -675,7 +677,7 @@ export default {
//编辑
editscrapitem(list){
if(Number(list.state) === 0){
if(Number(list.state) === 0 || Number(list.state) === 30){
this.$router.push({
path:'./Originationscraplist',
query:{
... ...
... ... @@ -33,6 +33,19 @@
<el-input v-model="scrapInfo.totalCount" disabled></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="报废流程">
<el-select v-model="Trialfield" :disabled="checkdis">
<el-option
v-for="item in Trialprolist"
:key="item.id"
:label="item.description"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
... ... @@ -386,7 +399,7 @@ import {
getWorklineListByWorkShopId,
getWorkshopList,
getShiftList,
getProductInfoById,
getProductInfoById, getprocess,
} from "@/services/prp/prp";
export default {
... ... @@ -521,6 +534,7 @@ export default {
recordNum: "",
remark: "",
totalCount: "",
defineId:''
},
shiftId: "",
worklineId: "",
... ... @@ -546,14 +560,19 @@ export default {
status: "",
list: {},
checkdis:false,
check:''
check:'',
Trialfield:'',
Trialprolist:[]
};
},
watch: {},
mounted() {
let status = (this.status = this.$route.query.status);
let list = (this.list = this.$route.query.list);
let define = JSON.parse(list.processDefineStruct)
console.log(define)
this.check = this.$route.query.check;
console.log(list)
if(this.$route.query.check){
this.checkdis = true
}
... ... @@ -567,6 +586,7 @@ export default {
this.scrapInfo.totalCount = list.totalCount;
this.scrapInfo.remark = list.remark;
this.scrapInfo.recordId = list.recordId;
this.scrapInfo.defineId = define.id;
if (this.scrapInfo.recordId) {
let params = {
scrapId: list.recordId,
... ... @@ -578,6 +598,7 @@ export default {
this.getdeviceCodelist();
this.getShiftListData();
this.getworkshopListData();
this.gteprocesslist()
},
methods: {
updateWorkOrderNum(val) {
... ... @@ -642,6 +663,14 @@ export default {
this.editScrapItem.equipmentNum = "";
}
},
gteprocesslist(){
let params={
type:1
}
getprocess(params).then((res) => {
this.Trialprolist = res.data
});
},
selectOqcCencel() {
this.selectOqcOpen = false;
},
... ... @@ -849,12 +878,14 @@ export default {
submit() {
//保存
this.scrapInfo.state = 0;
this.scrapInfo.defineId = this.Trialfield;
this.scrapInfo.resdz = this.scrapInfo.recordNum;
this.scrapsubmit(this.scrapInfo);
},
savefrom() {
//提交
this.scrapInfo.state = 10;
this.scrapInfo.defineId = this.Trialfield;
this.scrapInfo.resdz = this.scrapInfo.recordNum;
this.scrapsubmit(this.scrapInfo);
},
... ... @@ -944,23 +975,6 @@ export default {
}
});
this.scrapInfo.prodRecordScrapItems = listdel;
// console.log(this.list.id)
// if(this.status === 2 && list.id !== undefined){
// let id = list.id
// this.delscrapitem(id)
// }else if(this.status === 2 && list.id === undefined){
// this.scraplist.forEach((item,index) =>{
// if(i === index){
// this.scraplist.splice(index,1)
// }
// })
// }else if(this.status === 1){
// this.scraplist.forEach((item,index) =>{
// if(i === index){
// this.scraplist.splice(index,1)
// }
// })
// }
},
abrasiveCodingAddmaskchosefn() {
this.abrasiveCodingAddmaskchose = true;
... ...
... ... @@ -24,12 +24,12 @@
>
<el-form label-width="100px">
<el-row>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="试制单号">
<el-input disabled="disabled" v-model="Trialnum"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item
label="工单号码"
:rules="[{ required: true, message: '不能为空' }]"
... ... @@ -43,32 +43,32 @@
></sk-select-table>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="产品编码">
<el-input disabled="disabled" v-model="productcode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="产品描述">
<el-input disabled="disabled" v-model="productdes"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="设备编码">
<el-input disabled="disabled" v-model="equipcode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="模具编码">
<el-input disabled="disabled" v-model="modcode"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="试制数量">
<el-input disabled="disabled" v-model="sznum"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item label="试模原因">
<el-select v-model="reason" :disabled="checkdis" @change="changereason">
<el-option
... ... @@ -81,6 +81,19 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="试制流程">
<el-select v-model="Trialfield" :disabled="checkdis" @change="changereason">
<el-option
v-for="item in Trialprolist"
:key="item.id"
:label="item.description"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<el-input type="textarea" :disabled="checkdis" v-model="textarea"></el-input>
... ... @@ -102,6 +115,7 @@ import {
worknumber,
} from "../../services/manageMine/userService";
import { getOrderChoseList, getWorkNumList } from "@/services/wip/wip";
import {getprocess} from "@/services/prp/prp";
export default {
name: "moldInsertAdd",
... ... @@ -149,6 +163,9 @@ export default {
width: "500px",
height: "300px",
},
id:'',
Trialprolist:[],
Trialfield:'',
};
},
watch: {
... ... @@ -160,10 +177,18 @@ export default {
let list = this.$route.query.list;
let status = this.$route.query.status;
let check = this.$route.query.check;
let define = ''
if(list.processDefineStruct){
define = JSON.parse(list.processDefineStruct);
}
console.log(list)
console.log(define)
if(check) {
this.checkdis = true
}
if (status == 1) {
this.id = list.id;
this.Trialfield = define.id
this.Trialnum = list.recordNum;
this.Worknum = list.workOrderNum;
this.reason = list.tryCause;
... ... @@ -184,22 +209,34 @@ export default {
}
this.getdietestlist();
this.getworknumberlist();
this.gteprocesslist()//流程列表
},
methods: {
getSelectTableData(params) {
return new Promise((r) => {
getOrderChoseList(params).then((res) => {
r(res);
// r(res);
});
});
},
handleClick(tab, event) {
console.log(tab, event);
},
gteprocesslist(){
let params={
type:2
}
getprocess(params).then((res) => {
this.Trialprolist = res.data
});
},
// Trialprolist()
submit() {
//保存
let that = this,
params = {
id:that.id || '',
Trialfield:that.Trialfield,
resdz: that.Trialnum, //试制单号
remark: that.textarea, //备注
workOrderNum: that.Worknum, //工单号码
... ... @@ -216,6 +253,8 @@ export default {
//提交
let that = this,
params = {
id:that.id || '',
Trialfield:that.Trialfield,
resdz: that.Trialnum, //试制单号
remark: that.textarea, //备注
workOrderNum: that.Worknum, //工单号码
... ...
... ... @@ -98,8 +98,7 @@
auto-height
:fetch-data="fetchData"
:columnOptions="columnOptions"
@selection-change="handleSelectionChange"
>
@selection-change="handleSelectionChange">
<template slot="column-first">
<el-table-column
type="selection"
... ... @@ -119,13 +118,6 @@
@click="delTrialorder(scope.row)"
><sk-svg-icon icon-class="svg-del"/>
</el-button>
<!-- <el-button-->
<!-- type="text"-->
<!-- icon="el-icon-s-order"-->
<!-- size="small"-->
<!-- :disabled="djspbtn"-->
<!-- @click="checkTrialorder(scope.row)"-->
<!-- ></el-button>-->
</template>
</el-table-column>
</template>
... ... @@ -727,10 +719,9 @@ export default {
this.getList(params);
});
},
editTrialorder(list) {
if (list.state === 0) {
this.$message("此节点不能删除");
} else {
if (list.state === 0 || list.state === 30) {
this.$router.push({
path: "./Initiatorreagentlist",
query: {
... ... @@ -738,6 +729,8 @@ export default {
status: 1,
},
});
} else {
this.$message("此节点不能修改");
}
},
... ...