Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -107,7 +107,7 @@
               <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
             </span>
 
-            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus" v-show="scope.row.showFlag"
+            <span class="corles" @click="withdraw(scope.row)"  v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'" v-show="scope.row.showFlag"
             >撤回</span>
             <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.View`" -->
               <!-- v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`" -->
@@ -424,7 +424,7 @@
               }else{
                 response.records[i].show=false
               }
-              if (response.records[i].publisher == localStorage.getItem('ws-pf_staffName')) {
+              if (response.records[i].createUserId == localStorage.getItem('ws-pf_userId')) {
                 response.records[i].showFlag = true
               }