lilei 1 năm trước cách đây
mục cha
commit
f8c93be87a

+ 1 - 1
public/version.json

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

+ 5 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -135,10 +135,14 @@
       </div>
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
-          总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>元;
           总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
           总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
           总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+          总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+          <span v-if="showDiscount">
+            折扣金额:<strong>{{ totalData&&(totalData.totalDiscountAmount || totalData.totalDiscountAmount==0) ? toThousands(totalData.totalDiscountAmount) : '--' }}</strong>;
+            折后总售价:<strong>{{ totalData&&(totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</strong>;
+          </span>
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -258,7 +262,6 @@ export default {
   components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
   mixins: [commonMixin],
   data () {
-    const _this = this
     return {
       spinning: false,
       tableHeight: 0,
@@ -319,7 +322,6 @@ export default {
             }
             this.disabled = false
           }
-          console.log(res, 'res')
           this.spinning = false
           return data
         })

+ 11 - 9
src/views/salesManagement/salesQueryNew/list.vue

@@ -121,10 +121,15 @@
         <!-- 操作按钮 -->
         <div class="table-operator" style="display:flex;align-items:center;justify-content: space-between;">
           <div class="alert-message">
-            销售单数合计:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
-            销售款数合计:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
-            销售数量合计:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
-            销售金额合计:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+            合计:
+            总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
+            总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
+            总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
+            总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
+            <span v-if="showDiscount">
+              折扣金额:<strong>{{ totalData&&(totalData.totalDiscountAmount || totalData.totalDiscountAmount==0) ? toThousands(totalData.totalDiscountAmount) : '--' }}</strong>;
+              折后总售价:<strong>{{ totalData&&(totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</strong>;
+            </span>
           </div>
           <div class="action-buttons">
             <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
@@ -258,7 +263,6 @@ export default {
   components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
   mixins: [commonMixin],
   data () {
-    const _this = this
     return {
       spinning: false,
       tableHeight: 0,
@@ -319,7 +323,6 @@ export default {
             }
             this.disabled = false
           }
-          console.log(res, 'res')
           this.spinning = false
           return data
         })
@@ -336,8 +339,8 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: this.showDiscount ? '6%' : '9%', align: 'center' },
+        { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: this.showDiscount ? '12%' : '15%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -599,7 +602,6 @@ export default {
           this.$refs.table.refresh()
         }
       }
-      
     }
   },
   watch: {