Explorar el Código

feat: 发货单拆分后树状显示

liujt hace 2 semanas
padre
commit
624071d387

+ 15 - 1
src/views/saleManage/saleOrder/invoice/index.vue

@@ -20,6 +20,12 @@
             :cache-key="cacheKeyUrl"
             show-summary
             :summary-method="getSummaries"
+            row-key="id"
+            default-expand-all
+            :tree-props="{
+              children: 'children',
+              hasChildren: 'hasChildren'
+            }"
           >
             <!-- 表头工具栏 -->
             <template v-slot:toolbar>
@@ -118,6 +124,13 @@
             <!-- 查看详情列 -->
 
             <template v-slot:docNo="{ row }">
+              <el-tag
+                v-if="row.parentId && row.parentId != '0'"
+                type="success"
+                size="mini"
+                effect="plain">
+                拆
+              </el-tag>
               <el-link
                 type="primary"
                 :underline="false"
@@ -403,7 +416,7 @@
             sortable: true,
             slot: 'docNo',
             showOverflowTooltip: true,
-            minWidth: 200
+            minWidth: 220
           },
 
           {
@@ -618,6 +631,7 @@
         return getSendTableList({
           pageNum: page,
           size: limit,
+          isResponseTree: true,
           ...where
         });
       },

+ 2 - 1
src/views/saleManage/saleOrder/invoiceConfirm/components/sendListDialog.vue

@@ -23,7 +23,7 @@
       >
         <!-- 表头工具栏 -->
         <template v-slot:action="{ row }">
-          <el-radio class="radio" v-model="radio" :label="row.id"
+          <el-radio :disabled="row.isSplitFlag == 1" class="radio" v-model="radio" :label="row.id"
             ><i></i
           ></el-radio>
         </template>
@@ -180,6 +180,7 @@ export default {
 
     // 单击获取id
     cellClick(row) {
+      if (row.isSplitFlag == 1) return
       this.current = row;
       console.log(row);
       this.radio = row.id;

+ 2 - 1
src/views/saleManage/saleOrder/returnGoods/components/sendListDialog.vue

@@ -23,7 +23,7 @@
       >
         <!-- 表头工具栏 -->
         <template v-slot:action="{ row }">
-          <el-radio class="radio" v-model="radio" :label="row.id"
+          <el-radio :disabled="row.isSplitFlag == 1" class="radio" v-model="radio" :label="row.id"
             ><i></i
           ></el-radio>
         </template>
@@ -190,6 +190,7 @@ export default {
 
     // 单击获取id
     cellClick(row) {
+      if (row.isSplitFlag == 1) return
       this.current = row;
       console.log(row);
       this.radio = row.id;

+ 2 - 1
src/views/saleManage/saleOrder/returnGoods/components/sendListMultipleDialog.vue

@@ -41,7 +41,7 @@
             </template>
             <!-- 表头工具栏 -->
             <template v-slot:action="{ row }">
-              <el-radio class="radio" v-model="radio" :label="row.id"
+              <el-radio :disabled="row.isSplitFlag == 1" class="radio" v-model="radio" :label="row.id"
                 ><i></i
               ></el-radio>
             </template>
@@ -393,6 +393,7 @@
 
       // 单击获取id
       cellClick(row) {
+        if (row.isSplitFlag == 1) return
         this.current = row;
         this.radio = row.id;
       },

+ 4 - 1
src/views/transportManager/shipManage/taskWorkManage/components/sendListDialog.vue

@@ -79,7 +79,10 @@
             width: 45,
             type: 'selection',
             columnKey: 'selection',
-            align: 'center'
+            align: 'center',
+            selectable: (row, index) => {
+              return row.isSplitFlag != 1;
+            }
           },
 
           {