上传

src/views/Clue/Order/Comp/MallOrderList.vue

@@ -69,11 +69,7 @@
               <el-table-column prop="productName" label="成交产品" />
               <el-table-column prop="specsName" label="产品规格" />
               <el-table-column prop="signNum" label="成交数量" width="100px" />
-              <el-table-column label="发货状态" width="100px">
-                <template #default="scope">
-                  {{ scope.row.warehouseName ? '已发货' : '待发货' }}
-                </template>
-              </el-table-column>
+              <el-table-column label="发货状态" prop="sendState" width="100px" />
               <el-table-column label="发货备注" width="100px">
                 <template #default="scope">
                   <el-popover
@@ -95,7 +91,7 @@
                     type="primary"
                     class="mr-10px"
                     link
-                    :disabled="!!scope.row.warehouseName"
+                    :disabled="scope.row.sendState == '已发货'"
                     style="padding: 0; margin-left: 0"
                     v-hasPermi="['clue:order:send']"
                     @click="handleDelivery(scope.row)"
@@ -339,7 +335,7 @@ function getOptions() {
 }
 const deliveryDialog = ref()
 function handleDelivery(row) {
-  deliveryDialog.value.open(row.id, row.signNum)
+  deliveryDialog.value.open(row)
 }
 
 const userOptions = ref([])