From b2cdc1af33e73ea1fdf6303d6548712634b28aa4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 18:08:19 +0800
Subject: [PATCH] 优化审批界面样式

---
 src/views/flow/components/TodolistLeft.vue |   37 ++++++++++++++++++++++++++++++++-----
 1 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/views/flow/components/TodolistLeft.vue b/src/views/flow/components/TodolistLeft.vue
index 2be6c72..732baa2 100644
--- a/src/views/flow/components/TodolistLeft.vue
+++ b/src/views/flow/components/TodolistLeft.vue
@@ -8,12 +8,19 @@
     <basic-container>
         <!--'cureProgramTask', 鍥哄寲缂栧埗涓嶈兘娣诲姞鏂囦欢-->
         <div class="tool" v-show="['programmingTask', 'replaceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)">
-            <el-button type="primary" plain @click="addApp">娣诲姞鏂囦欢
+           
+            <!--鏃犲浐鍖栫殑鎯呭喌鎵嶆樉绀鸿寮�鍏�-->
+            <el-switch v-if="row.variables.hasCuredProgram!=='Y'" v-model="programOnMachine" active-text="鐜板満缂栧埗" inactive-text="宸ヨ壓鍛樼紪鍒�" />
+            &nbsp;
+            <el-button type="primary" :disabled="programOnMachine" plain @click="addApp">娣诲姞鏂囦欢
             </el-button>
         </div>
-         <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸查攣瀹氾紝璇疯皑鎱庝娇鐢ㄣ�傞攣瀹氬師鍥狅細{{ remark }}</el-text>
-         <el-text type="danger" v-if="row.processDefinitionKey === 'program-unlock'">绋嬪簭宸查攣瀹氾紝閿佸畾鍘熷洜锛歿{ remark }}</el-text>
+         <el-text type="danger" v-if="row.variables.curedLocked === 'Y'">鍥哄寲绋嬪簭宸查攣瀹氾紝璇疯皑鎱庝娇鐢ㄣ�傞攣瀹氬師鍥狅細{{ remark }}<br/></el-text>
+         <el-text type="danger" v-if="row.processDefinitionKey === 'program-unlock'">绋嬪簭宸查攣瀹氾紝閿佸畾鍘熷洜锛歿{ remark }}<br/></el-text>
+         <el-text type="primary" v-if="row.processDefinitionKey === 'program-unlock'"><br/>瑙ｉ攣鍘熷洜锛�</el-text>
+         <el-text type="warning">{{row.variables.unlockReason}}</el-text>
          <el-text type="danger" v-if="row.variables.hasCuredProgram==='Y' && row.variables.isProcessEditionSame=='N' && row.variables.cureProgramUseable==undefined">宸插浐鍖栫▼搴忓伐搴忕増娆′笉涓�鑷达紝娲惧伐鐗堟:{{row.variables.processEdition}},宸插浐鍖栫増娆★細{{row.variables.curedProcessEdition}}</el-text>
+         <el-text type="danger" v-if="row.variables.programOnMachine=='Y'">鐜板満缂栧埗</el-text>
         <el-table :data="tableData" border @row-click="showContent" :row-style="{height:'20px'}" :cell-style="{padding:'0px'}" max-height="240" highlight-current-row>
             <!-- <el-table-column prop="machineCode" label="鍔犲伐鏈哄簥">
             </el-table-column> -->
@@ -24,9 +31,17 @@
                     <div style="display: flex;align-items: center;">
                         <span style="margin-right: 8px;">{{ row.name }}</span>
                         <el-icon v-if="row.fileType === 'other'">
+                            <el-tooltip class="box-item" effect="light" content="鍏朵粬鏂囦欢"  placement="right">
                             <FolderOpened />
+                            </el-tooltip>
                         </el-icon>
-                        <img v-else src="./app.jpg" alt="" width="16" height="16">
+                        <el-icon v-if="row.fileType === 'program'">
+                            <el-tooltip class="box-item" effect="light" content="绋嬪簭鏂囦欢"  placement="right">
+                                <Tickets/>
+                            </el-tooltip>
+                        </el-icon>
+                        
+                        <!--<img v-else src="./app.jpg" alt="" width="16" height="16">-->
                     </div>
                 </template>
             </el-table-column>
@@ -111,6 +126,7 @@
             codeDiffFileName1: '鍥炰紶鐗堟湰',
             codeDiffFileName2: '涓嬪彂鐗堟湰',
             showContentId: '',
+            programOnMachine:false,//鏄惁鐜板満缂栧埗
             attForm: {
                 att: '',
                 fileType: 'program'
@@ -266,11 +282,22 @@
                     this.$message.error('鑾峰彇宸查�夌▼搴忓け璐�');
                     return;
                 } else {
-                    this.tableData = res.data.data || [];
+                    this.tableData = this.sortTable(res.data.data || []);
                 }
                 // this.$emit('selection-change',this.tableData)
             })
         },
+        sortTable(data) {
+           data.sort(function(a,b){
+                if(a.program === b.program){//濡傛灉program鐩稿悓锛屾寜鐓ame鐨勯檷搴�
+                    //return a.name - b.name
+                    return a.name.localeCompare(b.name)
+                }else{
+                    return b.program - a.program
+                }
+            });
+            return data;
+        },
         addApp() {
             this.appDialog = true;
         },

--
Gitblit v1.9.3