|
|
@@ -47,8 +47,8 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="签署机构" prop="partyBOrg" class="formTreeItem">
|
|
|
- <tree-select
|
|
|
+ <el-form-item label="签署机构" prop="partyBOrg">
|
|
|
+ <!-- <tree-select
|
|
|
v-model="queryParams.partyBOrg"
|
|
|
:options="deptOptions"
|
|
|
:show-count="true"
|
|
|
@@ -59,8 +59,16 @@
|
|
|
:noChildrenText="''"
|
|
|
noOptionsText="没有数据"
|
|
|
noResultsText="没有搜索结果"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ /> -->
|
|
|
+ <org-tree
|
|
|
+ v-model="queryParams.partyBOrg"
|
|
|
+ @defaultKey="getDefaultKey"
|
|
|
+ @checkChange="checkChange"
|
|
|
+ @click="clickTreeNode"
|
|
|
+ :defaultCheckSub="true"
|
|
|
+ ref="orgTree"
|
|
|
+ ></org-tree>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10">
|
|
|
@@ -213,23 +221,22 @@ import DialogEdit from "./dialog.edit";
|
|
|
import DialogDes from "./dialog.des";
|
|
|
import { deptTreeSelect } from "@/api/system/public";
|
|
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
|
|
-import OrgTree from "@/components/orgTree/index.vue";
|
|
|
import kOrgTree from "@/components/k-orgTree/index.vue";
|
|
|
import KFileUpload from "@/components/K-FileUpload/index.vue";
|
|
|
import tableList from "@/mixins/tableList";
|
|
|
-import orgTree from "@/components/orgTree";
|
|
|
import dayjs from "dayjs";
|
|
|
import {imageUrl} from "@/utils/ruoyi";
|
|
|
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
|
|
|
+
|
|
|
export default {
|
|
|
dicts: ["safety_book_type"],
|
|
|
name: "safetyBook",
|
|
|
components: {
|
|
|
- OrgTree,
|
|
|
kOrgTree,
|
|
|
KFileUpload,
|
|
|
DialogEdit,
|
|
|
- orgTree,
|
|
|
DialogDes,
|
|
|
+ OrgTree
|
|
|
},
|
|
|
mixins: [tableList],
|
|
|
data() {
|
|
|
@@ -335,7 +342,7 @@ export default {
|
|
|
|
|
|
// 节点单击事件
|
|
|
clickTreeNode(data) {
|
|
|
- this.queryParams.orgId = data.id;
|
|
|
+ this.queryParams.partyBOrg = data.id;
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
/** 下穿状态改变*/
|
|
|
@@ -344,7 +351,7 @@ export default {
|
|
|
},
|
|
|
|
|
|
getDefaultKey(key) {
|
|
|
- this.queryParams.orgId = key;
|
|
|
+ this.queryParams.partyBOrg = key;
|
|
|
this.getList();
|
|
|
},
|
|
|
//单选框状态改变
|