lilei 2 년 전
부모
커밋
61d11bb96c

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1678084276954
+  "version": 1678096238971
 }

+ 1 - 1
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -12,8 +12,8 @@
       :width="960">
       <div>
         <div style="padding: 0 0 10px 0;line-height: 24px;" v-if="baseData">
-          <div>产品名称:{{ baseData.productName }}</div>
           <div>产品编码:{{ baseData.productCode }}</div>
+          <div>产品名称:{{ baseData.productName }}</div>
         </div>
         <a-tabs size="small" type="card" v-model="curTab" @change="callback">
           <a-tab-pane key="1" tab="当前客户">

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

@@ -152,7 +152,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return salesDetailList(Object.assign(parameter, { salesBillSn: this.outBizSn || this.$route.params.sn })).then(res => {
+        return salesDetailList(Object.assign(parameter, { orderBy: "sales_bill_detail.CREATE_DATE desc", salesBillSn: this.outBizSn || this.$route.params.sn })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 25 - 24
src/views/salesManagement/salesQueryNew/edit.vue

@@ -94,23 +94,7 @@
               </a-row>
             </a-form-model>
           </div>
-          <div class="discount-box">
-            <div>
-            折扣金额:
-            <a-input-number
-              id="discount"
-              size="small"
-              v-model.trim="detailData.discountAmount"
-              :min="0"
-              :precision="2"
-              :max="999999"/>
-            <a-button size="small" type="primary" class="button-primary" @click="salesDiscount">打折</a-button>
-          </div>
-          <div style="padding:0 10px;">
-            折扣:<strong>{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</strong>;
-            折后总售价:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>;
-          </div>
-          </div>
+          
           <!-- 已选配件列表 -->
           <s-table
             class="sTable"
@@ -227,21 +211,33 @@
         <!-- 总计 -->
         <div v-if="detailData" class="total-bar">
           <div>
+            <div style="display: inline-block;">
+              折扣金额:
+              <a-input-number
+                id="discount"
+                size="small"
+                v-model.trim="detailData.discountAmount"
+                @blur="salesDiscount"
+                :min="0"
+                :precision="2"
+                :max="999999"/>
+              折扣:<span class="red">{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</span>,
+            </div>
             <div style="display: inline-block;">
               <span>共计 {{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }} 款</span>
-              <span> {{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }} 件产品,</span>
-              赠品总数量:<span class="red">{{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }}</span>,
+              <span> {{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }} 件产品</span>
+              <span>(赠品 {{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }} 件)</span>,
               <template v-if="isCosts">
                 总成本价:<span class="red">{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</span>,
                 毛利:<span class="red">{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</span>,
               </template>
-              总售价:<span class="red">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</span>;
+              总售价:<span class="red">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</span>
             </div>
             <div class="totalPrice" style="display: inline-block;">
               折后合计:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>
             </div>
           </div>
-          <div>
+          <div style="padding:5px 0 0;">
             <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox>
             <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox>
             <a-checkbox :value="2" :checked="tbForm.indexOf('SETTLE')>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox>
@@ -374,7 +370,8 @@ export default {
       },
       printerType: 'NEEDLE', //  打印机类型
       isCosts: false, // 是否显示成本价
-      shelfInfo: null // 是否有货架
+      shelfInfo: null, // 是否有货架
+      discountAmountBak: null
     }
   },
   computed: {
@@ -591,6 +588,9 @@ export default {
     },
     // 打折
     salesDiscount () {
+      if(this.discountAmountBak == this.detailData.discountAmount){
+        return false
+      }
       this.spinning = true
       salesWriteDiscount({
         discountAmount: this.detailData.discountAmount || 0,
@@ -599,7 +599,6 @@ export default {
       }).then(res => {
         if (res.status == 200) {
           this.getOrderDetail(true)
-          this.spinning = false
         } else {
           this.spinning = false
         }
@@ -763,6 +762,7 @@ export default {
       salesDetail({ id: vm.$route.params.id }).then(res => {
         if (res.status == 200) {
           vm.detailData = res.data
+          vm.discountAmountBak = vm.detailData.discountAmount
           if (flag) {
             const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.sourceType && vm.detailData.sourceType == 'PURCHASE') ? '' : vm.detailData.buyerSn
             const priceType = vm.$route.params.priceType
@@ -848,7 +848,7 @@ export default {
       })
     },
     setTableH () {
-      this.tableHeight = window.innerHeight - (this.showSearch ? 42 : 0) - 330
+      this.tableHeight = window.innerHeight - (this.showSearch ? 42 : 0) - 310
     },
     pageInit () {
       const vm = this
@@ -939,6 +939,7 @@ export default {
           }
           .red{
             color: #f5452e;
+            font-size: 14px;
           }
         }
         &:last-child{

+ 1 - 1
src/views/salesManagement/salesQueryNew/productSalesRecordModal.vue

@@ -12,8 +12,8 @@
       <div>
         <div ref="searchBox">
           <div style="padding: 0 0 10px 0;line-height: 24px;" v-if="baseData">
-            <div style="flex:1">产品名称:{{ baseData.productName }}</div>
             <div style="flex:1">产品编码:{{ baseData.productCode }}</div>
+            <div style="flex:1">产品名称:{{ baseData.productName }}</div>
           </div>
           <a-tabs size="small" type="card" v-model="curTab" @change="callback">
             <a-tab-pane key="1" tab="当前客户">