add

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -522,6 +522,7 @@
     },
     data() {
       return {
+        llList: [],
         codeList: [],
         materialType,
         warehousingType,
@@ -609,13 +610,26 @@
         this.formData.documentSource = row.code;
         for (const key in row.orderInfoList) {
           for (const i in row.orderInfoList[key].bomDetailDTOS) {
-            row.tableData.push({ ...row.orderInfoList[key].bomDetailDTOS[i] });
+            row.tableData.push({
+              ...row.orderInfoList[key].bomDetailDTOS[i],
+              code: row.orderInfoList[key].bomDetailDTOS[i].categoryCode,
+              name: row.orderInfoList[key].bomDetailDTOS[i].categoryName,
+              modelTyp: row.orderInfoList[key].bomDetailDTOS[i].model,
+              id: row.orderInfoList[key].bomDetailDTOS[i].categoryId
+            });
           }
           for (const j in row.orderInfoList[key].instanceList) {
-            row.tableData.push({ ...row.orderInfoList[key].instanceList[j] });
+            row.tableData.push({
+              ...row.orderInfoList[key].instanceList[j],
+              code: row.orderInfoList[key].instanceList[j].categoryCode,
+              name: row.orderInfoList[key].instanceList[j].categoryName,
+              modelTyp: row.orderInfoList[key].bomDetailDTOS[j].model,
+              id: row.orderInfoList[key].bomDetailDTOS[j].categoryId
+            });
           }
         }
         console.log(row);
+        this.onSelectTableData(row.tableData, 1);
         this.$forceUpdate();
       },
       handlePickorder() {
@@ -923,7 +937,15 @@
         // return newArr;
       },
       //添加明细
-      onSelectTableData(val) {
+      onSelectTableData(val, e) {
+        if (e == 1) {
+          this.llList = val;
+        } else {
+          this.llList = [];
+        }
+        if (this.warehousingMaterialList.length != 0) {
+          val = this.warehousingMaterialList.concat(val).concat(this.llList);
+        }
         this.onSelectTableDataVal = val;
         this.warehousingMaterialList = val.map((next) => {
           delete next.updateTime;

src/views/warehouseManagement/outgoingManagement/components/pickOrder.vue

@@ -19,7 +19,12 @@
           @row-click="chooseRow"
         >
           <!-- 表头工具栏 -->
-
+          <template v-slot:code="{ row }">
+            <!-- @click="details(row)" -->
+            <el-link type="primary" :underline="false">
+              {{ row.code }}
+            </el-link>
+          </template>
           <template v-slot:action="{ row }">
             <el-radio class="radio" v-model="radio" :label="row.id"
               ><i></i
@@ -62,7 +67,8 @@
           {
             prop: 'code',
             label: '领料单号',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'executorName',

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -158,11 +158,12 @@
         });
       },
       /* 表格数据源 */
-      datasource({ page, limit, where }) {
-        console.log();
+      datasource({ page, limit, where, order }) {
+        console.log(order);
         const dimension = this.$refs.refSeavch.dimension;
         return ouint.getRealTimeInventory({
           ...where,
+          ...order,
           pageNum: page,
           size: limit,
           dimension: dimension