Quellcode durchsuchen

修改--高知版字段及样式

plg vor 4 Wochen
Ursprung
Commit
e5244075a2

+ 2 - 2
src/components/PlanReport.vue

@@ -191,7 +191,7 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '0'"
-              label="号"
+              label="号"
               align="center"
               width=""
             >
@@ -199,7 +199,7 @@
             <el-table-column
               prop="userNo"
               v-if="planType == '1'"
-              label="号"
+              label="号"
               align="center"
               width=""
             >

+ 1 - 1
src/components/Report.vue

@@ -689,7 +689,7 @@ export default {
       let url = `/userRecordScore/findByFlagAndUserNo?planId=${params.planId}&userNo=${params.userNo}&flag=${params.flag}`;
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
-          debugger;
+          // debugger;
           // this.reportData = res.data;
           let listTmp1 = [];
           listTmp1 = res.data.dimensionScore.filter((item) => {

+ 20 - 21
src/views/manage/channelManagement/channelManagement.vue

@@ -298,9 +298,9 @@
           <p style="text-align: center; margin-bottom: 20px; font-weight: 700">
             报告下载
           </p>
-          <div style="text-align: left; margin-left: 10%; color: #333333">
+          <!-- <div style="text-align: left; margin-left: 10%; color: #333333">
             选择下载范围
-          </div>
+          </div> -->
           <el-form
             :inline="true"
             class="demo-form-inline form-plan"
@@ -313,7 +313,7 @@
               padding: 0 10%;
             "
           >
-            <el-form-item label="">
+            <!-- <el-form-item label="">
               <el-select v-model="dimensionality" placeholder="请选择下载范围">
                 <el-option
                   v-for="item in dimensionalityOption"
@@ -322,8 +322,8 @@
                   :value="item.id"
                 ></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="" v-show="dimensionality == '1'">
+            </el-form-item> -->
+            <!-- <el-form-item label="" v-show="dimensionality == '1'">
               <el-select v-model="grade" placeholder="请选择年级">
                 <el-option
                   v-for="item in gradeList"
@@ -332,8 +332,8 @@
                   :value="item"
                 ></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="" v-show="dimensionality == '2'">
+            </el-form-item> -->
+            <!-- <el-form-item label="" v-show="dimensionality == '2'">
               <el-select multiple v-model="orgName" placeholder="请选择班级">
                 <el-option
                   v-for="item in orgList"
@@ -342,27 +342,19 @@
                   :value="item.orgNo"
                 ></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="" v-show="dimensionality == '0'">
+            </el-form-item> -->
+            <!-- <el-form-item label="" v-show="dimensionality == '0'">
               <el-button
                 type="success"
                 style="border-radius: 20px"
                 v-show="dimensionality == '0'"
                 @click="downloadFun"
               >
-                全院下载
+                下载
               </el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           <div style="display: flex; width: 100%; justify-content: center">
-            <!-- <el-button
-              type="success"
-              style="border-radius: 20px"
-              v-show="dimensionality == '0'"
-              @click="downloadFun"
-            >
-              全院下载
-            </el-button> -->
             <el-button
               type="success"
               style="border-radius: 20px"
@@ -389,8 +381,15 @@
             </el-button>
           </div>
         </div>
-        <div style="margin-left: 10%; color: #333333; margin-bottom: 20px">
-          待下载列表
+        <div style="margin-left: 10%;margin-right: 10%; color: #333333; margin-bottom: 20px ;display:flex;justify-content: space-between;align-items: center;">
+          <span>待下载列表</span> <el-button
+                type="success"
+                style="border-radius: 20px"
+                v-show="dimensionality == '0'"
+                @click="downloadFun"
+              >
+                下载
+              </el-button>
         </div>
         <el-table
           :data="downList"

+ 1 - 1
src/views/manage/channelManagement/contract.vue

@@ -746,7 +746,7 @@ export default {
         }`;
       } else {
         //planType
-        url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}${
+        url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}&orgNo=${this.userInfo.orgNo}${
           this.planType == "" ? "" : `&planType=${this.planType}`
         }${this.planName == "" ? "" : `&planName=${this.planName}`}`;
       }