diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue index 3286441..44b48d7 100644 --- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue +++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue @@ -862,7 +862,7 @@ export default { return false } else { if ( - this.queryParams.leaseApplyDetails.length === 0 && + this.leaseApplyDetails.length === 0 && this.wholeTypeNameList.length === 0 ) { this.$message.error('请添加机具类型或成套设备') @@ -871,7 +871,7 @@ export default { let canSave = true - if (this.queryParams.leaseApplyDetails.length > 0) { + if (this.leaseApplyDetails.length > 0) { this.queryParams.leaseApplyDetails = this.leaseApplyDetails try { diff --git a/src/views/warehouseManage/machinery/type-nw/index.vue b/src/views/warehouseManage/machinery/type-nw/index.vue index 32f6e85..d975cf0 100644 --- a/src/views/warehouseManage/machinery/type-nw/index.vue +++ b/src/views/warehouseManage/machinery/type-nw/index.vue @@ -861,7 +861,7 @@ export default { getList() { this.loading = true getListByMaType(this.queryParams).then((response) => { - this.typeList = response.data + this.typeList = response.data.rows // this.total = response.total; this.loading = false }) diff --git a/vue.config.js b/vue.config.js index ed8f69c..531d3bf 100644 --- a/vue.config.js +++ b/vue.config.js @@ -42,7 +42,7 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - target: `http://192.168.2.158:39080`, //超 + target: `http://192.168.2.158:49080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://192.168.2.74:49080`, //旭/ // target: `http://192.168.2.17:39080`, //帅