|
@@ -169,6 +169,15 @@
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
+ icon="el-icon-view"
|
|
|
+ @click="handleSee(scope.row)"
|
|
|
+ >查看</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ <!-- <template v-slot="scope">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:update']"
|
|
@@ -228,7 +237,7 @@
|
|
|
>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
- </template>
|
|
|
+ </template> -->
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
@@ -302,17 +311,17 @@
|
|
|
@click="handleSee(scope.row)"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:update']"
|
|
|
>修改</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:delete']">删除</el-button> -->
|
|
|
- <el-dropdown
|
|
|
+ <!-- <el-dropdown
|
|
|
@command="
|
|
|
(command) => handleCommand(command, scope.$index, scope.row)
|
|
|
"
|
|
@@ -336,21 +345,23 @@
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配单位列表</el-dropdown-item
|
|
|
>
|
|
|
- <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
+
|
|
|
<el-dropdown-item
|
|
|
command="handleSelectedInsp"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配检查项列表</el-dropdown-item
|
|
|
- >
|
|
|
+ >
|
|
|
+ </el-dropdown-menu> -->
|
|
|
+ <!-- 写在el-dropdown-menu 第一阶段不需要了 -->
|
|
|
+ <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
+ icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
<!-- <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">分配检查项</el-dropdown-item> -->
|
|
|
<!-- <el-dropdown-item command="handPublish" size="mini" type="text"
|
|
|
icon="el-icon-circle-check">发布</el-dropdown-item> -->
|
|
|
- </el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ <!-- </el-dropdown> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -427,17 +438,17 @@
|
|
|
@click="handleSee(scope.row)"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
+ <!-- <el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:update']"
|
|
|
>修改</el-button
|
|
|
- >
|
|
|
+ > -->
|
|
|
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['backend:task-info:delete']">删除</el-button> -->
|
|
|
- <el-dropdown
|
|
|
+ <!-- <el-dropdown
|
|
|
@command="
|
|
|
(command) => handleCommand(command, scope.$index, scope.row)
|
|
|
"
|
|
@@ -461,8 +472,7 @@
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配单位列表</el-dropdown-item
|
|
|
>
|
|
|
- <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
+
|
|
|
<el-dropdown-item
|
|
|
command="handleSelectedInsp"
|
|
|
size="mini"
|
|
@@ -470,12 +480,9 @@
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配检查项列表</el-dropdown-item
|
|
|
>
|
|
|
- <!-- <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">分配检查项</el-dropdown-item> -->
|
|
|
- <!-- <el-dropdown-item command="handPublish" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">发布</el-dropdown-item> -->
|
|
|
+
|
|
|
</el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ </el-dropdown> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -556,7 +563,7 @@
|
|
|
@click="handleSee(scope.row)"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
- <el-dropdown
|
|
|
+ <!-- <el-dropdown
|
|
|
@command="
|
|
|
(command) => handleCommand(command, scope.$index, scope.row)
|
|
|
"
|
|
@@ -578,8 +585,6 @@
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配单位列表</el-dropdown-item
|
|
|
>
|
|
|
- <!-- <el-dropdown-item command="handleOrg" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">分配单位</el-dropdown-item> -->
|
|
|
<el-dropdown-item
|
|
|
command="handleSelectedInsp"
|
|
|
size="mini"
|
|
@@ -587,12 +592,8 @@
|
|
|
icon="el-icon-circle-check"
|
|
|
>已分配检查项列表</el-dropdown-item
|
|
|
>
|
|
|
- <!-- <el-dropdown-item command="handleInsp" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">分配检查项</el-dropdown-item> -->
|
|
|
- <!-- <el-dropdown-item command="handPublish" size="mini" type="text"
|
|
|
- icon="el-icon-circle-check">发布</el-dropdown-item> -->
|
|
|
</el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ </el-dropdown> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -1251,7 +1252,7 @@ export default {
|
|
|
this.taskStatus = type;
|
|
|
|
|
|
this.queryParams.taskStatus = type;
|
|
|
- console.log('type', type)
|
|
|
+ console.log("type", type);
|
|
|
switch (type) {
|
|
|
case "1":
|
|
|
this.selectedTab = "type1";
|
|
@@ -1327,19 +1328,21 @@ export default {
|
|
|
this.queryParams.iscycle = "1";
|
|
|
console.log(this.queryParams, "query");
|
|
|
getTaskInfoPage(this.queryParams).then((response) => {
|
|
|
- this.list = response.data!=null?response.data.list:[];
|
|
|
+ this.list = response.data != null ? response.data.list : [];
|
|
|
this.total = response.data.total;
|
|
|
this.loading = false;
|
|
|
});
|
|
|
} else {
|
|
|
- console.log('this.queryParams', this.queryParams)
|
|
|
+ console.log("this.queryParams", this.queryParams);
|
|
|
// 执行查询
|
|
|
- getNoPeriodicityPage(JSON.stringify(this.queryParams)).then((response) => {
|
|
|
- this.list = response.data!=null?response.data.list:[];
|
|
|
- console.log(response.data.list, "query1");
|
|
|
- this.total = response.data.total;
|
|
|
- this.loading = false;
|
|
|
- });
|
|
|
+ getNoPeriodicityPage(JSON.stringify(this.queryParams)).then(
|
|
|
+ (response) => {
|
|
|
+ this.list = response.data != null ? response.data.list : [];
|
|
|
+ console.log(response.data.list, "query1");
|
|
|
+ this.total = response.data.total;
|
|
|
+ this.loading = false;
|
|
|
+ }
|
|
|
+ );
|
|
|
}
|
|
|
},
|
|
|
/** 取消按钮 */
|
|
@@ -1407,7 +1410,7 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const id =row.taskId?row.taskId:row.id;
|
|
|
+ const id = row.taskId ? row.taskId : row.id;
|
|
|
getTaskInfo(id).then((response) => {
|
|
|
this.form = response.data != null ? response.data : {};
|
|
|
this.open = true;
|
|
@@ -1462,9 +1465,9 @@ export default {
|
|
|
let name =
|
|
|
row.taskInfoDO != null
|
|
|
? row.taskInfoDO.taskName
|
|
|
- :( row.taskName
|
|
|
+ : row.taskName
|
|
|
? row.taskName
|
|
|
- : "");
|
|
|
+ : "";
|
|
|
this.$modal
|
|
|
.confirm('是否确认删除名称为"' + name + '"的数据项?')
|
|
|
.then(function () {
|
|
@@ -1629,14 +1632,14 @@ export default {
|
|
|
// ============检查项信息确认按钮=====================================================
|
|
|
/** 检查项信息确认按钮 */
|
|
|
submitinsp() {
|
|
|
- this.alreadySelectedinspList =
|
|
|
- this.$refs["choiceTreeSelect"].confirmMSg();
|
|
|
- // 关闭弹窗
|
|
|
- this.openinsp = false;
|
|
|
- this.submitFormInsp(
|
|
|
- this.$refs["choiceTreeSelect"].confirmMSg(),
|
|
|
- this.$refs["choiceTreeSelect"].confirmoOrgTypeMSg()
|
|
|
- );
|
|
|
+ this.alreadySelectedinspList =
|
|
|
+ this.$refs["choiceTreeSelect"].confirmMSg();
|
|
|
+ // 关闭弹窗
|
|
|
+ this.openinsp = false;
|
|
|
+ this.submitFormInsp(
|
|
|
+ this.$refs["choiceTreeSelect"].confirmMSg(),
|
|
|
+ this.$refs["choiceTreeSelect"].confirmoOrgTypeMSg()
|
|
|
+ );
|
|
|
},
|
|
|
submitFormInsp(alreadySelectedinspList, inspectIds) {
|
|
|
var orgIds = [];
|
|
@@ -1649,11 +1652,13 @@ export default {
|
|
|
this.form.taskId = this.form.id;
|
|
|
console.log("this.form :>> ", this.form);
|
|
|
// =====================
|
|
|
- TaskInfoSetupinspect(this.form).then((response) => {
|
|
|
- this.$modal.msgSuccess('分配成功')
|
|
|
- }).catch((err)=>{
|
|
|
- this.$modal.msgError('请确认勾选内容是否移动到右侧区域中')
|
|
|
- });
|
|
|
+ TaskInfoSetupinspect(this.form)
|
|
|
+ .then((response) => {
|
|
|
+ this.$modal.msgSuccess("分配成功");
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ this.$modal.msgError("请确认勾选内容是否移动到右侧区域中");
|
|
|
+ });
|
|
|
},
|
|
|
// 取消按钮(分管单位)
|
|
|
cancelinsp() {
|