|
@@ -76,8 +76,8 @@
|
|
|
<a-form-item label="是否被参照">
|
|
|
<a-select v-model="queryParam.refer">
|
|
|
<a-select-option value="">请选择</a-select-option>
|
|
|
- <a-select-option :value="0">否</a-select-option>
|
|
|
- <a-select-option :value="1">是</a-select-option>
|
|
|
+ <a-select-option value="0">否</a-select-option>
|
|
|
+ <a-select-option value="1">是</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
@@ -137,30 +137,77 @@
|
|
|
|
|
|
<a-dropdown>
|
|
|
<a class="ant-dropdown-link">更多<a-icon type="down"/></a>
|
|
|
- <a-menu slot="overlay">
|
|
|
+ <!-- 已保存 -->
|
|
|
+ <a-menu slot="overlay" v-if="record.state == '0'">
|
|
|
<a-menu-item>
|
|
|
<a @click="details(record)">详情</a>
|
|
|
</a-menu-item>
|
|
|
|
|
|
- <a-menu-item v-if="record.state == '0'">
|
|
|
+ <a-menu-item>
|
|
|
+ <a @click="edit(record)">编辑</a>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
+ <a-menu-item>
|
|
|
<a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
|
|
|
- <a href="javascript:void(0);">提交</a>
|
|
|
+ <a href="javascript:void(0);" style="color:green;">提交</a>
|
|
|
</a-popconfirm>
|
|
|
</a-menu-item>
|
|
|
|
|
|
- <a-menu-item v-if="record.state == '0'">
|
|
|
- <a @click="edit(record)">编辑</a>
|
|
|
+ <a-menu-item>
|
|
|
+ <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
|
|
|
+ <a href="javascript:void(0);" style="color:red;">删除</a>
|
|
|
+ </a-popconfirm>
|
|
|
</a-menu-item>
|
|
|
+ </a-menu>
|
|
|
|
|
|
- <a-menu-item v-if="record.pushState == '0'">
|
|
|
+ <!-- 推送成功 且 已提交 -->
|
|
|
+ <a-menu slot="overlay" v-if="record.state == '1' && record.pushState == '1'">
|
|
|
+ <a-menu-item>
|
|
|
+ <a @click="details(record)">详情</a>
|
|
|
+ </a-menu-item>
|
|
|
+ </a-menu>
|
|
|
+
|
|
|
+ <!-- 已提交 -->
|
|
|
+ <a-menu slot="overlay" v-if="record.state == '1'">
|
|
|
+ <a-menu-item>
|
|
|
+ <a @click="details(record)">详情</a>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
+ <a-menu-item>
|
|
|
+ <a-popconfirm title="确定取消提交吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
|
|
|
+ <a href="javascript:void(0);" style="color:red;">取消提交</a>
|
|
|
+ </a-popconfirm>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
+ <a-menu-item>
|
|
|
<a-popconfirm title="确定推送吗?" ok-text="是" cancel-text="否" @confirm="push(record)">
|
|
|
- <a href="javascript:void(0);">推送</a>
|
|
|
+ <a href="javascript:void(0);" style="color:green;">推送</a>
|
|
|
</a-popconfirm>
|
|
|
</a-menu-item>
|
|
|
+ </a-menu>
|
|
|
|
|
|
- <a-menu-item v-if="record.state == '0'">
|
|
|
- <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
|
|
|
- <a href="javascript:void(0);" style="color:red;">删除</a>
|
|
|
+ <!-- 未推送 -->
|
|
|
+ <a-menu slot="overlay" v-if="record.pushState == '0'">
|
|
|
+ <a-menu-item>
|
|
|
+ <a @click="details(record)">详情</a>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
+ <a-menu-item>
|
|
|
+ <a-popconfirm title="确定推送吗?" ok-text="是" cancel-text="否" @confirm="push(record)">
|
|
|
+ <a href="javascript:void(0);" style="color:green;">推送</a>
|
|
|
+ </a-popconfirm>
|
|
|
+ </a-menu-item>
|
|
|
+ </a-menu>
|
|
|
+
|
|
|
+ <!-- 推送失败 -->
|
|
|
+ <a-menu slot="overlay" v-if="record.pushState == '2'">
|
|
|
+ <a-menu-item>
|
|
|
+ <a @click="details(record)">详情</a>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
+ <a-menu-item>
|
|
|
+ <a-popconfirm title="确定重新推送吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
|
|
|
+ <a href="javascript:void(0);" style="color:green;">重新推送</a>
|
|
|
</a-popconfirm>
|
|
|
</a-menu-item>
|
|
|
</a-menu>
|
|
@@ -402,7 +449,7 @@ export default {
|
|
|
dataIndex: 'operation',
|
|
|
scopedSlots: { customRender: 'operationSlot' },
|
|
|
fixed: 'right',
|
|
|
- width: 220,
|
|
|
+ width: 160,
|
|
|
className: 'replacecolor'
|
|
|
}
|
|
|
],
|
|
@@ -543,14 +590,14 @@ export default {
|
|
|
// 根据单据状态判断是否可删除数据(已提交不可删除)客户需要通过【删除】动作判断是否可删
|
|
|
//现在通过该状态,控制是否有【删除】按钮
|
|
|
// if (this.shipmentListData.state == 0) {
|
|
|
- deleteShipment({ id: record.id }).then(res => {
|
|
|
- console.log('res:', res)
|
|
|
- this.getShipmentList() // 渲染 发运明细列表
|
|
|
- this.$message.success('删除成功')
|
|
|
- })
|
|
|
+ deleteShipment({ id: record.id }).then(res => {
|
|
|
+ console.log('res:', res)
|
|
|
+ this.getShipmentList() // 渲染 发运明细列表
|
|
|
+ this.$message.success('删除成功')
|
|
|
+ })
|
|
|
// }
|
|
|
// else {
|
|
|
- // this.$message.error('单据已提交,不可删除')
|
|
|
+ // this.$message.error('单据已提交,不可删除')
|
|
|
// }
|
|
|
})
|
|
|
},
|