diff --git a/client/src/store/modules/user.js b/client/src/store/modules/user.js index 45701e8..18712d5 100644 --- a/client/src/store/modules/user.js +++ b/client/src/store/modules/user.js @@ -7,7 +7,8 @@ const getDefaultState = () => { token: getToken(), name: '', avatar: '', - perms: [] + perms: [], + dept:'' } } diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue index c32ba0b..42e4eb3 100644 --- a/client/src/views/ability/mQualityTask.vue +++ b/client/src/views/ability/mQualityTask.vue @@ -682,8 +682,13 @@ style="padding: 10px 20px;position: relative" >

新增能力

-

能力类型 :{{showData.data.atype_name}}

-

能力领域:{{showData.data.afield_name}}

+

能力类型 :{{showData.data.atype_name}}

+

能力领域:{{showData.data.afield_name}}

+ +

对象数量:{{showData.data.num}}

+

参数数量:{{showData.data.num2}}

+

方法标准数量:{{showData.data.num3}}

+

产品标准数量:{{showData.data.num4}}

上传文件:{{showData.data.file_.name}}

{{showData.data.file_.name}} @@ -716,8 +721,9 @@ diff --git a/client/src/views/ability/qualityTaskDo.vue b/client/src/views/ability/qualityTaskDo.vue index b91d6f2..57b612d 100644 --- a/client/src/views/ability/qualityTaskDo.vue +++ b/client/src/views/ability/qualityTaskDo.vue @@ -481,7 +481,7 @@ clickRow(row, col, e) { this.listLoading2 = true; this.detailItem = row; - this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.dept}; + this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.org}; this.getQactionList(); }, handleSelectRecords(val) { diff --git a/client/src/views/ability/recordselect.vue b/client/src/views/ability/recordselect.vue index a08a4c3..d9835cd 100644 --- a/client/src/views/ability/recordselect.vue +++ b/client/src/views/ability/recordselect.vue @@ -60,7 +60,6 @@ highlight-current-row max-height="600" @sort-change="changeTableSort" - :span-method="objectSpanMethod" > @@ -116,7 +115,7 @@ - +