合伙人

package-lock.json

@@ -182,7 +182,7 @@
     },
     "@riophae/vue-treeselect": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@riophae/vue-treeselect/-/vue-treeselect-0.4.0.tgz",
       "integrity": "sha512-J4atYmBqXQmiPFK/0B5sXKjtnGc21mBJEiyKIDZwk0Q9XuynVFX6IJ4EpaLmUgL5Tve7HAS7wkiGGSti6Uaxcg==",
       "requires": {
         "@babel/runtime": "^7.3.1",
@@ -2703,7 +2703,7 @@
     },
     "crypto-js": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
     "css-color-names": {
@@ -3077,7 +3077,7 @@
     },
     "decimal.js": {
       "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
       "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="
     },
     "decode-uri-component": {
@@ -6268,6 +6268,11 @@
       "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
       "dev": true
     },
+    "highlight.js": {
+      "version": "9.18.5",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.5.tgz",
+      "integrity": "sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA=="
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -7727,6 +7732,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz",
+      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
+    },
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -13780,6 +13790,16 @@
         }
       }
     },
+    "vue-doc-preview": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
+      "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
+      "requires": {
+        "axios": "^0.18.0",
+        "highlight.js": "^9.12.0",
+        "marked": "^0.4.0"
+      }
+    },
     "vue-draggable-resizable-gorkys": {
       "version": "2.4.8",
       "resolved": "https://registry.npmjs.org/vue-draggable-resizable-gorkys/-/vue-draggable-resizable-gorkys-2.4.8.tgz",
@@ -13992,7 +14012,7 @@
     },
     "vue-tree-to-table": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vue-tree-to-table/-/vue-tree-to-table-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-tree-to-table/-/vue-tree-to-table-1.0.4.tgz",
       "integrity": "sha512-uHVjc8Vu45JkIZEYexZDnuONSn+1IjWknIhDlkk4Qoo2LpGUcR+DaYQROGcIziAXULcUS94ye8Fzooy2KKFH3w==",
       "requires": {
         "element-ui": "^2.15.1",
@@ -14001,7 +14021,7 @@
       "dependencies": {
         "vue": {
           "version": "2.7.16",
-          "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+          "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.16.tgz",
           "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
           "requires": {
             "@vue/compiler-sfc": "2.7.16",

src/views/PeopleManage/Partner.vue

@@ -878,11 +878,12 @@ export default {
       this.$api.insCompany.queryRecommendAndPartner(this.formData.deptId,val).then((res) => {
         this.managerOptions = res.data;
       });
-      if(val!==1){
-        this.formDataRules.referrerId[0].required=true
+
+      if(val==1){
+        this.formDataRules.referrerId[0].required=false
       }
       else{
-        this.formDataRules.referrerId[0].required=false
+        this.formDataRules.referrerId[0].required=true
 
       }
      
@@ -946,10 +947,13 @@ export default {
     },
     // 提交
     submitForm() {
-      this.$refs.formDataDetails.$refs.formData.validate((valid) => {
-        this.formData.identityTime = this.formData.identityTime.join(',')
-        this.detailValid= valid;
-      })
+      // this.$refs.formDataDetails.$refs.formData.validate((valid) => {
+      //   this.formData.identityTime = this.formData.identityTime.join(',')
+      //   console.log(valid,this.formData,99999999);
+
+      //   this.detailValid= valid;
+      // })
+      this.$refs.formDataDetails.submit();
       this.formData.leaderName=''
       setTimeout(() => {
         this.$refs.formData.validate((valid) => {
@@ -1113,6 +1117,7 @@ export default {
         //   this.leaderOptions = res.data;
         // });
         res.data.sysUser.status += "";
+        res.data.sysUser.identityTimeArr = res.data.sysUser.identityTime ? res.data.sysUser.identityTime.split(',') : []
         this.formData = res.data.sysUser;
         if (this.formData.status == 0) {
           this.$set(this.formDataRules, "logoutTime", [