Merge branch 'feature/pyh_批量弹窗页面优化' into develop

package-lock.json

@@ -4716,9 +4716,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.13.15",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.15.tgz",
-      "integrity": "sha512-GXXOWr9aDcJH4JLu13uge+m3Tj6KXxs+M83mKrnOOBThFoV2TX1qH0S94Ulk14/E4BmG5WCd3OPbu1v8nFzxwA==",
+      "version": "2.13.17",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.17.tgz",
+      "integrity": "sha512-a8hnaMRrX1VBwjXCCmU7coz4Sj+WAJlF/M9SXeycp7dWtk7pQ4jId2UElH8AJdCxnay+cw1e5UG5b7WFgXQ1Fg==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.13.15",
+    "@zjlib/element-plugins": "^2.13.17",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryMaterialClass/index.vue

@@ -190,6 +190,7 @@ export default {
 					if(type == 'add1'){
 						this.formDialogType = 0
 					}else if(type == 'add2'){
+						this.formDialogType = 0
 						Object.assign(this.formData, {
 						  parentCategoryId: row.categoryId
 						})

src/views/auxiliaryFittings/settleAccountManagement/settleAccountOfflinePay/index.vue

@@ -106,7 +106,7 @@
 				<div slot="footer" class="dialog-footer">
 					<el-button size="mini" @click="formDialog = false; formData = {};data.removeTab()">取 消</el-button>
 					<el-button size="mini" v-if="formData.status == 'WAIT'" type="primary"
-						@click="settleAccounts(formData.settlementOrderId,data.removeTab)">确认结算
+						@click="settleAccounts(formData.settlementOrderId,data.removeTab,2)">确认结算
 					</el-button>
 					<!-- <el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab)">
 						确认提现
@@ -287,7 +287,7 @@ export default {
 				btnType: 'text',
 				prompt: '确认是否退款？',
 				conditions: ({ row, index, column }) => {
-					return row.totalAmount > 0 && this.tabIndex==2
+					return row.totalAmount > 0 && row.refundStatus == 'NO' && this.tabIndex==2
 				},
 				click: ({ row, index, column }) => {
 					refund({ id: row.settlementOrderId }).then(res => {
@@ -325,7 +325,7 @@ export default {
 		}
 		this.settleAccounts(this.recordSelected.map(item=>{return item.settlementOrderId}).join(','))
 	},
-	settleAccounts(id,cancel){
+	settleAccounts(id,cancel,type){
 		this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
 			confirmButtonText: '确定',
 			cancelButtonText: '取消',
@@ -336,7 +336,7 @@ export default {
 			}).then(res => {
 				if (res.code == 200) {
 					this.$message({ type: 'success', message: `结算成功!` })
-					cancel('list')
+					if(type== 2){cancel('list')}
 					this.$refs.pageRef.refreshList()
 					this.formDialog = false
 				} else {

src/views/auxiliaryFittings/settleAccountManagement/settleAccountWeixinPay/index.vue

@@ -153,9 +153,9 @@
 				<div slot="footer" class="dialog-footer">
 					<el-button size="mini" @click="formDialog = false; formData = {};data.removeTab()">取 消</el-button>
 					<el-button size="mini" v-if="formData.status == 'WAIT'" type="primary"
-						@click="settleAccounts(formData.settlementOrderId,data.removeTab)">确认结算
+						@click="settleAccounts(formData.settlementOrderId,data.removeTab,2)">确认结算
 					</el-button>
-					<el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab)">
+					<el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab,2)">
 						确认提现
 					</el-button>
 				</div>
@@ -394,7 +394,7 @@ export default {
 			}
 			this.settleAccounts(this.recordSelected.map(item => { return item.settlementOrderId }).join(','))
 		},
-		settleAccounts(id,cancel) {
+		settleAccounts(id,cancel,type) {
 			this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -405,7 +405,7 @@ export default {
 				}).then(res => {
 					if (res.code == 200) {
 						this.$message({ type: 'success', message: `结算成功!` })
-						cancel('list')
+						if(type== 2){cancel('list')}
 						this.$refs.pageRef.refreshList()
 						this.formDialog = false
 					} else {
@@ -420,7 +420,7 @@ export default {
 			}
 			this.withdraw(this.recordSelected.map(item => { return item.settlementOrderId }).join(','))
 		},
-		withdraw(id,cancel) {
+		withdraw(id,cancel,type) {
 			this.$confirm(`请确认是否提现选中数据, 是否继续?`, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
@@ -431,7 +431,7 @@ export default {
 				}).then(res => {
 					if (res.code == 200) {
 						this.$message({ type: 'success', message: `提现成功!` })
-						cancel('list')
+						if(type== 2){cancel('list')}
 						this.$refs.pageRef.refreshList()
 						this.formDialog = false
 					} else {

src/views/mallManagement/configCenter/chargingStandard/index.vue

@@ -64,6 +64,11 @@ export default {
 	  formVisible: false,
     }
   },
+	watch: {
+		'formData.imageUrl'(){
+			this.$refs?.formRef?.validateField(["imageUrl"])
+		}
+	},
   computed: {
 	// 事件组合
 	optionsEvensGroup() {