From a5e1a97d93ac767149f5ecb9b6f924587a0fbe4d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 9 Aug 2024 16:25:11 +0800
Subject: [PATCH] sc

---
 src/views/Clue/Order/Comp/MallOrderList.vue | 11 ++++++++++-
 src/views/Clue/Pool/Comp/DialogClue.vue     |  5 +++--
 src/views/Clue/Pool/Comp/DrawerClue.vue     |  8 +++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 9b6800f..5098fa6 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -72,7 +72,16 @@
               <el-table-column prop="specsName" label="产品规格" width="100px" />
               <el-table-column prop="signNum" label="成交数量" width="90px" />
               <el-table-column prop="remark" label="成交备注" />
-              <el-table-column label="发货状态" prop="sendState" width="90px" />
+              <el-table-column label="发货状态" prop="sendState" width="90px">
+                <template #default="scope">
+                  <el-tag
+                    :type="scope.row.sendState == '待发货' ? 'danger' : 'success'"
+                    size="small"
+                  >
+                    {{ scope.row.sendState }}
+                  </el-tag>
+                </template>
+              </el-table-column>
               <el-table-column label="发货备注" width="100px">
                 <template #default="scope">
                   <el-popover
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 174a5c2..70f755a 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -171,9 +171,10 @@ const formSchema = computed(() => {
       it.componentProps['disabled-date'] = dateAfterToday
       // it.componentProps['disabled'] = formType.value != 'create'
       it.componentProps['disabled'] = true
-    } else if (it.field == 'convertPeople' && formType.value == 'update') {
-      it.componentProps['disabled'] = true
     }
+    // else if (it.field == 'convertPeople' && formType.value == 'update') {
+    //   it.componentProps['disabled'] = true
+    // }
     if (it.field == 'convertPeople') {
       it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
     }
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index ec9e6fb..f09b6ec 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -22,7 +22,13 @@
           <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
             修改
           </el-button>
-          <el-button type="danger" v-hasPermi="['clue:pool:delete']" plain @click="handleRemove">
+          <el-button
+            type="danger"
+            v-if="info.state != '成交'"
+            v-hasPermi="['clue:pool:delete']"
+            plain
+            @click="handleRemove"
+          >
             删除
           </el-button>
         </div>