@lambo-design/workflow-approve 1.0.0-beta.81 → 1.0.0-beta.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.81",
+  "version": "1.0.0-beta.83",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/assignee-box.vue

@@ -2,7 +2,7 @@
   <div>
     <Modal v-model="modalBoxShow" width="1217" title="选择办理人"  @on-ok="onOk" @on-cancel="onCancel" loading>
       <div class="org-info">
-        <div class="org-tree">
+        <div class="org-tree" v-if="!useTransferRangeUsers">
           <div class="tree-content">
             <div v-if="treeData.length === 0">暂无数据</div>
             <Tree v-else v-for="(item,index) in treeData" :key="index" :data="item" ref="treeBM"
@@ -12,7 +12,7 @@
         </div>
         <div class="org-detil">
           <LamboPagingTable ref="selection" :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
-                            @on-selection-change="onSelectionChange" :page-disable="useTransferRangeUsers">
+                            @on-selection-change="onSelectionChange" :page-disable="useTransferRangeUsers" :showTableOption="!useTransferRangeUsers">
             <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60">
                 <Row>
@@ -157,28 +157,46 @@ export default {
         sortField: 'user_name',
         sortable: 'custom'
       })
+
+      if (self.useTransferRangeUsers){
+        columns.push({
+          title: '联系电话',
+          key: 'tel',
+          sortField: 'tel',
+          sortable: 'custom'
+        })
+      }
       columns.push({
         title: '部门名称',
         key: 'organName',
         sortField: 'organ_name',
         sortable: 'custom'
       })
-      columns.push({
-        title: '状态',
-        key: 'status',
-        sortable: 'custom',
-        align: 'center',
-        width: 100,
-        render: function (h, param) {
-          let state = param.row.status
-          if (state === '00') {
-            state = '正常'
-          } else {
-            state = '锁定'
+      if (self.useTransferRangeUsers){
+        columns.push({
+          title: '公司名称',
+          key: 'comName',
+          sortField: 'com_name',
+          sortable: 'custom'
+        })
+      } else {
+        columns.push({
+          title: '状态',
+          key: 'status',
+          sortable: 'custom',
+          align: 'center',
+          width: 100,
+          render: function (h, param) {
+            let state = param.row.status
+            if (state === '00') {
+              state = '正常'
+            } else {
+              state = '锁定'
+            }
+            return h('span', state)
           }
-          return h('span', state)
-        }
-      })
+        })
+      }
 
       return columns
     }
@@ -192,6 +210,7 @@ export default {
     },
     clearData(){
       this.idSelectedArr = []
+      this.useTransferRangeUsers = false
       //清除表格数据
       this.doSearch()
     },

package/src/components/history.vue

@@ -175,7 +175,7 @@
                                   v-else-if="item.auditResult === '82'">指定他人处理</span>
                             <span style="color: #ed4014; font-size: 13px;"
                                   v-else-if="item.auditResult === '83'">会签减签</span>
-                            <span style="color: #19be6b; font-size: 13px;"
+                            <span style="color: #ed4014; font-size: 13px;"
                                   v-else-if="item.auditResult === '90'">{{item.rejectName ? item.rejectName : '驳回'}}指定节点</span>
                           </Col>
                           <Col span="12" style="text-align: right">
@@ -270,7 +270,7 @@
                                         v-else-if="item.auditResult === '82'">指定他人处理</span>
                                   <span style="color: #ed4014; font-size: 13px;"
                                         v-else-if="item.auditResult === '83'">会签减签</span>
-                                  <span style="color: #19be6b; font-size: 13px;"
+                                  <span style="color: #ed4014; font-size: 13px;"
                                         v-else-if="item.auditResult === '90'">{{item.rejectName ? item.rejectName : '驳回'}}指定节点</span>
                                   <span style="color: #ff9900; font-size: 13px;" v-else>{{ '待' + handleName }}</span>
                                 </Col>
@@ -724,7 +724,7 @@ export default {
     getTimelineDotColor(auditResult) {
       if (this.auditPassStatus.includes(auditResult)) {
         return '#005aff'; // 蓝色：通过状态
-      } else if (auditResult === '40' || auditResult === '50') {
+      } else if (auditResult === '40' || auditResult === '50' ) {
         return '#ffcc66'; // 黄色：驳回状态
       } else if (auditResult === '60' || auditResult === '62' || auditResult === '83') {
         return '#ed4014'; // 红色：撤回/委派状态