|
@@ -128,7 +128,13 @@
|
|
|
</a-col>
|
|
|
<a-col flex="300px" v-if="hasPrompActive">
|
|
|
<a-form-item label="产品类型">
|
|
|
- <a-select v-model.trim="promoFlag" id="salesDetail-promoFlag" allowClear :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
|
|
|
+ <a-select
|
|
|
+ v-model="promoFlag"
|
|
|
+ @change="e=> {borrowFlag = undefined}"
|
|
|
+ id="salesDetail-promoFlag"
|
|
|
+ allowClear
|
|
|
+ :dropdownMatchSelectWidth="false"
|
|
|
+ placeholder="请选择产品类型">
|
|
|
<a-select-option value="0">
|
|
|
正常产品
|
|
|
</a-select-option>
|
|
@@ -150,7 +156,7 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col flex="200px" v-if="hasPrompActive">
|
|
|
+ <a-col flex="200px" v-if="hasPrompActive&&promoFlag!=='0'">
|
|
|
<a-form-item label="累计产品">
|
|
|
<v-select code="FLAG" v-model="borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
|
|
|
</a-form-item>
|
|
@@ -188,8 +194,16 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- 正常产品列表 -->
|
|
|
- <div v-if="!hideNormalTable">
|
|
|
+ </a-card>
|
|
|
+ <!-- 正常产品列表 -->
|
|
|
+ <a-card
|
|
|
+ size="small"
|
|
|
+ :bordered="false"
|
|
|
+ class="salesEdit-cont"
|
|
|
+ style="margin-bottom: 6px;"
|
|
|
+ v-if="!hideNormalTable"
|
|
|
+ >
|
|
|
+ <div>
|
|
|
<detailProductList
|
|
|
ref="productList"
|
|
|
:maxHeight="pageHeight"
|
|
@@ -254,6 +268,7 @@
|
|
|
:activeList="activeList"
|
|
|
:warehouseSn="warehouseSn"
|
|
|
:promoFlag="promoFlag"
|
|
|
+ :borrowFlag="borrowFlag"
|
|
|
:salesBillSn="$route.params.sn || bizSn"
|
|
|
:salesPromoSnSet="salesPromoSnSet"
|
|
|
:authCode="authCode"
|
|
@@ -542,11 +557,14 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
// 是否隐藏表格
|
|
|
- hideTable (type) {
|
|
|
+ hideTable (type, len) {
|
|
|
+ this.spinning = false
|
|
|
if (type == 'normal') {
|
|
|
- this.hideNormalTable = true
|
|
|
+ this.hideNormalTable = !(this.promoFlag == 0 || this.promoFlag == undefined) || this.borrowFlag != undefined
|
|
|
} else {
|
|
|
- // this.hideActiveTable = true
|
|
|
+ if (this.promoFlag == 0) {
|
|
|
+ this.hideActiveTable = true
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
// 编辑
|
|
@@ -618,6 +636,7 @@ export default {
|
|
|
searchTable () {
|
|
|
this.hideNormalTable = false
|
|
|
this.hideActiveTable = this.activeList.length == 0
|
|
|
+ this.spinning = true
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.productList.searchTable()
|
|
|
if (!this.hideActiveTable) this.$refs.productActiveList.searchTable()
|