apply-clients 7.1.36-yuchuan-1 → 7.1.36-yuchuan-3

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

@@ -67,19 +67,6 @@
       </data-grid>
     </criteria-paged>
   </div>
-  <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" title="选择文件">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
-      <h4 class="modal-title">选择文件</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定"
-                     v-ref:file></file-upload>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer"></footer>
-  </modal>
 
   <modal v-if="Sign" :show.sync="Sign" v-ref:modal :large="true" :backdrop="false">
     <header slot="modal-header" class="modal-header">
@@ -374,7 +361,6 @@ export default {
   data() {
     return {
       gasbrandDisable: false,
-      showFile: false,
       showModal: false,
       model: new PagedList('rs/sql/getApplyUserinfo', 20, null),
       areaList: [],
@@ -599,31 +585,10 @@ export default {
       this.newUserfile = {}
       this.Sign = {}
       this.search()
-    },
+    }
     //关闭导入弹框
-    closeFile() {
-      this.showFile = false
-      // 将选的文件清空
-      this.$refs.file.$el.querySelector('input').value = ''
-      this.search()
-    },
   },
   events: {
-    async 'onFileUpload'(file, result) {
-      let data = {
-        selectdata: this.selectdata,
-        filepath: result.f_downloadpath,
-        user: this.$login.f,
-        mark: this.mark
-      }
-      let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
-        resolveMsg: null,
-        rejectMsg: '导入失败！！！',
-        silent: true
-      }, 0)
-
-      this.$dispatch('breakControl', this.selectdata)
-    }
   },
   computed: {
     showAddress() {

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

@@ -161,7 +161,7 @@ export default {
       this.showselect = false
     },
     searchCondition (args) {
-      args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi}' and ui.f_user_type = '非民用'`
+      args.condition = `${args.condition} and ui.f_filiale = '${this.$login.f.f_fengongsi}'`
 
       this.model.search(args.condition, args.model)
     },