上传

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

@@ -15,18 +15,14 @@
             <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="发货备注">
               <template #default="scope">
                 <el-popover
                   placement="top"
                   width="500px"
                   trigger="click"
-                  v-if="scope.row.warehouseName && scope.row.sendRemark"
+                  v-if="scope.row.sendRemark"
                 >
                   <template #reference>
                     <el-button type="primary" style="padding: 0" text>点击查看</el-button>