From 994bd34bdb8d36fd74e329ecc2388e4aa2c595f2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 13:50:37 +0800
Subject: [PATCH] 恢复

---
 src/views/wel/shemi.vue |   60 ++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index cac8c4c..5ee7730 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -65,9 +65,9 @@
     </el-dialog>
     <avue-tabs :option="tabsOption" @change="tabsHandleChange" style="margin-top: 30px;" v-if="isShowTabs"></avue-tabs>
     <avue-form v-if="tabsType == 'tab1'" :option="tabsFormOption" v-model="tabsForm"></avue-form>
-    <span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>
+    <!--<span v-else-if="tabsType == 'tab2'">鐗堟湰淇℃伅</span>-->
     <template v-else-if="tabsType == 'tab3'">
-        <div v-html="convertToHtml(fileContent)"></div>
+        <div v-html="convertToHtml(fileContent)" class="convertToHtml"></div>
     </template>
     <template v-else-if="tabsType == 'tab4'">
         <avue-crud :addBtn="false" :option="tabsFormOption4" :data="tabsForm4" ref="crud4" @selection-change="selectionChange">
@@ -91,10 +91,10 @@
   <el-drawer title="鏇挎崲" append-to-body v-model="todolistModel" size="100%" class="code-box">
     <div class="approve-box">
         <div class="left">
-            <TodolistLeft :row="row" @selection-change="todoSelectionChange" />
+            <TodolistLeft :row="row" :replaceDataId="replaceDataId" :drawingNo="drawingNo" :processNo="processNo" :processEdition="processEdition" @selection-change="todoSelectionChange" />
         </div>
         <div class="right">
-            <TodolistRightTop :row="row" />
+            <TodolistRightTop :row="row" :name="name" />
             <avue-form ref="form" :option="optionApprove" v-model="formApprove" @submit="handleSubmit" />
         </div>
     </div>
@@ -113,6 +113,9 @@
   data() {
     let rejectText = '椹冲洖';//+this.row.categoryName;
     return {
+      drawingNo: '',
+      processNo: '',
+	  processEdition: '',
       replaceDataId: "",
       formApprove: {
         title: '',
@@ -161,7 +164,6 @@
               rules: [
                   {
                   validator: (rule, value, callback) => {
-                      console.log('-------',this.formApprove)
                       if (value === '' && this.formApprove.approve !== 'Y') {
                           callback(new Error('璇疯緭鍏ュ娉�'));
                       } else {
@@ -208,22 +210,22 @@
           icon: 'el-icon-info',
           label: '鑺傜偣淇℃伅',
           prop: 'tab1',
-        }, {
+        }/*, {
           icon: 'el-icon-warning',
           label: '鐗堟湰淇℃伅',
           prop: 'tab2',
-        }]
+        }*/]
       },
       tabsOption2: {
         column: [{
           icon: 'el-icon-info',
           label: '鑺傜偣淇℃伅',
           prop: 'tab1',
-        }, {
+        },/* {
           icon: 'el-icon-warning',
           label: '鐗堟湰淇℃伅',
           prop: 'tab2',
-        }, {
+        }, */{
           icon: 'el-icon-warning',
           label: '鏂囦欢鍐呭',
           prop: 'tab3'
@@ -260,25 +262,25 @@
             prop: 'createTime',
             disabled: true,
             placeholder: " "
-          },
+          },/*
           {
             label: '鑺傜偣鎻忚堪',
             prop: 'description',
             disabled: true,
             placeholder: " "
-          },
+          },*/
           {
             label: '淇敼鏃堕棿',
             prop: 'updateTime',
             disabled: true,
             placeholder: " "
-          },
+          }/*,
           {
             label: '澶囨敞',
             prop: 'remark',
             disabled: true,
             placeholder: " "
-          }
+          }*/
         ]
       },
       tabsForm: {},
@@ -410,7 +412,7 @@
                     return '';
                 }
             }
-          },
+          },/*
           {
             label: '鐗堟',
             prop: 'processEdition',
@@ -425,16 +427,16 @@
           {
             label: '鎻忚堪',
             prop: 'abc'
-          },
+          },*/
           {
             label: '绫诲瀷',
             prop: 'nodeTypeName'
-          },
+          },/*
           {
             label: '璁惧',
             prop: 'machineCode'
           },
-          
+          */
           {
             label: '閿佸畾鐘舵��',
             prop: 'isLocked',
@@ -457,25 +459,30 @@
                         //闈炵▼搴忚妭鐐�
                         return '';
                     }else{
-                        if(value==0||value==null){
+                        if(value==0||value==-1){
                             return '鏈惎鍔�';
                         }else if(value == 1){
                             return '瀹℃壒涓�';
                         }else if(value == 2){
                             return '宸查�氳繃';
                         }else{
-                            return '鏈畾涔�';
+                            return '';
                         }
                       }
                   },
-          },
+          },/*
           {
             label: '娴嬭瘯绋嬪簭',
             prop: 'abc'
-          },
+          },*/
           {
             label: '鍒涘缓浜�',
             prop: 'createUserName',
+            width: '180'
+          },
+		  {
+            label: '鍒涘缓鏃堕棿',
+            prop: 'createTime',
             width: '180'
           }
         ],
@@ -628,6 +635,7 @@
         title: this.formApprove.title,
         nodeId: this.id,
         tempInstanceId: this.replaceDataId,
+		comment: this.formApprove.comment,
         assignee: this.formApprove.assignee
       }
       axios({
@@ -687,11 +695,15 @@
       resp => {
         this.row = row;
         this.replaceDataId = resp.data.data.processInstanceId;
+        this.processNo = resp.data.data.processNo;
+        this.processEdition = resp.data.data.processEdition;
+		this.drawingNo = resp.data.data.drawingNo;
+        this.formApprove.title = resp.data.data.name + "鏇挎崲";
         this.todolistModel = true;
       });
     },
     convertToHtml(text) {
-        return text.replace(/\r\n/g, '<br>');
+        return text.replace(/\n/g, '<br>');
     },
     removeHasChildren(treeData) {  //鏌ヨ鏃跺�欎娇鐢紝鍒犳帀hasChildren 
       return treeData.map(node => {
@@ -1153,6 +1165,10 @@
       flex: 1;
   }
 }
+.convertToHtml {
+  background-color: #fffee1;
+  padding: 6px 12px;
+}
 </style>
 <style>
   .highlight-row {

--
Gitblit v1.9.3