Merge branch 'develop' into test

src/App.vue

 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 
@@ -83,10 +83,17 @@ input[type='number'] {
   display: flex;
   flex-wrap: wrap;
 }
+.line-wrap,
 .col-line-1,
 .el-form-item {
   width: 100%;
 }
+.line-wrap {
+  display: flex;
+}
+.tableMinHeightBig {
+  min-height: 120px;
+}
 .col-line-2 {
   width: 45%;
 }

src/containers/baseData/publicCarNumber/publicCarNumber.vue

@@ -17,6 +17,7 @@
         </el-table-column>
         <el-table-column prop="purpose" label="用途" min-width="120">
         </el-table-column>
+        <el-table-column prop="sortId" label="排序" min-width="50"></el-table-column>
         <el-table-column fixed="right" label="操作" min-width="80" align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" class="operationBtnWidth" @click="showEditDialog(1, scope)">修改</el-button>
@@ -35,6 +36,9 @@
         <el-form-item label="用途" label-width="200px">
           <el-input v-model.trim="selected.purpose" placeholder="请输入用途" :maxlength="20" clearable></el-input>
         </el-form-item>
+        <el-form-item label="排序" label-width="200px">
+          <el-input-number v-model.trim="selected.sortId" :controls="false" :precision="0" :min="0" :max="1000" clearable></el-input-number>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetEditDialog">取 消</el-button>
@@ -78,6 +82,7 @@ export default {
         id: '',
         name: '',
         purpose: '',
+        sortId: null,
       };
     },
     fetchList(entity) {
@@ -93,6 +98,7 @@ export default {
           id: data.row.id,
           name: data.row.name,
           purpose: data.row.purpose,
+          sortId: data.row.sortId,
         };
       } else {
         this.initSelected();
@@ -114,6 +120,7 @@ export default {
         id: this.selected.id,
         name: this.selected.name,
         purpose: this.selected.purpose,
+        sortId: this.selected.sortId,
       };
       if (this.editType) {
         updateSetting({ ...entity, type: this.type })

src/containers/baseData/publicCarType/publicCarType.vue

@@ -17,6 +17,7 @@
         </el-table-column>
         <el-table-column prop="purpose" label="用途" min-width="120">
         </el-table-column>
+        <el-table-column prop="sortId" label="排序" min-width="50"></el-table-column>
         <el-table-column fixed="right" label="操作" min-width="80" align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" class="operationBtnWidth" @click="showEditDialog(1, scope)">修改</el-button>
@@ -35,6 +36,9 @@
         <el-form-item label="用途" label-width="200px">
           <el-input v-model.trim="selected.purpose" placeholder="请输入用途" :maxlength="20" clearable></el-input>
         </el-form-item>
+        <el-form-item label="排序" label-width="200px">
+          <el-input-number v-model.trim="selected.sortId" :controls="false" :precision="0" :min="0" :max="1000" clearable></el-input-number>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetEditDialog">取 消</el-button>
@@ -78,6 +82,7 @@ export default {
         id: '',
         name: '',
         purpose: '',
+        sortId: 0,
       };
     },
     fetchList(entity) {
@@ -93,6 +98,7 @@ export default {
           id: data.row.id,
           name: data.row.name,
           purpose: data.row.purpose,
+          sortId: data.row.sortId,
         };
       } else {
         this.initSelected();
@@ -114,6 +120,7 @@ export default {
         id: this.selected.id,
         name: this.selected.name,
         purpose: this.selected.purpose,
+        sortId: this.selected.sortId,
       };
       if (this.editType) {
         updateSetting({ ...entity, type: this.type })

src/containers/baseData/repairArea/repairArea.vue

@@ -17,6 +17,7 @@
         </el-table-column>
         <el-table-column prop="purpose" label="用途" min-width="120">
         </el-table-column>
+        <el-table-column prop="sortId" label="排序" min-width="50"></el-table-column>
         <el-table-column fixed="right" label="操作" min-width="80" align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" class="operationBtnWidth" @click="showEditDialog(1, scope)">修改</el-button>
@@ -35,6 +36,9 @@
         <el-form-item label="用途" label-width="200px">
           <el-input v-model.trim="selected.purpose" placeholder="请输入用途" :maxlength="20" clearable></el-input>
         </el-form-item>
+        <el-form-item label="排序" label-width="200px">
+          <el-input-number v-model.trim="selected.sortId" :controls="false" :precision="0" :min="0" :max="1000" clearable></el-input-number>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetEditDialog">取 消</el-button>
@@ -78,6 +82,7 @@ export default {
         id: '',
         name: '',
         purpose: '',
+        sortId: null,
       };
     },
     fetchList(entity) {
@@ -93,6 +98,7 @@ export default {
           id: data.row.id,
           name: data.row.name,
           purpose: data.row.purpose,
+          sortId: data.row.sortId,
         };
       } else {
         this.initSelected();
@@ -114,6 +120,7 @@ export default {
         id: this.selected.id,
         name: this.selected.name,
         purpose: this.selected.purpose,
+        sortId: this.selected.sortId,
       };
       if (this.editType) {
         updateSetting({ ...entity, type: this.type })

src/containers/baseData/repairProject/repairProject.vue

@@ -17,6 +17,7 @@
         </el-table-column>
         <el-table-column prop="purpose" label="用途" min-width="120">
         </el-table-column>
+        <el-table-column prop="sortId" label="排序" min-width="50"></el-table-column>
         <el-table-column fixed="right" label="操作" min-width="80" align="center">
           <template slot-scope="scope">
             <el-button type="primary" size="mini" class="operationBtnWidth" @click="showEditDialog(1, scope)">修改</el-button>
@@ -35,6 +36,9 @@
         <el-form-item label="用途" label-width="200px">
           <el-input v-model.trim="selected.purpose" placeholder="请输入用途" :maxlength="20" clearable></el-input>
         </el-form-item>
+        <el-form-item label="排序" label-width="200px">
+          <el-input-number v-model.trim="selected.sortId" :controls="false" :precision="0" :min="0" :max="1000" clearable></el-input-number>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="resetEditDialog">取 消</el-button>
@@ -78,6 +82,7 @@ export default {
         id: '',
         name: '',
         purpose: '',
+        sortId: 0,
       };
     },
     fetchList(entity) {
@@ -93,6 +98,7 @@ export default {
           id: data.row.id,
           name: data.row.name,
           purpose: data.row.purpose,
+          sortId: data.row.sortId,
         };
       } else {
         this.initSelected();
@@ -114,6 +120,7 @@ export default {
         id: this.selected.id,
         name: this.selected.name,
         purpose: this.selected.purpose,
+        sortId: this.selected.sortId,
       };
       if (this.editType) {
         updateSetting({ ...entity, type: this.type })

src/containers/management/publicCar/publicCar.vue

@@ -2,10 +2,10 @@
   <div class="manage-publicCar main-wrap">
     <el-form class="search-bar">
       <div class="grid-content">
-        <el-input v-model.trim="filters.name" :maxlength="20" placeholder="请输入姓名" clearable></el-input>
+        <el-input v-model.trim="filters.name" :maxlength="20" placeholder="请输入申请人" clearable></el-input>
       </div>
       <div class="grid-content">
-        <el-input v-model.trim="filters.department" :maxlength="20" placeholder="请输入科室" clearable></el-input>
+        <el-input v-model.trim="filters.department" :maxlength="20" placeholder="请输入用车部门" clearable></el-input>
       </div>
       <div class="grid-content">
         <el-select v-model="filters.dealResult" filterable clearable placeholder="处理状态">
@@ -59,18 +59,22 @@
     </div>
     <drag-dialog :title="editType ? '处理' : '详情'" :visible.sync="dialogEditVisible" :before-close="resetEditDialog" width="70%" top="5vh">
       <el-form class="editForm" :disabled="loading">
-        <el-form-item class="col-line-2" label="用车部门" label-width="100px">
+        <div class="line-wrap">
+          <el-form-item class="col-line-3" label="用车部门" label-width="100px">
             <span>{{selected.department}}</span>
           </el-form-item>
-        <el-form-item class="col-line-2" label="用车申请时间" label-width="100px">
+          <el-form-item class="col-line-3" label="用车申请时间" label-width="100px">
             <span>{{selected.createDate}}</span>
           </el-form-item>
-        <el-form-item class="col-line-2" label="申请人" label-width="100px">
+        </div>
+        <div class="line-wrap">
+          <el-form-item class="col-line-3" label="申请人" label-width="100px">
             <span>{{selected.name}}</span>
           </el-form-item>
-        <el-form-item class="col-line-2" label="用车人数" label-width="100px">
+          <el-form-item class="col-line-3" label="用车人数" label-width="100px">
             <span>{{selected.userCount}}</span>
           </el-form-item>
+        </div>
         <el-form-item label="用车类型" label-width="100px">
           <span>{{selected.categoryName}}</span>
         </el-form-item>
@@ -80,16 +84,19 @@
         <el-form-item label="用车详细路线" label-width="100px">
           <span>{{selected.lineDescription}}</span>
         </el-form-item>
-        <el-form-item class="col-line-2" label="派车人" label-width="100px">
+        <div class="line-wrap">
+          <el-form-item class="col-line-3" label="派车人" label-width="100px">
             <span>{{selected.dealName}}</span>
           </el-form-item>
-        <el-form-item class="col-line-2" label="派车车牌" label-width="100px">
+          <el-form-item class="col-line-3" label="派车车牌" label-width="100px">
             <el-select v-if="editType" v-model="selected.carPlate" filterable clearable placeholder="派车车牌">
               <el-option v-for="item in carPlateOptions" :key="item.id" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
             <span v-else>{{selected.carPlate}}</span>
           </el-form-item>
+        </div>
+        <div class="line-wrap">
           <el-form-item class="col-line-3" label="出车公里数" label-width="100px">
             <el-input-number v-model.trim="selected.startKilometers" :controls="false" :precision="0" :min="0" :max="9999999" placeholder="" clearable></el-input-number>
           </el-form-item>
@@ -99,15 +106,19 @@
           <el-form-item class="col-line-3" label="实际公里数" label-width="100px">
             <el-input-number v-model.trim="selected.trueKilometers" :controls="false" :precision="0" :min="0" :max="9999999" placeholder="" clearable></el-input-number>
           </el-form-item>
+        </div>
         <el-form-item label="资金来源" label-width="100px">
           <el-input v-model.trim="selected.priceSource" placeholder="可不填" :maxlength="20" clearable></el-input>
         </el-form-item>
-        <el-form-item label="用车单价" label-width="100px">
-          <div class="item-value">
+        <div class="line-wrap">
+          <el-form-item class="col-line-3" label="用车单价" label-width="100px">
             <el-input-number v-model.trim="selected.price" :controls="false" :precision="2" :min="0" :max="9999999.99" placeholder="可不填" clearable></el-input-number>
+          </el-form-item>
+          <el-form-item class="col-line-3" label="用车金额" label-width="100px">
             <el-input-number v-model.trim="selected.totalPrice" :controls="false" :precision="2" :min="0" :max="9999999.99" placeholder="可不填" clearable></el-input-number>
-          </div>
           </el-form-item>
+        </div>
+
         <!-- <template v-else>
           <el-form-item class="col-line-2" label="用车单价" label-width="100px">
             <span>{{selected.price}}</span>
@@ -239,8 +250,8 @@ export default {
         //   new Date(data.row.endDate),
         //   'yyyy-MM-dd hh:mm:ss'
         // ),
-        beginDate:data.row.beginDate,
-        endDate:data.row.endDate,
+        beginDate: data.row.beginDate,
+        endDate: data.row.endDate,
         lineDescription: data.row.lineDescription,
         dealName: data.row.dealName || this.userInfo.name,
         carPlate: data.row.carPlate,
@@ -359,8 +370,8 @@ export default {
         //   'yyyy-MM-dd hh:mm:ss'
         // ),
 
-        beginDate:data.row.beginDate,
-        endDate:data.row.endDate,
+        beginDate: data.row.beginDate,
+        endDate: data.row.endDate,
         lineDescription: data.row.lineDescription,
         dealName: data.row.dealName,
         carPlate: data.row.carPlate,

src/containers/print/publicCar.vue

@@ -14,7 +14,7 @@
         <div :span="6" class="tableCell tabelCol-6">用车人数</div>
         <div :span="4" class="tableCell tabelCol-4">{{selected.userCount}}人</div>
       </div>
-      <div class="tableRow">
+      <div class="tableRow tableMinHeightBig">
         <div :span="4" class="tableCell tabelCol-4">用车类型<br>（勾选）</div>
         <div :span="20" class="tableCell tabelCol-20 tal">{{selected.categoryName}}</div>
       </div>
@@ -22,17 +22,23 @@
         <div :span="4" class="tableCell tabelCol-4">用车起始时间</div>
         <div :span="20" class="tableCell tabelCol-20 tal">{{selected.beginDate}} - {{selected.endDate}}（共 {{2}} 天）</div>
       </div>
-        <div class="tableRow">
+      <div class="tableRow tableMinHeightBig">
         <div :span="4" class="tableCell tabelCol-4">用车详细路线</div>
         <div :span="20" class="tableCell tabelCol-20 tal">{{selected.lineDescription}}</div>
       </div>
       <div class="tableRow">
         <div :span="4" class="tableCell tabelCol-4">部门负责人<br>签字（盖章）</div>
-            <div :span="4" class="tableCell tabelCol-12"></div>
+        <div :span="4" class="tableCell tabelCol-10"></div>
         <div :span="4" class="tableCell tabelCol-4">派车人</div>
-            <div :span="4" class="tableCell tabelCol-4">
-              {{selected.dealName}}<br/>
-              {{selected.carPlate}}</div>
+        <div :span="4" class="tableCell tabelCol-6">
+          <span>
+            {{selected.dealName}}
+          </span>
+          <br />
+          <span>
+            {{selected.carPlate}}
+          </span>
+        </div>
       </div>
       <div class="tableRow">
         <div :span="4" class="tableCell tabelCol-4">出车公里数</div>
@@ -57,6 +63,9 @@
         <div :span="8" class="tableCell tabelCol-8"></div>
       </div>
     </div>
+    <div class="tableBottm">
+      本表一式两份交车队北区体育场204或205办公室
+    </div>
   </div>
 </template>
 
@@ -92,6 +101,8 @@ export default {
   max-height: 978px;
   text-align: center;
   margin: 0 auto;
+  padding-bottom: 40px;
+  line-height: 40px;
   .tableTitle {
     font-size: 20px;
     line-height: 80px;
@@ -109,6 +120,8 @@ export default {
       padding: 10px 0;
       border-bottom: 1px solid #000;
       border-right: 1px solid #000;
+      word-break: break-all;
+      white-space: wrap;
     }
     .tableCell:last-child {
       border-right: none;
@@ -135,5 +148,8 @@ export default {
       width: 50%;
     }
   }
+  .tableBottm {
+    text-align: left;
+  }
 }
 </style>