From ba642d2510ca51edf0b5e64a78b0088fe2ee3b4f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 18:03:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/template/FlowPath.vue |  164 ++++++++++++++++++++++++++----------------------------
 1 files changed, 79 insertions(+), 85 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/template/FlowPath.vue b/Source/UBCS-WEB/src/components/template/FlowPath.vue
index 36aa624..d068154 100644
--- a/Source/UBCS-WEB/src/components/template/FlowPath.vue
+++ b/Source/UBCS-WEB/src/components/template/FlowPath.vue
@@ -1,5 +1,5 @@
 <template>
-        <avue-crud ref="crud" :table-loading="loading" :data="data" v-model="form" :option="option" :page.sync="page"   :permission="permissionList"
+        <avue-crud ref="crud" :table-loading="loading" :data="data" v-model="form" :option="option" :page.sync="page"
             :search.sync="search" @on-load="getDataList" @row-save="handleSave" @row-del="handleDelete"
             @row-update="handleEdit" @refresh-change="handleRefresh" @size-change="handleSizePage"
             @current-change="handleCurrentPage">
@@ -8,18 +8,21 @@
 
 <script>
 import { getFlowpathList, getStartList, flowpathSave, flowpathDelete } from '@/api/template/flowpath.js'
-import {mapGetters} from "vuex";
 export default {
     name: 'FlowPath',
     props: {
-      code: {
-        typeof: String,
-        required: true,
-        default: ""
+      checkStatus: {
+        type: Boolean,
+        default: false
       },
       crudLCStatus: {
         type: String,
         default: 'Editing'
+      },
+      code: {
+        typeof: String,
+        required: true,
+        default: ""
       }
     },
     data() {
@@ -36,84 +39,74 @@
             startData: [],
             form: {},
             option: {
-                height: "auto",
-                border: true,
-                align: 'center',
-                menuAlign: 'center',
-                index: true,
-                searchMenuSpan: 8,
-                searchBtn: false,
-                emptyBtn: false,
-                columnBtn: false,
-                defaultSort: {
-                    prop: 'id,name,description,version',
-                    order: 'descending'
+              height: "auto",
+              border: true,
+              align: 'center',
+              menuAlign: 'center',
+              index: true,
+              searchMenuSpan: 8,
+              searchBtn: false,
+              emptyBtn: false,
+              columnBtn: false,
+              addBtn: !this.checkStatus || this.crudLCStatus == 'Editing',
+              defaultSort: {
+                prop: 'id,name,description,version',
+                order: 'descending'
+              },
+              column: [
+                {
+                  label: '妯℃澘key',
+                  prop: 'modelKey',
+                  width: 120,
+                  sortable: true,
+                  type: 'tree',
+                  dicData: [],
+                  props: {
+                    label: "key",
+                    value: "key"
+                  },
+                  rules: [{
+                    required: true,
+                    message: '妯℃澘key涓嶈兘涓虹┖',
+                    trigger: 'blur'
+                  }],
+                  nodeClick: (data) => {
+                    console.log(data)
+                    // 鑺傜偣鐐瑰嚮鐨勬椂鍊欎細鑾峰彇鍒版暟鎹�
+                    this.form.modelName = data.name
+                  }
+                }, {
+                  label: '妯℃澘鍚嶇О',
+                  prop: 'modelName',
+                  sortable: true,
+                  width: 220,
+                  addDisabled: true,
+                  editDisabled: true,
                 },
-                column: [
-                    {
-                        label: '妯℃澘key',
-                        prop: 'modelKey',
-                        width:120,
-                        sortable: true,
-                        type: 'tree',
-                        dicData: [],
-                        props: {
-                            label: "key",
-                            value: "key"
-                        },
-                        rules: [{
-                            required: true,
-                            message: '妯℃澘key涓嶈兘涓虹┖',
-                            trigger: 'blur'
-                        }],
-                        nodeClick: (data) => {
-                            console.log(data)
-                            // 鑺傜偣鐐瑰嚮鐨勬椂鍊欎細鑾峰彇鍒版暟鎹�
-                            this.form.modelName = data.name
-                        }
-                    }, {
-                        label: '妯℃澘鍚嶇О',
-                        prop: 'modelName',
-                        sortable: true,
-                        width:220,
-                        addDisabled: true,
-                        editDisabled: true,
-                    },
-                    {
-                        label: '妯℃澘鐢ㄩ��',
-                        prop: 'buttonTypeKey',
-                        type: 'tree',
-                        width:120,
-                        dicUrl: '/api/ubcs-flow/processTS/tt',
-                        dicMethod: 'post',
-                        props: {
-                            value: "codee",
-                            label: "namee",
-                        },
-                    },
-                    {
-                        label: '妯℃澘鎻忚堪',
-                        prop: 'description',
-                        type:'textarea'
-                    },
-                ]
-            },
+                {
+                  label: '妯℃澘鐢ㄩ��',
+                  prop: 'buttonTypeKey',
+                  type: 'tree',
+                  width: 120,
+                  dicUrl: '/api/ubcs-flow/processTS/tt',
+                  dicMethod: 'post',
+                  props: {
+                    value: "codee",
+                    label: "namee",
+                  },
+                },
+                {
+                  label: '妯℃澘鎻忚堪',
+                  prop: 'description',
+                  type: 'textarea'
+                },
+              ]
+            }
         }
     },
     created() {
         this.getStart()
     },
-  computed:{
-    ...mapGetters([ "permission"]),
-    permissionList() {
-      return {
-        addBtn: this.crudLCStatus=='Editing',
-        viewBtn: false,
-        delBtn: this.crudLCStatus=='Editing',
-        editBtn: this.crudLCStatus=='Editing'
-      };
-    },
-  },
     methods: {
         async getStart() {
             const response = await getStartList()
@@ -130,18 +123,19 @@
         },
         // 鑾峰彇鍒楄〃
         async getDataList() {
-            this.loading = false
-            console.log(this.search)
+          this.loading = false
+          if(this.code){
             const { pageSize, currentPage } = this.page
             let param = { size: pageSize, current: currentPage }
             const response = await getFlowpathList({ ...param, ...{ templateId: this.code } })
             if (response.status === 200) {
-                console.log(response)
-                this.loading = false
-                const data = response.data.data
-                this.data = data.records
-                this.page.total = data.total
+              this.loading = false
+              const data = response.data.data
+              this.data = data.records
+              this.page.total = data.total
             } else this.loading = false
+          }
+
         },
         // 鏂板
         async handleSave(row, done, loading) {

--
Gitblit v1.9.3