|
@@ -1,6 +1,7 @@
|
|
|
<template>
|
|
|
<div class="tenant">
|
|
|
- <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading" highlight-current-row
|
|
|
+ <byTable :source="sourceList.data" :pagination="sourceList.pagination" :config="config" :loading="loading"
|
|
|
+ highlight-current-row
|
|
|
:selectConfig="selectConfig" :table-events="{
|
|
|
select: select,
|
|
|
}" :action-list="[]" @get-list="getList" @moreSearch="() => (queryDialogVisible = true)">
|
|
@@ -8,19 +9,19 @@
|
|
|
<template #orderId="{ item }">
|
|
|
<div style="display: flex; justify-content: flex-start;line-height: 34px;height: 34px" @click="getDtl(item);">
|
|
|
<div v-if="item.hasEx=='1'">
|
|
|
- <img src="@/assets/images/jdyc.png" alt="" style="width: 34px" />
|
|
|
+ <img src="@/assets/images/jdyc.png" alt="" style="width: 34px"/>
|
|
|
</div>
|
|
|
<div v-else style="width: 34px">
|
|
|
|
|
|
</div>
|
|
|
- <span style="color: blue">{{item.orderId}}</span>
|
|
|
+ <span style="color: blue">{{ item.orderId }}</span>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<template #diversionType="{item}">
|
|
|
<div style="width:100%">
|
|
|
<div v-if="item.diversionType">
|
|
|
- {{dictValueLabel(item.diversionType,diversionTypeData)}}
|
|
|
+ {{ dictValueLabel(item.diversionType, diversionTypeData) }}
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<!-- <el-button type="primary" text @click="handleDiversionType(item)">分流</el-button> -->
|
|
@@ -34,71 +35,78 @@
|
|
|
<i class="iconfont icon-iconm_banli" style="margin-right: 5px"></i>
|
|
|
<span v-if="isNullOrUndefined(item.remark)">编辑备注</span>
|
|
|
<el-tooltip v-else class="item" effect="dark" :content="item.remark" placement="top">
|
|
|
- {{item.remark}}
|
|
|
+ {{ item.remark }}
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</byTable>
|
|
|
<!--回告-->
|
|
|
- <el-dialog :z-index="1500" title="采购单回告" v-if="tellDialogVisible" v-model="formData.data" width="1500px" v-loading="loading">
|
|
|
- <el-descriptions title="基础信息" />
|
|
|
+ <el-dialog :z-index="1500" title="采购单回告" v-if="tellDialogVisible" v-model="formData.data" width="1500px"
|
|
|
+ v-loading="loading">
|
|
|
+ <el-descriptions title="基础信息"/>
|
|
|
<el-form label-width="auto" :rules="rules">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="采购单号:" :span="8">
|
|
|
- {{formData.data.orderId}}
|
|
|
+ {{ formData.data.orderId }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="配送中心:" :span="8">
|
|
|
- {{formData.data.deliverCenterName}}
|
|
|
+ {{ formData.data.deliverCenterName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="入库时间:" :span="8">
|
|
|
- {{formData.data.storageTime}}
|
|
|
+ {{ formData.data.storageTime }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="预计送货时间:" :span="8">
|
|
|
- <el-date-picker v-model="formData.data.deliveryTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
- placeholder="请选择预计送货时间" />
|
|
|
+ <el-date-picker v-model="formData.data.deliveryTime" type="datetime" format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
+ placeholder="请选择预计送货时间"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-descriptions title="采购单明细" />
|
|
|
+ <el-descriptions title="采购单明细"/>
|
|
|
<el-table :data="formData.data.jdOrderDetailsList" stripe style="width: 100%">
|
|
|
<!-- <el-table stripe style="width: 100%">-->
|
|
|
<el-table-column prop="wareId" label="京东商品编号" width="180">
|
|
|
<template #default="scope">
|
|
|
<span
|
|
|
- :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareId}}</span>
|
|
|
+ :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{
|
|
|
+ scope.row.wareId
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="wareName" label="京东商品名称">
|
|
|
<template #default="scope">
|
|
|
<span
|
|
|
- :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareName}}</span>
|
|
|
+ :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{
|
|
|
+ scope.row.wareName
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="productName" label="产品名称" />
|
|
|
- <el-table-column prop="originalNum" label="采购数量" />
|
|
|
+ <el-table-column prop="productName" label="产品名称"/>
|
|
|
+ <el-table-column prop="originalNum" label="采购数量"/>
|
|
|
<el-table-column prop="confirmNum" label="确认数量">
|
|
|
<template v-slot="scope">
|
|
|
<el-form-item :rules="rules['confirmNum']">
|
|
|
- <el-input-number :min="0" :step="1" :max="scope.row.originalNum" v-model="scope.row.confirmNum" placeholder="请输入确认数量" />
|
|
|
+ <el-input-number :min="0" :step="1" :max="scope.row.originalNum" v-model="scope.row.confirmNum"
|
|
|
+ placeholder="请输入确认数量"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="purchasePrice" label="采购价" />
|
|
|
+ <el-table-column prop="purchasePrice" label="采购价"/>
|
|
|
<el-table-column prop="nonDeliveryReason" label="不满足发货原因">
|
|
|
<template v-slot="scope">
|
|
|
<el-form-item :rules="rules['nonDeliveryReason']">
|
|
|
- <el-input v-model="scope.row.nonDeliveryReason" placeholder="请输入不满足发货原因" />
|
|
|
+ <el-input v-model="scope.row.nonDeliveryReason" placeholder="请输入不满足发货原因"/>
|
|
|
</el-form-item>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -112,163 +120,164 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!--详情-->
|
|
|
- <el-dialog :z-index="1500" title="采购单详情" v-if="dialogVisible" v-model="formData.data" width="1500px" v-loading="loading">
|
|
|
- <el-descriptions title="基础信息" />
|
|
|
+ <el-dialog :z-index="1500" title="采购单详情" v-if="dialogVisible" v-model="formData.data" width="1500px"
|
|
|
+ v-loading="loading">
|
|
|
+ <el-descriptions title="基础信息"/>
|
|
|
<el-form label-width="auto" :rules="rules">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="京东订单号:" :span="8">
|
|
|
- {{formData.data.orderId}}
|
|
|
+ {{ formData.data.orderId }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="订购时间:" :span="8" label-position="right">
|
|
|
- {{formData.data.createdDate}}
|
|
|
+ {{ formData.data.createdDate }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="供应商名称:" :span="8">
|
|
|
- {{formData.data.providerName}}
|
|
|
+ {{ formData.data.providerName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="采购总金额:" :span="8">
|
|
|
- {{formData.data.totalPrice}}
|
|
|
+ {{ formData.data.totalPrice }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="配送中心名称:" :span="8">
|
|
|
- {{formData.data.deliverCenterName}}
|
|
|
+ {{ formData.data.deliverCenterName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="采购员姓名:" :span="8">
|
|
|
- {{formData.data.purchaserName}}
|
|
|
+ {{ formData.data.purchaserName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="删除状态:" :span="8">
|
|
|
- {{formData.data.statusName}}
|
|
|
+ {{ formData.data.statusName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="是否EPT定制:" :span="8">
|
|
|
- {{formData.data.isEptCustomized?'是':'否'}}
|
|
|
+ {{ formData.data.isEptCustomized ? '是' : '否' }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="订单状态:" :span="8">
|
|
|
- {{formData.data.stateName}}
|
|
|
+ {{ formData.data.stateName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="完成时间:" :span="8">
|
|
|
- {{formData.data.completedDate}}
|
|
|
+ {{ formData.data.completedDate }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="账期:" :span="8">
|
|
|
- {{formData.data.accountPeriod}}
|
|
|
+ {{ formData.data.accountPeriod }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="收货负责人:" :span="8">
|
|
|
- {{formData.data.receiverName}}
|
|
|
+ {{ formData.data.receiverName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="收货电话:" :span="8">
|
|
|
- {{formData.data.warehousePhone}}
|
|
|
+ {{ formData.data.warehousePhone }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="详细地址:" :span="8">
|
|
|
- {{formData.data.address}}
|
|
|
+ {{ formData.data.address }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="采购类型:" :span="8">
|
|
|
- {{formData.data.orderTypeName}}
|
|
|
+ {{ formData.data.orderTypeName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="订单属性:" :span="8">
|
|
|
- {{formData.data.orderAttributeName}}
|
|
|
+ {{ formData.data.orderAttributeName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="回告状态:" :span="8">
|
|
|
- {{formData.data.confirmStateName}}
|
|
|
+ {{ formData.data.confirmStateName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="顾客单号:" :span="8">
|
|
|
- {{formData.data.customerOrderid}}
|
|
|
+ {{ formData.data.customerOrderid }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="品种数量:" :span="8">
|
|
|
- {{formData.data.wareVariety}}
|
|
|
+ {{ formData.data.wareVariety }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="预计到货时间:" :span="8">
|
|
|
- {{formData.data.deliveryTime}}
|
|
|
+ {{ formData.data.deliveryTime }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="是否可回告:" :span="8">
|
|
|
- {{formData.data.isCanConfirm?"可回告":"不可回告"}}
|
|
|
+ {{ formData.data.isCanConfirm ? "可回告" : "不可回告" }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="是否有差异:" :span="8">
|
|
|
- {{formData.data.isExistActualNumDif=='0'?"存在差异":"无差异"}}
|
|
|
+ {{ formData.data.isExistActualNumDif == '0' ? "存在差异" : "无差异" }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="是否已结算:" :span="8">
|
|
|
- {{formData.data.balanceStatus?"已结算":"未结算"}}
|
|
|
+ {{ formData.data.balanceStatus ? "已结算" : "未结算" }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="入库时间:" :span="8">
|
|
|
- {{formData.data.storageTime}}
|
|
|
+ {{ formData.data.storageTime }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="TC转运标识:" :span="8">
|
|
|
- {{formData.data.tcFlagName}}
|
|
|
+ {{ formData.data.tcFlagName }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="预约时间:" :span="8">
|
|
|
- {{formData.data.bookTime}}
|
|
|
+ {{ formData.data.bookTime }}
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
- <el-descriptions title="采购单明细" />
|
|
|
+ <el-descriptions title="采购单明细"/>
|
|
|
<div style="line-height: 34px;height: 34px;display: flex">
|
|
|
<span>(</span>
|
|
|
- <span><img src="@/assets/images/jdsh.png" alt="" style="width: 34px" /></span><span>多货</span>
|
|
|
- <span><img src="@/assets/images/jddh.png" alt="" style="width: 34px" /></span><span>少货</span>
|
|
|
+ <span><img src="@/assets/images/jdsh.png" alt="" style="width: 34px"/></span><span>多货</span>
|
|
|
+ <span><img src="@/assets/images/jddh.png" alt="" style="width: 34px"/></span><span>少货</span>
|
|
|
<span>)</span>
|
|
|
</div>
|
|
|
|
|
@@ -278,14 +287,14 @@
|
|
|
<template #default="scope">
|
|
|
<div style="display: flex; justify-content: center;line-height: 34px;height: 34px">
|
|
|
<div v-if="scope.row.exDesc=='1'">
|
|
|
- <img src="@/assets/images/jdsh.png" alt="" style="width: 34px" />
|
|
|
+ <img src="@/assets/images/jdsh.png" alt="" style="width: 34px"/>
|
|
|
</div>
|
|
|
<div v-if="scope.row.exDesc=='2'">
|
|
|
- <img src="@/assets/images/jddh.png" alt="" style="width: 34px" />
|
|
|
+ <img src="@/assets/images/jddh.png" alt="" style="width: 34px"/>
|
|
|
</div>
|
|
|
<div
|
|
|
- :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">
|
|
|
- {{scope.row.wareId}}
|
|
|
+ :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">
|
|
|
+ {{ scope.row.wareId }}
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
@@ -294,19 +303,21 @@
|
|
|
<el-table-column prop="wareName" label="京东商品名称" min-width="200">
|
|
|
<template #default="scope">
|
|
|
<span
|
|
|
- :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{scope.row.wareName}}</span>
|
|
|
+ :style="scope.row.productName=='' || scope.row.productName == undefined || scope.row.productName == 'undefined'?'color: red':''">{{
|
|
|
+ scope.row.wareName
|
|
|
+ }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="productName" label="产品名称" width="150" />
|
|
|
- <el-table-column prop="deliverCenterName" label="配送中心名称" width="110" />
|
|
|
- <el-table-column prop="purchasePrice" label="采购价" width="80" />
|
|
|
- <el-table-column prop="originalNum" label="原始采购数量" width="110" />
|
|
|
- <el-table-column prop="confirmNum" label="回告数量" width="80" />
|
|
|
- <el-table-column prop="actualNum" label="实收数量" width="80" />
|
|
|
- <el-table-column prop="nonDeliveryReason" label="不满足原因" width="100" />
|
|
|
- <el-table-column prop="totalPrice" label="采购总金额" width="110" />
|
|
|
- <el-table-column prop="storeName" label="库房名称" width="180" />
|
|
|
- <el-table-column prop="wareProperty" label="EPT采购单定制相关信息" width="180" />
|
|
|
+ <el-table-column prop="productName" label="产品名称" width="150"/>
|
|
|
+ <el-table-column prop="deliverCenterName" label="配送中心名称" width="110"/>
|
|
|
+ <el-table-column prop="purchasePrice" label="采购价" width="80"/>
|
|
|
+ <el-table-column prop="originalNum" label="原始采购数量" width="110"/>
|
|
|
+ <el-table-column prop="confirmNum" label="回告数量" width="80"/>
|
|
|
+ <el-table-column prop="actualNum" label="实收数量" width="80"/>
|
|
|
+ <el-table-column prop="nonDeliveryReason" label="不满足原因" width="100"/>
|
|
|
+ <el-table-column prop="totalPrice" label="采购总金额" width="110"/>
|
|
|
+ <el-table-column prop="storeName" label="库房名称" width="180"/>
|
|
|
+ <el-table-column prop="wareProperty" label="EPT采购单定制相关信息" width="180"/>
|
|
|
</el-table>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
@@ -316,12 +327,13 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!--修改备注-->
|
|
|
- <el-dialog :z-index="1500" title="编辑备注" v-if="remarkDialogVisible" v-model="formData.data" width="800px" v-loading="loading">
|
|
|
+ <el-dialog :z-index="1500" title="编辑备注" v-if="remarkDialogVisible" v-model="formData.data" width="800px"
|
|
|
+ v-loading="loading">
|
|
|
<el-form label-width="auto" :rules="rules">
|
|
|
<el-row>
|
|
|
<el-col>
|
|
|
<el-form-item label="备注:" :span="8">
|
|
|
- <el-input type="textarea" :rows="3" v-model="formData.data.remark" placeholder="请输入备注" />
|
|
|
+ <el-input type="textarea" :rows="3" v-model="formData.data.remark" placeholder="请输入备注"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -336,10 +348,12 @@
|
|
|
<el-dialog :title="'高级检索'" v-model="queryDialogVisible" width="500px" destroy-on-close>
|
|
|
<el-form :model="sourceList.pagination" label-width="100px" label-position="top">
|
|
|
<el-form-item label="采购单号">
|
|
|
- <el-input v-model="sourceList.pagination.orderId" placeholder="请输入采购单号" oninput="value=value.replace(/[^\d.]/g,'')" />
|
|
|
+ <el-input v-model="sourceList.pagination.orderId" placeholder="请输入采购单号"
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="京东商品编号">
|
|
|
- <el-input v-model="sourceList.pagination.wareId" placeholder="请输入京东商品编号" oninput="value=value.replace(/[^\d.]/g,'')" />
|
|
|
+ <el-input v-model="sourceList.pagination.wareId" placeholder="请输入京东商品编号"
|
|
|
+ oninput="value=value.replace(/[^\d.]/g,'')"/>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
@@ -349,7 +363,8 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog :title="'设置分流'" v-model="dialogVisibleOne" width="500" destroy-on-close>
|
|
|
- <byForm v-loading="submitLoading" :formConfig="formConfig" :formOption="formOption" v-model="formData.dataOne" :rules="rulesOne" ref="byform">
|
|
|
+ <byForm v-loading="submitLoading" :formConfig="formConfig" :formOption="formOption" v-model="formData.dataOne"
|
|
|
+ :rules="rulesOne" ref="byform">
|
|
|
</byForm>
|
|
|
<template #footer>
|
|
|
<el-button @click="dialogVisibleOne = false" size="large">取 消</el-button>
|
|
@@ -362,12 +377,13 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
-import { ElMessage, ElMessageBox } from "element-plus";
|
|
|
+import {ElMessage, ElMessageBox} from "element-plus";
|
|
|
import byTable from "@/components/byTable/index";
|
|
|
import byForm from "@/components/byForm/index";
|
|
|
-import { computed, nextTick, reactive, ref } from "vue";
|
|
|
-import { isNullOrUndefined } from "@tinymce/tinymce-vue/lib/es2015/main/ts/Utils";
|
|
|
-const { proxy } = getCurrentInstance();
|
|
|
+import {computed, reactive, ref} from "vue";
|
|
|
+import {isNullOrUndefined} from "@tinymce/tinymce-vue/lib/es2015/main/ts/Utils";
|
|
|
+
|
|
|
+const {proxy} = getCurrentInstance();
|
|
|
const props = defineProps({
|
|
|
selectStatus: {
|
|
|
type: Boolean,
|
|
@@ -405,13 +421,13 @@ const diversionTypeData = ref([
|
|
|
|
|
|
let rules = ref({
|
|
|
deliverCenterId: [
|
|
|
- { required: true, message: "请选择配送中心", trigger: "blur" },
|
|
|
+ {required: true, message: "请选择配送中心", trigger: "blur"},
|
|
|
],
|
|
|
nonDeliveryReason: [
|
|
|
- { required: true, message: "请输入不满足发货原因", trigger: "blur" },
|
|
|
+ {required: true, message: "请输入不满足发货原因", trigger: "blur"},
|
|
|
],
|
|
|
- confirmNum: [{ required: true, message: "请输入确认数量", trigger: "blur" }],
|
|
|
- remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
|
|
|
+ confirmNum: [{required: true, message: "请输入确认数量", trigger: "blur"}],
|
|
|
+ remark: [{required: true, message: "请输入备注", trigger: "blur"}],
|
|
|
});
|
|
|
|
|
|
const queryDialogVisible = ref(false);
|
|
@@ -695,7 +711,7 @@ const config = computed(() => {
|
|
|
},
|
|
|
renderHTML(row) {
|
|
|
return props.selectStatus
|
|
|
- ? [
|
|
|
+ ? [
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "选择",
|
|
@@ -708,7 +724,7 @@ const config = computed(() => {
|
|
|
},
|
|
|
},
|
|
|
]
|
|
|
- : [
|
|
|
+ : [
|
|
|
// {
|
|
|
// attrs: {
|
|
|
// label: "详情",
|
|
@@ -721,7 +737,7 @@ const config = computed(() => {
|
|
|
// },
|
|
|
// },
|
|
|
row.businessStatus == 0 && row.diversionType == "10"
|
|
|
- ? {
|
|
|
+ ? {
|
|
|
attrs: {
|
|
|
label: "采购单确认(需出库)",
|
|
|
type: "danger",
|
|
@@ -738,9 +754,9 @@ const config = computed(() => {
|
|
|
});
|
|
|
},
|
|
|
}
|
|
|
- : {},
|
|
|
+ : {},
|
|
|
row.businessStatus == 0 && row.diversionType == "10"
|
|
|
- ? {
|
|
|
+ ? {
|
|
|
attrs: {
|
|
|
label: "采购单确认(无需出库)",
|
|
|
type: "danger",
|
|
@@ -757,9 +773,9 @@ const config = computed(() => {
|
|
|
});
|
|
|
},
|
|
|
}
|
|
|
- : {},
|
|
|
+ : {},
|
|
|
row.diversionType == null
|
|
|
- ? {
|
|
|
+ ? {
|
|
|
attrs: {
|
|
|
label: "分流",
|
|
|
type: "primary",
|
|
@@ -770,7 +786,33 @@ const config = computed(() => {
|
|
|
handleDiversionType(row);
|
|
|
},
|
|
|
}
|
|
|
- : {},
|
|
|
+ : {},
|
|
|
+
|
|
|
+ {
|
|
|
+ attrs: {
|
|
|
+ label: "重新获取订单",
|
|
|
+ type: "danger",
|
|
|
+ text: true,
|
|
|
+ },
|
|
|
+ el: "button",
|
|
|
+ click() {
|
|
|
+ ElMessageBox.confirm("是否确认重新获取订单?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }).then(() => {
|
|
|
+ proxy.post("/jdOrder/reacquire", row).then(
|
|
|
+ (res) => {
|
|
|
+ ElMessage({
|
|
|
+ message: "操作成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ getList();
|
|
|
+ }
|
|
|
+ );
|
|
|
+ });
|
|
|
+ },
|
|
|
+ }
|
|
|
|
|
|
// row.businessStatus == 1 && row.isCanConfirm
|
|
|
// ? {
|
|
@@ -801,25 +843,25 @@ let formData = reactive({
|
|
|
|
|
|
const getDictlist = async () => {
|
|
|
proxy
|
|
|
- .getDictOne(["delivery_center", "confirmState", "OrderState"])
|
|
|
- .then((res) => {
|
|
|
- deliveryCenter.value = res["delivery_center"].map((x) => ({
|
|
|
- label: x.dictValue,
|
|
|
- value: x.dictKey,
|
|
|
- }));
|
|
|
- confirmState.value = res["confirmState"].map((x) => ({
|
|
|
- label: x.dictValue,
|
|
|
- value: x.dictKey,
|
|
|
- }));
|
|
|
- orderState.value = res["OrderState"].map((x) => ({
|
|
|
- label: x.dictValue,
|
|
|
- value: x.dictKey,
|
|
|
- }));
|
|
|
- });
|
|
|
+ .getDictOne(["delivery_center", "confirmState", "OrderState"])
|
|
|
+ .then((res) => {
|
|
|
+ deliveryCenter.value = res["delivery_center"].map((x) => ({
|
|
|
+ label: x.dictValue,
|
|
|
+ value: x.dictKey,
|
|
|
+ }));
|
|
|
+ confirmState.value = res["confirmState"].map((x) => ({
|
|
|
+ label: x.dictValue,
|
|
|
+ value: x.dictKey,
|
|
|
+ }));
|
|
|
+ orderState.value = res["OrderState"].map((x) => ({
|
|
|
+ label: x.dictValue,
|
|
|
+ value: x.dictKey,
|
|
|
+ }));
|
|
|
+ });
|
|
|
};
|
|
|
|
|
|
const getList = async (req) => {
|
|
|
- sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
|
|
|
+ sourceList.value.pagination = {...sourceList.value.pagination, ...req};
|
|
|
loading.value = true;
|
|
|
// if (props.selectStatus) {
|
|
|
// sourceList.value.pagination.diversionType = "10";
|
|
@@ -857,7 +899,7 @@ const select = (_selection, row) => {
|
|
|
|
|
|
const getDtl = (row) => {
|
|
|
modalType.value = "edit";
|
|
|
- proxy.post("/jdOrder/detail", { id: row.id }).then((res) => {
|
|
|
+ proxy.post("/jdOrder/detail", {id: row.id}).then((res) => {
|
|
|
formData.data = res;
|
|
|
dialogVisible.value = true;
|
|
|
});
|
|
@@ -865,7 +907,7 @@ const getDtl = (row) => {
|
|
|
|
|
|
const getTellDtl = (row) => {
|
|
|
modalType.value = "edit";
|
|
|
- proxy.post("/jdOrder/detail", { id: row.id }).then((res) => {
|
|
|
+ proxy.post("/jdOrder/detail", {id: row.id}).then((res) => {
|
|
|
formData.data = res;
|
|
|
tellDialogVisible.value = true;
|
|
|
});
|
|
@@ -886,26 +928,26 @@ const showTipRemark = (row) => {
|
|
|
const confirmBusinessStatus = (row, flag) => {
|
|
|
let businessStatus = row.businessStatus == "1" ? 0 : 1;
|
|
|
proxy
|
|
|
- .post("/jdOrder/confirmBusinessStatus", {
|
|
|
- id: row.id,
|
|
|
- businessStatus: businessStatus,
|
|
|
- isOut: flag,
|
|
|
- })
|
|
|
- .then(
|
|
|
- () => {
|
|
|
- ElMessage({
|
|
|
- message: "确认成功",
|
|
|
- type: "success",
|
|
|
- });
|
|
|
- dialogVisible.value = false;
|
|
|
- submitLoading.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => {
|
|
|
- console.log(err);
|
|
|
- submitLoading.value = false;
|
|
|
- }
|
|
|
- );
|
|
|
+ .post("/jdOrder/confirmBusinessStatus", {
|
|
|
+ id: row.id,
|
|
|
+ businessStatus: businessStatus,
|
|
|
+ isOut: flag,
|
|
|
+ })
|
|
|
+ .then(
|
|
|
+ () => {
|
|
|
+ ElMessage({
|
|
|
+ message: "确认成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ dialogVisible.value = false;
|
|
|
+ submitLoading.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ submitLoading.value = false;
|
|
|
+ }
|
|
|
+ );
|
|
|
};
|
|
|
|
|
|
//订单回告
|
|
@@ -918,19 +960,19 @@ const submitForm = () => {
|
|
|
submitLoading.value = true;
|
|
|
//TODO 这里应该是订单回告
|
|
|
proxy.post("/jdOrder/tellBackOrer", formData.data).then(
|
|
|
- () => {
|
|
|
- ElMessage({
|
|
|
- message: "回告成功",
|
|
|
- type: "success",
|
|
|
- });
|
|
|
- tellDialogVisible.value = false;
|
|
|
- submitLoading.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => {
|
|
|
- console.log(err);
|
|
|
- submitLoading.value = false;
|
|
|
- }
|
|
|
+ () => {
|
|
|
+ ElMessage({
|
|
|
+ message: "回告成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ tellDialogVisible.value = false;
|
|
|
+ submitLoading.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ submitLoading.value = false;
|
|
|
+ }
|
|
|
);
|
|
|
});
|
|
|
};
|
|
@@ -944,19 +986,19 @@ const submitRemark = () => {
|
|
|
}).then(() => {
|
|
|
submitLoadingRemark.value = true;
|
|
|
proxy.post("/jdOrder/saveRemark", formData.data).then(
|
|
|
- () => {
|
|
|
- ElMessage({
|
|
|
- message: "保存成功",
|
|
|
- type: "success",
|
|
|
- });
|
|
|
- remarkDialogVisible.value = false;
|
|
|
- submitLoadingRemark.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => {
|
|
|
- console.log(err);
|
|
|
- submitLoadingRemark.value = false;
|
|
|
- }
|
|
|
+ () => {
|
|
|
+ ElMessage({
|
|
|
+ message: "保存成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ remarkDialogVisible.value = false;
|
|
|
+ submitLoadingRemark.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => {
|
|
|
+ console.log(err);
|
|
|
+ submitLoadingRemark.value = false;
|
|
|
+ }
|
|
|
);
|
|
|
});
|
|
|
};
|
|
@@ -973,13 +1015,13 @@ const handleReset = () => {
|
|
|
|
|
|
const handleQuery = () => {
|
|
|
if (
|
|
|
- sourceList.value.pagination.arr &&
|
|
|
- sourceList.value.pagination.arr.length > 1
|
|
|
+ sourceList.value.pagination.arr &&
|
|
|
+ sourceList.value.pagination.arr.length > 1
|
|
|
) {
|
|
|
sourceList.value.pagination.purchaseStartTime =
|
|
|
- sourceList.value.pagination.arr[0];
|
|
|
+ sourceList.value.pagination.arr[0];
|
|
|
sourceList.value.pagination.purchaseEndTime =
|
|
|
- sourceList.value.pagination.arr[1];
|
|
|
+ sourceList.value.pagination.arr[1];
|
|
|
}
|
|
|
queryDialogVisible.value = false;
|
|
|
getList();
|
|
@@ -997,7 +1039,7 @@ const formOption = reactive({
|
|
|
rules: [],
|
|
|
});
|
|
|
const rulesOne = ref({
|
|
|
- diversionType: [{ required: true, message: "请选择分流", trigger: "change" }],
|
|
|
+ diversionType: [{required: true, message: "请选择分流", trigger: "change"}],
|
|
|
});
|
|
|
const formConfig = computed(() => {
|
|
|
return [
|
|
@@ -1030,16 +1072,16 @@ const submitFormOne = () => {
|
|
|
}).then(() => {
|
|
|
submitLoading.value = true;
|
|
|
proxy.post("/jdOrder/saveDiversion", formData.dataOne).then(
|
|
|
- (res) => {
|
|
|
- ElMessage({
|
|
|
- message: "操作成功",
|
|
|
- type: "success",
|
|
|
- });
|
|
|
- dialogVisibleOne.value = false;
|
|
|
- submitLoading.value = false;
|
|
|
- getList();
|
|
|
- },
|
|
|
- (err) => (submitLoading.value = false)
|
|
|
+ (res) => {
|
|
|
+ ElMessage({
|
|
|
+ message: "操作成功",
|
|
|
+ type: "success",
|
|
|
+ });
|
|
|
+ dialogVisibleOne.value = false;
|
|
|
+ submitLoading.value = false;
|
|
|
+ getList();
|
|
|
+ },
|
|
|
+ (err) => (submitLoading.value = false)
|
|
|
);
|
|
|
});
|
|
|
});
|
|
@@ -1050,9 +1092,11 @@ const submitFormOne = () => {
|
|
|
.tenant {
|
|
|
padding: 20px;
|
|
|
}
|
|
|
+
|
|
|
:deep(.el-form-item--default) {
|
|
|
margin-bottom: 0px;
|
|
|
}
|
|
|
+
|
|
|
.el-table .error-row {
|
|
|
background: rgba(245, 108, 108, 0.68);
|
|
|
}
|