弹窗问题修复

src/components/template/operation_mixin.js

@@ -21,9 +21,9 @@ function hasCommonElements(arr1, arr2) {
 export default {
   data(){
     return {
-      pageType:this.$route.params.pageType,
-      pageCode:this.$route.params.pageCode,
-      pagePam:this.$route.params.pagePam
+      pageType:this?.$route?.params?.pageType,
+      pageCode:this?.$route?.params?.pageCode,
+      pagePam:this?.$route?.params?.pagePam
     }
   },
   methods: {

src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -626,7 +626,7 @@ export default {
 		formCancel() {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
-			this.$data.formRef = this.$options.data().formRef
+			this.$data.formData = this.$options.data().formData
 		},
 		updateStatus(stateEnum) {
 			if (this.recordSelected.length == 0) {

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

@@ -471,7 +471,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

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

@@ -211,7 +211,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

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

@@ -360,7 +360,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

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

@@ -239,7 +239,7 @@ export default {
 		formCancel() {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
-			this.$data.formRef = this.$options.data().formRef
+			this.$data.formData = this.$options.data().formData
 		},
 
 		operation() {

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

@@ -262,7 +262,7 @@ export default {
 	formCancel() {
 		this.formVisible = false
 		this.$refs?.formRef?.resetFields()
-		this.$data.formRef = this.$options.data().formRef
+		this.$data.formData = this.$options.data().formData
 	},
 	// 表格操作列
 	operation() {

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

@@ -322,7 +322,7 @@ export default {
 		formCancel() {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
-			this.$data.formRef = this.$options.data().formRef
+			this.$data.formData = this.$options.data().formData
 		},
 		// 表格操作列
 		operation() {

src/views/auxiliaryFittings/supplier/index.vue

@@ -363,7 +363,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {

src/views/mallManagement/activity/coupon_index/index.vue

@@ -404,7 +404,7 @@ export default {
         formItemAttributes: {
           label: '使用时间',
           prop: 'activeDate',
-          rules: []
+          rules: [...required]
         }
       },
       {
@@ -562,7 +562,7 @@ export default {
     formCancel() {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
-			this.$data.formRef = this.$options.data().formRef
+			this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

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

@@ -161,7 +161,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {

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

@@ -234,7 +234,7 @@ export default {
 	formCancel() {
 	  this.formVisible = false
 	  this.$refs?.formRef?.resetFields()
-	  this.$data.formRef = this.$options.data().formRef
+	  this.$data.formData = this.$options.data().formData
 	},
 	// 打开 新增编辑 网点表单
 	openForm(type, id) {
@@ -253,6 +253,7 @@ export default {
 					this.formVisible = true
 					if (type == 'add') {
 						this.formDialogType = 0
+						this.initData()
 					} else if(type == 'edit'){
 						this.formDialogType = 1
 						getMainDetail({ id }).then(res => {

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

@@ -261,7 +261,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {
@@ -280,19 +280,20 @@ export default {
             this.formVisible = true
             if (type == 'add') {
               this.formDialogType = 0
+				this.initData()
             } else if(type == 'edit'){
-    					this.formDialogType = 1
-    					getMainDetail({ id }).then(res => {
-    					  Object.assign(this.formData, res.data)
-    					  this.initData()
-    					})
+    			this.formDialogType = 1
+    			getMainDetail({ id }).then(res => {
+    			  Object.assign(this.formData, res.data)
+    			  this.initData()
+    			})
             }else{
-    					this.formDialogType = 2
-							getMainDetail({ id }).then(res => {
-							  Object.assign(this.formData, res.data)
-							  this.initData()
-							})
-    				}
+    			this.formDialogType = 2
+				getMainDetail({ id }).then(res => {
+					Object.assign(this.formData, res.data)
+					this.initData()
+				})
+    		}
           })
         },
         // 关闭时事件

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

@@ -254,7 +254,7 @@ export default {
 					this.formVisible = true
 					this.addParentFormType = type;
 					this.addParentFormVisible = true;
-					if(type == 'edit'){
+					if(type == 'edit1'){
 						this.editParentId = cid;
 						getClassifyDetail({categoryId: cid}).then(res => {
 						  this.addParentForm = {
@@ -291,7 +291,7 @@ export default {
             status: this.addParentForm.status,
             sortNum: this.addParentForm.sort,
           }
-          if(this.addParentFormType == 'edit') {
+          if(this.addParentFormType == 'edit1') {
             params.categoryId = this.editParentId;
             editClassify(params).then(res => {
 				cancel('list')
@@ -346,10 +346,10 @@ export default {
 					getClassifyList({name: '', type: 2}).then(res => {
 					  this.classifyList = res.data;
 					})
-					if(type == 'add') {
+					if(type == 'add2') {
 					  this.addChildForm.oneClassify = cid;
 					}
-					if(type == 'edit'){
+					if(type == 'edit2'){
 						this.editChildId = cid;
 						getClassifyDetail({categoryId: cid}).then(res => {
 						  this.addChildForm = {

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

@@ -12,7 +12,7 @@
 				  </zj-form-module>
 				</zj-form-container>
 				<div slot="footer" class="dialog-footer">
-				  <el-button size="mini" @click="data.removeTab">取 消</el-button>
+				  <el-button size="mini" @click="data.removeTab()">取 消</el-button>
 				  <el-button size="mini" @click="formConfirm(data.removeTab)" type="primary">确 定</el-button>
 				</div>
 			</div>
@@ -268,7 +268,7 @@ export default {
 	formCancel() {
 	  this.formVisible = false
 	  this.$refs?.formRef?.resetFields()
-	  this.$data.formRef = this.$options.data().formRef
+	  this.$data.formData = this.$options.data().formData
 	},
 	// 打开 新增编辑 网点表单
 	openForm(type, id) {
@@ -308,7 +308,8 @@ export default {
 	    },
 	    // 关闭时事件
 	    closeEvent: () => {
-	      
+			console.log(111)
+	      this.formCancel()
 	    }
 	  })
 	},

src/views/mallManagement/freight/index.vue

@@ -292,7 +292,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

src/views/mallManagement/goods/classify_index/index.vue

@@ -214,7 +214,7 @@ export default {
       },
 
       editParentId:  null,
-      addParentFormType: 'add',
+      addParentFormType: 'add1',
       addParentFormVisible: false,
       addParentForm: {
         oneClassify: '',
@@ -320,7 +320,7 @@ export default {
 					this.formVisible = true
 					this.addParentFormType = type;
 					this.addParentFormVisible = true;
-					if(type == 'edit'){
+					if(type == 'edit1'){
 						this.editParentId = cid;
 						getClassifyDetail({categoryId: cid}).then(res => {
 						  this.addParentForm = {
@@ -345,7 +345,7 @@ export default {
     // 取消 新增编辑 一级分类
     cancelAddParentForm(){
       this.addParentFormVisible = false;
-      this.$refs.addParentForm.resetFields();
+      this.$refs?.addParentForm?.resetFields();
     },
 
     // 提交 一级分类
@@ -360,17 +360,17 @@ export default {
             status: this.addParentForm.status,
             sortNum: this.addParentForm.sort,
           }
-          if(this.addParentFormType == 'edit') {
+          if(this.addParentFormType == 'edit1') {
             params.categoryId = this.editParentId;
             editClassify(params).then(res => {
-			  cancel('list')
+				cancel('list')
               this.cancelAddParentForm();
               this.getList();
               this.$successMsg('编辑成功');
             })
           }else {
             addClassify(params).then(res => {
-			  cancel('list')
+				cancel('list')
               this.cancelAddParentForm();
               this.getList();
               this.$successMsg('添加成功');
@@ -417,13 +417,13 @@ export default {
 					getClassifyList({name: ''}).then(res => {
 					  this.classifyList = res.data;
 					})
-					if(type == 'add') {
+					if(type == 'add2') {
 					  this.addChildForm.oneClassify = cid;
 					  let item = this.dataList[this.$findElem(this.dataList, 'categoryId', cid)];
 					  this.addChildForm.taxNumber = item.taxNumber;
 					  this.addChildForm.taxPercent = item.taxPercent;
 					}
-					if(type == 'edit'){
+					if(type == 'edit2'){
 						this.editChildId = cid;
 						getClassifyDetail({categoryId: cid}).then(res => {
 							console.log(this.orderMainType,'获取大类')
@@ -459,7 +459,7 @@ export default {
     // 取消 新增编辑 二级分类
     cancelAddChildForm(){
       this.addChildFormVisible = false;
-      this.$refs.addChildForm.resetFields();
+      this.$refs?.addChildForm?.resetFields();
     },
 
     // 提交 二级分类
@@ -473,7 +473,7 @@ export default {
           // let smallName = index2 >= 0 ? this.orderSmallType[index2].name : '';
           
           let params = {}
-          if(this.addChildFormType == 'edit') {
+          if(this.addChildFormType == 'edit2') {
             params = {
                 categoryId: this.editChildId,
                 name: this.addChildForm.twoClassify,

src/views/mallManagement/goods/newclassify_index/index.vue

@@ -228,7 +228,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

src/views/mallManagement/storage/index.vue

@@ -176,7 +176,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {

src/views/workOrder/basicConfiguration/assessmentItemAllocation/index.vue

@@ -179,7 +179,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {

src/views/workOrder/basicConfiguration/orderType/index.vue

@@ -232,7 +232,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
-      this.$data.formRef = this.$options.data().formRef
+      this.$data.formData = this.$options.data().formData
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {

src/views/workOrder/settleAccountsManagement/rewardsPunishmentsOrder/index.vue

@@ -396,7 +396,7 @@ export default {
 		formCancel() {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
-			this.$data.formRef = this.$options.data().formRef
+			this.$data.formData = this.$options.data().formData
 		},
 		formConfirm(cancel) {
 			this.$refs.formRef.validate((valid, invalidFields, errLabels) => {