cxmo 1 жил өмнө
parent
commit
59893e1d3e

+ 22 - 3
src/views/approve_manage/approveEdit.vue

@@ -16,8 +16,8 @@
                 </el-form-item>
             </el-form>
             <div class="form-btn">
-                <el-button @click="$router.back()">取消</el-button>
-                <el-button @click="checkFlow">保存</el-button>
+                <el-button type="primary" plain @click="$router.back()">取消</el-button>
+                <el-button type="primary" @click="checkFlow">保存</el-button>
             </div>
         </div>
         <div class="form-item" style="color:#606266;width:100px;">
@@ -150,7 +150,13 @@ export default {
     components: { FlowEdiotr }
 };
 </script>
-
+<style lang="scss">
+.approve-edit-wrap{
+    .el-form-item__content{
+        flex: 1;
+    }
+}
+</style>
 <style scoped lang="scss">
 @import url('./css/pageStyle.scss');
 .approve-edit-wrap{
@@ -160,6 +166,19 @@ export default {
     .head-box{
         display: flex;
         justify-content: space-between;
+        .el-form{
+            flex:1;
+            .el-input,.el-cascader{
+                min-width: 200px;
+                max-width: 420px;
+                width:100%;
+            }
+            .el-form-item{
+                width:45%;
+                display: inline-flex;
+            }
+
+        }
     }
     .flow-editor-wrap{
         padding-left: 100px;

+ 8 - 7
src/views/approve_manage/components/flowNode/approveNode.vue

@@ -66,7 +66,7 @@
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="2">
-                                会签
+                                会签(须所有审批人同意)
                                 <el-tooltip effect="dark" placement="top" content="所有审批人同意,该节点才能通过;审批无先后顺序" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
@@ -74,8 +74,8 @@
                                 </el-tooltip>
                             </el-radio>
                             <el-radio :label="3">
-                                或签
-                                <el-tooltip effect="dark" placement="top" content="所有审批人同意,该节点才能通过;审批无先后顺序" >
+                                或签(一名审批人同意或拒绝即可)
+                                <el-tooltip effect="dark" placement="top" content="任意一名审批人同意,该节点即通过;审批无先后顺序" >
                                     <span class="hint-text">
                                         <i class="el-icon-info"></i>
                                     </span>
@@ -151,11 +151,11 @@ export default {
             this.drawerShow = true;
         },
         getChoosedList(){
-            this.choosedList = _.cloneDeep(this.$refs["tree-trans"].choosedList)
-            if(!this.choosedList.length){
+            if(!this.$refs["tree-trans"].choosedList.length){
                 this.$message.warning("请至少选择一人")
                 return
             }
+            this.choosedList = _.cloneDeep(this.$refs["tree-trans"].choosedList)||[]
             this.chooseDialogShow = false
         },
         removeChoosedItem(item){
@@ -250,6 +250,7 @@ export default {
                 flex-wrap: wrap;
                 gap:10px;
                 .list-item{
+                    cursor: move;
                     padding:8px;
                     border-radius: 4px;
                     border:1px solid #C8CDD9;
@@ -271,8 +272,8 @@ export default {
             }
         }
         .drawer-btn{
-            text-align: right;
-            margin:10px 10px 10px 0;
+            text-align: center;
+            margin:10px;
         }
     }
     

+ 1 - 1
src/views/approve_manage/components/treeTransfer.vue

@@ -3,7 +3,7 @@
     <div class="tree-transfer">
         <div class="before-transfer transfer">
             <div class="search">
-                <el-input placeholder="搜索" style="width:100%;"
+                <el-input placeholder="搜索" suffix-icon="el-icon-search" style="width:100%;"
                     v-model="searchText" @input="$refs['trans-tree'].filter(searchText)"></el-input>
             </div>
             <div class="content">