|
|
@@ -607,11 +607,12 @@
|
|
|
<!-- 相似产品弹窗 -->
|
|
|
<el-dialog
|
|
|
title="选择相似产品"
|
|
|
- :visible="showSimilarProductModal"
|
|
|
+ :visible.sync="showSimilarProductModal"
|
|
|
:close-on-click-modal="false"
|
|
|
:close-on-press-escape="false"
|
|
|
class="similarProductModal"
|
|
|
width="1000px"
|
|
|
+ :before-close="handleClose"
|
|
|
>
|
|
|
<Form :label-width="100" :model="similarProductData">
|
|
|
<FormItem label="产品分类">
|
|
|
@@ -728,8 +729,7 @@
|
|
|
v-model="tempProcessLine.title"
|
|
|
style="width: 120px"
|
|
|
placeholder="请输入"
|
|
|
- >
|
|
|
- </Input>
|
|
|
+ />
|
|
|
</div>
|
|
|
<Button
|
|
|
type="primary"
|
|
|
@@ -1466,9 +1466,7 @@ export default {
|
|
|
},
|
|
|
];
|
|
|
} else {
|
|
|
- this.formData.parts.map(v=>{
|
|
|
- this.handleSimilarProductConfirm(res.data.product_id, v);
|
|
|
- })
|
|
|
+ this.handleSimilarProductConfirm(res.data.product_id, this.formData);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -1524,6 +1522,9 @@ export default {
|
|
|
this.tempSelectedPartIndex
|
|
|
].partsProcessLineTableData.concat(this.selectTags);
|
|
|
this.showProcessLineDetailModal = false;
|
|
|
+ this.formData.parts[
|
|
|
+ this.tempSelectedPartIndex
|
|
|
+ ].process_name = this.info.title;
|
|
|
}
|
|
|
},
|
|
|
// 删除工艺路线列表项
|
|
|
@@ -2143,6 +2144,9 @@ export default {
|
|
|
obj
|
|
|
);
|
|
|
},
|
|
|
+ handleClose(done) {
|
|
|
+ done();
|
|
|
+ },
|
|
|
handlePartMetalsDele(row, index, parentIndex) {
|
|
|
this.formData.parts[parentIndex].partsMetalseData.splice(index, 1);
|
|
|
},
|
|
|
@@ -2177,7 +2181,7 @@ export default {
|
|
|
element.partsNameList.forEach((ele) => {
|
|
|
if (element.part_id == ele.id && ele.id == ele.title) {
|
|
|
flag = true;
|
|
|
- }
|
|
|
+
|
|
|
});
|
|
|
if (flag) {
|
|
|
let result = await this.axios({
|
|
|
@@ -2300,6 +2304,7 @@ export default {
|
|
|
data: {
|
|
|
...this.formData,
|
|
|
order_no: this.$route.query.order_no,
|
|
|
+ oa_id: this.$route.query.oa_id,
|
|
|
orders_area_product_detail_id: this.$route.query
|
|
|
.orders_area_product_detail_id,
|
|
|
},
|
|
|
@@ -2536,40 +2541,40 @@ export default {
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
justify-content: flex-start;
|
|
|
- border-left: 1px solid #3764ff;
|
|
|
+ border-left: 1px solid #dedede;
|
|
|
.radio-us {
|
|
|
- background: #fff;
|
|
|
+ background: #f4f5f7;
|
|
|
padding: 5px 20px;
|
|
|
margin: 5px;
|
|
|
margin-right: 18px;
|
|
|
- color: #3764ff;
|
|
|
+ color: #999999;
|
|
|
border-radius: 15px;
|
|
|
- border: 1px solid #3764ff;
|
|
|
+ border: 1px solid #dedede;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
.radio-us-foc {
|
|
|
- color: #fff;
|
|
|
- background: #3764ff;
|
|
|
+ color: #3764ff;
|
|
|
+ background: #fff;
|
|
|
border: 1px solid #3764ff;
|
|
|
}
|
|
|
}
|
|
|
.tit_box {
|
|
|
.box-us {
|
|
|
+ background: #f4f5f7;
|
|
|
padding: 5px 20px;
|
|
|
margin: 5px;
|
|
|
margin-right: 18px;
|
|
|
+ color: #999999;
|
|
|
border-radius: 5px;
|
|
|
+ border: 1px solid #dedede;
|
|
|
cursor: pointer;
|
|
|
width: 100px;
|
|
|
display: inline-block;
|
|
|
text-align: center;
|
|
|
- color: #3764ff;
|
|
|
- background: #fff;
|
|
|
- border: 1px solid #3764ff;
|
|
|
}
|
|
|
.box-us-foc {
|
|
|
- color: #fff;
|
|
|
- background: #3764ff;
|
|
|
+ color: #3764ff;
|
|
|
+ background: #fff;
|
|
|
border: 1px solid #3764ff;
|
|
|
}
|
|
|
}
|
