|
@@ -130,6 +130,13 @@
|
|
|
@click="handleSee(scope.row)"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
+ @click="handleSeeOrg(scope.row)"
|
|
|
+ >分配组织</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -340,8 +347,15 @@
|
|
|
</el-form-item></el-col
|
|
|
>
|
|
|
<el-col :span="14">
|
|
|
- <el-form-item label="提醒内容:" prop="remindContent" style="line-height:6px !important">
|
|
|
- <span v-html="deatilData.remindContent" style="display: flex;justify-content: start;"></span>
|
|
|
+ <el-form-item
|
|
|
+ label="提醒内容:"
|
|
|
+ prop="remindContent"
|
|
|
+ style="line-height: 6px !important"
|
|
|
+ >
|
|
|
+ <span
|
|
|
+ v-html="deatilData.remindContent"
|
|
|
+ style="display: flex; justify-content: start"
|
|
|
+ ></span>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -419,7 +433,10 @@
|
|
|
<el-row :gutter="20" v-if="deatilData2.doneFileUrls">
|
|
|
<el-col :span="14">
|
|
|
<el-form-item label="完成情况附件:" prop="doneFileUrls">
|
|
|
- <fileUpload v-model="deatilData2.doneFileUrls" :isShowTip="false" />
|
|
|
+ <fileUpload
|
|
|
+ v-model="deatilData2.doneFileUrls"
|
|
|
+ :isShowTip="false"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -470,7 +487,11 @@ import {
|
|
|
getuserinfo,
|
|
|
remindBroadFinish,
|
|
|
} from "@/api/backend/remindInfo";
|
|
|
-import { getRemindBroad, getRemindBroadPage, getDepts } from "@/api/backend/remindBroad";
|
|
|
+import {
|
|
|
+ getRemindBroad,
|
|
|
+ getRemindBroadPage,
|
|
|
+ getDepts,
|
|
|
+} from "@/api/backend/remindBroad";
|
|
|
import { getUserProfile } from "@/api/system/user";
|
|
|
import Editor from "@/components/Editor";
|
|
|
import choiceOrange from "@/components/choiceOrange";
|
|
@@ -515,6 +536,7 @@ export default {
|
|
|
pubDateEnd: null,
|
|
|
doneDateStart: null,
|
|
|
doneDateEnd: null,
|
|
|
+ remindInfoId: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
@@ -557,7 +579,7 @@ export default {
|
|
|
getUserProfile().then((response) => {
|
|
|
this.form.deptId = response.data ? response.data.dept.id : "";
|
|
|
this.userType = this.form.deptId;
|
|
|
- console.log('this.userType', this.userType)
|
|
|
+ console.log("this.userType", this.userType);
|
|
|
getuserinfo(response.data.id)
|
|
|
.then((res) => {
|
|
|
this.streetId = res.data.streetInfo.id;
|
|
@@ -579,7 +601,9 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 查询列表 */
|
|
|
- getList() {
|
|
|
+ getList(seeId) {
|
|
|
+ this.list = []
|
|
|
+ console.log('seeId=====', seeId)
|
|
|
this.loading = true;
|
|
|
this.queryParams.userId = this.$store.state.user.id;
|
|
|
// 执行查询
|
|
@@ -597,14 +621,19 @@ export default {
|
|
|
this.total = response.data.total;
|
|
|
});
|
|
|
} else {
|
|
|
+ this.queryParams.remindInfoId = null;
|
|
|
//已接受和信息反馈的接口
|
|
|
if (this.taskStatus == 1) {
|
|
|
this.queryParams.reciver =
|
|
|
this.userType > 10000 ? this.streetId : this.userType;
|
|
|
this.queryParams.sender = null;
|
|
|
- } else {
|
|
|
+ } else if (this.taskStatus != 1 && !seeId) {
|
|
|
this.queryParams.sender = this.userType;
|
|
|
this.queryParams.reciver = null;
|
|
|
+ } else if (seeId) {
|
|
|
+ this.queryParams.sender = null;
|
|
|
+ this.queryParams.reciver = null;
|
|
|
+ this.queryParams.remindInfoId = seeId;
|
|
|
}
|
|
|
getRemindBroadPage(this.queryParams).then((response) => {
|
|
|
this.loading = false;
|
|
@@ -726,6 +755,12 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
+ handleSeeOrg(row) {
|
|
|
+ //查看分配组织
|
|
|
+ this.selectedTab = "type2";
|
|
|
+ this.taskStatus = "2"
|
|
|
+ this.getList(row.id);
|
|
|
+ },
|
|
|
/** 取消按钮 */
|
|
|
cancelComplete() {
|
|
|
this.openSeeComplete = false;
|