|
@@ -134,9 +134,9 @@
|
|
|
<a-col flex="300px" v-if="hasPrompActive">
|
|
|
<a-form-item label="产品类型">
|
|
|
<a-select
|
|
|
- v-model="promoFlag"
|
|
|
+ v-model="promoProductClz"
|
|
|
@change="e=> {borrowFlag = undefined}"
|
|
|
- id="salesDetail-promoFlag"
|
|
|
+ id="salesDetail-promoProductClz"
|
|
|
allowClear
|
|
|
:dropdownMatchSelectWidth="false"
|
|
|
placeholder="请选择产品类型">
|
|
@@ -161,7 +161,7 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col flex="200px" v-if="hasPrompActive&&promoFlag!=='0'">
|
|
|
+ <a-col flex="200px" v-if="hasPrompActive&&promoProductClz!=='0'">
|
|
|
<a-form-item label="累计产品">
|
|
|
<v-select code="FLAG" v-model="borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
|
|
|
</a-form-item>
|
|
@@ -214,7 +214,7 @@
|
|
|
:maxHeight="pageHeight"
|
|
|
:detailData="detailData"
|
|
|
:warehouseSn="warehouseSn"
|
|
|
- :promoFlag="promoFlag"
|
|
|
+ :promoProductClz="promoProductClz"
|
|
|
:pageType="$route.params.pageType"
|
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
|
:authCode="authCode"
|
|
@@ -273,7 +273,7 @@
|
|
|
:detailData="detailData"
|
|
|
:activeList="activeList"
|
|
|
:warehouseSn="warehouseSn"
|
|
|
- :promoFlag="promoFlag"
|
|
|
+ :promoProductClz="promoProductClz"
|
|
|
:borrowFlag="borrowFlag"
|
|
|
:pageType="$route.params.pageType"
|
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
@@ -459,7 +459,7 @@ export default {
|
|
|
auditText: null, // 审核备注信息
|
|
|
fromRouter: null, // 从那个页面打开当前页面
|
|
|
warehouseSn: undefined, // 所在仓库
|
|
|
- promoFlag: undefined, // 产品类型
|
|
|
+ promoProductClz: undefined, // 产品类型
|
|
|
openTipModal: false, // 改单弹窗
|
|
|
sourceData: undefined, // 价格变动数据
|
|
|
tempData: undefined, // 校验临时数据
|
|
@@ -568,9 +568,9 @@ export default {
|
|
|
hideTable (type, len) {
|
|
|
this.spinning = false
|
|
|
if (type == 'normal') {
|
|
|
- this.hideNormalTable = !(this.promoFlag == 0 || this.promoFlag == undefined) || this.borrowFlag != undefined || (len == 0 && this.activeList.length)
|
|
|
+ this.hideNormalTable = !(this.promoProductClz == 0 || this.promoProductClz == undefined) || this.borrowFlag != undefined || (len == 0 && this.activeList.length)
|
|
|
} else {
|
|
|
- if (this.promoFlag == 0) {
|
|
|
+ if (this.promoProductClz == 0) {
|
|
|
this.hideActiveTable = true
|
|
|
}
|
|
|
}
|
|
@@ -635,7 +635,7 @@ export default {
|
|
|
// 重置
|
|
|
resetSearchForm () {
|
|
|
this.warehouseSn = undefined
|
|
|
- this.promoFlag = undefined
|
|
|
+ this.promoProductClz = undefined
|
|
|
this.transferQty = undefined
|
|
|
this.borrowFlag = undefined
|
|
|
this.searchTable()
|