d

4eff8998 · 蒋勇 · d4f7452d · 4eff8998 · 4eff8998 · 4eff8998
Commit 4eff8998 authored May 14, 2020 by 蒋勇
4 changed files
--- a/iview-admin/src/view/components/tables/biztables.vue
+++ b/iview-admin/src/view/components/tables/biztables.vue
 <template>
-  <div  style="height:100%">
+  <div style="height:100%">
    <Card style="height:100%">
      <Drawer
        placement="right"
@@ -68,7 +68,6 @@
        v-model="showedform"
        width="70"
        @on-visible-change="ondrawvisable"
      >
        <Forms
          ref="edform"
@@ -170,6 +169,14 @@ export default {
      //     return callback();
      //   };
      // }
+    },
+    savebefore: {
+      type: Function,
+      default(){
+        return (key,row,cbk)=>{
+          return cbk(row)
+        }
+      }
    }
  },
  data() {
@@ -320,7 +327,9 @@ export default {
        this.$emit("onnew");
      }
      if (key == "save") {
-        console.log("beforevalid.........................");
+        console.log(
+          "beforevalid.........................================================"
+        );
        this.$refs.edform.validate(valid => {
          console.log("valid.........................", valid);
          if (valid) {
@@ -342,22 +351,30 @@ export default {
                }
              }
              console.log("before.......savbeformdata...............2");
-              saveFormData(url, row).then(res => {
+              this.$nextTick(() => {
-                let rtn = res.data;
+                if (this.savebefore) {
-                console.log(rtn);
+                  this.savebefore(key, row, data => {
-                if (rtn.status == 0) {
+                    saveFormData(url, data).then(res => {
-                  this.$refs.edform.resetForm();
+                      let rtn = res.data;
-                  this.fm_status = "normal";
+                      console.log(rtn);
-                  this.showedform = false;
+                      if (rtn.status == 0) {
-                  this.clickcount["save"] = this.clickcount["save"] - 1;
+                        this.$refs.edform.resetForm();
-                  this.$Message.success(msg);
+                        this.fm_status = "normal";
+                        this.showedform = false;
+                        this.clickcount["save"] = this.clickcount["save"] - 1;
+                        this.$Message.success(msg);
-                  this.fetchData();
+                        this.fetchData();
-                } else {
+                      } else {
-                  this.fm_status = "normal";
+                        this.fm_status = "normal";
-                  this.showedform = false;
+                        this.showedform = false;
-                  this.$Message.error("当前操作失败，请稍后重试或联系管理员.");
+                        this.$Message.error(
-                  this.fetchData();
+                          "当前操作失败，请稍后重试或联系管理员."
+                        );
+                        this.fetchData();
+                      }
+                    });
+                  });
                }
              });
            } else {
@@ -382,8 +399,7 @@ export default {
      if (key == "adv-search") {
        this.advsearch();
      }
-      this.$emit("onexec", key, row?row:null, btninfo);
+      this.$emit("onexec", key, row ? row : null, btninfo);
    },
    doquery(q, k) {
      if (k == "cancel-search") {
@@ -435,8 +451,8 @@ export default {
    }
  },
  created() {
-       console.log("created..........................................")
+    console.log("created..........................................");
-       console.log(this.metainfo)
+    console.log(this.metainfo);
  },
  computed: {
    searchinfo() {

--- a/iview-admin/src/view/components/tables/forms/jsoneditor.vue
+++ b/iview-admin/src/view/components/tables/forms/jsoneditor.vue
 <template>
  <div id="orgcard" style="height:100%">
    <Card style="height:100%">
-      <Alert type="warning">
+      <Alert type="error">
        <template slot="desc">
-          当前节点：
+          <Icon type="ios-alert-outline" />
+           双击编辑,单击选择
+          <br/>
+          &nbsp;&nbsp;  &nbsp;&nbsp;当前节点：
          {{currentData?currentData.title:"请选择操作节点"}}
        </template>
      </Alert>
@@ -134,7 +137,7 @@ export default {
                "span",
                {
                  on: {
-                    click: () => {
+                    "dblclick": () => {
                      this.onselnode(node, data);
                    }
                  }
@@ -170,7 +173,7 @@ export default {
                      width: "64px"
                    },
                    on: {
-                      click: () => {
+                     "click": () => {
                        this.append(data);
                      }
                    }
@@ -325,7 +328,7 @@ export default {
            "span",
            {
              on: {
-                click: $event => {
+                "dblclick": $event => {
                  $("span", ".ptree").removeClass("spansel");
                  $($event.target)
                    .parent()

--- a/iview-admin/src/view/userinfo/orginfo_page.vue
+++ b/iview-admin/src/view/userinfo/orginfo_page.vue
@@ -9,7 +9,7 @@
        @controlctl="controlctl"
        @drawaction="drawaction"
      ></OrgEditor>
-      <UserInfo ref="userinfo" slot="right"></UserInfo>
+      <UserInfo ref="userinfo" slot="right" :beforesave="beforesave"></UserInfo>
    </SplitPanel>
  </div>
 </template>
@@ -99,12 +99,20 @@ export default {
    });
  },
  methods: {
+    beforesave(key, row, cbk) {
+      //对row添加组织结构需要的字段
+      if(this.$refs.orgtree.currentData && this.$refs.orgtree.currentData.isPosition){
+         row.opath=this.$refs.orgtree.currentData.orgpath
+      }
+      console.log("before.save",key,row)
+      return cbk(row)
+    },
    setHeight() {
      let $orgdiv = $("#orgdiv");
      let el = $orgdiv.get()[0];
      let h = window.innerHeight - el.offsetTop;
      $orgdiv.css("height", h + "px");
-      this.$refs.userinfo.setHeight(h-120)
+      this.$refs.userinfo.setHeight(h - 120);
    },
    drawaction(v, fm) {
      if (fm.formModel.isPosition) {

--- a/iview-admin/src/view/userinfo/userinfo_page.vue
+++ b/iview-admin/src/view/userinfo/userinfo_page.vue
@@ -8,6 +8,7 @@
      isMulti
      @onnew="onnew"
      @onedit="onedit"
+      :savebefore="beforesave"
    ></BizTable>
  </div>
 </template>
@@ -21,6 +22,16 @@ export default {
  components: {
    BizTable
  },
+  props:{
+     beforesave:{
+       type:Function,
+       default(){
+         return (key,row,cbk)=>{
+           return cbk(row)
+         }
+       }
+     }
+  },
  methods: {
    setHeight(h){
        this.$refs.bt.setHeight(h)