Parcourir la Source

Merge branch 'developStateAndButton' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_UI into developStateAndButton

liuzhihui il y a 2 ans
Parent
commit
fdfa22bd45

BIN
.DS_Store


BIN
CallCenterWeb.UI/.DS_Store


+ 58 - 50
CallCenterWeb.UI/RMYYAPP/node_modules/.package-lock.json

@@ -1,53 +1,61 @@
1 1
 {
2
-    "name": "个人信息编辑表单",
3
-    "version": "1.0.1",
4
-    "lockfileVersion": 3,
5
-    "requires": true,
6
-    "packages": {
7
-        "node_modules/dingtalk-jsapi": {
8
-            "version": "3.0.12",
9
-            "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.12.tgz",
10
-            "integrity": "sha512-vSP5fGuSthytrIYsN9ITa4DIO5h0bhIIKmcIYIRdvHN0brhzn1IX3hkFtNNNnjg6+u+pHWT8bKH/PRheWIhOLQ==",
11
-            "dependencies": {
12
-                "promise-polyfill": "^7.1.0"
13
-            }
14
-        },
15
-        "node_modules/echarts": {
16
-            "version": "5.4.2",
17
-            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
18
-            "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
19
-            "dependencies": {
20
-                "tslib": "2.3.0",
21
-                "zrender": "5.4.3"
22
-            }
23
-        },
24
-        "node_modules/jsencrypt": {
25
-            "version": "3.3.1",
26
-            "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz",
27
-            "integrity": "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw=="
28
-        },
29
-        "node_modules/mpvue-echarts": {
30
-            "version": "0.3.2",
31
-            "resolved": "https://registry.npmjs.org/mpvue-echarts/-/mpvue-echarts-0.3.2.tgz",
32
-            "integrity": "sha512-KULGS1DOMNhXu3nBkBv6BtmnqjyHLc+2Dur7eW+2s2aic1NCOygglCMmAmMEU6/TGSR67ttFA2NYxXPUYbNhWQ=="
33
-        },
34
-        "node_modules/promise-polyfill": {
35
-            "version": "7.1.2",
36
-            "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
37
-            "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
38
-        },
39
-        "node_modules/tslib": {
40
-            "version": "2.3.0",
41
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
42
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
43
-        },
44
-        "node_modules/zrender": {
45
-            "version": "5.4.3",
46
-            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
47
-            "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
48
-            "dependencies": {
49
-                "tslib": "2.3.0"
50
-            }
51
-        }
2
+  "name": "ヾ(✿゚▽゚)ノ圆形进度条",
3
+  "version": "1.2",
4
+  "lockfileVersion": 3,
5
+  "requires": true,
6
+  "packages": {
7
+    "node_modules/dingtalk-jsapi": {
8
+      "version": "3.0.25",
9
+      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-3.0.25.tgz",
10
+      "integrity": "sha512-l+q2lRzTCH/00DM2EZ+GKFiP/3TZHOupCM7rpG/hgrNpYkexGvF/O6yDI0XNqSMs8iFqWv9haCLOPf1nvCqB/w==",
11
+      "dependencies": {
12
+        "promise-polyfill": "^7.1.0"
13
+      }
14
+    },
15
+    "node_modules/echarts": {
16
+      "version": "5.4.2",
17
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
18
+      "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
19
+      "dependencies": {
20
+        "tslib": "2.3.0",
21
+        "zrender": "5.4.3"
22
+      }
23
+    },
24
+    "node_modules/jsbn": {
25
+      "version": "1.1.0",
26
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
27
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
28
+    },
29
+    "node_modules/jsencrypt": {
30
+      "version": "3.3.2",
31
+      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz",
32
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
33
+    },
34
+    "node_modules/promise-polyfill": {
35
+      "version": "7.1.2",
36
+      "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
37
+      "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
38
+    },
39
+    "node_modules/sm-crypto": {
40
+      "version": "0.3.12",
41
+      "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.12.tgz",
42
+      "integrity": "sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==",
43
+      "dependencies": {
44
+        "jsbn": "^1.1.0"
45
+      }
46
+    },
47
+    "node_modules/tslib": {
48
+      "version": "2.3.0",
49
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
50
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
51
+    },
52
+    "node_modules/zrender": {
53
+      "version": "5.4.3",
54
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
55
+      "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
56
+      "dependencies": {
57
+        "tslib": "2.3.0"
58
+      }
52 59
     }
60
+  }
53 61
 }

+ 1 - 4
CallCenterWeb.UI/RMYYAPP/node_modules/dingtalk-jsapi/package.json

@@ -7,8 +7,5 @@
7 7
   "license": "MIT",
8 8
   "dependencies": {
9 9
     "promise-polyfill": "^7.1.0"
10
-  },
11
-  "__npminstall_done": true,
12
-  "_from": "dingtalk-jsapi@3.0.25",
13
-  "_resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.25.tgz"
10
+  }
14 11
 }

+ 67 - 70
CallCenterWeb.UI/RMYYAPP/node_modules/jsencrypt/package.json

@@ -1,74 +1,71 @@
1 1
 {
2
-  "name": "jsencrypt",
3
-  "version": "3.3.2",
4
-  "description": "A Javascript library to perform OpenSSL RSA Encryption, Decryption, and Key Generation.",
5
-  "main": "bin/jsencrypt.js",
6
-  "module": "lib/index.js",
7
-  "browser": "lib/index.js",
8
-  "types": "lib/index.d.ts",
9
-  "dependencies": {},
10
-  "devDependencies": {
11
-    "@babel/core": "^7.20.12",
12
-    "@babel/preset-env": "^7.20.2",
13
-    "@babel/preset-typescript": "^7.18.6",
14
-    "@babel/register": "^7.18.9",
15
-    "@types/expect": "^24.3.0",
16
-    "@types/mocha": "^10.0.0",
17
-    "@types/node": "^18.11.4",
18
-    "chai": "^4.3.6",
19
-    "dirty-chai": "^2.0.1",
20
-    "fs-jetpack": "^5.1.0",
21
-    "mocha": "^10.0.0",
22
-    "process": "^0.11.10",
23
-    "ts-mocha": "^10.0.0",
24
-    "ts-node": "^10.9.1",
25
-    "typescript": "^4.2.4",
26
-    "url": "^0.11.0",
27
-    "webpack": "^5.35.1",
28
-    "webpack-cli": "^4.6.0"
29
-  },
30
-  "files": [
31
-    "bin",
32
-    "lib"
33
-  ],
34
-  "scripts": {
35
-    "build:dev": "tsc && tsc --project tsconfig-def.json && webpack",
36
-    "build:test": "tsc && tsc --project tsconfig-def.json && webpack --config webpack.test.js",
37
-    "build:prod": "tsc && tsc --project tsconfig-def.json && webpack --config webpack.prod.js",
38
-    "build": "npm run build:dev && npm run build:test && npm run build:prod",
39
-    "serve": "bundle exec jekyll server --config _config.build.yml",
40
-    "test": "ts-mocha test/test.rsa.js"
41
-  },
42
-  "author": "Travis Tidwell <travis@form.io>",
43
-  "contributors": [
44
-    {
45
-      "name": "Travis Tidwell",
46
-      "email": "travis@form.io",
47
-      "url": "http://github.com/travist"
2
+    "name": "jsencrypt",
3
+    "version": "3.3.2",
4
+    "description": "A Javascript library to perform OpenSSL RSA Encryption, Decryption, and Key Generation.",
5
+    "main": "bin/jsencrypt.js",
6
+    "module": "lib/index.js",
7
+    "browser": "lib/index.js",
8
+    "types": "lib/index.d.ts",
9
+    "dependencies": {},
10
+    "devDependencies": {
11
+        "@babel/core": "^7.20.12",
12
+        "@babel/preset-env": "^7.20.2",
13
+        "@babel/preset-typescript": "^7.18.6",
14
+        "@babel/register": "^7.18.9",
15
+        "@types/expect": "^24.3.0",
16
+        "@types/mocha": "^10.0.0",
17
+        "@types/node": "^18.11.4",
18
+        "chai": "^4.3.6",
19
+        "dirty-chai": "^2.0.1",
20
+        "fs-jetpack": "^5.1.0",
21
+        "mocha": "^10.0.0",
22
+        "process": "^0.11.10",
23
+        "ts-mocha": "^10.0.0",
24
+        "ts-node": "^10.9.1",
25
+        "typescript": "^4.2.4",
26
+        "url": "^0.11.0",
27
+        "webpack": "^5.35.1",
28
+        "webpack-cli": "^4.6.0"
48 29
     },
49
-    {
50
-      "name": "Antonio",
51
-      "url": "https://github.com/zoloft"
30
+    "files": [
31
+        "bin",
32
+        "lib"
33
+    ],
34
+    "scripts": {
35
+        "build:dev": "tsc && tsc --project tsconfig-def.json && webpack",
36
+        "build:test": "tsc && tsc --project tsconfig-def.json && webpack --config webpack.test.js",
37
+        "build:prod": "tsc && tsc --project tsconfig-def.json && webpack --config webpack.prod.js",
38
+        "build": "npm run build:dev && npm run build:test && npm run build:prod",
39
+        "serve": "bundle exec jekyll server --config _config.build.yml",
40
+        "test": "ts-mocha test/test.rsa.js"
52 41
     },
53
-    {
54
-      "name": "Julio",
55
-      "url": "https://github.com/jmgaya"
42
+    "author": "Travis Tidwell <travis@form.io>",
43
+    "contributors": [
44
+        {
45
+            "name": "Travis Tidwell",
46
+            "email": "travis@form.io",
47
+            "url": "http://github.com/travist"
48
+        },
49
+        {
50
+            "name": "Antonio",
51
+            "url": "https://github.com/zoloft"
52
+        },
53
+        {
54
+            "name": "Julio",
55
+            "url": "https://github.com/jmgaya"
56
+        },
57
+        {
58
+            "name": "Taehyun Hwang",
59
+            "url": "https://github.com/HwangTaehyun"
60
+        }
61
+    ],
62
+    "homepage": "http://www.travistidwell.com/jsencrypt",
63
+    "repository": {
64
+        "type": "git",
65
+        "url": "git://github.com/travist/jsencrypt.git"
56 66
     },
57
-    {
58
-      "name": "Taehyun Hwang",
59
-      "url": "https://github.com/HwangTaehyun"
60
-    }
61
-  ],
62
-  "homepage": "http://www.travistidwell.com/jsencrypt",
63
-  "repository": {
64
-    "type": "git",
65
-    "url": "git://github.com/travist/jsencrypt.git"
66
-  },
67
-  "bugs": {
68
-    "url": "http://github.com/travist/jsencrypt/issues"
69
-  },
70
-  "license": "MIT",
71
-  "__npminstall_done": true,
72
-  "_from": "jsencrypt@3.3.2",
73
-  "_resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz"
74
-}
67
+    "bugs": {
68
+        "url": "http://github.com/travist/jsencrypt/issues"
69
+    },
70
+    "license": "MIT"
71
+}

+ 2 - 5
CallCenterWeb.UI/RMYYAPP/node_modules/promise-polyfill/package.json

@@ -59,8 +59,5 @@
59 59
     "ES6",
60 60
     "promises-aplus"
61 61
   ],
62
-  "dependencies": {},
63
-  "__npminstall_done": true,
64
-  "_from": "promise-polyfill@7.1.2",
65
-  "_resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz"
66
-}
62
+  "dependencies": {}
63
+}

+ 68 - 60
CallCenterWeb.UI/RMYYAPP/package-lock.json

@@ -1,63 +1,71 @@
1 1
 {
2
-    "name": "个人信息编辑表单",
3
-    "version": "1.0.1",
4
-    "lockfileVersion": 3,
5
-    "requires": true,
6
-    "packages": {
7
-        "": {
8
-            "name": "个人信息编辑表单",
9
-            "version": "1.0.1",
10
-            "dependencies": {
11
-                "dingtalk-jsapi": "^3.0.12",
12
-                "echarts": "^5.4.2",
13
-                "jsencrypt": "^3.3.1",
14
-                "mpvue-echarts": "^0.3.2"
15
-            }
16
-        },
17
-        "node_modules/dingtalk-jsapi": {
18
-            "version": "3.0.12",
19
-            "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.12.tgz",
20
-            "integrity": "sha512-vSP5fGuSthytrIYsN9ITa4DIO5h0bhIIKmcIYIRdvHN0brhzn1IX3hkFtNNNnjg6+u+pHWT8bKH/PRheWIhOLQ==",
21
-            "dependencies": {
22
-                "promise-polyfill": "^7.1.0"
23
-            }
24
-        },
25
-        "node_modules/echarts": {
26
-            "version": "5.4.2",
27
-            "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
28
-            "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
29
-            "dependencies": {
30
-                "tslib": "2.3.0",
31
-                "zrender": "5.4.3"
32
-            }
33
-        },
34
-        "node_modules/jsencrypt": {
35
-            "version": "3.3.1",
36
-            "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz",
37
-            "integrity": "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw=="
38
-        },
39
-        "node_modules/mpvue-echarts": {
40
-            "version": "0.3.2",
41
-            "resolved": "https://registry.npmjs.org/mpvue-echarts/-/mpvue-echarts-0.3.2.tgz",
42
-            "integrity": "sha512-KULGS1DOMNhXu3nBkBv6BtmnqjyHLc+2Dur7eW+2s2aic1NCOygglCMmAmMEU6/TGSR67ttFA2NYxXPUYbNhWQ=="
43
-        },
44
-        "node_modules/promise-polyfill": {
45
-            "version": "7.1.2",
46
-            "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
47
-            "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
48
-        },
49
-        "node_modules/tslib": {
50
-            "version": "2.3.0",
51
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
52
-            "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
53
-        },
54
-        "node_modules/zrender": {
55
-            "version": "5.4.3",
56
-            "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
57
-            "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
58
-            "dependencies": {
59
-                "tslib": "2.3.0"
60
-            }
61
-        }
2
+  "name": "ヾ(✿゚▽゚)ノ圆形进度条",
3
+  "version": "1.2",
4
+  "lockfileVersion": 3,
5
+  "requires": true,
6
+  "packages": {
7
+    "": {
8
+      "name": "ヾ(✿゚▽゚)ノ圆形进度条",
9
+      "version": "1.2",
10
+      "dependencies": {
11
+        "dingtalk-jsapi": "^3.0.25",
12
+        "echarts": "^5.4.2",
13
+        "jsencrypt": "^3.3.2",
14
+        "sm-crypto": "^0.3.12"
15
+      }
16
+    },
17
+    "node_modules/dingtalk-jsapi": {
18
+      "version": "3.0.25",
19
+      "resolved": "https://registry.npmjs.org/dingtalk-jsapi/-/dingtalk-jsapi-3.0.25.tgz",
20
+      "integrity": "sha512-l+q2lRzTCH/00DM2EZ+GKFiP/3TZHOupCM7rpG/hgrNpYkexGvF/O6yDI0XNqSMs8iFqWv9haCLOPf1nvCqB/w==",
21
+      "dependencies": {
22
+        "promise-polyfill": "^7.1.0"
23
+      }
24
+    },
25
+    "node_modules/echarts": {
26
+      "version": "5.4.2",
27
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
28
+      "integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
29
+      "dependencies": {
30
+        "tslib": "2.3.0",
31
+        "zrender": "5.4.3"
32
+      }
33
+    },
34
+    "node_modules/jsbn": {
35
+      "version": "1.1.0",
36
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
37
+      "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
38
+    },
39
+    "node_modules/jsencrypt": {
40
+      "version": "3.3.2",
41
+      "resolved": "https://registry.npmjs.org/jsencrypt/-/jsencrypt-3.3.2.tgz",
42
+      "integrity": "sha512-arQR1R1ESGdAxY7ZheWr12wCaF2yF47v5qpB76TtV64H1pyGudk9Hvw8Y9tb/FiTIaaTRUyaSnm5T/Y53Ghm/A=="
43
+    },
44
+    "node_modules/promise-polyfill": {
45
+      "version": "7.1.2",
46
+      "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
47
+      "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
48
+    },
49
+    "node_modules/sm-crypto": {
50
+      "version": "0.3.12",
51
+      "resolved": "https://registry.npmjs.org/sm-crypto/-/sm-crypto-0.3.12.tgz",
52
+      "integrity": "sha512-272PBzB4PYaBdeGa41TH9ZlMGLPVRmS36Gs4FjmHwXIdihQypAbhhFWZTaa/3de69q2KfMme1M5O2W5+spAdrg==",
53
+      "dependencies": {
54
+        "jsbn": "^1.1.0"
55
+      }
56
+    },
57
+    "node_modules/tslib": {
58
+      "version": "2.3.0",
59
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
60
+      "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
61
+    },
62
+    "node_modules/zrender": {
63
+      "version": "5.4.3",
64
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
65
+      "integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
66
+      "dependencies": {
67
+        "tslib": "2.3.0"
68
+      }
62 69
     }
70
+  }
63 71
 }

+ 8 - 12
CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -58,24 +58,20 @@
58 58
 			},
59 59
 			changeType(e,f,g){
60 60
 				const valueData = e.detail.value
61
+				console.log(valueData, 'valueData')
61 62
 				this.WorkOrderCategory = valueData[valueData.length-1].value
62 63
 			},
63 64
 			searchTrue(e){
64 65
 				this.WorkOrderCategory = e.value
65 66
 			},
66 67
 			nodeclick(data) {
67
-				// this.WorkOrderCategory = data.value
68
-				this.order = data.value
69
-				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
70
-				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
71
-				// this.$http.get("GongDanType/GetModule", {mId:data.value}).then((response) => {
72
-				// 	if (response.state.toLowerCase() === "success") {
73
-				// 		if(response.data.autodept!=''){
74
-				// 			this.autoData = JSON.parse(response.data.autodept)
75
-				//             this.$emit('post-select-data',data.value,data.id,data.orderType,identification, data.text,this.autoData)
76
-				// 		}
77
-				// 	}
78
-				// })
68
+				
69
+				if (data.hasChild === 0) {
70
+					this.order = data.value
71
+					this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
72
+					this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification, data.text)
73
+				}
74
+				
79 75
 			},
80 76
 			popupclosed(data) {
81 77
 				// this.WorkOrderCategory = this.order

+ 6 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -525,6 +525,8 @@
525 525
 				// 	this.$mHelper.toast('请输入设备资产编码')
526 526
 				// 	return
527 527
 				// }
528
+				
529
+				
528 530
 
529 531
 				this.$refs[ref].validate().then(res => {
530 532
 					const params = {
@@ -546,6 +548,10 @@
546 548
 						Maintenancer: "", // 指派人
547 549
 						EmergencyTypes: this.valiFormData.EmergencyTypes
548 550
 					}
551
+					
552
+					// console.log(params, 'params')
553
+					// return;
554
+					
549 555
 					if (this.workorderid) {
550 556
 						params.WorkOrderCode = this.workorderid
551 557
 						this.$mHelper.httpPost("FaultRepair/UpdateFaultRepairWorkOrder ", params, 1, res => this

+ 6 - 1
CallCenterWeb.UI/RMYYAPP/utils/dataTreating.js

@@ -7,6 +7,7 @@ export function filterTreeDatas(tree) {
7 7
 	    accessedRouters.push({
8 8
 	      value: tree[i].id, //tree[i].id
9 9
 	      text: tree[i].text,
10
+		  hasChild: tree[i].children && tree[i].children.length > 0 ? 1 : 0,
10 11
 				id: tree[i].id ,//treeValue
11 12
 	    })
12 13
 	    if (tree[i].children) {
@@ -27,6 +28,7 @@ export function filterGongDanTreeDatas(tree,zIndex,position) {
27 28
 	      text: tree[i].text,
28 29
 				id: tree[i].id ,//treeValue
29 30
 				zIndex:zIndex,
31
+				hasChild: tree[i].children && tree[i].children.length > 0 ? 1 : 0,
30 32
 				sort:j,
31 33
 				position:position+i+'-'
32 34
 	    })
@@ -47,6 +49,7 @@ export function filterTreeDatasNew(tree) {
47 49
 	    accessedRouters.push({
48 50
 	      value: tree[i].id, //tree[i].id
49 51
 	      text: tree[i].text,
52
+		  hasChild: tree[i].children && tree[i].children.length > 0 ? 1 : 0,
50 53
 	    })
51 54
 	    if (tree[i].children) {
52 55
 	      accessedRouters[j].children = filterTreeDatasNew(tree[i].children)
@@ -68,6 +71,7 @@ export function filterDepartTreeDatas(tree,tid,zIndex,position) {
68 71
 		  id: tree[i].id,
69 72
 			zIndex:zIndex,
70 73
 			sort:j,
74
+			hasChild: tree[i].children && tree[i].children.length > 0 ? 1 : 0,
71 75
 			position:position+i+'-'
72 76
 		})
73 77
 	    if (tree[i].children) {
@@ -84,7 +88,8 @@ export function filterMuterDatas(tree){
84 88
 	  accessedRouters.push({
85 89
 	    value: tree[i].id, //tree[i].id
86 90
 	    text: tree[i].text,
87
-		id: tree[i].id //treeValue
91
+		id: tree[i].id ,//treeValue
92
+		hasChild: tree[i].children && tree[i].children.length > 0 ? 1 : 0,
88 93
 	  })
89 94
 	  if (tree[i].children) {
90 95
 	    accessedRouters[j].children = filterMuterDatas(tree[i].children)