lilei 3 tuần trước cách đây
mục cha
commit
870de68b36

+ 1 - 1
public/version.json

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

+ 7 - 2
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -53,8 +53,13 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
-          应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          应付金额合计 <strong>{{ (productTotal&&productTotal.pay) ? toThousands(productTotal.pay) : 0 }}</strong>
+          应收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          已收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          待收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          应付合计 <strong>{{ (productTotal&&(productTotal.pay || productTotal.pay==0)) ? toThousands(productTotal.pay) : '--' }}</strong> ;
+          已付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          待付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+          折让合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ;
         </div>
       </a-alert>
       <!-- 列表 -->

+ 8 - 3
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -54,10 +54,15 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 统计 -->
         <div class="table-operator">
-          <div class="alert-message">
+          <div slot="message">
             共 <strong>{{ total }}</strong> 条记录,
-            应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            应付金额合计 <strong>{{ (productTotal&&productTotal.pay) ? toThousands(productTotal.pay) : 0 }}</strong>
+            应收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+            已收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+            待收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+            应付合计 <strong>{{ (productTotal&&(productTotal.pay || productTotal.pay==0)) ? toThousands(productTotal.pay) : '--' }}</strong> ;
+            已付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+            待付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
+            折让合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ;
           </div>
         </div>
         <!-- 列表 -->

+ 3 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -165,7 +165,7 @@ export default {
       printRemarks: false, // 是否打印备注
       printPrice: false, // 是否打印价格
       printNo: true, // 是否打印销售单号
-      printDate: false, // 是否打印日期
+      printDate: true, // 是否打印日期
       printWarehouse: false, // 是否打印仓库
       showOutInModal: false, // 出库明细弹框
       // 加载数据方法 必须为 Promise 对象
@@ -315,7 +315,8 @@ export default {
         vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.printPrice = localStorage.getItem('printPrice-' + this.$store.state.user.info.orgId) == 'true'
         vm.printWarehouse = localStorage.getItem('printWarehouse-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId) == 'true'
+        const printDate = localStorage.getItem('printDate-' + this.$store.state.user.info.orgId)
+        vm.printDate = printDate ? printDate == 'true' : true
         const printNo = localStorage.getItem('printNo-' + this.$store.state.user.info.orgId)
         vm.printNo = printNo ? printNo == 'true' : true
         // 查询列表

+ 1 - 12
src/views/salesManagement/salesReturn/queryPart.vue

@@ -25,15 +25,6 @@
                 <a-input id="salesReturn-productList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="可退货数量">
-                <a-select id="salesReturn-productList-thnums" v-model.trim="queryParam.thnums" placeholder="请选择" allowClear>
-                  <a-select-option value="1">大于0</a-select-option>
-                  <a-select-option value="2">等于0</a-select-option>
-                  <a-select-option value="3">全部</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesReturn-productList-refresh">查询</a-button>
@@ -174,8 +165,7 @@ export default {
         salesBillNo: '', //  销售单号
         productName: '', // 产品名称
         productCode: '', //  产品编码
-        oosFlag: undefined, // 是否急件
-        thnums: undefined
+        oosFlag: undefined // 是否急件
       },
       buyerSn: '', // 客户sn
       priceType: '', // 价格类型
@@ -370,7 +360,6 @@ export default {
       this.queryParam.productName = ''
       this.queryParam.productCode = ''
       this.queryParam.oosFlag = undefined
-      this.queryParam.thnums = undefined
       this.$refs.table.refresh(true)
     },
     // 初始化,客户sn、价格类型