Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-08-24 11:15:56 +08:00
@@ -734,7 +734,8 @@ export default {
}, res => {
if (res.ok) {
// this.$message.success(res.message)
this.getDataList()
// this.getDataList()
this.showLocalProductData(this.getLocalPro)
}
}, e => {
});
@@ -838,7 +839,8 @@ export default {
this.proId = this.localProEO.id
// 查询详情表格数据
this.$http.get('sarStandProjectLibrary/queryStandInfo', {
id: this.localProEO.id
id: this.localProEO.id,
cars: "1"
}, {
_this: this,
loading: 'loading'