|
@@ -60,12 +60,8 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="3" :lg="3">
|
|
<el-col :xs="24" :sm="3" :lg="3">
|
|
- <el-button
|
|
|
|
- size="mini"
|
|
|
|
- type="primary"
|
|
|
|
- :disabled="!screenForm.phone || countDown != 60"
|
|
|
|
- @click="getCode"
|
|
|
|
- >{{ countDown == 60 ? getCodeText : '重新获取(' + countDown + 's)' }}
|
|
|
|
|
|
+ <el-button size="mini" type="primary" :disabled="!screenForm.phone || countDown != 60" @click="getCode"
|
|
|
|
+ >{{ countDown == 60 ? getCodeText : '重新获取(' + countDown + 's)' }}
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="8" :lg="8">
|
|
<el-col :xs="24" :sm="8" :lg="8">
|
|
@@ -79,7 +75,7 @@
|
|
type="primary"
|
|
type="primary"
|
|
:disabled="!screenForm.phone || !screenForm.code"
|
|
:disabled="!screenForm.phone || !screenForm.code"
|
|
@click="getPickupManInfo"
|
|
@click="getPickupManInfo"
|
|
- >确 认
|
|
|
|
|
|
+ >确 认
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
@@ -144,11 +140,8 @@
|
|
<el-col :xs="24" :sm="24" :lg="24">
|
|
<el-col :xs="24" :sm="24" :lg="24">
|
|
<el-form-item prop="status" label-width="0">
|
|
<el-form-item prop="status" label-width="0">
|
|
<el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
|
|
<el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
|
|
- <el-radio-button
|
|
|
|
- v-for="(item, index) in statusList"
|
|
|
|
- :key="index"
|
|
|
|
- :label="item.value"
|
|
|
|
- >{{ item.label }}
|
|
|
|
|
|
+ <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value"
|
|
|
|
+ >{{ item.label }}
|
|
</el-radio-button>
|
|
</el-radio-button>
|
|
</el-radio-group>
|
|
</el-radio-group>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -251,18 +244,18 @@
|
|
<CopyButton
|
|
<CopyButton
|
|
:copy-text="
|
|
:copy-text="
|
|
scope.row.orderType === 'TRADE' ||
|
|
scope.row.orderType === 'TRADE' ||
|
|
- scope.row.orderType === 'HOME' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_HOME'
|
|
|
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
? scope.row.enginOrderNo
|
|
? scope.row.enginOrderNo
|
|
: scope.row.mainOrderId
|
|
: scope.row.mainOrderId
|
|
"
|
|
"
|
|
/>
|
|
/>
|
|
<span>{{
|
|
<span>{{
|
|
scope.row.orderType === 'TRADE' ||
|
|
scope.row.orderType === 'TRADE' ||
|
|
- scope.row.orderType === 'HOME' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
- scope.row.orderType === 'REQUISITION_HOME'
|
|
|
|
|
|
+ scope.row.orderType === 'HOME' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_TRADE' ||
|
|
|
|
+ scope.row.orderType === 'REQUISITION_HOME'
|
|
? scope.row.enginOrderNo
|
|
? scope.row.enginOrderNo
|
|
: scope.row.mainOrderId
|
|
: scope.row.mainOrderId
|
|
}}</span>
|
|
}}</span>
|
|
@@ -274,13 +267,7 @@
|
|
<span>{{ scope.row.invoiceId }}</span>
|
|
<span>{{ scope.row.invoiceId }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="销售类型"
|
|
|
|
- prop="saleTypeName"
|
|
|
|
- min-width="100"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
|
|
+ <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip />
|
|
<el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
|
|
<el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<CopyButton :copy-text="scope.row.materialCode" />
|
|
<CopyButton :copy-text="scope.row.materialCode" />
|
|
@@ -311,31 +298,13 @@
|
|
<span>{{ scope.row.specification }}</span>
|
|
<span>{{ scope.row.specification }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="单位"
|
|
|
|
- prop="unit"
|
|
|
|
- min-width="100"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="数量"
|
|
|
|
- prop="refundableQty"
|
|
|
|
- min-width="100"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
|
|
+ <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip />
|
|
|
|
+ <el-table-column align="left" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip />
|
|
<!-- <el-table-column align="left" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
|
|
<!-- <el-table-column align="left" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
|
|
<el-table-column align="left" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
|
|
<el-table-column align="left" label="金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
|
|
<el-table-column align="left" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
|
|
<el-table-column align="left" label="使用返利金额" prop="payRebateAmount" min-width="120" show-overflow-tooltip></el-table-column>
|
|
<el-table-column align="left" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column> -->
|
|
<el-table-column align="left" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column> -->
|
|
- <el-table-column
|
|
|
|
- align="left"
|
|
|
|
- label="仓库"
|
|
|
|
- prop="correspondName"
|
|
|
|
- min-width="160"
|
|
|
|
- show-overflow-tooltip
|
|
|
|
- />
|
|
|
|
|
|
+ <el-table-column align="left" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip />
|
|
<el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
|
|
<el-table-column align="left" label="提货方式" prop="pickType" min-width="100" show-overflow-tooltip>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.pickType == '1' ? '自提' : '物流快递' }}
|
|
{{ scope.row.pickType == '1' ? '自提' : '物流快递' }}
|
|
@@ -376,7 +345,7 @@
|
|
type="primary"
|
|
type="primary"
|
|
:disabled="tableSelection.length < 1"
|
|
:disabled="tableSelection.length < 1"
|
|
@click="toPrint"
|
|
@click="toPrint"
|
|
- >打印发货单
|
|
|
|
|
|
+ >打印发货单
|
|
</el-button>
|
|
</el-button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -420,7 +389,15 @@
|
|
<el-button type="primary" @click="submitDialogForm">确 定</el-button>
|
|
<el-button type="primary" @click="submitDialogForm">确 定</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
- <print-preview ref="preView" :add-print="addPrint" :get-oval-dateil="getOvalDateil" :get-new-detail-print-dis-string="getNewDetailPrintDisString" @refreshTableSelection="refreshTableSelection" @initPrint="handleInitPrint" @refreshList="handleRefreshList" />
|
|
|
|
|
|
+ <print-preview
|
|
|
|
+ ref="preView"
|
|
|
|
+ :add-print="addPrint"
|
|
|
|
+ :get-oval-dateil="getOvalDateil"
|
|
|
|
+ :get-new-detail-print-dis-string="getNewDetailPrintDisString"
|
|
|
|
+ @refreshTableSelection="refreshTableSelection"
|
|
|
|
+ @initPrint="handleInitPrint"
|
|
|
|
+ @refreshList="handleRefreshList"
|
|
|
|
+ />
|
|
|
|
|
|
<!-- <PickupPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" /> -->
|
|
<!-- <PickupPrint :listItem="queryItem" v-if="isShowPrint" @backListFormDetail="backList" /> -->
|
|
</div>
|
|
</div>
|
|
@@ -524,22 +501,24 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
setLabel() {
|
|
setLabel() {
|
|
- return (item) => {
|
|
|
|
|
|
+ return item => {
|
|
const flag = +item.flag === 1 ? '有效' : +item.flag === 2 ? '停用' : '失效'
|
|
const flag = +item.flag === 1 ? '有效' : +item.flag === 2 ? '停用' : '失效'
|
|
const del = +item.del === 1 ? '删除' : '正常'
|
|
const del = +item.del === 1 ? '删除' : '正常'
|
|
- const expireTime = new Date(item.expireTime).getTime() >= new Date().getTime() ? '未过期' : '过期'
|
|
|
|
|
|
+ const expireTime =
|
|
|
|
+ new Date(item.expireTime).getTime() >= new Date().getTime() * 24 * 3600 * 1000 ? '未过期' : '过期'
|
|
|
|
|
|
return `${item.takerName} - ${item.customerName} - ${item.phone} - ${flag} - ${del} - ${expireTime}`
|
|
return `${item.takerName} - ${item.customerName} - ${item.phone} - ${flag} - ${del} - ${expireTime}`
|
|
}
|
|
}
|
|
},
|
|
},
|
|
setDisabled() {
|
|
setDisabled() {
|
|
- return (item) => {
|
|
|
|
|
|
+ return item => {
|
|
const flag = +item.flag === 1
|
|
const flag = +item.flag === 1
|
|
const del = +item.del !== 1
|
|
const del = +item.del !== 1
|
|
- const expireTime = new Date(item.expireTime).getTime() >= new Date().getTime()
|
|
|
|
|
|
+ const expireTime = new Date(item.expireTime).getTime() >= new Date().getTime() * 24 * 3600 * 1000
|
|
return !(flag && del && expireTime)
|
|
return !(flag && del && expireTime)
|
|
}
|
|
}
|
|
- } },
|
|
|
|
|
|
+ }
|
|
|
|
+ },
|
|
watch: {
|
|
watch: {
|
|
'screenForm.warehouse'() {
|
|
'screenForm.warehouse'() {
|
|
if (this.check == 1) {
|
|
if (this.check == 1) {
|
|
@@ -760,7 +739,7 @@ export default {
|
|
// 检查是否一致
|
|
// 检查是否一致
|
|
isAllEqual(array) {
|
|
isAllEqual(array) {
|
|
if (array.length > 0) {
|
|
if (array.length > 0) {
|
|
- return !array.some(function(item, index) {
|
|
|
|
|
|
+ return !array.some(function (item, index) {
|
|
return item.informationKey !== array[0].informationKey
|
|
return item.informationKey !== array[0].informationKey
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
@@ -788,7 +767,7 @@ export default {
|
|
}
|
|
}
|
|
const { data } = await this.getNewDetailPrintDisString()
|
|
const { data } = await this.getNewDetailPrintDisString()
|
|
if (data) {
|
|
if (data) {
|
|
- this.$confirm(<p class='text'>{data}</p>, '提示', {
|
|
|
|
|
|
+ this.$confirm(<p class="text">{data}</p>, '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
customClass: 'text'
|
|
customClass: 'text'
|