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

Merge branch 'fix_foton_20240430' into 'master'

Browse Source 
Fix foton 20240430

See merge request laws-foton-slrs/foton-laws-system-front!183
This commit is contained in:
王晓勇
2024-05-21 09:49:04 +00:00
parent cd182a5410 551e2e8863
commit b8a5da09fe
7 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+5 -5
View File
@@ -459,7 +459,7 @@
</div>
<div style="width: 80%">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-form-item label="核心技术要求" prop="technicalRequir" :rules="[{required: true, message: '请输入核心技术要求', trigger: 'blur'}]" class="add-form-item" v-if="!form.itemsNum1">
<el-input :disabled="disabledXX"
type="textarea"
v-model="plForm.technicalRequir"
@@ -468,7 +468,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-form-item label="国内标准的差异点" prop="changePoint" :rules="[{required: true, message: '请输入国内标准的差异点', trigger: 'blur'}]" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
<el-input :disabled="disabledXX"
type="textarea"
v-model="plForm.changePoint"
@@ -477,7 +477,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-form-item label="上一版本差异点" prop="changePoint" :rules="[{required: true, message: '请输入上一版本差异点', trigger: 'blur'}]" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input :disabled="disabledXX"
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
@@ -498,12 +498,12 @@
v-model="plForm.onlineData"
:required="true"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-form-item label="适用车型" prop="applyArctic" :rules="[{required: true, message: '请选择适用车型', trigger: 'change'}]" class="add-form-item">
<el-select :disabled="disabledXX" multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item" required>
<el-form-item label="责任人" prop="zrUserId" :rules="[{required: true, message: '请选择责任人', trigger: 'change'}]" class="add-form-item">
<el-input :disabled="disabledXX"
style="display: none;"
v-model="plForm.zrUserId"
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+16 -3
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -374,7 +374,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item,standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -544,6 +555,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+22 -9
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -399,7 +399,7 @@
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-form-item label="核心技术要求" prop="technicalRequir" :rules="[{required: true, message: '请输入核心技术要求', trigger: 'blur'}]" class="add-form-item" v-if="!form.itemsNum1">
<el-input
type="textarea"
v-model="editForm.technicalRequir"
@@ -408,7 +408,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-form-item label="国内标准的差异点" prop="changePoint" :rules="[{required: true, message: '请输入国内标准的差异点', trigger: 'blur'}]" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
<el-input
type="textarea"
v-model="editForm.changePoint"
@@ -417,7 +417,7 @@
:autosize="{minRows:10,maxRows:10}"
></el-input>
</el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-form-item label="上一版本差异点" prop="changePoint" :rules="[{required: true, message: '请输入上一版本差异点', trigger: 'blur'}]" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" >
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 14}"
@@ -438,12 +438,12 @@
v-model="editForm.onlineData"
:required="true"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-form-item label="适用车型" prop="applyArctic" :rules="[{required: true, message: '请选择适用车型', trigger: 'change'}]" class="add-form-item">
<el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" required>
<el-form-item label="符合性要求" prop="complianceRequir" :rules="[{required: true, message: '请选择符合性要求', trigger: 'change'}]" class="add-form-item">
<el-select
v-model="editForm.complianceRequir"
placeholder="请选择符合性要求">
@@ -451,7 +451,7 @@
<el-option value="2" label="不符合"></el-option>
</el-select>
</el-form-item>
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" required>
<el-form-item label="合规性分析" prop="complianceState" :rules="[{required: true, message: '请输入合规性分析', trigger: 'blur'}]" class="add-form-item">
<el-input
v-model="editForm.complianceState"
placeholder="请输入合规性分析"
@@ -769,7 +769,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item, standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -988,6 +999,8 @@
this.AOLIGEI = data.AOLIGEI
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
this.form.itemsNum = data.itemsNum || data.form.itemsNum
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+16 -3
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -424,7 +424,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item,standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -528,6 +539,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.endTime = data.endTime || data.form.endTime
this.form.deptUserId = data.form ? data.form.deptUserId : data.deptUserId
this.form.deptUserIdName = data.form ? data.form.deptUserIdName : data.deptUserIdName
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+16 -3
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -421,7 +421,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item,standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -527,6 +538,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue
+16 -3
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -424,7 +424,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item,standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -528,6 +539,8 @@
},{},res=>{
let data = JSON.parse(res.mesg)
console.log(data)
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+16 -3
View File
@@ -25,10 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
<span class="file-box-span" @click="handlePreview(form.itemsNum,form.standId)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -423,7 +423,18 @@
})
},
// 点击跳转标准详情
handlePreview (item) {
handlePreview (item,standId) {
if (standId) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: standId,
pageType: this.form.standInData + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
return
}
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
@@ -527,6 +538,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.standId = data.standId || data.form.standId
this.form.standInData = data.standInData || data.form.standInData
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName