瀏覽代碼

修改bug

chenrui 6 月之前
父節點
當前提交
3b0c05a317

+ 4 - 2
src/views/salesManagement/salesQueryNew/comps/dealerStockModal.vue

@@ -15,12 +15,12 @@
           <a-radio :style="radioStyle" v-for="(item,index) in dealerList" :key="item.dealerSn" :value="item.dealerSn">
           <a-radio :style="radioStyle" v-for="(item,index) in dealerList" :key="item.dealerSn" :value="item.dealerSn">
             {{ item.dealerName }}{{ item.parentType?item.parentType==='SUPERIORS'?'(上级)':'(省仓)' :'' }}
             {{ item.dealerName }}{{ item.parentType?item.parentType==='SUPERIORS'?'(上级)':'(省仓)' :'' }}
             <dealerSubareaScopeList
             <dealerSubareaScopeList
-              v-if="index==dealerList.length-1"
+              v-if="index==dealerList.length-1&&chooseVal=='a1'"
               dealertype="tire"
               dealertype="tire"
               placeholder="请输入发货经销商名称"
               placeholder="请输入发货经销商名称"
               ref="dealerSubareaScopeList"
               ref="dealerSubareaScopeList"
               id="dealerStockModal-custList"
               id="dealerStockModal-custList"
-              style="margin-left:10px;"
+              style="margin-left:10px;width:280px;"
               @change="dealerChange" />
               @change="dealerChange" />
           </a-radio>
           </a-radio>
         </a-radio-group>
         </a-radio-group>
@@ -69,6 +69,8 @@ export default {
       this.spinning = true
       this.spinning = true
       querySuperiorDealer({ salesBillSn: this.itemSn }).then(res => {
       querySuperiorDealer({ salesBillSn: this.itemSn }).then(res => {
         this.dealerList = res.data.concat(this.dealerList)
         this.dealerList = res.data.concat(this.dealerList)
+        // 默认选中第一项
+        this.chooseVal = this.dealerList[0].dealerSn
         this.spinning = false
         this.spinning = false
       })
       })
     },
     },

+ 2 - 4
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -413,11 +413,9 @@ export default {
         if (this.transferQty) {
         if (this.transferQty) {
           this.dataSource = listData.filter(item => {
           this.dataSource = listData.filter(item => {
             if (this.transferQty == '0') { // 不满足
             if (this.transferQty == '0') { // 不满足
-              return item.transferDealerStockQty <= 0
+              return (item.transferDealerStockQty < item.qty || item.transferDealerStockQty == '--')
             } else if (this.transferQty == '1') { // 满足
             } else if (this.transferQty == '1') { // 满足
-              return item.transferDealerStockQty > 0
-            } else { // 未入库
-              return item.transferDealerStockQty == '--'
+              return item.transferDealerStockQty >= item.qty
             }
             }
           })
           })
         }
         }

+ 4 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -515,6 +515,8 @@ export default {
         if (res.status == 200) {
         if (res.status == 200) {
           this.spinning = false
           this.spinning = false
           this.$message.success(res.message)
           this.$message.success(res.message)
+          //  转单成功 关闭详情跳列表
+          this.handleBack()
         }
         }
       })
       })
     },
     },
@@ -528,7 +530,8 @@ export default {
         if (res.status == 200) {
         if (res.status == 200) {
           this.openTransferOrder = false
           this.openTransferOrder = false
           this.$message.success(res.message)
           this.$message.success(res.message)
-          this.getDetail()
+          //  转单成功 关闭详情跳列表
+          this.handleBack()
         }
         }
       })
       })
     },
     },

+ 25 - 15
src/views/salesManagement/salesQueryNew/list.vue

@@ -218,20 +218,6 @@
           <!-- 操作 -->
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
             <div>
             <div>
-              <a-button
-                size="small"
-                type="link"
-                class="button-warning"
-                v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
-                @click="handleDetail(record,'salesNewDetailAudit')"
-              >审核</a-button>
-              <a-button
-                size="small"
-                type="link"
-                class="button-warning"
-                v-if="record.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')"
-                @click="handleDispatch(record)"
-              >下推</a-button>
               <a-button
               <a-button
                 size="small"
                 size="small"
                 type="link"
                 type="link"
@@ -241,7 +227,7 @@
               >
               >
                 编辑
                 编辑
               </a-button>
               </a-button>
-              <!-- 转单显示条件:$hasPermissions('B_salesTransfer')&& 业务状态  待审核;非促销单;下级提交,且产品类型是“轮胎产品”的销售单 -->
+              <!-- 转单显示条件: 业务状态  待审核;非促销单;下级提交,且产品类型是“轮胎产品”的销售单 -->
               <a-button
               <a-button
                 size="small"
                 size="small"
                 type="link"
                 type="link"
@@ -251,6 +237,30 @@
               >
               >
                 转单
                 转单
               </a-button>
               </a-button>
+              <!-- 上级审核 -->
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                v-if="record.billStatus == 'SUPERIOR_WAIT_AUDIT'"
+                @click="handleDetail(record,'salesNewDetailTransfer')"
+              >
+                上级审核
+              </a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
+                @click="handleDetail(record,'salesNewDetailAudit')"
+              >审核</a-button>
+              <a-button
+                size="small"
+                type="link"
+                class="button-warning"
+                v-if="record.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')"
+                @click="handleDispatch(record)"
+              >下推</a-button>
               <a-button
               <a-button
                 size="small"
                 size="small"
                 type="link"
                 type="link"