FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20231201_feizhi' into 'master'

Browse Source 
Dev 20231201 feizhi

See merge request laws-foton-slrs/foton-laws-system-front!123
This commit is contained in:
高嵩
2023-12-12 10:13:30 +00:00
parent e9905b840d 83a367c06e
commit e8585e91ee
11 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1
View File
@@ -51,6 +51,7 @@
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start"> <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
<el-input <el-input
readonly
:disabled="disabledXX" :disabled="disabledXX"
v-model="form.standSystem" v-model="form.standSystem"
type="textarea" type="textarea"
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -51,7 +51,7 @@
</el-form-item> </el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start"> <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
<el-input v-model="form.standSystem" type="textarea" autosize clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input readonly v-model="form.standSystem" type="textarea" autosize clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
</el-tooltip> </el-tooltip>
<tree-select-new <tree-select-new
:key="key" :key="key"
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+1 -1
View File
@@ -298,7 +298,7 @@
<!-- <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>--> <!-- <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input> <el-input v-model="form.TXLBBUSS" placeholder="选择标准体系" readonly clearable @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+1
View File
@@ -53,6 +53,7 @@
border border
default-expand-all> default-expand-all>
<el-table-column <el-table-column
type="index"
label="序号" label="序号"
width="50" width="50"
align="center"> align="center">
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+1 -1
View File
@@ -318,7 +318,7 @@
<!-- <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>--> <!-- <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable <el-input readonly v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input> @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+1 -1
View File
@@ -328,7 +328,7 @@
<!-- <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>--> <!-- <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input> <el-input readonly v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+1 -1
View File
@@ -225,7 +225,7 @@
<!-- <el-input v-model="form.CYCDYBXHBUSS" :disabled="disabledState"></el-input>--> <!-- <el-input v-model="form.CYCDYBXHBUSS" :disabled="disabledState"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input> <el-input v-model="form.TXLBBUSS" :disabled="disabledState" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3 -3
View File
@@ -2154,7 +2154,7 @@
this.QTWJBUSSFileList = this.assemble(this.form.QTWJBUSS, this.form.QTWJBUSSName); this.QTWJBUSSFileList = this.assemble(this.form.QTWJBUSS, this.form.QTWJBUSSName);
this.GLWJBUSSFileList = this.assemble(this.form.GLWJBUSS, this.form.GLWJBUSSName); this.GLWJBUSSFileList = this.assemble(this.form.GLWJBUSS, this.form.GLWJBUSSName);
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText2 || ''
this.ccc = false this.ccc = false
}) })
} else { } else {
@@ -3268,7 +3268,7 @@
taskInfo: '技术标准起草', taskInfo: '技术标准起草',
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText2: this.commentText
})) }))
updateBusProcessNew(_formData).then(res => { updateBusProcessNew(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -3560,7 +3560,7 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
let processForm = JSON.parse(res.mesg) let processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText this.commentText = processForm.commentText2||''
if(processForm.form){ if(processForm.form){
processForm = processForm.form processForm = processForm.form
} }
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+1 -1
View File
@@ -342,7 +342,7 @@
<!-- <el-input :disabled="disabledXX" v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>--> <!-- <el-input :disabled="disabledXX" v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled"> <el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" v-model="form.TXLBBUSS" placeholder="选择标准体系" <el-input readonly :disabled="disabledXX" v-model="form.TXLBBUSS" placeholder="选择标准体系"
clearable clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input> @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input>
</el-form-item> </el-form-item>
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+1 -3
View File
@@ -57,12 +57,10 @@
border border
default-expand-all> default-expand-all>
<el-table-column <el-table-column
type="index"
label="序号" label="序号"
min-width="15%" min-width="15%"
align="center"> align="center">
<template slot-scope="scope">
{{scope.$index + 1}}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="footFileName" prop="footFileName"
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
-6
View File
@@ -27,12 +27,6 @@
show-summary show-summary
:span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))" :span-method="(({row, column, rowIndex, columnIndex})=>objectSpanMethod({row, column, rowIndex, columnIndex},form.evaluationData))"
style="width: 100%"> style="width: 100%">
<el-table-column
type="index"
width="55"
label="序号"
align="center">
</el-table-column>
<el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1"> <el-table-column label="企业标准编写质量评价表" align="center" label-class-name="column1">
<el-table-column <el-table-column
label="标准类别" label="标准类别"