diff --git a/back/public/index.html b/back/public/index.html
index 4869501d..465e77bf 100644
--- a/back/public/index.html
+++ b/back/public/index.html
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-04-11 10:11:40
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-08 14:13:20
+ * @LastEditTime: 2022-07-11 12:09:13
* @Description: 告诉大家这是什么
-->
@@ -43,8 +43,9 @@
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 9c8395e7..784284be 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -19,7 +19,7 @@ js:
@@ -30,6 +30,21 @@ js:
{{ itemSelect.dictLabel }}
+
+
+ {{ itemSelect.name }}
+
+
{
- console.log(res, 'res')
const dataList = []
res.data.list.forEach((element) => {
dataList.push(element)
- console.log(dataList, 'this.options')
})
this.options = dataList
- console.log(this.options)
})
.catch(() => {})
+ } else if (this.data.name === '归属部门') {
+ this.$http.get('/sys/dept/all').then(res => {
+ const dataList = []
+ res.data.data.forEach((element) => {
+ dataList.push(element)
+ })
+ this.options = dataList
+ if (!this.data.note1) {
+ this.$http.get('/sys/user/info').then(({ data: res }) => {
+ this.data.note1 = res.data.deptId
+ })
+ }
+ })
}
},
chekBoxChange (list) {
@@ -102,10 +127,16 @@ export default {
str += ';'
}
})
- // console.log(str)
this.data.note1 = str
}
},
+ created () {
+ if (this.data.name === '应用领域') {
+ if (this.data.note1) {
+ this.valueCheckBox = this.data.note1.split(';')
+ }
+ }
+ },
mounted () {
this.selectOptions()
}
diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue
index 77fa3e34..ee40bfcc 100644
--- a/back/src/views/modules/putOnTheShelf/components/special.vue
+++ b/back/src/views/modules/putOnTheShelf/components/special.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:54:50
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-09 10:54:48
+ * @LastEditTime: 2022-07-11 15:00:24
* @Description: 多条数据特殊处理
-->
@@ -62,7 +62,8 @@ export default {
upload
},
props: {
- configure: Object
+ configure: Object,
+ showData: Object
},
data () {
return {
@@ -75,7 +76,6 @@ export default {
const list = this.configure.list
let flag = true
list.forEach((item) => {
- console.log(item)
if (item.type !== 'number' && !item.note1.length > 0) {
flag = false
} else if (item.type === 'number' && !item.note1 > 0) {
@@ -88,7 +88,6 @@ export default {
obj[item.field] = item.note1
})
this.data.push(obj)
- // console.log(data.value[title])
this.$emit('changeInfoList', {
attrType: title,
attrValue: JSON.stringify(this.data),
@@ -110,6 +109,17 @@ export default {
delFlag: 0
})
}
+ },
+ created () {
+ if (this.configure.name === '计费标准信息' || this.configure.name === '常见问题') {
+ if (this.showData.children[0].note1) {
+ this.data = JSON.parse(this.showData.children[0].note1)
+ }
+ } else {
+ if (this.showData.note1) {
+ this.data = JSON.parse(this.showData.note1)
+ }
+ }
}
}
diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue
index 5a0e8322..a257dfb0 100644
--- a/back/src/views/modules/putOnTheShelf/index.vue
+++ b/back/src/views/modules/putOnTheShelf/index.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-07-08 09:48:52
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-09 10:57:07
+ * @LastEditTime: 2022-07-11 15:11:10
* @Description: 告诉大家这是什么
-->
@@ -13,13 +13,15 @@
{{child.name}}
{{ item.name }}
-
- -->
+
-
+
-
@@ -31,7 +33,7 @@
-
+