compliance_management / ruoyi-ui · 提交

转到一个项目

作者 雷海东
提交 f7701059b58fdbde385b5deda1d0eb5aaf907fc1 2 个父辈 2a19ead6 3c5ea162

Merge branch 'dev' of http://39.105.222.208:1024/compliance_management/ruoyi-ui into dev

内嵌 并排对比
正在显示 2 个修改的文件 包含 80 行增加 和 17 行删除
@@ -17,14 +17,7 @@ @@ -17,14 +17,7 @@
17 @keyup.enter.native="handleQuery" 17 @keyup.enter.native="handleQuery"
18 /> 18 />
19 </el-form-item> 19 </el-form-item>
20 - <el-form-item label="到期日期" prop="expirationDate">  
21 - <el-date-picker clearable  
22 - v-model="queryParams.expirationDate"  
23 - type="date"  
24 - value-format="yyyy-MM-dd"  
25 - placeholder="请选择到期日期">  
26 - </el-date-picker>  
27 - </el-form-item> 20 +
28 <el-form-item label="甲方" prop="partyA"> 21 <el-form-item label="甲方" prop="partyA">
29 <el-input 22 <el-input
30 v-model="queryParams.partyA" 23 v-model="queryParams.partyA"
@@ -41,14 +34,6 @@ @@ -41,14 +34,6 @@
41 @keyup.enter.native="handleQuery" 34 @keyup.enter.native="handleQuery"
42 /> 35 />
43 </el-form-item> 36 </el-form-item>
44 - <el-form-item label="签订日期" prop="signingDate">  
45 - <el-date-picker clearable  
46 - v-model="queryParams.signingDate"  
47 - type="date"  
48 - value-format="yyyy-MM-dd"  
49 - placeholder="请选择签订日期">  
50 - </el-date-picker>  
51 - </el-form-item>  
52 <el-form-item> 37 <el-form-item>
53 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 38 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
54 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 39 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -129,7 +114,14 @@ @@ -129,7 +114,14 @@
129 <img v-if="scope.row.attachments" src="@/assets/images/PDF.png" @click="preview(scope.row.attachments)" width="40px" height="auto" style="cursor: pointer"/> 114 <img v-if="scope.row.attachments" src="@/assets/images/PDF.png" @click="preview(scope.row.attachments)" width="40px" height="auto" style="cursor: pointer"/>
130 </template> 115 </template>
131 </el-table-column> 116 </el-table-column>
132 - <el-table-column label="合同状态" align="center" prop="status" /> 117 + <el-table-column label="合同状态" align="center" prop="status" >
  118 + <template slot-scope="scope">
  119 + <el-tag v-if="scope.row.status=='0'" type="success">已完成</el-tag>
  120 + <el-tag v-if="scope.row.status=='1'" >进行中</el-tag>
  121 + <el-tag v-if="scope.row.status=='2'" type="warning">已终止</el-tag>
  122 + <el-tag v-if="scope.row.status=='3'" type="danger">已解除</el-tag>
  123 + </template>
  124 + </el-table-column>
133 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 125 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
134 <template slot-scope="scope"> 126 <template slot-scope="scope">
135 <el-button 127 <el-button
@@ -241,6 +233,7 @@ @@ -241,6 +233,7 @@
241 233
242 <script> 234 <script>
243 import { listComplianceReview, getComplianceReview, delComplianceReview, addComplianceReview, updateComplianceReview } from "@/api/compliancemanagement/compliancereview"; 235 import { listComplianceReview, getComplianceReview, delComplianceReview, addComplianceReview, updateComplianceReview } from "@/api/compliancemanagement/compliancereview";
  236 +import { startProcess, stopProcess } from "@/api/workflow/process";
244 import VuePdf from 'vue-pdf'; 237 import VuePdf from 'vue-pdf';
245 export default { 238 export default {
246 name: "ComplianceReview", 239 name: "ComplianceReview",
@@ -493,6 +486,7 @@ export default { @@ -493,6 +486,7 @@ export default {
493 }, 486 },
494 handleAgain(row) { 487 handleAgain(row) {
495 console.log(row) 488 console.log(row)
  489 + // return
496 startProcess(row.procDefId,row).then((res) =>{ 490 startProcess(row.procDefId,row).then((res) =>{
497 if(res){ 491 if(res){
498 this.$modal.msgSuccess("流程重启动成功"); 492 this.$modal.msgSuccess("流程重启动成功");
@@ -246,6 +246,14 @@ @@ -246,6 +246,14 @@
246 type="text" 246 type="text"
247 size="mini" 247 size="mini"
248 icon="el-icon-edit-outline" 248 icon="el-icon-edit-outline"
  249 + v-hasPermi="['workflow:process:start']"
  250 + @click="handleEvaluate(scope.row)"
  251 + >履行评价</el-button
  252 + >
  253 + <el-button
  254 + type="text"
  255 + size="mini"
  256 + icon="el-icon-edit-outline"
249 @click="handleEdit(scope.row)" 257 @click="handleEdit(scope.row)"
250 >合同变更</el-button 258 >合同变更</el-button
251 > 259 >
@@ -356,6 +364,33 @@ @@ -356,6 +364,33 @@
356 <el-button @click="cancel">取 消</el-button> 364 <el-button @click="cancel">取 消</el-button>
357 </div> 365 </div>
358 </el-dialog> 366 </el-dialog>
  367 + <!-- 履行评价 -->
  368 + <el-dialog :title="title" :visible.sync="showDialogEvaluate">
  369 + <el-table :data="tableData" style="width: 100%" border>
  370 + <el-table-column prop="content" label="内容" width="200"></el-table-column>
  371 + <el-table-column prop="description" label="评价描述" width="350">
  372 + <template slot-scope="scope">
  373 + <el-input v-model="scope.row.description"
  374 + clearable
  375 + />
  376 + </template>
  377 + </el-table-column>
  378 + <el-table-column prop="level" label="评价等级">
  379 + <template slot-scope="scope">
  380 + <el-radio v-model="scope.row.level" label="1">优秀</el-radio>
  381 + <el-radio v-model="scope.row.level" label="2">良好</el-radio>
  382 + <el-radio v-model="scope.row.level" label="3">一般</el-radio>
  383 + <el-radio v-model="scope.row.level" label="4">较差</el-radio>
  384 + </template>
  385 + </el-table-column>
  386 + </el-table>
  387 + <div slot="footer" class="dialog-footer">
  388 + <el-button :loading="buttonLoading" type="primary" @click="submitFormEvaluate"
  389 + >确 定</el-button
  390 + >
  391 + <el-button @click="cancelEvaluate">取 消</el-button>
  392 + </div>
  393 + </el-dialog>
359 </div> 394 </div>
360 </template> 395 </template>
361 396
@@ -376,6 +411,27 @@ export default { @@ -376,6 +411,27 @@ export default {
376 }, 411 },
377 data() { 412 data() {
378 return { 413 return {
  414 + tableData: [{
  415 + content: '合同规范性',
  416 + description: '',
  417 + level: ''
  418 + }, {
  419 + content: '质量',
  420 + description: '',
  421 + level: ''
  422 + }, {
  423 + content: '交期（工期）',
  424 + description: '',
  425 + level: ''
  426 + }, {
  427 + content: '成本',
  428 + description: '',
  429 + level: ''
  430 + },{
  431 + content: '合作配合情况',
  432 + description: '',
  433 + level: ''
  434 + }],
379 switchValue: true, 435 switchValue: true,
380 pdfUrl: "", 436 pdfUrl: "",
381 dialogVisibleContract: false, 437 dialogVisibleContract: false,
@@ -463,6 +519,7 @@ export default { @@ -463,6 +519,7 @@ export default {
463 ], 519 ],
464 id: [{ required: true, message: "不能为空", trigger: "blur" }], 520 id: [{ required: true, message: "不能为空", trigger: "blur" }],
465 }, 521 },
  522 + showDialogEvaluate:false
466 }; 523 };
467 }, 524 },
468 created() { 525 created() {
@@ -652,6 +709,18 @@ export default { @@ -652,6 +709,18 @@ export default {
652 console.log(row); 709 console.log(row);
653 startProcess(row.procDefId, row).then((res) => {}); 710 startProcess(row.procDefId, row).then((res) => {});
654 }, 711 },
  712 + handleEvaluate(row){
  713 + console.log('评价',row)
  714 + this.title = row.contractName
  715 + this.showDialogEvaluate = true
  716 + },
  717 + submitFormEvaluate(){
  718 + console.log(this.tableData)
  719 + this.showDialogEvaluate = false
  720 + },
  721 + cancelEvaluate(){
  722 + this.showDialogEvaluate = false
  723 + }
655 }, 724 },
656 }; 725 };
657 </script> 726 </script>