|
@@ -344,7 +344,8 @@
|
|
size="mini"
|
|
size="mini"
|
|
@click="submitChooseBeiGoods(scope.row)"
|
|
@click="submitChooseBeiGoods(scope.row)"
|
|
:disabled="scope.row.selected"
|
|
:disabled="scope.row.selected"
|
|
- >选择</el-button
|
|
|
|
|
|
+ >选择
|
|
|
|
+ </el-button
|
|
>
|
|
>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -513,7 +514,8 @@
|
|
size="mini"
|
|
size="mini"
|
|
@click="submitChooseKeGoods(scope.row)"
|
|
@click="submitChooseKeGoods(scope.row)"
|
|
:disabled="scope.row.selected"
|
|
:disabled="scope.row.selected"
|
|
- >选择</el-button
|
|
|
|
|
|
+ >选择
|
|
|
|
+ </el-button
|
|
>
|
|
>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -614,7 +616,8 @@
|
|
<el-table-column align="center" width="80">
|
|
<el-table-column align="center" width="80">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button type="primary" size="mini" @click="submitChooseOrder(scope.row)" :disabled="scope.row.selected"
|
|
<el-button type="primary" size="mini" @click="submitChooseOrder(scope.row)" :disabled="scope.row.selected"
|
|
- >选择</el-button
|
|
|
|
|
|
+ >选择
|
|
|
|
+ </el-button
|
|
>
|
|
>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -813,7 +816,8 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
|
|
- created() {},
|
|
|
|
|
|
+ created() {
|
|
|
|
+ },
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
// 切换置换类型
|
|
// 切换置换类型
|
|
@@ -892,8 +896,10 @@ export default {
|
|
package: '',
|
|
package: '',
|
|
signType: 'MD5',
|
|
signType: 'MD5',
|
|
paySign: '',
|
|
paySign: '',
|
|
- success(res) {},
|
|
|
|
- fail(res) {}
|
|
|
|
|
|
+ success(res) {
|
|
|
|
+ },
|
|
|
|
+ fail(res) {
|
|
|
|
+ }
|
|
})
|
|
})
|
|
})
|
|
})
|
|
},
|
|
},
|
|
@@ -1038,6 +1044,7 @@ export default {
|
|
pageSize: 100,
|
|
pageSize: 100,
|
|
type: 2,
|
|
type: 2,
|
|
materialOldNumber: this.beiGoodsList[0].oldNumber,
|
|
materialOldNumber: this.beiGoodsList[0].oldNumber,
|
|
|
|
+ isOver: false,
|
|
...this.orderDialog_screenForm
|
|
...this.orderDialog_screenForm
|
|
}).then(res => {
|
|
}).then(res => {
|
|
let oldGoodsList = this.orderList
|
|
let oldGoodsList = this.orderList
|
|
@@ -1177,11 +1184,13 @@ export default {
|
|
height: 60px;
|
|
height: 60px;
|
|
border-bottom: 1px solid #dcdfe6;
|
|
border-bottom: 1px solid #dcdfe6;
|
|
margin-bottom: 20px;
|
|
margin-bottom: 20px;
|
|
|
|
+
|
|
.title {
|
|
.title {
|
|
font-size: 16px;
|
|
font-size: 16px;
|
|
padding-left: 10px;
|
|
padding-left: 10px;
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
}
|
|
}
|
|
|
|
+
|
|
.el-radio-group {
|
|
.el-radio-group {
|
|
margin-left: 30px;
|
|
margin-left: 30px;
|
|
}
|
|
}
|