OTA修改

jero-web/src/common/lang/en-us.js

@@ -1841,4 +1841,10 @@ module.exports = {
   submissionProcess:'Submission Process',
   localapproval1:'Local Approval1',
   localapproval2:'Local Approval2',
+  averageapprovalperiod:'Average approval period',
+  day:'day',
+  passreturntime:'Pass/return time',
+  approvalcycle:'Approval cycle',
+  transittime:'Transit Time',
+  returntime:'Return time',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1942,4 +1942,10 @@ module.exports = {
   submissionProcess:'提交流程',
   localapproval1:'地方批准1',
   localapproval2:'地方批准2',
+  averageapprovalperiod:'平均审批周期',
+  day:'天',
+  passreturntime:'通过/退回时间',
+  approvalcycle:'审批周期',
+  transittime:'通过时间',
+  returntime:'退回时间',
 }

jero-web/src/views/otamanagement/upgradeactivity/components/maintenance.vue

@@ -30,11 +30,11 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-                            <span class="Required">*</span>
+                            <span v-if='!propflag' class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="batjsj">
+            <a-form-model-item class="itemModel" :prop="!propflag?'batjsj':''" :key="propflag">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
@@ -46,6 +46,44 @@
             </a-form-model-item>
           </div>
         </a-col>
+        <a-col :span="24" v-if='transittime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('transittime')">
+                {{$t('transittime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('transittime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='returntime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('returntime')">
+                {{$t('returntime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('returntime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
@@ -77,9 +115,13 @@ export default {
     return {
       visible: false,
       confirmLoading: false,
+      transittime:false,
+      returntime:false,
+      propflag: false,
       formInline: {
         bazt:undefined,
         batjsj:'',
+        tgthsj:'',
         bz:'',
       },
       rules: {
@@ -99,7 +141,14 @@ export default {
         ],
         bz: [
           { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
-        ]
+        ],
+        tgthsj: [
+          {
+            required: true,
+            message: this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // listConfirmation: [
         //   {
         //     required: true,
@@ -161,16 +210,43 @@ export default {
         this.ids = row.join(',')
         this.formInline = {
           bazt:undefined,
+          tgthsj:'',
           batjsj:'',
           bz:'',
         }
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
+        this.formInline.tgthsj = row.tgthsj
         this.formInline.bz = row.bz
         this.ids = row.id
+        if (this.formInline.bazt == 1) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if (this.formInline.bazt == 2) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if(this.formInline.bazt == 4){
+          this.propflag = false
+          this.transittime = true
+          this.returntime = false
+        } else if(this.formInline.bazt == 5){
+          this.propflag = false
+          this.returntime = true
+          this.transittime = false
+        }else{
+          this.propflag = false
+          this.transittime = false
+          this.returntime = false
+        }
       }
       this.visible = true
+
       this.$nextTick(() => {
         this.$refs.ruleForm.clearValidate()
       })
@@ -197,7 +273,29 @@ export default {
         }
       })
     },
-    selectchange(value){
+    selectchange(value) {
+      console.log(value)
+      if (value == 1) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if (value == 2) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if(value == 4){
+        this.propflag = false
+        this.transittime = true
+        this.returntime = false
+      } else if(value == 5){
+        this.propflag = false
+        this.returntime = true
+        this.transittime = false
+      }else{
+        this.propflag = false
+        this.transittime = false
+        this.returntime = false
+      }
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
         this.$refs.ruleForm.validateField('bazt')

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -159,6 +159,9 @@
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
       </a-table>
+      <div>
+        {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}}
+      </div>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
           :show-total="total => $t('total')+` ${total} `+$t('strip')"
@@ -205,6 +208,7 @@ export default {
         importZipUrl: '/ota/otaBaSjList/importData',//导入
 
       },
+      number:'',
       visible: false,
       loading: false,
       toggleSearchStatus: false,
@@ -301,9 +305,23 @@ export default {
           title: this.$t('filingtime'),
           align: 'left',
           ellipsis: true,
-          width: 140,
+          width: 170,
           dataIndex: 'batjsj'
         },
+        {
+          title: this.$t('passreturntime'),
+          align: 'left',
+          ellipsis: true,
+          width: 170,
+          dataIndex: 'tgthsj'
+        },
+        {
+          title: this.$t('approvalcycle'),
+          align: 'left',
+          ellipsis: true,
+          width: 140,
+          dataIndex: 'spzq'
+        },
         {
           title: this.$t('createTime'),
           align: 'left',

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue

@@ -425,10 +425,10 @@ this.$forceUpdate()
             this.flagqr = false
             this.qrheight = '50px'
           }
-          if(this.form.yhqr == '1' && (this.form.flagqr == '其他' || this.form.flagqr == 'others')){
+          if(this.form.yhqr == '1' && this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
             this.qrheight = '150px'
             this.flagqrqt = true
-          }else if(this.form.yhqr == '1' && (this.form.flagqr != '其他' || this.form.flagqr != 'others')){
+          }else if(this.form.yhqr == '1' && this.form.flagqr != '344a3320beba45afb3718c59b7a7144a'){
             this.flagqr = true
             this.flagqrqt = false
             this.qrheight = '100px'
@@ -476,10 +476,14 @@ this.$forceUpdate()
       if(val.target.value == '1'){
         this.qrheight = '100px'
         this.flagqr = true
-
+        if(this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
+          this.qrheight = '150px'
+          this.flagqrqt = true
+        }
       }else{
         this.qrheight = '50px'
         this.flagqr = false
+        this.flagqrqt = false
       }
     },
     handleInput(val){

jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue

@@ -30,17 +30,56 @@
         <a-col :span="24">
           <div class="box-title-text">
             <div class="title-text">
-                            <span class="Required">*</span>
+              <span v-if='!propflag' class="Required">*</span>
               <span class="title-text-text" :title="$t('filingtime')">
                 {{$t('filingtime')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="batjsj">
+            <a-form-model-item class="itemModel" :prop="!propflag?'batjsj':''" :key="propflag">
               <a-date-picker class="box-input"
                              :placeholder="$t('PleaseSelect')+$t('filingtime')"
                              @change="dateChange({db_field_name:'batjsj'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
                              v-model="formInline.batjsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='transittime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('transittime')">
+                {{$t('transittime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('transittime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
+                             style="width: 90%"/>
+            </a-form-model-item>
+          </div>
+        </a-col>
+        <a-col :span="24" v-if='returntime'>
+          <div class="box-title-text">
+            <div class="title-text">
+              <span v-if='!propflag' class="Required">*</span>
+              <span class="title-text-text" :title="$t('returntime')">
+                {{$t('returntime')}}</span>
+            </div>
+            <a-form-model-item class="itemModel" prop="tgthsj">
+              <a-date-picker class="box-input"
+                             :placeholder="$t('PleaseSelect')+$t('returntime')"
+                             @change="dateChange({db_field_name:'tgthsj'})"
+                             format="YYYY-MM-DD"
+                             :getCalendarContainer="(trigger) => trigger.parentNode"
+                             v-model="formInline.tgthsj"
+                             :disabled="false"
                              style="width: 90%"/>
             </a-form-model-item>
           </div>
@@ -79,8 +118,12 @@ export default {
       formInline: {
         bazt:undefined,
         batjsj:'',
+        tgthsj:'',
         bz:'',
       },
+      transittime:false,
+      returntime:false,
+      propflag: false,
       rules: {
         bazt: [
           {
@@ -98,7 +141,14 @@ export default {
         ],
         bz: [
           { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
-        ]
+        ],
+        tgthsj: [
+          {
+            required: true,
+            message: this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
         // designDeadline: [
         //   {
         //     required: true,
@@ -147,13 +197,39 @@ export default {
         this.formInline = {
             bazt:undefined,
             batjsj:'',
+            tgthsj:'',
             bz:'',
         }
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
       }else{
         this.formInline.bazt = row.bazt ? row.bazt : undefined
         this.formInline.batjsj = row.batjsj
+        this.formInline.tgthsj = row.tgthsj
         this.formInline.bz = row.bz
         this.ids = row.id
+        if (this.formInline.bazt == 1) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if (this.formInline.bazt == 2) {
+          this.propflag = true
+          this.transittime = false
+          this.returntime = false
+        } else if(this.formInline.bazt == 4){
+          this.propflag = false
+          this.transittime = true
+          this.returntime = false
+        } else if(this.formInline.bazt == 5){
+          this.propflag = false
+          this.returntime = true
+          this.transittime = false
+        }else{
+          this.propflag = false
+          this.transittime = false
+          this.returntime = false
+        }
       }
       this.visible = true
       this.$nextTick(() => {
@@ -183,6 +259,27 @@ export default {
       })
     },
     selectchange(value){
+      if (value == 1) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if (value == 2) {
+        this.propflag = true
+        this.transittime = false
+        this.returntime = false
+      } else if(value == 4){
+        this.propflag = false
+        this.transittime = true
+        this.returntime = false
+      } else if(value == 5){
+        this.propflag = false
+        this.returntime = true
+        this.transittime = false
+      }else{
+        this.propflag = false
+        this.transittime = false
+        this.returntime = false
+      }
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
         this.$refs.ruleForm.validateField('bazt')

jero-web/src/views/otamanagement/vehicleregistration/index.vue

@@ -126,6 +126,9 @@
             @click="deleteData(record)">{{ $t('delete') }}</a>
         </span>
       </a-table>
+      <div>
+        {{$t('averageapprovalperiod')}} : {{number}}{{$t('day')}}
+      </div>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination :show-total="total => $t('total') + ` ${total} ` + $t('strip')" show-quick-jumper show-size-changer
           :page-size.sync="pageSize" :total="total" :current="pageNo" @change="pageOnChange"
@@ -159,6 +162,7 @@ export default {
         exportData: '/ota/otaBaCxList/exportData',
         importZipUrl: '/ota/otaBaCxList/importData',//导入
       },
+      number:'',
       visible: false,
       loading: false,
       toggleSearchStatus: false,
@@ -251,6 +255,20 @@ export default {
           width: 140,
           dataIndex: 'batjsj'
         },
+        {
+          title: this.$t('passreturntime'),
+          align: 'left',
+          ellipsis: true,
+          width: 170,
+          dataIndex: 'tgthsj'
+        },
+        {
+          title: this.$t('approvalcycle'),
+          align: 'left',
+          ellipsis: true,
+          width: 140,
+          dataIndex: 'spzq'
+        },
         {
           title: this.$t('createTime'),
           align: 'left',