pull/2/head
qsh 2 months ago
parent a3dc76e6a8
commit a5e1a97d93
  1. 11
      src/views/Clue/Order/Comp/MallOrderList.vue
  2. 5
      src/views/Clue/Pool/Comp/DialogClue.vue
  3. 8
      src/views/Clue/Pool/Comp/DrawerClue.vue

@ -72,7 +72,16 @@
<el-table-column prop="specsName" label="产品规格" width="100px" /> <el-table-column prop="specsName" label="产品规格" width="100px" />
<el-table-column prop="signNum" label="成交数量" width="90px" /> <el-table-column prop="signNum" label="成交数量" width="90px" />
<el-table-column prop="remark" label="成交备注" /> <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"> <el-table-column label="发货备注" width="100px">
<template #default="scope"> <template #default="scope">
<el-popover <el-popover

@ -171,9 +171,10 @@ const formSchema = computed(() => {
it.componentProps['disabled-date'] = dateAfterToday it.componentProps['disabled-date'] = dateAfterToday
// it.componentProps['disabled'] = formType.value != 'create' // it.componentProps['disabled'] = formType.value != 'create'
it.componentProps['disabled'] = true 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') { if (it.field == 'convertPeople') {
it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname })) it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
} }

@ -22,7 +22,13 @@
<el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate"> <el-button type="primary" v-hasPermi="['clue:pool:update']" plain @click="handleUpdate">
修改 修改
</el-button> </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> </el-button>
</div> </div>

Loading…
Cancel
Save