whj 10 maanden geleden
bovenliggende
commit
579f9119e8

+ 29 - 1
src/api/workflow/publish.js

@@ -28,4 +28,32 @@ export function sendWorkflow (parameter) {
       url: '/workflow/bom/publish/task/' + parameter.id,
       method: 'put',
   })
-}
+}
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getWorkflowBomInfo (parameter) {
+  return axios({
+      url: '/workflow/bom/'  + parameter.id,
+      method: 'get',
+      headers: {
+          'Content-Type': 'application/json;charset=UTF-8'
+      }
+  })
+}
+/**
+ * page func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function verifyWorkflow (parameter) {
+  return axios({
+      url: '/workflow/bom/verify/task',
+      method: 'put',
+      data: parameter
+  })
+}

+ 3 - 0
src/views/workplace/newWoekplace/Workplace.vue

@@ -125,6 +125,9 @@ export default {
           break
       }
     },
+    handleClickMenu(record) {
+      this.$router.push(record.menuRouterUrl)
+    },
     handleOk() {
       this.visible = true
       this.getData()

+ 1 - 1
src/views/workplace/publish/Executed.vue

@@ -37,7 +37,7 @@
         </a-row>
       </div>
 
-      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" showPagination="auto">
+      <s-table ref="table" :scroll="{x: 1300, y: BaseTool.Constant.scrollY }" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" showPagination="auto">
         <span slot="action" slot-scope="record">
           <template>
             <a @click="handleView(record)">查看</a>

+ 15 - 15
src/views/workplace/publish/WaitWork.vue

@@ -37,12 +37,10 @@
         </a-row>
       </div>
 
-      <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" showPagination="auto">
+      <s-table ref="table" :scroll="{x: 1300, y: BaseTool.Constant.scrollY }" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert" :rowSelection="options.rowSelection" showPagination="auto">
         <span slot="action" slot-scope="record">
           <template>
-            <a @click="handleView(record)">查看</a>
-            <operation-button @click="handleEdit(record)">修改</operation-button>
-            <operation-button :type="2" title="确认发送" @confirm="handleSend(record.id)">发送</operation-button>
+            <a @click="handleAudit(record.id)">审核</a>
           </template>
         </span>
       </s-table>
@@ -52,7 +50,7 @@
 
 <script>
 import { STable, Ellipsis } from '@/components'
-import { getWorplacePublishPage, sendWorkflow } from '@/api/workflow/publish'
+import { getWorplacePublishPage, getWorkflowBomInfo } from '@/api/workflow/publish'
 
 export default {
   name: 'WorkflowTaskList',
@@ -92,7 +90,7 @@ export default {
         {
           title: '标题',
           checked: true,
-          width: 200,
+          width: 300,
           dataIndex: 'taskName',
         },
         {
@@ -128,15 +126,18 @@ export default {
         {
           title: '催办次数',
           checked: true,
-          width: 140,
+          width: 120,
           dataIndex: 'reminderNum',
         },
         {
           title: '已阅标识',
           checked: true,
-          width: 140,
+          width: 120,
           dataIndex: 'readFlag',
           fixed: 'right',
+          customRender: (text, record, index) => {
+            return this.yesMap[text]
+          },
         },
         {
           title: '操作',
@@ -182,12 +183,14 @@ export default {
       },
       optionAlertShow: false,
       statusMap: {},
+      yesMap: {},
     }
   },
   created() {
     // 下拉框map
     this.tableOption()
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FLOW_TASK_STATUS)
+    this.yesMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
   },
   methods: {
     tableOption() {
@@ -237,15 +240,12 @@ export default {
       //   this.$refs.table.clearSelected()
       // })
     },
-    handleAdd() {},
-    handleEdit(record) {},
-    handleView(record) {},
-    handleSend(id) {
-      sendWorkflow({ id }).then((res) => {
-        this.$message.info('发送成功')
-        this.$refs.table.refresh()
+    handleAudit(id) {
+      getWorkflowBomInfo({ id }).then((res) => {
+        console.log(res.data)
       })
     },
+    handleView(record) {},
     handleOk(values) {
       this.visible = true
       this.$refs.table.refresh()