浏览代码

市场部会议申报3

wangguangping 3 年之前
父节点
当前提交
6aa6616a6f

+ 14 - 12
src/pages/main/meetingDeclaration/marketDecisionMeeting.vue

@@ -4,7 +4,7 @@
             <toolList @iconCli="iconCli" :tooltit="tooltit"></toolList>
             <div class="search">
                 <div class="search-item">
-                    <label for="">年份</label>
+                    <label>年份</label>
                     <el-date-picker
                         v-model="year"
                         type="year"
@@ -14,14 +14,14 @@
                     </el-date-picker>
                 </div>
                 <div class="search-item">
-                    <label for="">月份</label>
+                    <label>月份</label>
                     <el-select clearable v-model="month" placeholder="月份">
                         <el-option
                             v-for="i in monthOpt"
                             :key="i"
                             :label="`${i}月`"
                             :value="`${i}`"
-                        >
+                        > 
                         </el-option>
                     </el-select>
                 </div>
@@ -379,14 +379,14 @@
     </fullscreen>
 </template>
 <script>
-import mySearch from "../../../components/search.vue";
+// import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
 import myUpload from "../../../components/upload";
 
 export default {
     components: {
-        mySearch,
+        // mySearch,
         myMessage,
         toolList,
         myUpload
@@ -631,7 +631,7 @@ export default {
             this.editDialogStatus = false;
         },
         //搜索数据
-        searchInfo(v) {
+        searchInfo() {
             this.params = {};
 
             this.year ? (this.params.creatTime = this.year) : "";
@@ -660,7 +660,7 @@ export default {
         //获取列表
         getList(v, n) {
             this.pageSize = n;
-            let _this = this;
+            // let _this = this;
             this.loading = true;
             this.tableData = [];
             this.$http({
@@ -725,8 +725,10 @@ export default {
                         window.URL.revokeObjectURL(href);
                     }
                 });
-            } else if (v === 2) {
-            } else if (v === 3) {
+            } 
+            // else if (v === 2) {
+            // } 
+            else if (v === 3) {
                 this.$refs.infolist.validate(valid => {
                     if (valid) {
                         //上传提交
@@ -948,7 +950,7 @@ export default {
             padding-right: 5px;
         }
     }
-    .remark-box/deep/ {
+    .remark-box::v-deep {
         width: calc(100% - 80px);
         display: inline-block;
         div {
@@ -1014,11 +1016,11 @@ export default {
         }
     }
 }
-.container/deep/ .el-upload-dragger {
+.container::v-deep .el-upload-dragger {
     width: auto !important;
     height: 120px !important;
 }
-.container/deep/ .el-upload {
+.container::v-deep .el-upload {
     padding-left: 20px;
     padding-right: 0;
 }

+ 13 - 11
src/pages/main/meetingDeclaration/specialReport.vue

@@ -4,7 +4,7 @@
             <toolList @iconCli="iconCli" :tooltit="tooltit"></toolList>
             <div class="search">
                 <div class="search-item">
-                    <label for="">年份</label>
+                    <label>年份</label>
                     <el-date-picker
                         v-model="year"
                         type="year"
@@ -14,7 +14,7 @@
                     </el-date-picker>
                 </div>
                 <div class="search-item">
-                    <label for="">月份</label>
+                    <label>月份</label>
                     <el-select clearable v-model="month" placeholder="月份">
                         <el-option
                             v-for="i in monthOpt"
@@ -379,14 +379,14 @@
     </fullscreen>
 </template>
 <script>
-import mySearch from "../../../components/search.vue";
+// import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
 import myUpload from "../../../components/upload";
 
 export default {
     components: {
-        mySearch,
+        // mySearch,
         myMessage,
         toolList,
         myUpload
@@ -631,7 +631,7 @@ export default {
             this.editDialogStatus = false;
         },
         //搜索数据
-        searchInfo(v) {
+        searchInfo() {
             this.params = {};
 
             this.year ? (this.params.creatTime = this.year) : "";
@@ -660,7 +660,7 @@ export default {
         //获取列表
         getList(v, n) {
             this.pageSize = n;
-            let _this = this;
+            // let _this = this;
             this.loading = true;
             this.tableData = [];
             this.$http({
@@ -725,8 +725,10 @@ export default {
                         window.URL.revokeObjectURL(href);
                     }
                 });
-            } else if (v === 2) {
-            } else if (v === 3) {
+            } 
+            // else if (v === 2) {
+            // } 
+            else if (v === 3) {
                 this.$refs.infolist.validate(valid => {
                     if (valid) {
                         //上传提交
@@ -948,7 +950,7 @@ export default {
             padding-right: 5px;
         }
     }
-    .remark-box/deep/ {
+    .remark-box::v-deep {
         width: calc(100% - 80px);
         display: inline-block;
         div {
@@ -1014,11 +1016,11 @@ export default {
         }
     }
 }
-.container/deep/ .el-upload-dragger {
+.container::v-deep .el-upload-dragger {
     width: auto !important;
     height: 120px !important;
 }
-.container/deep/ .el-upload {
+.container::v-deep .el-upload {
     padding-left: 20px;
     padding-right: 0;
 }