Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/audit/audit/index.vue

@@ -205,6 +205,10 @@ const closeCase = (id: string) => {
       onChange: (e) => closeCaseRemark.value = e.target.value
     }),
     onOk: async () => {
+      if(closeCaseRemark.value.trim().length <=0){
+        message.warning('关闭原因不能为空')
+        return Promise.reject()
+      }
       changeLoading(true)
       try{
         const result = await CloseCaseInfo(type, {id, closereason: closeCaseRemark.value})
@@ -217,6 +221,7 @@ const closeCase = (id: string) => {
         closeCaseRemark.value = ''
       } catch (error){
         changeLoading(false)
+        closeCaseRemark.value = ''
       }
     },
     onCancel() {

src/views/demo/illegalmining/mainaudit/index.vue

@@ -189,6 +189,10 @@ const closeCase = (id: string) => {
       onChange: (e) => closeCaseRemark.value = e.target.value
     }),
     onOk: async () => {
+      if(closeCaseRemark.value.trim().length <=0){
+        message.warning('关闭原因不能为空')
+        return Promise.reject()
+      }
       changeLoading(true)
       try{
         const result = await MainCloseCaseInfo({id, closereason: closeCaseRemark.value})
@@ -203,6 +207,7 @@ const closeCase = (id: string) => {
         closeCaseRemark.value = ''
       }catch(error){
         changeLoading(false)
+        closeCaseRemark.value = ''
       }
     },
     onCancel() {

src/views/demo/system/casemodification/index.vue

@@ -109,6 +109,7 @@ const submit = () => {
 const closeInfoModal = () => {
   infoModal.value = false
   infoResult.value = {}
+  shppath.value = ''
 }
 const closeHistoryModal = () => {
   historyModal.value = false