前端gjy

src/api/V2/taskspost/index.js

@@ -41,4 +41,6 @@ export const API_POST_OUT_STATES = '/tranTaskInfo/api/editStatus'
 //移库任务状态修改
 export const API_POST_OUT_MOVESTATES = '/inOutWarehouseTask/api/editStatus'
 // 删除运输阶段
-export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
+export const API_POST_DEL_HAULAGE_STAGE= '/tranProcessInfo/api/deleteTranProcess'
+// 审核记录
+export const API_GET_TASKHISTORIES= '/workflowHistory/query/taskHistories'

src/model/tasksport/index.js

@@ -22,7 +22,8 @@ import {
     API_GET_OUT_MOVELOOK,
     API_POST_OUT_STATES,
     API_POST_OUT_MOVESTATES,
-    API_POST_DEL_HAULAGE_STAGE
+    API_POST_DEL_HAULAGE_STAGE,
+    API_GET_TASKHISTORIES
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -65,4 +66,6 @@ export const states = appRx.post(API_POST_OUT_STATES, errorCatcher, errorHandle,
 //移库任务状态修改
 export const movestates = appRx.post(API_POST_OUT_MOVESTATES, errorCatcher, errorHandle, filter)
 //删除运输阶段
-export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
+export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
+//删除运输阶段
+export const gettaskhistories = appRx.get(API_GET_TASKHISTORIES, errorCatcher, errorHandle, filter)

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -357,6 +357,23 @@
           </el-form-item>
         </el-form>
       </div>
+      <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 80%"
+        height="180"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+     </el-table>
     </div>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
@@ -369,7 +386,8 @@ import {
   getwarehousename,
   xialaNo,
   addoreditoutput,
-  outexamine
+  outexamine,
+  gettaskhistories
 } from '@/model/tasksport/index'
 import Pagination from '@/components/Pagination'
 import { mapActions, mapGetters, mapState } from 'vuex'
@@ -406,6 +424,7 @@ export default {
       deptBudgetTotal: 0,
       readonly: true,
       currentPage: 1,
+      taskhistories:[],
       pageSize: 10,
       searchType: 1,
       searchKeyWord: '',
@@ -630,6 +649,10 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
+      gettaskhistories({businessKey: this.$route.query.businessKey,workflowId: this.$route.query.workflowId}).toPromise()
+          .then((response) => {
+            this.taskhistories=response
+          })
       outexamine({ relevanceId: this.$route.query.relevanceId })
         .toPromise()
         .then(response => {
@@ -741,11 +764,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
+  margin: 10px auto;
   margin-right: 180px;
 }
 /deep/.el-form-item__label {
@@ -870,4 +889,7 @@ export default {
   width: 400px;
   height: 20px;
 }
+.wenzi{
+  margin:0 auto;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -404,6 +404,8 @@ export default {
         query: {
           relevanceId: item.relevanceId,
           taskId: item.taskId,
+          businessKey:item.id,
+          workflowId:item.workflowId
         },
       })
     },
@@ -444,6 +446,8 @@ export default {
         path: 'inOutWarehouseTaskEdit',
         query: {
           relevanceId: row.relevanceId,
+          businessKey:row.id,
+          workflowId:row.workflowId
         },
       })
     },

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -687,6 +687,23 @@
         >通过</el-button
       >
     </div>
+     <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 80%"
+        height="180"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+     </el-table>
     <WinseaContentModal
       v-model="outerVisible"
       title="驳回原因"
@@ -716,7 +733,8 @@ import {
   outexamine,
   getGoodsName,
   warehousetask,
-  woekflowhandle
+  woekflowhandle,
+  gettaskhistories
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
@@ -769,6 +787,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      taskhistories:[],
       goodnameList: [],
       checked: true,
       form: {},
@@ -1175,6 +1194,11 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
+      gettaskhistories({businessKey: this.$route.query.businessKey,workflowId: this.$route.query.workflowId}).toPromise()
+          .then((response) => {
+            this.taskhistories=response
+          })
+
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
@@ -1404,11 +1428,8 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
-  margin: 0 auto;
+  height: 100px;
+  margin: 10px auto;
   margin-right: 180px;
 }
 /deep/.el-form-item__label {
@@ -1510,4 +1531,7 @@ export default {
   width: 381px;
   height: 20px;
 }
+.wenzi{
+  margin:0 auto;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -932,17 +932,14 @@ export default {
       this.dataList.inOutFlag=1
       this.dataList1.inOutFlag=2
       if (this.dataList.taskTypeKey == 1) {
-        
-        this.dataList.inOutTaskNo = this.inOutTaskNo
         this.requestadd(this.dataList)
       } else if (this.dataList1.taskTypeKey == 2) {
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.requestadd(this.dataList1)
       } else if (
         this.dataList.taskTypeKey == 3 ||
         this.dataList.taskTypeKey == 4
       ) {
-        this.dataList.inOutTaskNo = this.inOutTaskNo
+
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
         if(this.dataList.taskTypeKey == 3){
           this.dataList.businessDescribe=this.dataList1.businessDescribe
@@ -950,7 +947,6 @@ export default {
           this.dataList1.businessDescribe=this.dataList.businessDescribe
         }
         this.requestadd(this.dataList, 'repetition')
-        this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
         if(!this.deletetask){
           this.requestadd(this.dataList1, 'repetition')

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.121:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',