Merge remote-tracking branch 'origin/qirui-v2' into qirui-v2

src/locales/lang/en-US/baseInfo.js

@@ -20,6 +20,7 @@ export default {
     'base.info.performance.module': 'Performance Module',
     'base.info.demand.department': 'Demand Department',
     'base.info.requirement.owner': 'Requirement Owner',
+    'base.info.please-choose-owner': 'Please Choose The Requirement Owner',
     'base.info.development.scope': 'Development Scope',
     'base.info.serial-number': 'ID',
 

src/locales/lang/zh-CN/baseInfo.js

@@ -20,6 +20,7 @@ export default {
     'base.info.performance.module': '性能模块',
     'base.info.demand.department': '需求部门',
     'base.info.requirement.owner': '需求负责人',
+    'base.info.please-choose-owner': '请选择需求负责人',
     'base.info.development.scope': '开发范围',
     'base.info.serial-number': '序号',
 

src/styles/index.scss

@@ -74,7 +74,7 @@ a,
 a:focus,
 a:hover {
   cursor: pointer;
-  color: inherit;
+  // color: inherit;
   text-decoration: none;
 }
 
@@ -506,6 +506,10 @@ aside {
   padding: 10px !important;
 }
 
+.p12 {
+  padding: 12px !important;  
+}
+
 .p15 {
   padding: 15px !important;
 }

src/views/fullVehicle/baseInfo/baseInfo/index.vue

@@ -120,7 +120,7 @@
                 class="selectWidth"
                 v-model="owner"
                 :filter-option="filterOption"
-                :placeholder="$t('base.info.requirement.owner')"
+                :placeholder="$t('base.info.please-choose-owner')"
                 showSearch
                 @change="changeOwner"
               >

src/views/fullVehicle/verify/dvpVerify.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="background">
+  <div class="p12">
     <a-row :gutter="24" class="topCard">
       <!-- DVP计划-检索条件 -->
-      <a-card>
-        <a-form>
+      <a-card class="topCardMargin p12">
+        <a-form layout="vertical">
           <!-- 试验车用途 -->
           <a-col :lg="8" :md="12" :sm="24" :xl="6" :xs="24">
             <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-use-description')">
@@ -31,7 +31,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeDeliveryTime'
                   v-model="queryParam.actualDeliveryTime"
               />
@@ -42,7 +43,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-start-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeStartTime'
                   v-model="queryParam.actualStartTime"
               />
@@ -53,7 +55,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-end-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeEndTime'
                   v-model="queryParam.actualEndTime"
               />
@@ -101,22 +104,26 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
+            <a-form-item class='tr' :label="'\xa0'">
+              <!-- 重置 -->
+              <a-button @click='reset' type="primary" class="ml10">
+                {{ $t('global-btn.reset') }}
+              </a-button>
+              <!-- 查询 -->
+              <a-button @click='search' type="primary" class="ml10">
+                {{ $t('global-btn.search') }}
+              </a-button>
+            </a-form-item>
+          </a-col>
         </a-form>
       </a-card>
     </a-row>
     <a-row class="mt10">
-      <a-card :style="{ height: tableHeight }">
+      <a-card class="p12 cardOverFlow" :style="{ height: tableHeight }">
         <template slot="extra">
-          <!-- 重置 -->
-          <a-button @click='reset' type="primary" class="mr10">
-            {{ $t('global-btn.reset') }}
-          </a-button>
-          <!-- 查询 -->
-          <a-button @click='search' type="primary" class="mr10">
-            {{ $t('global-btn.search') }}
-          </a-button>
           <!-- 导出 -->
-          <a-button @click='exportFile'>
+          <a-button class="mr-12" @click='exportFile'>
             {{ $t('global-btn.export') }}
           </a-button>
         </template>
@@ -127,9 +134,8 @@
             :rowKey="(record, index) => { return index; }"
             :loading="tableLoading"
             size="small"
-            :style="{ height:tableHeightValue }"
             @change="handleOuterTableChange"
-            :scroll="{ x: 1000, y: 500 }">
+            :scroll="{ x: 2100, y: tableHeightValue }">
           <!--操作-->
           <template slot='operation' slot-scope='name, row'>
             <a href='javascript: void(0);' @click='editInit(row)'>
@@ -178,7 +184,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.vehicle-actual-delivery-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeDeliveryTime'
                   v-model="editParam.actualDeliveryTime"
               />
@@ -189,7 +196,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-start-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-start-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeStartTime'
                   v-model="editParam.actualStartTime"
               />
@@ -200,7 +208,8 @@
             <a-form-item :label="$t('dvp.full.vehicle.dvp.actual-end-time')">
               <a-date-picker
                   :placeholder="$t('global-btn.please-select') + $t('dvp.full.vehicle.dvp.actual-end-time')"
-                  style="width: 100%"
+                  class="width100"
+                  valueFormat="YYYY/MM/DD"
                   @change='changeEndTime'
                   v-model="editParam.actualEndTime"
               />
@@ -254,7 +263,6 @@
     </a-modal>
   </div>
 </template>
-
 <script>
 export default {
   name: "dvpVerify",
@@ -264,9 +272,9 @@ export default {
       queryParam: {
         vehicleUse: undefined,          //试验车用途
         vehicleStatusDesc: undefined,   //车辆状态描述
-        actualDeliveryTime: null,  //样车实际提供时间
-        actualStartTime: null,     //实际开始时间
-        actualEndTime: null,       //实际结束时间
+        actualDeliveryTime: undefined,  //样车实际提供时间
+        actualStartTime: undefined,     //实际开始时间
+        actualEndTime: undefined,       //实际结束时间
         taskStatus: undefined,          //任务状态
         vehicleVin: undefined,          //车辆VIN
         testReportCode: undefined,      //试验报告编号
@@ -446,24 +454,24 @@ export default {
         performanceModule: undefined,   //整车性能模块
         vehicleUse: undefined,          //试验车用途
         vehicleStatusDesc: undefined,   //车辆状态描述
-        actualDeliveryTime: null,  //样车实际提供时间
-        actualStartTime: null,     //实际开始时间
-        actualEndTime: null,       //实际结束时间
+        actualDeliveryTime: undefined,  //样车实际提供时间
+        actualStartTime: undefined,     //实际开始时间
+        actualEndTime: undefined,       //实际结束时间
         vehicleVin: undefined,          //车辆VIN
         testReportCode: undefined,      //试验报告编号
       },
       /** 试验报告附件list */
       fileList: [],
       /** 高度计算 */
-      tableHeight: window.innerHeight - 360 + 'px',
-      tableHeightValue: window.innerHeight - 360,
+      tableHeight: window.innerHeight - 421 + 'px',
+      tableHeightValue: window.innerHeight - 421,
     }
   },
   created() {
     this.list()
     window.onresize = () => {
-      this.tableHeight = window.innerHeight - 360 + 'px';
-      this.tableHeightValue = window.innerHeight - 360;
+      this.tableHeight = window.innerHeight - 421 + 'px';
+      this.tableHeightValue = window.innerHeight - 421;
     };
   },
   methods: {
@@ -522,14 +530,14 @@ export default {
     },
     /** 重置 */
     reset() {
-      this.queryParam.vehicleUse = undefined
-      this.queryParam.vehicleStatusDesc = undefined
-      this.queryParam.actualDeliveryTime = null
-      this.queryParam.actualStartTime = null
-      this.queryParam.actualEndTime = null
-      this.queryParam.taskStatus = undefined
-      this.queryParam.vehicleVin = undefined
-      this.queryParam.testReportCode = undefined
+      this.queryParam.vehicleUse = undefined;
+      this.queryParam.vehicleStatusDesc = undefined;
+      this.queryParam.actualDeliveryTime = undefined;
+      this.queryParam.actualStartTime = undefined;
+      this.queryParam.actualEndTime = undefined;
+      this.queryParam.taskStatus = undefined;
+      this.queryParam.vehicleVin = undefined;
+      this.queryParam.testReportCode = undefined;
     },
     /** 编辑模态框及模态框数据获取 */
     editInit(data) {
@@ -555,36 +563,36 @@ export default {
         if (!res.flag) {
           this.$notification.error({message: res.message});
         }
-        this.offModal()
+        this.offModal();
       });
     },
     /** 编辑 取消 */
     offModal() {
-      this.editParam = []
-      this.fileList = []
+      this.editParam = [];
+      this.fileList = [];
     },
     /** 样车实际提供时间-选择变化 */
     changeDeliveryTime(data, dateString) {
       if (this.isEdit) {
-        this.editParam.actualDeliveryTime = dateString
+        this.editParam.actualDeliveryTime = dateString;
       } else {
-        this.queryParam.actualDeliveryTime = dateString
+        this.queryParam.actualDeliveryTime = dateString;
       }
     },
     /** 实际开始时间-选择变化 */
     changeStartTime(data, dateString) {
       if (this.isEdit){
-        this.editParam.actualStartTime = dateString
+        this.editParam.actualStartTime = dateString;
       }else {
-        this.queryParam.actualStartTime = dateString
+        this.queryParam.actualStartTime = dateString;
       }
     },
     /** 实际结束时间-选择变化 */
     changeEndTime(data, dateString) {
       if (this.isEdit) {
-        this.editParam.actualEndTime = dateString
+        this.editParam.actualEndTime = dateString;
       }else {
-        this.queryParam.actualEndTime = dateString
+        this.queryParam.actualEndTime = dateString;
       }
     },
     /** 任务状态 下拉变化 */
@@ -602,10 +610,17 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.background {
-  padding: 12px;
+.topCardMargin {
+  margin-top: -12px;
 }
-.topCard{
+.topCard {
   padding: 0 12px;
 }
+.cardOverFlow {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.mr-12 {
+  margin-right: -12px;
+}
 </style>