update sytle

src/modules/print/view/CourseStatistic.vue

@@ -22,7 +22,7 @@
           label-position="right"
           label-width="100px"
         >
-          <el-form-item label="学校" class="pull-left">
+          <el-form-item label="学校">
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select v-model="formSearch.examId" placeholder="请选择">
               <el-option
                 v-for="item in examList"
@@ -50,7 +50,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="试卷状态" class="pull-left">
+          <el-form-item label="试卷状态">
             <el-select
               v-model="formSearch.paperStatus"
               clearable
@@ -66,7 +66,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="课程名称" class="pull-left">
+          <el-form-item label="课程名称">
             <el-select
               v-model="formSearch.courseId"
               placeholder="请选择"
@@ -85,7 +85,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="试卷名称" class="pull-left">
+          <el-form-item label="试卷名称">
             <el-input v-model="formSearch.paperName"></el-input>
           </el-form-item>
 
@@ -101,7 +101,7 @@
             <el-button
               size="small"
               type="primary"
-              icon="el-icon-setting"
+              icon="el-icon-menu"
               @click="openAllotPaperModel"
               >分配待指定试卷
             </el-button>
@@ -158,7 +158,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-document"
+                icon="el-icon-view"
                 v-show="scope.row.paperStatus == '2'"
                 @click="preview(scope.row);"
                 >预览
@@ -177,7 +177,7 @@
         </el-table>
 
         <!-- 分页 -->
-        <div class="page pull-left">
+        <div class="page pull-right">
           <el-pagination
             @current-change="handlePager"
             :current-page="formSearch.pageNo"
@@ -355,4 +355,10 @@ export default {
 .page {
   margin-top: 10px;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 </style>

src/modules/print/view/ExamStructure.vue

@@ -22,7 +22,7 @@
           label-position="right"
           label-width="100px"
         >
-          <el-form-item label="学校" class="pull-left">
+          <el-form-item label="学校">
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select v-model="formSearch.examId" placeholder="请选择">
               <el-option
                 v-for="item in examList"
@@ -93,7 +93,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-setting"
+                icon="el-icon-menu"
                 @click="cloneStructure(scope.row);"
                 :disabled="!hasPermit"
                 >复用
@@ -112,7 +112,7 @@
         </el-table>
 
         <!-- 分页 -->
-        <div class="page pull-left">
+        <div class="page pull-right">
           <el-pagination
             @current-change="handlePager"
             :current-page="formSearch.pageNo"
@@ -246,4 +246,10 @@ export default {
 .page {
   margin-top: 10px;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 </style>

src/modules/print/view/Project.vue

@@ -22,7 +22,7 @@
           label-position="right"
           label-width="100px"
         >
-          <el-form-item label="学校" class="pull-left">
+          <el-form-item label="学校">
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select v-model="formSearch.examId" placeholder="请选择">
               <el-option
                 v-for="item in examList"
@@ -50,7 +50,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="项目经理" class="pull-left">
+          <el-form-item label="项目经理">
             <el-select
               v-model="formSearch.pmId"
               placeholder="请选择"
@@ -69,7 +69,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="印刷供应商" class="pull-left">
+          <el-form-item label="印刷供应商">
             <el-select
               v-model="formSearch.supplierId"
               placeholder="请选择"
@@ -114,11 +114,13 @@
 
           <el-table-column width="120" label="项目统计">
             <template slot-scope="scope">
-              <a
-                href="javascript:void(0)"
+              <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-view"
                 @click="gotoProjectStatistic(scope.row);"
                 >查看
-              </a>
+              </el-button>
             </template>
           </el-table-column>
 
@@ -127,8 +129,8 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-setting"
-                @click="editProjectSetting(scope.row);"
+                icon="el-icon-menu"
+                @click="openProjectSettingDialog(scope.row);"
                 :disabled="!hasPermit"
                 >项目设置
               </el-button>
@@ -137,7 +139,7 @@
         </el-table>
 
         <!-- 分页 -->
-        <div class="page pull-left">
+        <div class="page pull-right">
           <el-pagination
             @current-change="handlePager"
             :current-page="formSearch.pageNo"
@@ -147,6 +149,186 @@
           ></el-pagination>
         </div>
       </div>
+
+      <!-- 项目设置弹窗 -->
+      <el-dialog
+        title="项目设置"
+        width="800px"
+        :visible.sync="projectSettingDialog"
+        @close="closeProjectSettingDialog"
+      >
+        <el-form
+          :model="projectSettingForm"
+          ref="projectSettingForm"
+          :rules="rules"
+          label-position="right"
+          label-width="100px"
+        >
+          <el-row :gutter="10">
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item label="学校" class="form-item" prop="orgId">
+                <el-select
+                  :disabled="true"
+                  @change="searchExamList(projectSettingForm.orgId);"
+                  v-model.number="projectSettingForm.orgId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in orgList"
+                    :label="item.orgName"
+                    :value="item.orgId"
+                    :key="item.orgId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item label="考试" class="form-item" prop="examId">
+                <el-select
+                  :disabled="true"
+                  v-model.number="projectSettingForm.examId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in examList"
+                    :label="item.examName"
+                    :value="item.examId"
+                    :key="item.examId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item label="项目经理" class="form-item" prop="pmId">
+                <el-select
+                  v-model.number="projectSettingForm.pmId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in pmList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item label="供应商" class="form-item" prop="supplierId">
+                <el-select
+                  v-model.number="projectSettingForm.supplierId"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in supplierList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="准备开始时间"
+                class="form-item"
+                prop="prepareStartTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.prepareStartTime"
+                  type="datetime"
+                  placeholder="选择开始时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="准备结束时间"
+                class="form-item"
+                prop="prepareEndTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.prepareEndTime"
+                  type="datetime"
+                  placeholder="选择结束时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="印刷开始时间"
+                class="form-item"
+                prop="printStartTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.printStartTime"
+                  type="datetime"
+                  placeholder="选择开始时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="印刷结束时间"
+                class="form-item"
+                prop="printEndTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.printEndTime"
+                  type="datetime"
+                  placeholder="选择结束时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="10">
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="邮寄开始时间"
+                class="form-item"
+                prop="mailStartTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.mailStartTime"
+                  type="datetime"
+                  placeholder="选择开始时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="10" :sm="10" :md="10" :lg="10">
+              <el-form-item
+                label="邮寄结束时间"
+                class="form-item"
+                prop="mailEndTime"
+              >
+                <el-date-picker
+                  v-model.number="projectSettingForm.mailEndTime"
+                  type="datetime"
+                  placeholder="选择结束时间"
+                ></el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+
+        <span slot="footer" class="dialog-footer" style="text-align: center">
+          <el-button type="primary" @click="editProjectSetting"
+            >确 定
+          </el-button>
+          <el-button @click="closeProjectSettingDialog">取 消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </section>
 </template>
@@ -175,6 +357,21 @@ export default {
       examList: [],
       pmList: [],
       supplierList: [],
+      projectSettingDialog: false,
+      projectSettingForm: {
+        orgId: "",
+        examId: "",
+        pmId: "",
+        pmName: "",
+        supplierId: "",
+        supplierName: "",
+        prepareStartTime: "",
+        prepareEndTime: "",
+        printStartTime: "",
+        printEndTime: "",
+        mailStartTime: "",
+        mailEndTime: ""
+      },
       rules: {}
     };
   },
@@ -263,13 +460,19 @@ export default {
       let url = "/print/project/statistic/" + row.orgId + "/" + row.examId;
       this.$router.push({ path: url });
     },
-    editProjectSetting(row) {
+    editProjectSetting() {
       /* 项目设置 */
-      console.log(row);
       this.$notify({
         message: "Todo...",
         type: "warning"
       });
+    },
+    openProjectSettingDialog(row) {
+      console.log(row);
+      this.projectSettingDialog = true;
+    },
+    closeProjectSettingDialog() {
+      this.projectSettingDialog = false;
     }
   },
   computed: {
@@ -301,4 +504,10 @@ export default {
 .page {
   margin-top: 10px;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 </style>

src/modules/print/view/ProjectStatistic.vue

@@ -22,7 +22,7 @@
           label-position="right"
           label-width="100px"
         >
-          <el-form-item label="学校" class="pull-left">
+          <el-form-item label="学校">
             <el-select
               :disabled="showGoBack"
               v-model="formSearch.orgId"
@@ -40,7 +40,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select
               :disabled="showGoBack"
               v-model="formSearch.examId"
@@ -119,7 +119,7 @@
               <el-button
                 size="mini"
                 type="primary"
-                icon="el-icon-setting"
+                icon="el-icon-menu"
                 v-if="scope.row.btnType == 'BACKUP'"
                 @click="editBackupSetting(scope.row);"
                 :disabled="!hasPermit"
@@ -346,4 +346,10 @@ export default {
 .page {
   margin-top: 10px;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 </style>

src/modules/print/view/ProjectTemplate.vue

@@ -22,7 +22,7 @@
           label-position="right"
           label-width="100px"
         >
-          <el-form-item label="学校" class="pull-left">
+          <el-form-item label="学校">
             <el-select
               v-model="formSearch.orgId"
               placeholder="请选择"
@@ -39,7 +39,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="考试" class="pull-left">
+          <el-form-item label="考试">
             <el-select v-model="formSearch.examId" placeholder="请选择">
               <el-option
                 v-for="item in examList"
@@ -98,7 +98,7 @@
               <el-button
                 size="mini"
                 type="default"
-                icon="el-icon-document"
+                icon="el-icon-view"
                 @click="preview(scope.row);"
                 >预览
               </el-button>
@@ -222,4 +222,10 @@ export default {
 .page {
   margin-top: 10px;
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
 </style>