diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue index db1157f0..0333e984 100644 --- a/back/src/views/modules/putOnTheShelf/components/special.vue +++ b/back/src/views/modules/putOnTheShelf/components/special.vue @@ -104,8 +104,17 @@ export default { }) if (flag) { const obj = {} + let sfFlag = false + list.forEach((item) => { if (item.type === 'input2') { + sfFlag = this.data.filter( + (val) => val.type === this.numType + )[0] + if (sfFlag) { + this.$message.warning('已添加过该类型！') + return + } obj[item.field] = item.note1 + (this.numType === '一次性买断' @@ -121,7 +130,10 @@ export default { obj[item.field] = item.note1 } }) - this.data.push(obj) + if (!sfFlag) { + this.data.push(obj) + } + // this.data.push(obj) this.$emit('changeInfoList', { attrType: title, attrValue: JSON.stringify(this.data), diff --git a/front/public/index.html b/front/public/index.html index d2dc40f3..2eb674ba 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-16 16:01:48 + * @LastEditTime: 2022-07-18 14:09:10 * @Description: 告诉大家这是什么 --> @@ -49,7 +49,7 @@ window.SITE_CONFIG['backUrl'] = 'http://localhost:8001'; window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index acba5bf8..d66ea6b5 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -1,13 +1,13 @@ /* * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-18 11:34:38 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-07-18 15:07:32 * @Description: 数据资源参数配置 */ -//const newLocation = 'qingdao' +const newLocation = 'qingdao' // const newLocation = 'baotou' -const newLocation = 'xihaian' +// const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 99066335..a106e878 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -1,8 +1,8 @@