工艺流程一栏页面

src/api/pages/mst/process.js

@@ -5,7 +5,7 @@
  */
 export default  {
   processService:{
-    prefix:'order-server/sale/order/',
+    prefix:'mdm-server/mst/process_flow/',
   }
 }
 
@@ -16,6 +16,6 @@ export default  {
  */
 export const routeUrl = {
     // 流程
-    process: {key: 'process', url: '/process/process-flow/process'},
+    process: {key: 'process', url: '/process/process-flow/process-setting'},
 
 }

src/components/business/process/node-modal/node-modal.vue

@@ -223,12 +223,10 @@ export default {
     },
     onShow(n,o){//监听model显示，达到类似onShow的效果
       if(n){
-        this.allNodes=[];
-        this.graph.getNodes().filter(it=>it.shape=='custom-image').map((it)=>{
-          let {id,name}={id:it.id,name:it.data.nodeName}
-          this.allNodes.push({id:id,name:name})
+        //过滤调节点组并将json解构成新结构数组
+        this.allNodes=this.graph.getNodes().filter(it=>it.shape=='custom-image').map((it)=>{
+          return {id:it.id,name:it.data.nodeName}
         })
-
       }
     }
   },

src/libs/base/router-util.js

@@ -29,7 +29,7 @@ export const formatMenu = (list) => {
   let res = []
   forEach(list, item => {
     let obj = {
-      path: (item.path?.endsWith('/edit') || item.path?.endsWith('/detail')) ? item.path + '/:id' : item.path,
+      path: (item.path?.endsWith('/edit') || item.path?.endsWith('/detail')|| item.path?.endsWith('/process-setting')) ? item.path + '/:id' : item.path,
       name: item.name
     }
     // console.log('obj', obj.path)

src/router/core-router.js

@@ -84,14 +84,7 @@ export default [
             },
             component: () => import('@/view/core/system-setting/index.vue')
           },
-          {
-            path: 'process/index',
-            name: 'process',
-            meta: {
-              title: '工艺流程',
-            },
-            component: () => import('@/view/process/process-flow/process.vue')
-          },
+
         ]
       },
     ]

src/view/process/process-flow/index.vue

@@ -9,11 +9,12 @@
         <!--    清空条件    -->
         <BaseIndexButton right-button="process-clear" ref="clear" name="clear"
                          @click="open($config.routeUrl.process.clear)"></BaseIndexButton>
-      </template>
-      <template #right>
         <!--    编辑    -->
         <BaseIndexButton right-button="process-edit" ref="edit" name="edit"
-                         @click="open($config.routeUrl.process,undefined,false)"></BaseIndexButton>
+                         @click="open($config.routeUrl.process)"></BaseIndexButton>
+      </template>
+      <template #right>
+
         <!--   新建     -->
         <BaseIndexButton right-button="process-add" ref="create" name="create"
                          @click="open($config.routeUrl.process.add)"></BaseIndexButton>
@@ -28,11 +29,21 @@
     </div>
 
     <!--  表格部分  -->
-    <card :padding=0 style="margin-top: 1px;padding: 0">
-        <DkTable :pageFlag="true" primaryKey="flow-id" :id="'table-'+$options.name" name="table"
-                 ref="table-select" :data="tableData" :height="tableHeight-15" >
+    <div>
+        <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
+                 :page-total="pageInfo.total"
+                 :current-page="pageInfo.currentPage"
+                 :height="this.tableHeight" primaryKey="flowId"
+                 :multiple="false"
+                 @pageChange="pageSizeChange">
+          <DkTableColumn field="flowCode"></DkTableColumn>
+          <DkTableColumn field="flowName"></DkTableColumn>
+          <DkTableColumn field="displayNo"></DkTableColumn>
+          <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
+                         :switch-disabled="false"></DkTableColumn>
+          <DkTableColumn field="remarks" width="auto"></DkTableColumn>
         </DkTable>
-    </card>
+    </div>
 
   </div>
 </template>
@@ -59,8 +70,35 @@ export default {
   }
   },
   methods:{
-    getData() {
-      return {"code":200,"message":"操作成功","exception":null,"data":{}}},
+    /**
+     * @desc   : 分页变化
+     * @author : 张潇木
+     * @date   : 2023/2/3 10:19
+     */
+    pageSizeChange(pageInfo) {
+      this.searchData(pageInfo.currentPage) // 查询数据
+    },
+    /**
+     * @desc   : 获取数据
+     * @author : 张潇木
+     * @date   : 2023/2/3 10:20
+     */
+    getData(params) {
+      // 查询数据
+      return this.excute(this.$service.processService, this.$service.processService.selectByCond, params)
+    },
+    /**
+     * @desc   : 停用启用
+     * @author : 张潇木
+     * @date   : 2023/2/3 10:54
+     */
+    onSwitchChange(param) {
+      if (param.flgValid) {
+        this.excuteNoParam(this.$service.processService, this.$service.processService.enable, [param.flowId])
+      } else {
+        this.excuteNoParam(this.$service.processService, this.$service.processService.disable, [param.flowId])
+      }
+    },
   }
 }
 </script>

src/view/process/process-flow/process.vue → src/view/process/process-flow/process-setting.vue

@@ -22,8 +22,8 @@
         </Content>
         <!--   底部按钮   -->
         <Footer class="footer">
-          <Button style="margin-right: 10px;">保存</Button>
-          <Button>关闭</Button>
+          <DkButton style="margin-right: 10px;" ref="save" type="primary"  @click="save">{{ $t('save') }}</DkButton>
+          <DkButton ref="close" @click="close('/process/process-flow/index')">{{ $t('close') }}</DkButton>
         </Footer>
       </Layout>
     </Layout>
@@ -40,8 +40,10 @@ import EdgeModal from '_c/business/process/edge-modal/edge-modal'
 const insertCss = require('insert-css')
 const zt1 = require('./data/zt1.json')
 import Process from '@/view/process/process-flow/config/ProcessConfig'
+import {formMixin} from '@/mixins/form'
 
 export default {
+  mixins: [formMixin],
   components: { NodeModal,EdgeModal },
   data() {
     return {
@@ -58,6 +60,10 @@ export default {
     this.getBaseData()
     //创建流程图对象
     this.graph=Process.init(this.$refs.container)
+    //初始化数据
+    // this.graph.fromJSON(zt1)
+    // this.graph.zoomToFit({ maxScale: 1 });// 将画布中元素缩小或者放大一定级别，让画布正好容纳所有元素，可以通过 maxScale 配置最大缩放级别
+    // this.graph.centerContent(); // 将画布中元素居中展示
   },
   computed: {
     ...mapState(['process']),
@@ -75,17 +81,15 @@ export default {
         }
       })
     },
-    init() {
-
-    // region 初始化数据
-    //   this.graph.fromJSON(zt1)
-      // this.graph.zoomToFit({ maxScale: 1 });// 将画布中元素缩小或者放大一定级别，让画布正好容纳所有元素，可以通过 maxScale 配置最大缩放级别
-      // this.graph.centerContent(); // 将画布中元素居中展示
-    // endregion
-
-    },
-
-
+    /**
+     * @desc   : 提交保存
+     * @author : 张潇木
+     * @date   : 2023/2/3 9:30
+     */
+    save(){
+      //todo 校验
+      this.excute(this.$service.processService, this.$service.processService.insert, this.graph.toJSON())
+    }
   }
 }
 </script>