bug

src/BIZComponents/inventoryTableDetails.vue

@@ -162,14 +162,7 @@
             align: 'center'
           },
           orderColumn,
-          {
-            minWidth: 200,
-            prop: 'orderNo',
-            slot: 'orderNo',
-            label: '订单编码',
-            showOverflowTooltip: true,
-            align: 'center'
-          },
+      
           {
             width: 280,
             prop: 'productName',

src/views/bpm/collaborative/index.vue

@@ -880,7 +880,7 @@ export default {
         pageNo: page,
         pageSize: limit,
         ...this.params,
-        processType: '1',
+        processType: '1',createTimeBegin,createTimeEnd
       });
       data = data.list.map(item => {
         return {
@@ -916,7 +916,7 @@ export default {
         pageNo: page,
         pageSize: limit,
         ...this.params,
-        processType: '1',
+        processType: '1',createTimeBegin,createTimeEnd
       });
       data = data.list.map(item => {
         return {

src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
 import {cancel} from "@/api/bpm/components/financialManage/fee-manage/fee-application";
-import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -162,8 +162,9 @@ export default {
           cancelButtonText: '取消',
           confirmButtonText: '确定'
         }).then(() => {
-          cancel({
-            id: this.taskId,
+          cancelTask({
+            taskId: this.taskId,
+            id: this.id,
             reason: this.form.reason,
             businessId: this.businessId,
           }).then(() => {

src/views/bpm/handleTask/components/inquiryManage/submit.vue

@@ -71,7 +71,7 @@
 
 <script>
   import { UpdateInformation, cancel } from '@/api/bpm/components/purchasingManage/inquiryManage';
-  import {approveTaskWithVariables, rejectTask} from '@/api/bpm/task';
+  import {approveTaskWithVariables, rejectTask,cancelTask} from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页，可用于审批
@@ -180,8 +180,9 @@
             cancelButtonText: '取消',
             confirmButtonText: '确定'
           }).then(() => {
-            cancel({
-              id: this.taskId,
+            cancelTask({
+              taskId: this.taskId,
+              id: this.id,
               reason: this.form.reason,
               businessId: this.businessId,
             }).then(() => {

src/views/bpm/handleTask/components/purchaseOrder/invoice/receiptInfo.vue

@@ -143,6 +143,12 @@
             slot: 'productCategoryName',
             align: 'center'
           },
+          {
+            width: 110,
+            prop: 'batchNo',
+            label: '批次号',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'productBrand',

src/views/bpm/outgoingManagement/components/AssetsDialog.vue

@@ -44,11 +44,11 @@
             <el-input type="text" placeholder="搜索发货码" v-model="searchForm.barcodes"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="批次号">
             <el-input type="text" placeholder="搜索批号" v-model="searchForm.batchNo"></el-input>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="牌号">
             <el-input type="text" placeholder="搜索牌号" v-model="searchForm.brandNum"></el-input>