huang_an преди 2 години
родител
ревизия
1d3797949e
променени са 3 файла, в които са добавени 11 реда и са изтрити 17 реда
  1. 2 2
      src/api/bpm/task.js
  2. 7 10
      src/views/bpm/handleTask/components/outBound/detailDialog.vue
  3. 2 5
      src/views/bpm/handleTask/components/outBound/submit.vue

+ 2 - 2
src/api/bpm/task.js

@@ -120,9 +120,9 @@ export function apspurchaseplan(data) {
   });
   });
 }
 }
 
 
-export function outinApproveNotPass(data) {
+export function outApproveNotPass(data) {
   return request({
   return request({
-    url: '/bpm/outinApprove/notPass',
+    url: '/bpm/outApprove/notPass',
     method: 'PUT',
     method: 'PUT',
     data: data
     data: data
   });
   });

+ 7 - 10
src/views/bpm/handleTask/components/outBound/detailDialog.vue

@@ -5,14 +5,6 @@
         <!-- <PageHeader title="出库单详情"> </PageHeader> -->
         <!-- <PageHeader title="出库单详情"> </PageHeader> -->
       </div>
       </div>
 
 
-      <!-- <StatusStep :activeCode="infoData.verifyStatus" /> -->
-      <div class="stepsStatus">
-        <el-steps :active="active" align-center>
-          <el-step title="创建"></el-step>
-          <el-step title="待审核"></el-step>
-          <el-step :title="stepsTitle" :status="stepsStatus"></el-step>
-        </el-steps>
-      </div>
       <div>
       <div>
         <div class="content-detail">
         <div class="content-detail">
           <header-title title="基本信息" size="16px"></header-title>
           <header-title title="基本信息" size="16px"></header-title>
@@ -230,7 +222,7 @@
                   <!-- {{ row.measurementUnit }}{{ row.measuringUnit }}/{{
                   <!-- {{ row.measurementUnit }}{{ row.measuringUnit }}/{{
                     row.packingUnit
                     row.packingUnit
                   }} -->
                   }} -->
-                  <span>{{ row.minPackingCount }}/{{ row.packingUnit }}</span>
+                  <span>{{ row.measuringUnit }}/{{ row.packingUnit }}</span>
                 </template>
                 </template>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -283,6 +275,11 @@
   import { getUser } from '@/api/system/user';
   import { getUser } from '@/api/system/user';
   export default {
   export default {
     components: { StatusStep },
     components: { StatusStep },
+    props: {
+      businessId: {
+        default: ''
+      }
+    },
     data() {
     data() {
       return {
       return {
         infoData: {},
         infoData: {},
@@ -372,7 +369,7 @@
       getSceneState: useDictLabel(outputSceneState),
       getSceneState: useDictLabel(outputSceneState),
       getAuditStatus: useDictLabel(auditStatus),
       getAuditStatus: useDictLabel(auditStatus),
       async _getInfo() {
       async _getInfo() {
-        const res = await outin.getById(this.$route.query.id);
+        const res = await outin.getById(this.businessId);
         console.log(res);
         console.log(res);
         this.infoData = {
         this.infoData = {
           ...res,
           ...res,

+ 2 - 5
src/views/bpm/handleTask/components/outBound/submit.vue

@@ -39,10 +39,7 @@
   </el-col>
   </el-col>
 </template>
 </template>
 <script>
 <script>
-  import {
-    approveTaskWithVariables,
-    outinApproveNotPass
-  } from '@/api/bpm/task';
+  import { approveTaskWithVariables, outApproveNotPass } from '@/api/bpm/task';
   export default {
   export default {
     data() {
     data() {
       return {
       return {
@@ -94,7 +91,7 @@
             reason: this.form.reason,
             reason: this.form.reason,
             outInId: this.businessId
             outInId: this.businessId
           };
           };
-          const data = await outinApproveNotPass(params);
+          const data = await outApproveNotPass(params);
           if (data.data.code != '-1') {
           if (data.data.code != '-1') {
             this.$emit('handleAudit', {
             this.$emit('handleAudit', {
               status,
               status,