lilei 1 ano atrás
pai
commit
adf5dfab96

+ 2 - 2
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -24,7 +24,7 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="省份" prop="provinceSn">
+              <a-form-model-item label="省份">
                 <Area id="priceDifferenceDetailList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
               </a-form-model-item>
             </a-col>
@@ -205,7 +205,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择月份和省份')
+          _this.$message.error('请选择月份')
           return false
         }
       })

+ 13 - 0
src/views/salesManagement/salesList/list.vue

@@ -90,6 +90,16 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="促销单">
+                  <v-select
+                    v-model="queryParam.promoFlag"
+                    ref="cxFlag"
+                    code="FLAG"
+                    placeholder="请选择是否促销单"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <div class="table-page-search-submitButtons">
@@ -141,6 +151,7 @@
           <!-- 销售单号 -->
           <template slot="salesBillNo" slot-scope="text, record">
             <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo||'--' }}</span>
+            <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
           <!-- 备货单号 -->
           <template slot="dispatchBillNo" slot-scope="text, record">
@@ -224,6 +235,7 @@ export default {
         endDate: undefined,
         billStatus: undefined, //  业务状态
         sendFlag: '', // 发货状态
+        promoFlag: undefined,
         provinceSn: undefined, // 省份
         timeoutflag: undefined // 超时环节提醒
       },
@@ -385,6 +397,7 @@ export default {
       this.queryParam.settleEndDate = undefined
       this.queryParam.billStatus = undefined
       this.queryParam.sendFlag = ''
+      this.queryParam.promoFlag = undefined
       this.queryParam.provinceSn = undefined
       this.queryParam.timeoutflag = undefined
       this.examineTime = []

+ 37 - 26
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -81,7 +81,8 @@
           </div>
           <div>
             <span style="margin-right: 10px;" v-if="selNums">已选{{ selNums }}项</span>
-            <a-button type="default" class="button-info" @click="openPlSetReason">批量设置退货原因</a-button>
+            <a-button type="default" class="button-info" @click="openPlSetReason(1)">整单设置退货原因</a-button>
+            <a-button type="default" class="button-info" style="margin-left: 5px;" @click="openPlSetReason(0)">批量设置退货原因</a-button>
             <a-button type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
           </div>
         </div>
@@ -371,38 +372,48 @@ export default {
       })
     },
     // 批量设置退货原因
-    openPlSetReason () {
-      if (this.selNums) {
+    openPlSetReason (type) {
+      // 整单设置
+      if(type==1){
         this.showPlModal = true
-      } else {
-        this.$message.warning('请先选择产品!')
+      }else{
+        if (this.selNums) {
+          this.showPlModal = true
+        } else {
+          this.$message.warning('请先选择产品!')
+        }
       }
     },
     setPlReturnReason () {
       if (!this.plReturnReason) {
         this.$message.warning('请选择退货原因!')
       } else {
-        this.spinning = true
-        const snList = []
-        const arr = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows || []
-        const rows = this.returnReasonlist.find(item => item.code == this.plReturnReason)
-        arr.map(item => {
-          snList.push(item.salesReturnDetailSn)
-        })
-        salesReturnDetailSetReason({
-          salesReturnBillDetailSnList: snList,
-          salesReturnBillSn: this.orderSn,
-          returnReason: rows ? rows.dispName : '',
-          returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined
-        }).then(res => {
-          if (res.status == 200) {
-            this.showPlModal = false
-            this.$refs.table.clearSelected()
-            this.resetTable(false)
-          }
-          this.spinning = false
-        })
+        // 批量设置
+        if(this.selNums){
+          this.spinning = true
+          const snList = []
+          const arr = this.rowSelectionInfo && this.rowSelectionInfo.selectedRows || []
+          const rows = this.returnReasonlist.find(item => item.code == this.plReturnReason)
+          arr.map(item => {
+            snList.push(item.salesReturnDetailSn)
+          })
+          salesReturnDetailSetReason({
+            salesReturnBillDetailSnList: snList,
+            salesReturnBillSn: this.orderSn,
+            returnReason: rows ? rows.dispName : '',
+            returnReasonCode: this.plReturnReason,
+            returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined
+          }).then(res => {
+            if (res.status == 200) {
+              this.showPlModal = false
+              this.$refs.table.clearSelected()
+              this.resetTable(false)
+            }
+            this.spinning = false
+          })
+        }else{
+          // 整单设置
+        }
       }
     },
     // 获取单据详细