bugfix

config/dev.env.js

@@ -35,8 +35,8 @@ module.exports = merge(prodEnv, {
         "/dcucauth": {
             // target: "http://10.11.1.237:8861"
             // target: "http://10.254.11.203:8861"
-             target: "http://192.168.10.2:8871"
-            //  target: "http://192.168.6.133:3471"
+            //  target: "http://192.168.10.2:8871"
+             target: "http://192.168.6.133:3471"
 
         }
     })

package-lock.json

@@ -4112,6 +4112,7 @@
       "version": "2.15.3",
       "resolved": "http://192.168.6.13:8082/repository/npm_all/element-ui/-/element-ui-2.15.3.tgz",
       "integrity": "sha1-VRCKuCo7zGRuewVwhxxIupYwBlI=",
+      "dev": true,
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
@@ -15173,18 +15174,18 @@
       }
     },
     "ui-component-v4": {
-      "version": "1.2.19",
-      "resolved": "http://192.168.6.13:8082/repository/npm_all/ui-component-v4/-/ui-component-v4-1.2.19.tgz",
-      "integrity": "sha512-H1CGe3Ug8w5NNrlq+eNaFJ1wyTADRFDTAvHXWrs5mfZJFoNCkKwmL6/3AvLapFreR2K1+crqgb7GXabWmmRXDg==",
+      "version": "1.2.43",
+      "resolved": "http://192.168.6.13:8082/repository/npm_all/ui-component-v4/-/ui-component-v4-1.2.43.tgz",
+      "integrity": "sha512-38CcMrNUREK2Nl9EvOvApbyPxac2q3mm4Xx6aId5rh3BzN+eMGewlrgHN2+iJndCY5jG7Nbn6Zu/BUx050I8NA==",
       "requires": {
         "async-validator": "~1.8.1",
         "babel-helper-vue-jsx-merge-props": "^2.0.0",
         "dayjs": "^1.8.35",
         "deepmerge": "^1.2.0",
         "diff-match-patch": "^1.0.4",
-        "element-ui": "^2.11.1",
+        "element-ui": "2.11.1",
         "jquery": "^3.4.1",
-        "lodash": "^4.17.11",
+        "lodash": "^4.17.21",
         "mime": "^2.4.0",
         "normalize-wheel": "^1.0.1",
         "prettier": "^1.18.2",
@@ -15195,6 +15196,19 @@
         "xe-utils": "^1.9.4"
       },
       "dependencies": {
+        "element-ui": {
+          "version": "2.11.1",
+          "resolved": "http://192.168.6.13:8082/repository/npm_all/element-ui/-/element-ui-2.11.1.tgz",
+          "integrity": "sha1-K2f57uPtouaISHPBxYnL4w2anWA=",
+          "requires": {
+            "async-validator": "~1.8.1",
+            "babel-helper-vue-jsx-merge-props": "^2.0.0",
+            "deepmerge": "^1.2.0",
+            "normalize-wheel": "^1.0.1",
+            "resize-observer-polyfill": "^1.5.0",
+            "throttle-debounce": "^1.0.1"
+          }
+        },
         "mime": {
           "version": "2.5.2",
           "resolved": "http://192.168.6.13:8082/repository/npm_all/mime/-/mime-2.5.2.tgz",

package.json

@@ -41,7 +41,7 @@
     "postcss-salad": "^2.0.1",
     "request": "^2.88.2",
     "screenfull": "^4.0.0",
-    "ui-component-v4": "^1.2.19",
+    "ui-component-v4": "^1.2.43",
     "ui-gojs": "^2.1.9",
     "ui-jz-v4-common": "^1.2.222",
     "vue": "2.6.10",

src/pages/permission-selfhelp-manage/component/app-func-form.vue

@@ -70,9 +70,10 @@ export default {
     },
     // 树节点转成文字
     nodeTransferLabel(keys, tree) {
+      // 需要过滤匹配不到的
       const funcAttr = keys.map((item) => {
         return this.findIndexArray(tree, item, []);
-      });
+      }).filter(item => item !== false);
       let attr = [];
       for (let i = 0; i < funcAttr.length; i++) {
         const element = funcAttr[i].join('/');

src/pages/permission-selfhelp-manage/component/basic-form.vue

@@ -197,8 +197,7 @@
                 </dg-col>
                 <dg-col :span="10">
                   <dg-date-picker
-                    :start-value.sync="sizeForm.startTime"
-                    :end-value.sync="sizeForm.endTime"
+                    v-model="dateRange"
                     type="daterange"
                     range-separator="至"
                     start-placeholder="开始日期"
@@ -303,7 +302,7 @@ export default {
     // 验证有效期间
     const checkPermissionValid = (rule, val, callback) => {
       if (val == '01') {
-        if (!this.sizeForm.startTime && !this.sizeForm.endTime) {
+        if (!this.dateRange) {
           return callback(new Error('请选择开始时间和结束时间'));
         } else {
           callback();
@@ -347,6 +346,7 @@ export default {
           code: '02'
         }
       ],
+      dateRange: "",
       pickerOptions: {
         disabledDate(currentDate) {
           return currentDate.getTime() < Date.now() - 8.64e7;
@@ -454,19 +454,6 @@ export default {
     },
     // 切换审批类型,判断是否存在未审批的单,清空审批内容
     handleChangeApplyType(val) {
-      const params = {
-        applyType: val,
-        applicantIdcard: this.$store.getters.user.idcard
-      };
-      // Api.checkAppFunRepeat(params).then((res) => {
-      //   const { result, msg } = res.data;
-      //   if (result == '300') {
-      //     this.repeatApply = msg;
-      //     this.visible = true;
-      //   } else {
-      //     this.repeatApply = '';
-      //   }
-      // });
       this.sizeForm.flowContent = '';
       this.sizeForm.resourceInfos = [];
       this.applySelectKeys = [];
@@ -500,7 +487,10 @@ export default {
         delResourceInfos
       };
       let api = '';
-
+      if (this.sizeForm.permissionValidType == '01') {
+        this.sizeForm.startTime = this.dateRange[0];
+        this.sizeForm.endTime = this.dateRange[1];
+      }
       if (this.type == 'add') {
         params['workFlow'] = otherInfo;
         api = 'savePermissionApply';
@@ -628,6 +618,9 @@ export default {
           delResourceInfos,
           ...otherInfo
         };
+        if (this.sizeForm.permissionValidType == '01') {
+           this.dateRange = [this.sizeForm.startTime, this.sizeForm.endTime];
+        }
         const delResourceInfoIds = delResourceInfos.map((item) => item.funId);
         // 默认选中节点 = 新增节点 + ( 已有节点 - 欲撤销节点 )
         this.applySelectKeys = [