apply-clients 3.3.222 → 3.4.2-FuGu-4

package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue

@@ -1,4 +1,6 @@
 <template>
+  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
+
   <div class="col-sm-12" style="margin: 20px 0px;">
     <criteria-paged :model="model" v-ref:cp>
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
@@ -106,7 +108,7 @@ export default {
     },
     mark: {
       type: Number,
-      default: 0        // 0：正常  1：禁用  2：追加用户
+      default: 0        // 0：正常  1：禁用
     }
   },
   data () {
@@ -117,7 +119,8 @@ export default {
           f_filialeid: this.$login.f.orgid,
           f_process_id: this.selectdata.f_process_id
         }
-      })
+      }),
+      showWork: false
     }
   },
   ready () {
@@ -132,6 +135,7 @@ export default {
     },
     // 关闭文件上传对话框
     closeFile() {
+      this.showWork = false
       this.showFile = false
       // 将选的文件清空
       this.$refs.file.$el.querySelector('input').value = ''
@@ -139,6 +143,9 @@ export default {
     }
   },
   events: {
+    'beforeFileUpload' (file) {
+      this.showWork = true
+    },
     async 'onFileUpload'(file, result) {
       let data = {
         selectdata: this.selectdata,
@@ -146,8 +153,19 @@ export default {
         user: this.$login.f,
         mark: this.mark
       }
-      let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
-      this.closeFile()
+
+      try {
+        let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '导入失败！！！',
+          silent: true
+        }, 0)
+      } catch (e) {
+        // this.closeFile()
+      } finally {
+        this.closeFile()
+      }
+
     }
   },
   computed: {
@@ -155,11 +173,19 @@ export default {
   watch: {
     'model.count': {
       handler: function () {
-        for (let i = 0; i < this.selectdata.fields.length; i++) {
-          if (this.selectdata.fields[i].label === '户数') {
-            console.log(this.model.count)
-            this.selectdata.fields[i].value = this.model.count
-          }
+        if (this.model.count != this.selectdata.f_apply_count) {
+          console.log(this.model.count)
+          console.log(this.selectdata.f_apply_count)
+          console.log(this.model.count !== this.selectdata.f_apply_count)
+          this.selectdata.f_apply_count = this.model.count
+
+          this.$resetpost(
+            'rs/entity/t_apply',
+            this.selectdata,
+            {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
+          ).then(res => {
+            this.$dispatch('breakControl', this.selectdata)
+          })
         }
       }
     }