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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhuangxinwei
2022-10-08 12:09:12 +08:00
parent de300ea504 f9d4a45c32
commit 7fd3f82245
5 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+5 -3
View File
@@ -18,15 +18,16 @@
type="primary" type="primary"
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"
@click="selectStandardBtn"> @click="selectStandardBtn">
查询 查询
</el-button> </el-button>
<!-- v-btn-permission="'b19a4a9ad4f0767f70d622f257800dd5'"-->
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"
@click="resetSelect">清空</el-button> @click="resetSelect">清空</el-button>
<!-- v-btn-permission="'16c7a9cd3d9c5d8e0575593e0f632d85'"-->
<!-- <el-button--> <!-- <el-button-->
<!-- class="common-button-default"--> <!-- class="common-button-default"-->
<!-- size="mini"--> <!-- size="mini"-->
@@ -63,7 +64,8 @@
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button> <!-- v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"-->
<el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+71 -9
View File
@@ -235,7 +235,8 @@
<el-input <el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0 v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
|| dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0 || dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
|| dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null" || dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
|| dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
disabled disabled
v-model="dataList[scope.$index].complianceReasons" v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
@@ -263,7 +264,8 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0" v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
|| dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
disabled disabled
v-model="dataList[scope.$index].noCompliance" v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项" placeholder="请输入不合规项"
@@ -285,7 +287,8 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0" v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
|| dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
disabled disabled
v-model="dataList[scope.$index].countermeasures" v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
@@ -307,7 +310,8 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0" v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0
|| dataList[scope.$index].noInvolve && dataList[scope.$index].noInvolve.length>0"
disabled disabled
v-model="dataList[scope.$index].completionTime" v-model="dataList[scope.$index].completionTime"
type="date" type="date"
@@ -326,6 +330,32 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
prop="researchCompliance"
align="center"
width="160"
label="不涉及理由">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
|| dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
|| dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null
|| dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].noInvolve"
placeholder="请输入不涉及理由"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
clearable
v-model="dataList[scope.$index].noInvolve"
placeholder="请输入不涉及理由"
>
</el-input>
</template>
</el-table-column>
</el-table> </el-table>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="回执说明">
@@ -456,7 +486,8 @@
<el-input <el-input
v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0 v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
|| batchEditForm.countermeasures && batchEditForm.countermeasures.length>0 || batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
|| batchEditForm.completionTime && batchEditForm.completionTime !== null" || batchEditForm.completionTime && batchEditForm.completionTime !== null
|| batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
disabled disabled
v-model="batchEditForm.complianceReasons" v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
@@ -472,7 +503,8 @@
</el-formItem> </el-formItem>
<el-form-item label="不合规项目" class="add-form-item"> <el-form-item label="不合规项目" class="add-form-item">
<el-input <el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0" v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
|| batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
disabled disabled
v-model="batchEditForm.noCompliance" v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项" placeholder="请输入不合规项"
@@ -488,7 +520,8 @@
</el-form-item> </el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item"> <el-form-item label="不合规应对措施" class="add-form-item">
<el-input <el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0" v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
|| batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
disabled disabled
v-model="batchEditForm.countermeasures" v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施" placeholder="请输入不合规应对措施"
@@ -504,7 +537,8 @@
</el-form-item> </el-form-item>
<el-form-item label="完成时间" class="add-form-item"> <el-form-item label="完成时间" class="add-form-item">
<el-date-picker <el-date-picker
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0" v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0
|| batchEditForm.noInvolve && batchEditForm.noInvolve.length>0"
disabled disabled
v-model="batchEditForm.completionTime" v-model="batchEditForm.completionTime"
type="date" type="date"
@@ -521,6 +555,25 @@
placeholder="请选择日期"> placeholder="请选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-formItem label="不涉及理由" class="add-form-item">
<el-input
v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
|| batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
|| batchEditForm.completionTime && batchEditForm.completionTime !== null
|| batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.noInvolve"
placeholder="请输入不涉及理由"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.noInvolve"
placeholder="请输入不涉及理由"
>
</el-input>
</el-formItem>
<br> <br>
</el-form> </el-form>
</div> </div>
@@ -573,6 +626,8 @@ export default {
noCompliance: "", noCompliance: "",
// 应对措施 // 应对措施
countermeasures: "", countermeasures: "",
// 不涉及理由
noInvolve: "",
// 完成时间 // 完成时间
completionTime: "", completionTime: "",
}, },
@@ -620,6 +675,8 @@ export default {
complianceReasons: "", //在研合规原因 complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目 noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施 countermeasures: "", //在研应对措施
// 不涉及理由
noInvolve: "",
completionTime: "", //在研完成时间 completionTime: "", //在研完成时间
}] }]
}, },
@@ -818,6 +875,9 @@ export default {
if(item.complianceReasons){ if(item.complianceReasons){
this.comFlag = 0; this.comFlag = 0;
return return
}else if (item.noInvolve){
this.comFlag = 0;
return
}else{ }else{
for (let i = 0; i < this.dataList.length; i++) { for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) { if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
@@ -834,7 +894,7 @@ export default {
handleSubmit() { handleSubmit() {
let submitFlag = 0; let submitFlag = 0;
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(item.complianceReasons || item.noCompliance){ if(item.complianceReasons || item.noCompliance || item.noInvolve){
submitFlag = 1 submitFlag = 1
} }
return return
@@ -905,6 +965,8 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures; item.countermeasures = this.batchEditForm.countermeasures;
//完成时间 //完成时间
item.completionTime = this.batchEditForm.completionTime; item.completionTime = this.batchEditForm.completionTime;
//不涉及理由
item.noInvolve = this.batchEditForm.noInvolve;
} }
}); });
}); });
src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+7
View File
@@ -251,6 +251,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
prop="noInvolve"
align="center"
width="160"
label="不涉及理由">
</el-table-column>
<el-table-column <el-table-column
prop="implementer" prop="implementer"
align="center" align="center"
@@ -445,6 +451,7 @@ export default {
distributePersonId: "", distributePersonId: "",
complianceReasons: "", //在研合规原因 complianceReasons: "", //在研合规原因
noCompliance: "", //在研不合规项目 noCompliance: "", //在研不合规项目
noInvolve: "", //不涉及理由
countermeasures: "", //在研应对措施 countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间 completionTime: "", //在研完成时间
zcComplianceReasons: "", //在产的合规原因 zcComplianceReasons: "", //在产的合规原因
src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+7
View File
@@ -260,6 +260,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
prop="noInvolve"
align="center"
width="160"
label="不涉及理由">
</el-table-column>
<el-table-column <el-table-column
prop="implementer" prop="implementer"
align="center" align="center"
@@ -456,6 +462,7 @@ export default {
noCompliance: "", //在研不合规项目 noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施 countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间 completionTime: "", //在研完成时间
noInvolve: "", //不涉及理由
zcComplianceReasons: "", //在产的合规原因 zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目 zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施 zcCountermeasures: "", //在产的应对措施
src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+7
View File
@@ -260,6 +260,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
prop="noInvolve"
align="center"
width="160"
label="不涉及理由">
</el-table-column>
<el-table-column <el-table-column
prop="implementer" prop="implementer"
align="center" align="center"
@@ -456,6 +462,7 @@ export default {
noCompliance: "", //在研不合规项目 noCompliance: "", //在研不合规项目
countermeasures: "", //在研应对措施 countermeasures: "", //在研应对措施
completionTime: "", //在研完成时间 completionTime: "", //在研完成时间
noInvolve: "", //不涉及理由
zcComplianceReasons: "", //在产的合规原因 zcComplianceReasons: "", //在产的合规原因
zcNoCompliance: "", //在产不合规项目 zcNoCompliance: "", //在产不合规项目
zcCountermeasures: "", //在产的应对措施 zcCountermeasures: "", //在产的应对措施