|
@@ -84,7 +84,7 @@
|
|
class="matched-block"
|
|
class="matched-block"
|
|
>
|
|
>
|
|
<Row type="flex" justify="space-between" align="top">
|
|
<Row type="flex" justify="space-between" align="top">
|
|
- <Col span="4" v-if="matched_info.matching_status == 1" style="display:flex;justify-content: space-around;">
|
|
|
|
|
|
+ <Col style="display:flex;justify-content: space-around;">
|
|
<div v-if="matched_info.matching_status == 2">
|
|
<div v-if="matched_info.matching_status == 2">
|
|
<Checkbox
|
|
<Checkbox
|
|
v-show="matched_info.produce_status == 0"
|
|
v-show="matched_info.produce_status == 0"
|
|
@@ -308,6 +308,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
|
+import colorSettingVue from '../../BasicSettings/colorSetting.vue';
|
|
// 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
|
|
// 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
|
|
// 例如:import 《组件名称》 from '《组件路径》';
|
|
// 例如:import 《组件名称》 from '《组件路径》';
|
|
|
|
|
|
@@ -402,7 +403,7 @@ export default {
|
|
},
|
|
},
|
|
handleMatchedSelect(row, e) {
|
|
handleMatchedSelect(row, e) {
|
|
row.isSelect = e;
|
|
row.isSelect = e;
|
|
-
|
|
|
|
|
|
+ console.log(row)
|
|
let flag = true;
|
|
let flag = true;
|
|
this.matchedSelectedList = [];
|
|
this.matchedSelectedList = [];
|
|
this.matchedList.map((v) => {
|
|
this.matchedList.map((v) => {
|
|
@@ -443,6 +444,7 @@ export default {
|
|
if (res.code == 200) {
|
|
if (res.code == 200) {
|
|
this.$Message.success(res.msg);
|
|
this.$Message.success(res.msg);
|
|
this.processModal = false;
|
|
this.processModal = false;
|
|
|
|
+ this.initData();
|
|
}
|
|
}
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
this.process_control = false;
|
|
this.process_control = false;
|
|
@@ -459,13 +461,20 @@ export default {
|
|
},
|
|
},
|
|
})
|
|
})
|
|
.then((res) => {
|
|
.then((res) => {
|
|
- console.log(res);
|
|
|
|
res.data.list.map((v) => {
|
|
res.data.list.map((v) => {
|
|
v.isCurrenct = false;
|
|
v.isCurrenct = false;
|
|
});
|
|
});
|
|
this.urlMatchedList = res.data.image_number;
|
|
this.urlMatchedList = res.data.image_number;
|
|
this.productMatchedList = res.data.product_name;
|
|
this.productMatchedList = res.data.product_name;
|
|
- this.matchedList = res.data.list;
|
|
|
|
|
|
+ // this.matchedList = res.data.list;
|
|
|
|
+ res.data.list.forEach((v,index)=>{
|
|
|
|
+ if(v.matching_status==2){
|
|
|
|
+ console.log(this.matchedList)
|
|
|
|
+ this.matchedList.push(v)
|
|
|
|
+ console.log(this.matchedList)
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ console.log(this.matchedList)
|
|
});
|
|
});
|
|
},
|
|
},
|
|
handleHiddenMatchedDetail(row) {
|
|
handleHiddenMatchedDetail(row) {
|