|
@@ -12,7 +12,7 @@
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<el-tabs v-model="activeName" @tab-click="handleClick">
|
|
|
- <dilTable v-bind.sync="option1" ref="table"> </dilTable>
|
|
|
+ <mergeRowTable v-bind.sync="option1" ref="table"> </mergeRowTable>
|
|
|
</el-tabs>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -27,7 +27,11 @@ export default {
|
|
|
activeName: "first",
|
|
|
option1: {
|
|
|
// 表格请求数据的地址
|
|
|
- requestUrl: "/api/v1/wmsh/getOutBoundResult?apiId=159"
|
|
|
+ requestUrl: "/api/v1/wmsh/getUnLockPortStock?apiId=494",
|
|
|
+ comparison:"resultNumber",
|
|
|
+ columnIndexs:[
|
|
|
+ 0,1,2,3,4,5
|
|
|
+ ]
|
|
|
}
|
|
|
};
|
|
|
},
|
|
@@ -36,7 +40,7 @@ export default {
|
|
|
onclick() {
|
|
|
if (this.activeName == "first") {
|
|
|
this.option1.requestUrl =
|
|
|
- "/api/v1/wmsh/getOutBoundResult?apiId=159&con=" + this.input;
|
|
|
+ "/api/v1/wmsh/getUnLockPortStock?apiId=494&con=" + this.input;
|
|
|
}
|
|
|
},
|
|
|
insert() {
|