|
@@ -28,14 +28,14 @@
|
|
|
>
|
|
|
</Toptitle>
|
|
|
<div class="top-info">
|
|
|
- <Row align="middle">
|
|
|
- <Col span="6">
|
|
|
+ <Row align="middle" type="flex" justify="space-between">
|
|
|
+ <Col>
|
|
|
<span>项目编号:</span><span>{{ info.project_number }}</span>
|
|
|
</Col>
|
|
|
- <Col span="4"
|
|
|
- ><span>项目名称:</span><span>{{ info.project_name }}</span>
|
|
|
+ <Col>
|
|
|
+ <span>项目名称:</span><span>{{ info.project_name }}</span>
|
|
|
</Col>
|
|
|
- <Col span="6" v-if="currencyTag == 1">
|
|
|
+ <Col v-if="currencyTag == 1">
|
|
|
<span>图号:</span>
|
|
|
<span>
|
|
|
<Select
|
|
@@ -57,7 +57,7 @@
|
|
|
</Select>
|
|
|
</span>
|
|
|
</Col>
|
|
|
- <Col span="6" v-if="currencyTag == 1">
|
|
|
+ <Col v-if="currencyTag == 1">
|
|
|
<span>产品名称:</span>
|
|
|
<span>
|
|
|
<Select
|
|
@@ -79,7 +79,7 @@
|
|
|
</Select>
|
|
|
</span>
|
|
|
</Col>
|
|
|
- <Col span="2" v-if="currencyTag == 1">
|
|
|
+ <Col v-if="currencyTag == 1">
|
|
|
<Button @click="handleSearchUnmatchedInfo" type="primary">
|
|
|
确认
|
|
|
</Button>
|
|
@@ -506,6 +506,7 @@
|
|
|
<Row>
|
|
|
<Col span="2">
|
|
|
<Checkbox
|
|
|
+ v-show="matched_info.produce_status == 0"
|
|
|
v-model="matched_info.isSelect"
|
|
|
@on-change="(e) => handleMatchedSelect(matched_info, e)"
|
|
|
>选择</Checkbox
|
|
@@ -522,6 +523,7 @@
|
|
|
@click="handleMatchedSet(matched_info, -1, 5)"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
+ :disabled="matched_info.produce_status > 0"
|
|
|
style="margin-right: 10px"
|
|
|
>撤销匹配</Button
|
|
|
>
|
|
@@ -1117,24 +1119,25 @@ export default {
|
|
|
handleMatchedSelectAll() {
|
|
|
this.isMatchedSelectAll = !this.isMatchedSelectAll;
|
|
|
this.matchedList.map((v) => {
|
|
|
- v.isSelect = this.isMatchedSelectAll;
|
|
|
+ if (v.produce_status == 0) {
|
|
|
+ v.isSelect = this.isMatchedSelectAll;
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
handleMatchedSelect(row, e) {
|
|
|
row.isSelect = e;
|
|
|
- let flag = true
|
|
|
- this.matchedSelectedList = this.matchedList.map((v) => {
|
|
|
- if (!v.isSelect) {
|
|
|
- flag = false
|
|
|
+ let flag = true;
|
|
|
+ this.matchedSelectedList = [];
|
|
|
+ this.matchedList.map((v) => {
|
|
|
+ if (v.produce_status == 0) {
|
|
|
+ if (v.isSelect) {
|
|
|
+ this.matchedSelectedList.push(v.id);
|
|
|
+ } else {
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
}
|
|
|
- return v.id;
|
|
|
});
|
|
|
- this.isMatchedSelectAll = flag
|
|
|
- // for (let index = 0; index < this.matchedDetailList.length; index++) {
|
|
|
- // const element = this.matchedDetailList[index];
|
|
|
- // this.$refs["matched" + index][0].selectAll(bool);
|
|
|
- // console.log('this.$refs :>> ', this.$refs['matched'+index]);
|
|
|
- // }
|
|
|
+ this.isMatchedSelectAll = flag;
|
|
|
},
|
|
|
handleMatchedSet(row, index, type) {
|
|
|
switch (type) {
|
|
@@ -1182,7 +1185,7 @@ export default {
|
|
|
}
|
|
|
.context-tabs {
|
|
|
position: relative;
|
|
|
- max-height: 650px;
|
|
|
+ max-height: 80%;
|
|
|
overflow: hidden;
|
|
|
overflow-y: auto;
|
|
|
padding: 15px;
|
|
@@ -1215,7 +1218,7 @@ export default {
|
|
|
}
|
|
|
.sheet-block,
|
|
|
.room-block {
|
|
|
- max-height: 500px;
|
|
|
+ max-height: 100%;
|
|
|
overflow: hidden;
|
|
|
overflow-y: auto;
|
|
|
}
|