修改bug
This commit is contained in:
@@ -117,11 +117,11 @@ export default {
|
||||
// },
|
||||
{ prop: 'name', label: '参数名' },
|
||||
{
|
||||
prop: 'name', label: '设定范围最小- 最大 / 标准',
|
||||
prop: 'status', label: '设定范围最小- 最大 / 标准',
|
||||
subcomponent: StatusBtn
|
||||
},
|
||||
{
|
||||
prop: 'code', label: '最小值',
|
||||
prop: '', label: '最小值',
|
||||
children: [
|
||||
{
|
||||
prop: 'minValueSet',
|
||||
@@ -134,7 +134,7 @@ export default {
|
||||
]
|
||||
},
|
||||
{
|
||||
prop: 'code', label: '最大值',
|
||||
prop: '', label: '最大值',
|
||||
children: [
|
||||
{
|
||||
prop: 'maxValueSet',
|
||||
@@ -184,9 +184,9 @@ export default {
|
||||
getDetMaterial({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
orderId: this.$route.params.orderId,
|
||||
orderId: this.$route.query.orderId,
|
||||
flowDetId: [this.detId],
|
||||
// orderId: this.$route.params.orderId,
|
||||
// orderId: this.$route.query.orderId,
|
||||
|
||||
},).then((res) => {
|
||||
console.log(res);
|
||||
@@ -231,25 +231,29 @@ export default {
|
||||
getDetMaterial({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
orderId: this.$route.params.orderId,
|
||||
orderId: this.$route.query.orderId,
|
||||
flowDetId: [this.detId],
|
||||
// orderId: this.$route.params.orderId,
|
||||
// orderId: this.$route.query.orderId,
|
||||
|
||||
},).then((res) => {
|
||||
this.materialList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
if (res.data.length != []) {
|
||||
this.materialList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
}
|
||||
})
|
||||
} else {
|
||||
getDetValue({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
orderId: this.$route.params.orderId,
|
||||
orderId: this.$route.query.orderId,
|
||||
flowDetId: [this.detId],
|
||||
// orderId: this.$route.params.orderId,
|
||||
// orderId: this.$route.query.orderId,
|
||||
|
||||
}).then((res) => {
|
||||
this.valueList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
if (res.data.length != []) {
|
||||
this.valueList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
@@ -258,12 +262,14 @@ export default {
|
||||
getDetMaterial({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
orderId: this.$route.params.orderId,
|
||||
orderId: this.$route.query.orderId,
|
||||
flowDetId: [this.detId],
|
||||
}).then((res) => {
|
||||
console.log(res);
|
||||
this.materialList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
if (res.data.length != []) {
|
||||
this.materialList = res.data[0].data
|
||||
this.name = res.data[0].name
|
||||
}
|
||||
})
|
||||
},
|
||||
clearList() {
|
||||
|
||||
@@ -123,7 +123,7 @@ export default {
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
console.log(this.$route.params.id)
|
||||
console.log(this.$route.query.id)
|
||||
this.loadLayout().then(json => {
|
||||
this.initGraph(json)
|
||||
})
|
||||
@@ -260,7 +260,7 @@ export default {
|
||||
},
|
||||
|
||||
async loadLayout() {
|
||||
const flowId = this.$route.params.id;
|
||||
const flowId = this.$route.query.id;
|
||||
console.log(flowId)
|
||||
if (!flowId) return { cells: [] }
|
||||
const { code, data } = await this.info({ id: flowId });
|
||||
@@ -288,12 +288,12 @@ export default {
|
||||
async handleUpdateLayout() {
|
||||
this.layout.content = JSON.stringify(this.graph.toJSON());
|
||||
let code, data;
|
||||
console.table([this.layout, this.$route.params.id])
|
||||
console.table([this.layout, this.$route.query.id])
|
||||
// 手动刷新布局
|
||||
if (this.layout.id) {
|
||||
({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
|
||||
} else {
|
||||
this.layout.flowId = this.$route.params.id;
|
||||
this.layout.flowId = this.$route.query.id;
|
||||
({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
|
||||
}
|
||||
|
||||
@@ -410,7 +410,7 @@ export default {
|
||||
},
|
||||
|
||||
createProcess() {
|
||||
// const flowId = this.$route.params.id;
|
||||
// const flowId = this.$route.query.id;
|
||||
const flowId = this.getFlowId(); // it also works
|
||||
if (!flowId) {
|
||||
this.$modal.msgError('工艺ID不能为空');
|
||||
|
||||
@@ -20,14 +20,13 @@
|
||||
<InfoItem label="产品名称" :value="form.productName" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<InfoItem label="产品规格" />
|
||||
<InfoItem label="产品规格" :value="form.specifications" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
const InfoItem = {
|
||||
name: 'InfoItem',
|
||||
components: {},
|
||||
@@ -62,6 +61,7 @@ export default {
|
||||
id: null,
|
||||
name: null,
|
||||
productName: null,
|
||||
specifications:null,
|
||||
processFlowName: null,
|
||||
// remark: null,
|
||||
// enable: null,
|
||||
@@ -70,7 +70,8 @@ export default {
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
this.getInfo()
|
||||
this.getInfo()
|
||||
console.log(this.$route.query)
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
@@ -95,12 +96,14 @@ export default {
|
||||
// info(payload) {
|
||||
// return this.http(this.infoUrl, 'get', payload);
|
||||
// },
|
||||
async getInfo() {
|
||||
this.form.name = this.$route.params.name
|
||||
this.form.productName = this.$route.params.productName
|
||||
this.form.processFlowName = this.$route.params.processFlowName
|
||||
// this.form.name = this.$route.params.name
|
||||
// const flowId = this.$route.params.id;
|
||||
getInfo() {
|
||||
// console.log(this.$route.query.planProductId);
|
||||
this.form.name = this.$route.query.name
|
||||
this.form.specifications = this.$route.query.specifications
|
||||
this.form.productName = this.$route.query.productName
|
||||
this.form.processFlowName = this.$route.query.processFlowName
|
||||
// this.form.name = this.$route.query.name
|
||||
// const flowId = this.$route.query.id;
|
||||
// console.log(flowId);
|
||||
// if (!flowId) this.$router.go(-1);
|
||||
// const { code, data } = await this.info({ id: flowId });
|
||||
|
||||
Reference in New Issue
Block a user