Merge remote-tracking branch 'origin/master'

packjson.json

@@ -1,9 +0,0 @@
-{
-	"dependencies": {
-		"crypto-js": "^4.0.0"
-	},
-	"devDependencies": {
-		"sass": "^1.83.4",
-		"sass-loader": "^16.0.4"
-	}
-}

sub/owner/policy-detail.vue

@@ -77,9 +77,9 @@ export default {
 
 <style lang="scss">
 .policy-detail {
-  min-height: 100vh;
+  height: 100vh;
   background: #fff;
-overflow-y: auto;
+
 
   .nav-bar {
     position: fixed;

sub/task/detail.vue

@@ -113,7 +113,7 @@
               :options="getDropdownOption('Inspections_status')"
               @change="
                 v => {
-                  querySelect(v, 'Inspections_status')
+                  querySelect(v, 'inspectionsStatus')
                 }
               "
             />
@@ -247,7 +247,7 @@ export default {
       // 查询条件
       queryParams: {
         departmentId: '',
-        Inspections_status: '',
+        inspectionsStatus: '',
         pageSize: 8,
         pageNo: 1,
         userId: ''