conghelong 1 year ago
parent
commit
9536def25c

+ 1 - 32
api/handleAffairs/dept.js

@@ -4,40 +4,9 @@ import request from '@/utils/request'
 // 查询部门列表
 export function listdept(query) {
   return request({
-    url: '/system/matter/listdept',
+    url: '/jnb/matter/listdept',
     method: 'get',
     params: query
   })
 }
 
-// // 查询部门详细
-// export function getDept(id) {
-//   return request({
-//     url: '/system/department/lists/' + id,
-//     method: 'get'
-//   })
-// }
-// // 新增部门
-// export function addDept(data) {
-//   return request({
-//     url: '/system/department/add',
-//     method: 'post',
-//     data: data
-//   })
-// }
-
-// // 修改部门
-// export function updateDept(data) {
-//   return request({
-//     url: '/system/department/update/',
-//     method: 'put',
-//     data: data
-//   })
-// }
-
-// // 删除部门
-// export function delDept(id) {
-//   return request({
-//     url: '/system/department/delete/' + id,
-//     method: 'delete'
-//   })}

+ 1 - 1
api/handleAffairs/gridType.js

@@ -28,7 +28,7 @@ export function addGridType(data) {
 // 查询主题事项列表
 export function listMatters(query) {
   return request({
-    url: '/system/matter/list',
+    url: '/jnb/matter/list',
     method: 'get',
     params: query
   })

+ 9 - 9
api/handleAffairs/matter.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询事项列表
 export function listDept(query) {
   return request({
-    url: '/system/collect/list',
+    url: '/jnb/collect/list',
     method: 'get',
     params: query
   })
@@ -11,7 +11,7 @@ export function listDept(query) {
 // 查询事项列表
 export function getMattersAll(query) {
   return request({
-    url: '/system/matter/listAll',
+    url: '/jnb/matter/listAll',
     method: 'get',
     params: query
   })
@@ -19,14 +19,14 @@ export function getMattersAll(query) {
 // 查询事项详细
 export function getDept(id) {
   return request({
-    url: '/system/matter/lists/' + id,
+    url: '/jnb/matter/lists/' + id,
     method: 'get'
   })
 }
 // 新增事项
 export function addsc(data) {
   return request({
-    url: '/system/matter/add',
+    url: '/jnb/matter/add',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function addsc(data) {
 // 查询事项列表
 export function listMatters(query) {
   return request({
-    url: '/system/matter/list',
+    url: '/jnb/matter/list',
     method: 'get',
     params: query
   })
@@ -43,7 +43,7 @@ export function listMatters(query) {
 // 收藏事项
 export function scadd(data) {
   return request({
-    url: '/system/collect/add',
+    url: '/jnb/collect/add',
     method: 'post',
     data: data
   })
@@ -52,14 +52,14 @@ export function scadd(data) {
 // 查询事项收藏详细
 export function collectlist(id) {
   return request({
-    url: '/system/collect/collectlist/' + id,
+    url: '/jnb/collect/collectlist/' + id,
     method: 'get'
   })
 }
 
 export function getsc(query) {
   return request({
-    url: '/system/collect/lists',
+    url: '/jnb/collect/lists',
     method: 'get',
     params: query
     
@@ -70,6 +70,6 @@ export function getsc(query) {
 // 取消收藏事项
 export function delDept(id) {
   return request({
-    url: '/system/collect/delete/' + id,
+    url: '/jnb/collect/delete/' + id,
     method: 'delete'
   })}

+ 3 - 3
api/me/matters/matters.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 我的事项列表
 export function getMattersList(query) {
   return request({
-    url: '/system/matter/list',
+    url: '/jnb/matter/list',
     method: 'get',
 	params:query
   })
@@ -12,7 +12,7 @@ export function getMattersList(query) {
 // 事项详情
 export function getMattersDetail(id) {
   return request({
-    url: `/system/matter/lists/${id}`,
+    url: `/jnb/matter/lists/${id}`,
     method: 'get'
   })
 }
@@ -29,7 +29,7 @@ export function getListTopicType(query) {
 // 查询部门列表
 export function getListDepts(query) {
   return request({
-    url: `/system/department/list`,
+    url: `/jnb/department/list`,
     method: 'get',
 	params: query
   })

+ 1 - 1
pages/handleAffairs/dept/dept.vue

@@ -65,7 +65,7 @@
 				}
 				listdept(data).then(res => {
 					_that.dataList = res.data
-					console.log("9999999999999999999999",_that.dataList)
+					
 				})
 
 			},

+ 0 - 1
pages/handleAffairs/matterAll/matterAll.vue

@@ -76,7 +76,6 @@
 				listMatters(_that.queryForm).then(res => {
 					
 					_that.dataList = res.rows
-					console.log("5555555555555555",_that.dataList)
 					_that.total = res.total
 
 				})

+ 1 - 1
pages/handleAffairs/mattercontent/mattercontent.vue

@@ -62,7 +62,7 @@
 				const matterId = this.matterlist.id
 				getsc({ matterId , userId }).then(res => {
 					this.isFavorite = res.data;
-					console.log('111111111111111111',this.isFavorite)
+					
 				});
 			},
 		},

+ 26 - 26
pages/handleAffairs/mattersAdd/mattersAdd.vue

@@ -27,7 +27,7 @@
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.type"
 						  placeholder="请选择主题类型"
-						  field="deptName as value, deptName as text"
+						  field="id as value, deptName as text"
 						  :localdata="topicTypeList"
 					></uni-data-select>
 				</uni-forms-item>
@@ -37,7 +37,7 @@
 						  style="width: 30%;margin: auto;"
 						  v-model="formData.department"
 						  placeholder="请选择所属部门"
-						  field="name as value, name as text"
+						  field="id as value, name as text"
 						  :localdata="departmentList"
 					></uni-data-select>
 				</uni-forms-item>
@@ -75,7 +75,7 @@
 				e.rows.forEach(v => {
 					this.topicTypeList.push({
 						text:v.deptName,
-						value:v.deptName
+						value:v.id
 					})
 				})
 			})
@@ -83,7 +83,7 @@
 				e.rows.forEach(v => {
 					this.departmentList.push({
 						text:v.name,
-						value:v.name
+						value:v.id
 					})
 				})
 			})
@@ -133,28 +133,28 @@
 							}
 						]
 					},
-					type: {
-						rules: [{
-								required: true,
-								errorMessage: '请选择主题类型'
-							},
-							{
-								minLength: 1,
-								errorMessage: '主题类型不得为空'
-							}
-						]
-					},
-					department: {
-						rules: [{
-								required: true,
-								errorMessage: '请选择所属部门'
-							},
-							{
-								minLength: 1,
-								errorMessage: '所属部门不得为空'
-							}
-						]
-					},
+					// type: {
+					// 	rules: [{
+					// 			required: true,
+					// 			errorMessage: '请选择主题类型'
+					// 		},
+					// 		{
+					// 			minLength: 1,
+					// 			errorMessage: '主题类型不得为空'
+					// 		}
+					// 	]
+					// },
+					// department: {
+					// 	rules: [{
+					// 			required: true,
+					// 			errorMessage: '请选择所属部门'
+					// 		},
+					// 		{
+					// 			minLength: 1,
+					// 			errorMessage: '所属部门不得为空'
+					// 		}
+					// 	]
+					// },
 				// 	textDetails: {
 				// 		rules: [{
 				// 				required: true,