deason 6 rokov pred
rodič
commit
78eb922625

+ 14 - 7
src/modules/print/view/CourseStatistic.vue

@@ -92,7 +92,7 @@
             <el-button
               size="small"
               type="primary"
-              icon="search"
+              icon="el-icon-search"
               @click="searchRecords"
               >查询
             </el-button>
@@ -127,10 +127,10 @@
               <el-button
                 size="mini"
                 type="primary"
+                icon="el-icon-setting"
                 @click="editProjectSetting(scope.row);"
                 :disabled="!hasPermit"
-              >
-                <i class="el-icon-edit"></i> 项目设置
+                >项目设置
               </el-button>
             </template>
           </el-table-column>
@@ -234,8 +234,7 @@ export default {
       /* 查询项目经理列表 */
       this.pmList = [];
       let url =
-        core_api +
-        "/user/query?rootOrgIdNull=true&roleCode=PRINT_PROJECT_LEADER";
+        core_api + "/user/query?rootOrgCode=qmth&roleCode=PRINT_PROJECT_LEADER";
 
       if (!this.isEmptyStr(query)) {
         url += "&name=" + query;
@@ -249,7 +248,7 @@ export default {
       /* 查询印刷供应商列表 */
       this.supplierList = [];
       let url =
-        core_api + "/user/query?rootOrgIdNull=true&roleCode=PRINT_SUPPLIER";
+        core_api + "/user/query?rootOrgCode=qmth-print&roleCode=PRINT_SUPPLIER";
 
       if (!this.isEmptyStr(query)) {
         url += "&name=" + query;
@@ -277,8 +276,16 @@ export default {
 
     this.loadUserRole(this.user);
 
-    if (this.curUserRole.isSuperLeader || this.curUserRole.isPM) {
+    if (this.curUserRole.isSuperLeader) {
       this.hasPermit = true;
+      // this.searchPmList();
+      // this.searchSupplierList();
+    } else if (this.curUserRole.isPM) {
+      this.hasPermit = true;
+      //this.loadPmInfo(this.user);
+    } else if (this.curUserRole.isSupplier) {
+      this.hasPermit = false;
+      //this.loadSupplierInfo(this.user);
     } else {
       this.hasPermit = false;
     }

+ 13 - 5
src/modules/print/view/ExamStructure.vue

@@ -57,7 +57,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchPmList()"
+              :remote-method="searchPmList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -76,7 +76,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchSupplierList()"
+              :remote-method="searchSupplierList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -93,7 +93,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchRecords();"
+              @click="searchRecords"
               >查询
             </el-button>
           </el-form-item>
@@ -139,7 +139,7 @@
         <!-- 分页 -->
         <div class="page pull-left">
           <el-pagination
-            @current-change="handlePager();"
+            @current-change="handlePager"
             :current-page="formSearch.pageNo"
             :page-size="formSearch.pageSize"
             :total="totalElements"
@@ -276,8 +276,16 @@ export default {
 
     this.loadUserRole(this.user);
 
-    if (this.curUserRole.isSuperLeader || this.curUserRole.isPM) {
+    if (this.curUserRole.isSuperLeader) {
       this.hasPermit = true;
+      // this.searchPmList();
+      // this.searchSupplierList();
+    } else if (this.curUserRole.isPM) {
+      this.hasPermit = true;
+      //this.loadPmInfo(this.user);
+    } else if (this.curUserRole.isSupplier) {
+      this.hasPermit = false;
+      //this.loadSupplierInfo(this.user);
     } else {
       this.hasPermit = false;
     }

+ 4 - 4
src/modules/print/view/Project.vue

@@ -57,7 +57,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchPmList()"
+              :remote-method="searchPmList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -76,7 +76,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchSupplierList()"
+              :remote-method="searchSupplierList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -93,7 +93,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchRecords();"
+              @click="searchRecords"
               >查询
             </el-button>
           </el-form-item>
@@ -139,7 +139,7 @@
         <!-- 分页 -->
         <div class="page pull-left">
           <el-pagination
-            @current-change="handlePager();"
+            @current-change="handlePager"
             :current-page="formSearch.pageNo"
             :page-size="formSearch.pageSize"
             :total="totalElements"

+ 4 - 4
src/modules/print/view/ProjectStatistic.vue

@@ -60,7 +60,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchRecords();"
+              @click="searchRecords"
               >查询
             </el-button>
 
@@ -69,7 +69,7 @@
               type="primary"
               icon="el-icon-plus"
               :disabled="!hasPermit"
-              @click="addOtherSetting();"
+              @click="addOtherSetting"
               >新增其他事项
             </el-button>
 
@@ -79,7 +79,7 @@
               icon="el-icon-refresh"
               :disabled="!hasPermit"
               v-show="formSearch.examId != ''"
-              @click="refreshStatistic();"
+              @click="refreshStatistic"
               >刷新
             </el-button>
 
@@ -88,7 +88,7 @@
               type="primary"
               icon="el-icon-arrow-left"
               v-show="showGoBack"
-              @click="goBack();"
+              @click="goBack"
               >返回
             </el-button>
           </el-form-item>

+ 13 - 5
src/modules/print/view/ProjectTemplate.vue

@@ -57,7 +57,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchPmList()"
+              :remote-method="searchPmList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -76,7 +76,7 @@
               filterable
               clearable
               remote
-              :remote-method="searchSupplierList()"
+              :remote-method="searchSupplierList"
             >
               <el-option label="请选择" value=""></el-option>
               <el-option
@@ -93,7 +93,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchRecords();"
+              @click="searchRecords"
               >查询
             </el-button>
           </el-form-item>
@@ -139,7 +139,7 @@
         <!-- 分页 -->
         <div class="page pull-left">
           <el-pagination
-            @current-change="handlePager();"
+            @current-change="handlePager"
             :current-page="formSearch.pageNo"
             :page-size="formSearch.pageSize"
             :total="totalElements"
@@ -276,8 +276,16 @@ export default {
 
     this.loadUserRole(this.user);
 
-    if (this.curUserRole.isSuperLeader || this.curUserRole.isPM) {
+    if (this.curUserRole.isSuperLeader) {
       this.hasPermit = true;
+      // this.searchPmList();
+      // this.searchSupplierList();
+    } else if (this.curUserRole.isPM) {
+      this.hasPermit = true;
+      //this.loadPmInfo(this.user);
+    } else if (this.curUserRole.isSupplier) {
+      this.hasPermit = false;
+      //this.loadSupplierInfo(this.user);
     } else {
       this.hasPermit = false;
     }