WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

Browse Source
This commit is contained in:
yuekuo
2023-03-28 14:36:18 +08:00
parent 42a278d4aa c690af58ed
commit a8e52370d9
28 changed files with 353 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+1
View File
@@ -894,6 +894,7 @@ module.exports = {
designComplianceReview: 'Design Compliance Confirmation',
preHomeConfirmation: 'Pre-Homo Confirmation',
verificationComplianceReview: 'Validation Compliance Confirmation',
verificationComplianceExamine:'Verification compliance examine',
Deployment: 'Deploy',
pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
jero-web/src/common/lang/zh-cn.js
+1
View File
@@ -910,6 +910,7 @@ module.exports = {
designComplianceReview: '设计符合性确认',
preHomeConfirmation: 'Pre-Homo确认',
verificationComplianceReview: '验证符合性确认',
verificationComplianceExamine:'验证符合性审查',
pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
pleaseConformityVerification: '请补全验证符合性确认的数据',
jero-web/src/components/CollectionType/index.vue
+1 -1
View File
@@ -1106,7 +1106,7 @@
}
.selectWid {
min-width: 150px;
/*min-width: 150px;*/
width: 100%;
}
jero-web/src/components/CollectionTypeDisabled/index.vue
+1 -1
View File
@@ -980,7 +980,7 @@
}
.selectWid {
min-width: 150px;
/*min-width: 150px;*/
width: 100%;
}
jero-web/src/components/tableCollection/index.vue
+1 -1
View File
@@ -8,7 +8,7 @@
rowKey="id"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 330px)'}"
:scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 330px)'} : {x: '100%'}"
:data-source="dataSource"
:loading="loading"
@change="tableOnChange"
jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+10 -11
View File
@@ -23,25 +23,25 @@
style="margin-bottom: 20px"
>
<span slot="functionname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title="record.gnmc" v-model="record.gnmc" :max-length="50"></a-input>
</span>
<span slot="upgradedestinationype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjmdlx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title="record.sjmdlx" v-model="record.sjmdlx" :max-length="50"></a-input>
</span>
<span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span>
<span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs":max-length="500"></a-input>
</span>
<span slot="functionalchangedescription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" :title='record.gnbgms' :max-length="500"></a-input>
</span>
<span slot="variationofapplicableconditions" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sytjbg" :title='record.sytjbg' :max-length="500"></a-input>
</span>
<span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsjkzq" :title='record.sjsjkzq' :max-length="500"></a-input>
</span>
@@ -99,7 +99,6 @@ export default {
align: 'left',
dataIndex: 'functionname',
ellipsis: true,
width: 170,
scopedSlots: { customRender: 'functionname' },
},
{
@@ -140,7 +139,7 @@ export default {
align: 'left',
dataIndex: 'functionalchangedescription',
ellipsis: true,
width: 170,
width: 230,
scopedSlots: { customRender: 'functionalchangedescription' },
},
{
@@ -148,7 +147,7 @@ export default {
align: 'left',
dataIndex: 'variationofapplicableconditions',
ellipsis: true,
width: 170,
width: 230,
scopedSlots: { customRender: 'variationofapplicableconditions' },
},
{
@@ -156,7 +155,7 @@ export default {
align: 'left',
dataIndex: 'upgradetheelectroniccontrollerinvolved',
ellipsis: true,
width: 170,
width: 230,
scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
},
{
jero-web/src/views/otamanagement/upgradeactivityrecord/components/informationaboutotherupgradetasks.vue
+1
View File
@@ -13,6 +13,7 @@
<a-input
:placeholder="$t('pleaseEnter')"
v-model.trim="queryParam.rwmc"
:title='queryParam.rwmc'
:max-length="500"></a-input>
</a-form-model-item>
</div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+1
View File
@@ -22,6 +22,7 @@
<a-input class="box-input"
:disabled="disabled"
v-model="formInline.zsl"
:title='formInline.zsl'
:placeholder="$t('PleaseSelect')"></a-input>
</a-form-model-item>
</div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+12 -12
View File
@@ -23,42 +23,42 @@
style="margin-bottom: 20px"
>
<span slot="systemname" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" :title='record.xtmc' :max-length="50"></a-input>
</span>
<!-- 升级前-->
<span slot="preupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjqbgcs ? record.sjqbgcs : $t('ifNot')" v-model="record.sjqbgcs" :max-length="500"></a-input>
</span>
<!-- 升级后-->
<span slot="afterupgrade" slot-scope="text,record">
<a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
<a-input :placeholder="$t('ifNot')" :title="record.sjhbgcs ? record.sjhbgcs : $t('ifNot')" v-model="record.sjhbgcs" :max-length="500"></a-input>
</span>
<span slot="nameoftheupgradedelectroniccontroller" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" :title='record.sjkzqmc' :max-length="50"></a-input>
</span>
<span slot="adaptivehardwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbb" :title='record.yjbb' :max-length="50"></a-input>
</span>
<span slot="beforethesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" :title='record.sjqrjbb' :max-length="50"></a-input>
</span>
<span slot="afterthesoftwareversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhrjbb" :title='record.sjhrjbb' :max-length="50"></a-input>
</span>
<span slot="beforetheOSversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqczxt" :title='record.sjqczxt' :max-length="50"></a-input>
</span>
<span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjhczxt" :title='record.sjhczxt' :max-length="50"></a-input>
</span>
<span slot="upgradepackageintegrityverificationdata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" :title='record.sjbyzsj' :max-length="500"></a-input>
</span>
<span slot="upgradepackagesize" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbdx" :title='record.sjbdx' :max-length="50"></a-input>
</span>
<span slot="differentialupgradeornot" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>
</span>
<!-- 操作列-->
<span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+5 -5
View File
@@ -41,7 +41,7 @@
</div>
<div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.babh" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
<a-input class="box-input" v-model="form.babh" :title='form.babh' :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
</div>
</div>
</a-col>
@@ -52,7 +52,7 @@
</div>
<div class="title-text-add-input">
<!-- <span class="title-text-text">中文</span> -->
<a-input class="box-input" v-model="form.qymc" :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
<a-input class="box-input" v-model="form.qymc" :title='form.qymc' :placeholder="$t('pleaseEnter')" disabled style="width:93%"></a-input>
</div>
</div>
</a-col>
@@ -77,7 +77,7 @@
<span class="title-text-text" :title="$t('producttrademark')">{{$t('producttrademark')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpsb"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpsb' v-model="form.cpsb"></a-input>
</a-form-model-item>
</div>
@@ -88,7 +88,7 @@
<span class="title-text-text" :title="$t('productname')">{{$t('productname')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpmc"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpmc' v-model="form.cpmc"></a-input>
</a-form-model-item>
</div>
@@ -99,7 +99,7 @@
<span class="title-text-text" :title="$t('productModel')">{{$t('productModel')}}</span>
</div>
<a-form-model-item class="itemModel">
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" v-model="form.cpxh"></a-input>
<a-input disabled class="box-input" :placeholder="$t('pleaseEnter')" :title='form.cpxh' v-model="form.cpxh"></a-input>
</a-form-model-item>
</div>
jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+6
View File
@@ -23,6 +23,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="500"
:title='formInline.sjmd'
v-model='formInline.sjmd'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
@@ -37,6 +38,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="500"
:title='formInline.gxbh'
v-model='formInline.gxbh'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
@@ -51,6 +53,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="50"
:title='formInline.sjsj'
v-model='formInline.sjsj'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
@@ -65,6 +68,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="50"
:title='formInline.sjky'
v-model='formInline.sjky'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
@@ -79,6 +83,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="50"
:title='formInline.sjbkygn'
v-model='formInline.sjbkygn'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
@@ -93,6 +98,7 @@
<a-input class="box-input"
:disabled="disabled"
:max-length="500"
:title='formInline.zdxx'
v-model='formInline.zdxx'
:placeholder="$t('pleaseEnter')"></a-input>
</a-form-model-item>
jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+6
View File
@@ -39,6 +39,7 @@
:disabled="disabled"
class="box-input"
:placeholder="$t('pleaseEnter')"
:title='form.qymc'
v-model="form.qymc">
</a-input>
</a-form-model-item>
@@ -55,6 +56,7 @@
<a-input
:max-length="50"
:disabled="disabled"
:title='form.djbh'
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model.trim="form.djbh">
@@ -88,6 +90,7 @@
<a-input
:max-length="500"
:disabled="disabled"
:title='form.ggpc'
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model="form.ggpc">
@@ -104,6 +107,7 @@
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpsb'
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model="form.cpsb">
@@ -120,6 +124,7 @@
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpmc'
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model="form.cpmc">
@@ -137,6 +142,7 @@
<a-input
:max-length="50"
:disabled="disabled"
:title='form.cpxh'
class="box-input"
:placeholder="$t('pleaseEnter')"
v-model="form.cpxh">
jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+9 -9
View File
@@ -14,7 +14,7 @@
size="middle"
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 140px)'}"
:scroll="this.dataSource.length > 1 ? {x: '100%',y:'calc(100vh - 140px)'} : {x: '100%'}"
rowKey="id"
bordered
:data-source="dataSource"
@@ -59,26 +59,26 @@
<a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
</span>
<span slot="functiondeelectronicscription" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>
</span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"> </a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqscqy' v-model="record.kzqscqy" :max-length="50"> </a-input>
</span>
<span slot="electroniccontrollertypeone" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqxh' v-model="record.kzqxh" :max-length="50"></a-input>
</span>
<span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.yjbbxx' v-model="record.yjbbxx" :max-length="50"></a-input>
</span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.rjkfqy' v-model="record.rjkfqy" :max-length="50"></a-input>
</span>
<span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.czxtbbh' v-model="record.czxtbbh" :max-length="50"></a-input>
</span>
<span slot="inflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csyzsj" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.csyzsj' v-model="record.csyzsj" :max-length="500"></a-input>
</span>
<!-- 操作列-->
<span slot="operation" slot-scope="text,record">
@@ -366,7 +366,7 @@ import ImportFile from '@/components/ImportFileData/index'
this.$message.success(this.$t('SavedSuccessfully'))
this.getData()
}
})
},
last(){
jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+7 -7
View File
@@ -218,7 +218,7 @@
<div style='width: 700px'>
<span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
<span v-for='(item,index) in dataSource' class='content-text'>
<a-input v-model="item.val" class="item-input" :placeholder="item.fillincontent" :max-length="50"/>
<a-input v-model="item.val" class="item-input" :title='item.val' :placeholder="item.fillincontent" :max-length="50"/>
</span><br>
</div>
</div>
@@ -244,22 +244,22 @@
</a-radio-group>
</span>
<span slot="controllername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :title='record.kzqmc' :max-length="50"></a-input>
</span>
<span slot="hardwarespecificationmodel" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjggxh" :title='record.yjggxh' :max-length="50"></a-input>
</span>
<span slot="hardwaremanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjscqy" :title='record.yjscqy' :max-length="50"></a-input>
</span>
<span slot="softwareversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjbb" :title='record.rjbb' :max-length="50"></a-input>
</span>
<span slot="softwaredevelopmententerprise" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :title='record.rjkfqy' :max-length="50"></a-input>
</span>
<span slot="layoutposition" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" v-model="record.bzwz" :title='record.bzwz' :max-length="50"></a-input>
</span>
<!-- 操作列-->
<span slot="operation" slot-scope="text,record">
jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+11 -11
View File
@@ -43,37 +43,37 @@
</a-button>
</span>
<span slot="electronicController" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>
</span>
<span slot="electroniccontrollername" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.aqwzxdj" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.aqwzxdj' v-model="record.aqwzxdj" :max-length="50"></a-input>
</span>
<span slot="electroniccontrollerproductionenterprises" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqscqy" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqscqy' v-model="record.kzqscqy" :max-length="50"></a-input>
</span>
<span slot="electroniccontrollertype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqxh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.kzqxh' v-model="record.kzqxh" :max-length="50"></a-input>
</span>
<span slot="hardwareversioninformation" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.yjbbxx' v-model="record.yjbbxx" :max-length="50"></a-input>
</span>
<span slot="initialsoftwareversionnumber" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbbh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.csrjbbh' v-model="record.csrjbbh" :max-length="50"></a-input>
</span>
<span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.csrjbwzsj" :max-length="500"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.csrjbwzsj' v-model="record.csrjbwzsj" :max-length="500"></a-input>
</span>
<span slot="environmentalprotection" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.sjsfyx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.sjsfyx' v-model="record.sjsfyx" :max-length="50"></a-input>
</span>
<span slot="operatingsystemtype" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtlx" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.czxtlx' v-model="record.czxtlx" :max-length="50"></a-input>
</span>
<span slot="operatingsystemmanufacturer" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtscqy" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.czxtscqy' v-model="record.czxtscqy" :max-length="50"></a-input>
</span>
<span slot="operatingsystemversion" slot-scope="text,record">
<a-input :placeholder="$t('pleaseEnter')" v-model="record.czxtbbh" :max-length="50"></a-input>
<a-input :placeholder="$t('pleaseEnter')" :title='record.czxtbbh' v-model="record.czxtbbh" :max-length="50"></a-input>
</span>
<!-- 操作列-->
<span slot="operation" slot-scope="text,record" >
jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+153 -4
View File
@@ -40,6 +40,11 @@
<span slot="approvalResult" slot-scope="text,result">
{{approvalResult[text]}}
</span>
<span slot="resultofhandling" slot-scope="text,result">
<span :class="statusClass[result.operatorResult]" :title="result.operatorResultName">
{{result.operatorResultName}}
</span>
</span>
<span slot="approvalFile" slot-scope="text,result">
<span class="viewFile"
@click="viewFileClick(result.approvalFile)"
@@ -78,7 +83,40 @@
return {
loading: false,
dataSource: [],
regulatoryCertificationTaskPlanList: [
statusClass: {
'Accepted': 'AcceptedClass',
'Rejected': 'RejectedClass',
'Transfer': 'TransferClass',
'Returned': 'ReturnedClass',
'Adopt': 'AdoptClass',
'Compliance': 'ComplianceClass',
'Non-Compliance': 'NonComplianceClass',
'To be tracked': 'trackedClass',
'NA': 'NAClass'
},
verifyList: [
{
status: '1',
name: this.$t('initiatingProcess')
},
{
status: '1',
name: this.$t('Taskresponsibilityrecognition')
},
{
status: '1',
name: this.$t('verificationComplianceReview')
},
{
status: '2',
name: this.$t('verificationComplianceExamine')
},
{
status: '3',
name: this.$t('missionAccomplished')
}
],
designList: [
{
status: '1',
name: this.$t('initiatingProcess')
@@ -100,6 +138,7 @@
name: this.$t('missionAccomplished')
}
],
regulatoryCertificationTaskPlanList: [],
columns: [
{
title: this.$t('Operator'),
@@ -131,6 +170,7 @@
align: 'left',
width: 160,
ellipsis: true,
scopedSlots: { customRender: 'resultofhandling' }
},
{
title: this.$t('feedback'),
@@ -151,6 +191,7 @@
}
},
mounted() {
console.log(this.queryProject)
this.getList()
},
methods: {
@@ -163,8 +204,13 @@
if (res.success) {
this.dataSource = res.result || []
if (this.dataSource.length > 0) {
if (this.queryProject.flowType == 4) {
this.regulatoryCertificationTaskPlanList = this.verifyList
} else {
this.regulatoryCertificationTaskPlanList = this.designList
}
let taskData = this.dataSource[this.dataSource.length - 1]
if (this.queryProject.TaskKey == 'fqlc'){
if (this.queryProject.TaskKey == 'fqlc') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '2'
@@ -194,13 +240,15 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '2'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '2'
} else {
val.status = '3'
}
})
}
if (this.queryProject.TaskKey == 'fggcssh') {
if (taskData.operatorResult == 'Adopt'){
if (taskData.operatorResult == 'Adopt') {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
@@ -210,11 +258,15 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '1'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('verificationComplianceExamine')) {
val.status = '1'
} else {
val.status = '1'
}
})
}else{
} else {
this.regulatoryCertificationTaskPlanList.forEach(val => {
if (val.name == this.$t('initiatingProcess')) {
val.status = '1'
@@ -222,8 +274,12 @@
val.status = '1'
} else if (val.name == this.$t('designComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('verificationComplianceReview')) {
val.status = '1'
} else if (val.name == this.$t('designComplianceReviewAdmin')) {
val.status = '2'
} else if (val.name == this.$t('verificationComplianceExamine')) {
val.status = '2'
} else {
val.status = '3'
}
@@ -248,6 +304,7 @@
<style scoped lang="less">
@import '~@assets/less/common.less';
.box {
padding: 0 0 24px 0;
box-sizing: border-box;
@@ -331,6 +388,7 @@
}
}
}
.process-content-content:first-child {
padding: 0 10px 0 0;
}
@@ -338,6 +396,7 @@
.process-content-content:last-child {
padding: 0 0 0 10px;
}
.process-content-right-xian {
height: 2px;
width: calc(100% - 27px);
@@ -346,4 +405,94 @@
top: 16px;
}
}
.AcceptedClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.RejectedClass {
background: #fdeaea;
color: #E83030;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.TransferClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.ReturnedClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.AdoptClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.ComplianceClass {
background: #e9f8ed;
color: #26BD4B;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.NonComplianceClass {
background: #fdeaea;
color: #E83030;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.trackedClass {
background: #fff6e8;
color: #FDA71C;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
.NAClass {
background: #f1f1f3;
color: #707486;
display: inline-block;
padding: 4px 8px;
border-radius: 2px;
font-weight: 400;
font-size: 12px;
}
</style>