隐藏物料明细

src/BIZComponents/inventoryTable.vue

@@ -768,6 +768,13 @@
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
+          {
+            width: 110,
+            prop: 'batchNo',
+            label: '批次号',
+            slot: 'batchNo',
+            align: 'center'
+          },
           {
             width: 120,
             prop: 'availableCountBase',

src/BIZComponents/inventoryTableDetails.vue

@@ -331,6 +331,13 @@
                 : '';
             }
           },
+          {
+            width: 110,
+            prop: 'batchNo',
+            label: '批次号',
+            slot: 'batchNo',
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'productBrand',
@@ -511,7 +518,7 @@
     methods: {
       async getSupplierObj(productList, queryName) {
         try {
-          let categoryIds = productList.map((item) => item[queryName]);
+          let categoryIds = productList.filter((item) => item[queryName]).map((item) => item[queryName]);
           return await contactQueryByCategoryIdsAPI({
             categoryIds,
             isQueryEE: 1

src/BIZComponents/outdetails.vue

@@ -385,7 +385,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="mt20">
+        <!-- <div class="mt20">
           <header-title :title="`物料明细`" size="16px"> </header-title>
           <el-table
             ref="multipleTable"
@@ -451,7 +451,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
   </div>

src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/procurementStorage.vue

@@ -656,7 +656,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isSplit">
+        <!-- <div class="mt20" v-if="isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length != 0"
@@ -781,7 +781,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
     <selectType

src/views/bpm/handleTask/components/outsourcedWarehousingNoProcurement/procurementWarehousing.vue

@@ -837,7 +837,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="
@@ -999,7 +999,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div class="center mt20">
         <el-button

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

@@ -848,7 +848,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="
@@ -1010,7 +1010,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div class="center mt20">
         <el-button

src/views/bpm/handleTask/components/purchaseOrder/outSourceSend/boxTabPage.vue

@@ -19,7 +19,8 @@
     name: 'boxTabPage',
     components: {
       tab1: () => import('./detailDialog.vue'),
-      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue'),
+      tab3: () => import('@/views/bpm/outgoingManagement/details.vue')
     },
     props: {
       taskDefinitionKey: {
@@ -37,7 +38,8 @@
       businessId: {
         type: String,
         default: ''
-      }
+      },
+      isView: ''
     },
     data() {
       return {
@@ -56,7 +58,7 @@
           },
           {
             label: '出库单信息',
-            name: 'tab2',
+            name: this.isView ? 'tab3' : 'tab2',
             isShow: true
           }
         ];
@@ -79,6 +81,10 @@
               bizType: 7,
               sourceBizNo: this.form.code
             };
+          case 'tab3':
+            return {
+              businessId: this.form.code
+            };
         }
       },
       isValidComponent(componentName) {

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/entrustedStorage.vue

@@ -652,7 +652,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isSplit">
+        <!-- <div class="mt20" v-if="isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length != 0"
@@ -773,7 +773,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
     <selectType

src/views/bpm/handleTask/components/purchaseOrder/outsourceSendReturnGoods/innerboundDetailsDialog.vue

@@ -277,7 +277,7 @@
           </el-table-column> -->
         </el-table>
       </div>
-      <div class="mt20">
+      <!-- <div class="mt20">
         <header-title :title="`出库物料明细`" size="16px"></header-title>
         <el-table
           ref="multipleTable1"
@@ -315,7 +315,7 @@
           <el-table-column label="重量单位" prop="weightUnit">
           </el-table-column>
         </el-table>
-      </div>
+      </div> -->
     </div>
 
     <div slot="footer">

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue

@@ -622,7 +622,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="mt20" v-if="resultArray.length > 0 && isSplit">
+        <!-- <div class="mt20" v-if="resultArray.length > 0 && isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length > 0 && !formData.isStorage"
@@ -748,7 +748,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/innerFillWeight.vue

@@ -775,7 +775,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="
@@ -903,7 +903,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorage.vue

@@ -634,7 +634,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="resultArray.length > 0 && isSplit">
+        <!-- <div class="mt20" v-if="resultArray.length > 0 && isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length > 0 && !formData.isStorage"
@@ -760,7 +760,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorProductionStorageQuality.vue

@@ -800,7 +800,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length > 0 && taskDefinitionKey === 'innerInQC'"
@@ -957,7 +957,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcing.vue

@@ -620,7 +620,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="mt20" v-if="resultArray.length > 0 && isSplit">
+        <!-- <div class="mt20" v-if="resultArray.length > 0 && isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length > 0 && !formData.isStorage"
@@ -746,7 +746,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/interiorStorageToOutsourcingQuality.vue

@@ -783,7 +783,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length > 0 && taskDefinitionKey === 'outerInQC'"
@@ -940,7 +940,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div class="center mt20">
         <el-button

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/outboundDetailsDialog.vue

@@ -277,7 +277,7 @@
           </el-table-column> -->
         </el-table>
       </div>
-      <div class="mt20">
+      <!-- <div class="mt20">
         <header-title :title="`出库物料明细`" size="16px"></header-title>
         <el-table
           ref="multipleTable1"
@@ -311,7 +311,7 @@
           <el-table-column label="重量单位" prop="weightUnit">
           </el-table-column>
         </el-table>
-      </div>
+      </div> -->
     </div>
 
     <div slot="footer">

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/entrustedStorage.vue

@@ -652,7 +652,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isSplit">
+        <!-- <div class="mt20" v-if="isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length != 0"
@@ -773,7 +773,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
     <selectType

src/views/bpm/handleTask/components/saleOrder/entrustedReceive/procurementWarehousing.vue

@@ -835,7 +835,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isDetail">
+        <!-- <div class="mt20" v-if="isDetail">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="
@@ -997,7 +997,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div class="center mt20">
         <el-button

src/views/bpm/handleTask/components/saleOrder/saleReturnGoods/salesReturnReceipt.vue

@@ -652,7 +652,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isSplit">
+        <!-- <div class="mt20" v-if="isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length != 0"
@@ -773,7 +773,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
     <selectType

src/views/bpm/handleTask/components/selectedCollectionOutbound/boxTabPage.vue

@@ -19,7 +19,8 @@
     name: 'boxTabPage',
     components: {
       tab1: () => import('./detailDialog.vue'),
-      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue')
+      tab2: () => import('@/views/bpm/outgoingManagement/outbound.vue'),
+      tab3: () => import('@/views/bpm/outgoingManagement/details.vue')
     },
     props: {
       taskDefinitionKey: {
@@ -37,7 +38,8 @@
       businessId: {
         type: String,
         default: ''
-      }
+      },
+      isView: ''
     },
     data() {
       return {
@@ -58,7 +60,7 @@
           },
           {
             label: '出库',
-            name: 'tab2',
+            name: this.isView ? 'tab3' : 'tab2',
             isShow: true
           }
         ];
@@ -86,6 +88,10 @@
               wwType: this.wwType,
               extractedList: this.extractedList
             };
+          case 'tab3':
+            return {
+              businessId: this.form.code
+            };
         }
       },
       isValidComponent(componentName) {

src/views/bpm/handleTask/components/selectedCollectionOutbound/detailDialog.vue

@@ -4,7 +4,7 @@
     <el-table :data="form.detailList" style="width: 100%">
       <el-table-column prop="code" label="领料单号"> </el-table-column>
       <el-table-column prop="workOrderCode" label="工单编号"> </el-table-column>
-      <el-table-column prop="workOrderId" label="工单编号"> </el-table-column>
+      <!-- <el-table-column prop="workOrderId" label="工单编号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="物品编码"> </el-table-column>
       <el-table-column prop="categoryName" label="物品名称"> </el-table-column>
       <el-table-column label="数量">

src/views/bpm/outgoingManagement/outbound.vue

@@ -206,7 +206,7 @@
             </el-table>
           </div>
         </div>
-        <div class="mt20">
+        <!-- <div class="mt20">
           <header-title class="mt20" title="物料明细"></header-title>
           <el-table ref="multipleTable" :data="showMaterialList" tooltip-effect="dark" :max-height="300"
             :row-class-name="tableRowClassName" :header-cell-style="rowClass" border style="width: 100%" stripe
@@ -240,7 +240,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
     <AssetsDialog ref="assetsDialogRef" :treeIds="formData.extInfo?.assetType" @detailData="detailData"

src/views/bpm/stockManagement/add.vue

@@ -978,7 +978,7 @@
           <!-- </el-tab-pane>
         </el-tabs> -->
         </div>
-        <div class="mt20" v-if="isSplit">
+        <!-- <div class="mt20" v-if="isSplit">
           <header-title :title="`物料明细`"> </header-title>
           <el-button
             v-if="resultArray.length != 0"
@@ -1091,7 +1091,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div class="center mt20">
         <el-button

src/views/bpm/stockManagement/quality.vue

@@ -452,7 +452,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <div class="mt20">
+        <!-- <div class="mt20">
           <header-title :title="`物料明细`" size="16px"> </header-title>
           <el-table
             ref="multipleTable"
@@ -597,7 +597,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
     </el-card>
   </div>

src/views/bpm/stockManagement/storage.vue

@@ -452,8 +452,8 @@
         </el-table>
       </div>
       <div v-if="showMaterialList.length > 0" class="inbound_details">
-        <header-title :title="`物料明细`"></header-title>
-        <el-table ref="materialListTable" :data="showMaterialList" tooltip-effect="dark" :key="formData.bizType"
+        <!-- <header-title :title="`物料明细`"></header-title> -->
+        <!-- <el-table ref="materialListTable" :data="showMaterialList" tooltip-effect="dark" :key="formData.bizType"
           :header-cell-style="rowClass" style="width: 100%" border stripe :max-height="300"
           v-el-table-infinite-scroll="materielHandleScroll">
           <el-table-column label="序号" type="index" width="50">
@@ -486,12 +486,7 @@
                 " v-model="row.clientCode"></el-input>
               <span v-else>{{ row.clientCode }}</span>
             </template>
-            <!-- <template slot-scope="{ row, $index }" v-if="bizType == 2">
-              <el-input v-if="!row.isPack" :ref="'packing_clientCode' + $index" @keyup.native="
-                moveFocus($event, $index, 'packing_clientCode', '物料', row)
-                " v-model="row.customerMark"></el-input>
-              <span v-else> {{ row.customerMark }}</span>
-            </template> -->
+
           </el-table-column>
           <el-table-column label="刻码" prop="engrave" width="140">
             <template slot-scope="{ row, $index }">
@@ -527,14 +522,8 @@
               <span>{{ qualityStatus[row.status] }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="操作" width="120" fixed="right">
-            <template slot-scope="{ row, $index }">
-              <el-button type="text" @click="materialDelete(row, $index)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column> -->
-        </el-table>
+         
+        </el-table> -->
       </div>
     </el-card>
     <!-- 产品选择弹框 -->

src/views/bpm/tickets/maintenance/index.vue

@@ -34,6 +34,7 @@
                 filterable
                 v-model="searchForm.orderStatus"
                 size="small"
+                clearable
               >
                 <el-option
                   v-for="item in ticketStatus"
@@ -107,7 +108,7 @@
         <el-table-column prop="orderStatus" label="状态">
           <template slot-scope="{ row }">
             {{
-              ticketStatus.filter((item) => item.id == row.orderStatus)[0].label
+              ticketStatus.filter((item) => item.id == row.orderStatus)[0]?.label
             }}
           </template>
         </el-table-column>
@@ -177,7 +178,7 @@
         ticketStatus: [],
         searchForm: {
           code: '',
-          orderStatus: 0,
+          orderStatus: '',
           ruleId: '',
           date: '',
           startTime: '',
@@ -242,7 +243,9 @@
         let par = {
           ...this.pages,
           ...this.searchForm,
-          executeUserId: userId
+          executeUserId: userId,
+          isQueryTodo:1,
+
         };
         if (this.searchForm.date) {
           par.startTime = this.searchForm.date[0];

src/views/bpm/tickets/patrolInspection/index.vue

@@ -34,6 +34,7 @@
                 filterable
                 v-model="searchForm.orderStatus"
                 size="small"
+                clearable
               >
                 <el-option
                   v-for="item in ticketStatus"
@@ -107,7 +108,7 @@
         <el-table-column prop="orderStatus" label="状态">
           <template slot-scope="{ row }">
             {{
-              ticketStatus.filter((item) => item.id == row.orderStatus)[0].label
+              ticketStatus.filter((item) => item.id == row.orderStatus)[0]?.label
             }}
           </template>
         </el-table-column>
@@ -177,7 +178,7 @@
         ticketStatus: [],
         searchForm: {
           code: '',
-          orderStatus: 0,
+          orderStatus: '',
           ruleId: '',
           date: '',
           startTime: '',
@@ -242,7 +243,8 @@
         let par = {
           ...this.pages,
           ...this.searchForm,
-          executeUserId: userId
+          executeUserId: userId,
+          isQueryTodo:1,
         };
         if (this.searchForm.date) {
           par.startTime = this.searchForm.date[0];
@@ -250,6 +252,7 @@
         }
         delete par.date;
         getWorkOrderPage(par).then((res) => {
+          console.log(res.list,'res.list')
           this.tableData = res.list;
           this.total = res.total;
         });
@@ -262,7 +265,7 @@
       rest() {
         this.searchForm = {
           code: '',
-          orderStatus: 0,
+          orderStatus: '',
           ruleId: '',
           date: '',
           startTime: '',

src/views/bpm/tickets/repair/index.vue

@@ -32,7 +32,8 @@
             <el-form-item label="状态">
               <el-select
                 filterable
-                v-model="searchForm.orderStatus"
+                clearable
+                v-model="searchForm.status"
                 size="small"
               >
                 <el-option
@@ -95,6 +96,7 @@
         <el-table-column prop="ruleName" label="规则名称" />
         <el-table-column prop="equiCode" label="设备编号" />
         <el-table-column prop="equiName" label="设备名称" />
+        <el-table-column prop="requestUserName" label="报修人" />
         <el-table-column prop="executeUserName" label="执行人" />
         <el-table-column prop="acceptTime" label="开始时间" />
         <el-table-column prop="finishTime" label="结束时间" />
@@ -112,8 +114,9 @@
         </el-table-column>
         <el-table-column prop="orderStatus" label="状态">
           <template slot-scope="{ row }">
+
             {{
-              ticketStatus.filter((item) => item.id == row.orderStatus)[0].label
+              ticketStatus.filter((item) => item.id == row.orderStatus)[0]?.label
             }}
           </template>
         </el-table-column>
@@ -217,7 +220,7 @@
         ticketStatus: [],
         searchForm: {
           code: '',
-          orderStatus: 0,
+          status: '',
           ruleId: '',
           date: '',
           startTime: '',
@@ -287,7 +290,7 @@
           ...this.pages,
           ...this.searchForm,
           executeUserId: this.userId,
-          statusType: 1
+          statusType: 0
         };
         if (this.searchForm.date) {
           par.startTime = this.searchForm.date[0];

src/views/bpm/todo/index.vue

@@ -146,9 +146,8 @@
   import { getTodoTaskPage } from '@/api/bpm/task';
   import handleTask from '@/views/bpm/handleTask/index.vue';
   import handleFormParserTask from '@/views/bpm/handleTask/formParser/formParserDialog.vue'; //处理
-  import detail from '@/views/bpm/processInstance/detail.vue';
+  import detail from '@/views/bpm/done/detailDialog.vue';
   import inOut from '../outgoingManagement/add.vue';
-
   // import {getDate} from "@/utils/dateUtils";
   // 默认表单数据
   const defaultParams = {
@@ -317,7 +316,7 @@
           }
         } else {
 
-          this.$refs.detailRef.open(row.processInstance.id);
+          this.$refs.detailRef.open(row);
         }
       }
     }