lilei 2 vuotta sitten
vanhempi
commit
fc3d65622b

+ 1 - 1
public/version.json

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

+ 10 - 0
src/components/index.less

@@ -328,6 +328,16 @@
     box-shadow: 0 0 20px #dcdee2;
   }
 }
+// 确认框居中
+.confirm-center{
+  .ant-modal-confirm-body > .anticon + .ant-modal-confirm-title + .ant-modal-confirm-content{
+    margin-left:0;
+  }
+  .ant-modal-confirm-btns{
+    float: none;
+    text-align: center;
+  }
+}
 // 页签样式
 .multi-tab-con{
   .ant-tabs-nav-container{

+ 4 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -373,9 +373,10 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认收款吗?',
+        content: <div style="text-align:center"><p style="margin-top:20px;">收款单号:{row.settleNo} { row.bizName } 合计{ row.unsettleAmount }元</p><p>{row.settleClientName}</p><p>确认收款吗?</p></div>,
         centered: true,
         closable: true,
+        class:'confirm-center',
         onOk () {
           _this.settleAcountPay(null, { type: 0, row: row })
         }
@@ -396,9 +397,10 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div><p style="margin-top:20px;">合计金额¥{ this.selectTotalAmount } </p><p>确认批量收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">共计{this.rowSelectionInfo.selectedRowKeys.length}单,合计金额¥{ this.selectTotalAmount } </p><p>确认批量收款吗?</p></div>,
         centered: true,
         closable: true,
+        class:'confirm-center',
         onOk () {
           _this.settleAcountPay(null, { type: 1, row: null })
         }

+ 3 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -137,7 +137,8 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        onlineFalg: ''
+        onlineFalg: '',
+        enabledFlag: '1'
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -209,6 +210,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.onlineFalg = ''
+      this.queryParam.enabledFlag = '1'
       this.productType = []
       this.$refs.table.refresh(true)
       this.rowSelectionInfo = null