Merge branch 'feature-data' of http://222.76.244.118:3000/CPICXIM/desktop_task_schedule into feature-data
This commit is contained in:
		@@ -20,16 +20,17 @@ SELECT s.saler_code,
 | 
				
			|||||||
       idst0.bm_t      bm
 | 
					       idst0.bm_t      bm
 | 
				
			||||||
 WHERE s.team_code = t.team_code
 | 
					 WHERE s.team_code = t.team_code
 | 
				
			||||||
   AND t.department_code = bm.department_code
 | 
					   AND t.department_code = bm.department_code
 | 
				
			||||||
   AND s.saler_name = '<EFBFBD>ŵ<EFBFBD><EFBFBD><EFBFBD>';
 | 
					   AND s.saler_name = '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					SELECT *
 | 
				
			||||||
 | 
					  FROM tele_saler_team t
 | 
				
			||||||
 | 
					 WHERE t.team_code = '107077'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    SELECT *
 | 
				
			||||||
 | 
					            FROM <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ձ<EFBFBD><EFBFBD><EFBFBD>
 | 
				
			||||||
 | 
					           ORDER BY <EFBFBD><EFBFBD>ϯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
				
			||||||
 | 
					              ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SELECT <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
					 | 
				
			||||||
       SUM
 | 
					 | 
				
			||||||
  FROM <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ձ<EFBFBD><EFBFBD><EFBFBD>
 | 
					 | 
				
			||||||
 GROUP BY <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 | 
					 | 
				
			||||||
 ORDER BY <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
					 | 
				
			||||||
          <EFBFBD><EFBFBD><EFBFBD><EFBFBD>N,
 | 
					 | 
				
			||||||
          <EFBFBD><EFBFBD>ϯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
					 | 
				
			||||||
          ǩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
SELECT <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
					SELECT <EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
				
			||||||
       SUM(<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD>) <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
					       SUM(<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ۼ<EFBFBD>) <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										8
									
								
								code/web/task_schedule/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										8
									
								
								code/web/task_schedule/package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -29,7 +29,7 @@
 | 
				
			|||||||
                "eslint-config-recommended": "^4.1.0",
 | 
					                "eslint-config-recommended": "^4.1.0",
 | 
				
			||||||
                "eslint-config-standard-with-typescript": "^34.0.1",
 | 
					                "eslint-config-standard-with-typescript": "^34.0.1",
 | 
				
			||||||
                "eslint-plugin-vue": "^9.10.0",
 | 
					                "eslint-plugin-vue": "^9.10.0",
 | 
				
			||||||
                "sass": "^1.61.0",
 | 
					                "sass": "^1.62.0",
 | 
				
			||||||
                "typescript": "^5.0.4",
 | 
					                "typescript": "^5.0.4",
 | 
				
			||||||
                "vite": "^4.2.1",
 | 
					                "vite": "^4.2.1",
 | 
				
			||||||
                "vue-eslint-parser": "^9.1.1"
 | 
					                "vue-eslint-parser": "^9.1.1"
 | 
				
			||||||
@@ -10863,9 +10863,9 @@
 | 
				
			|||||||
            "dev": true
 | 
					            "dev": true
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "node_modules/sass": {
 | 
					        "node_modules/sass": {
 | 
				
			||||||
            "version": "1.61.0",
 | 
					            "version": "1.62.0",
 | 
				
			||||||
            "resolved": "https://registry.npmmirror.com/sass/-/sass-1.61.0.tgz",
 | 
					            "resolved": "https://registry.npmmirror.com/sass/-/sass-1.62.0.tgz",
 | 
				
			||||||
            "integrity": "sha512-PDsN7BrVkNZK2+dj/dpKQAWZavbAQ87IXqVvw2+oEYI+GwlTWkvbQtL7F2cCNbMqJEYKPh1EcjSxsnqIb/kyaQ==",
 | 
					            "integrity": "sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==",
 | 
				
			||||||
            "dev": true,
 | 
					            "dev": true,
 | 
				
			||||||
            "dependencies": {
 | 
					            "dependencies": {
 | 
				
			||||||
                "chokidar": ">=3.0.0 <4.0.0",
 | 
					                "chokidar": ">=3.0.0 <4.0.0",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,7 +30,7 @@
 | 
				
			|||||||
        "eslint-config-recommended": "^4.1.0",
 | 
					        "eslint-config-recommended": "^4.1.0",
 | 
				
			||||||
        "eslint-config-standard-with-typescript": "^34.0.1",
 | 
					        "eslint-config-standard-with-typescript": "^34.0.1",
 | 
				
			||||||
        "eslint-plugin-vue": "^9.10.0",
 | 
					        "eslint-plugin-vue": "^9.10.0",
 | 
				
			||||||
        "sass": "^1.61.0",
 | 
					        "sass": "^1.62.0",
 | 
				
			||||||
        "typescript": "^5.0.4",
 | 
					        "typescript": "^5.0.4",
 | 
				
			||||||
        "vite": "^4.2.1",
 | 
					        "vite": "^4.2.1",
 | 
				
			||||||
        "vue-eslint-parser": "^9.1.1"
 | 
					        "vue-eslint-parser": "^9.1.1"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user