Explorar o código

修改导入选择企业

LiFei %!s(int64=5) %!d(string=hai) anos
pai
achega
b0ae3b9ef0

+ 59 - 6
src/views/hwpayment/modules/HwPaymentExportModal.vue

@@ -24,10 +24,23 @@
           </a-form-item>
         </template>
 
-        <a-form-item label="付款企业" :labelCol="labelCol" :wrapperCol="wrapperCol" v-has="'payment:saas'">
-          <j-select-depart v-decorator="['companyId']" :trigger-change="true"/>
+
+        <a-form-item label="付款企业" :labelCol="labelCol" :wrapperCol="wrapperCol" v-has="'require:saas'" :required="true">
+            <a-input-search
+              placeholder="选择企业"
+              disabled
+              v-decorator="[ 'companyName', validatorRules.companyId]"
+              @search="onSearch1">
+              <a-button slot="enterButton" icon="search" >选择</a-button>
+            </a-input-search>
+        </a-form-item>
+
+
+        <a-form-item label="账户余额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <span style="color: #2eabff">{{balance}}</span>
         </a-form-item>
 
+
         <a-form-item label="上传文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-upload name="file" :showUploadList="showUploadList" :fileList="fileList" :multiple="false" :headers="headers" :action="importExcelUrl()" @change="handleImportExcel2">
           <a-button><a-icon type="upload"/>导入付款</a-button>
@@ -51,6 +64,7 @@
       </a-form>
     </a-spin>
     <hw-payment-export-error-modal ref="modalSelectRequireForm"></hw-payment-export-error-modal>
+    <company-select-window ref="companyWindow" @ok="modalFormOk1"></company-select-window>
   </a-modal>
 
 </template>
@@ -65,6 +79,7 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getAction, deleteAction, putAction, postAction,downFile } from '@/api/manage'
   import HwPaymentExportErrorModal from './HwPaymentExportErrorModal'
+  import CompanySelectWindow from '../../requiremanager/modules/CompanySelectWindow'
   const tyemplateGeneration = (params) => putAction('/hwpayment/hwPaymentDetail/tyemplateGeneration', params)
 
   const FILE_TYPE_ALL = "all"
@@ -83,6 +98,7 @@
   export default {
     name: 'HwPaymentExportModal',
     components: {
+      CompanySelectWindow,
       HwPaymentExportErrorModal,
       JDate,
       JUpload,
@@ -91,6 +107,10 @@
     },
     data() {
       return {
+        balance:0.00,
+        selectedDepartKeys1:[], //保存用户选择企业id
+        checkedDepartKeys1:[],
+        companyId:0,
         dataError:"",
         uploadAction: window._CONFIG['domianURL'] + '/hpSys/common/ossUpload',
         urlDownload: window._CONFIG['domianURL'] + '/hpSys/common/ossDownload',
@@ -115,13 +135,14 @@
         accept:'.pdf',
         confirmLoading: false,
         validatorRules: {
-
+          companyId:{ rules: [{ required: true, message: '请输入所属平台企业!' }] },
         },
         url: {
           fileUpload: window._CONFIG['domianURL'] + '/hpSys/common/ossUpload',
           edit: '/hwuser/hwUser/edit',
           importExcelUrl: "/hwpayment/hwPaymentDetail/importExcel?companyId=",
-          exportXlsUrl:"/hwpayment/hwPaymentDetail/tyemplateGeneration"
+          exportXlsUrl:"/hwpayment/hwPaymentDetail/tyemplateGeneration",
+          queryBalance:"/saasmanager/hwPlatformCompanyAccount/queryBalance"
         }
 
       }
@@ -141,7 +162,9 @@
         this.edit({})
       },
       edit(record) {
+        this.form = this.$form.createForm(this)
         this.type=0
+        this.balance=0.00
         this.model={}
         this.fileList=[]
         this.form.resetFields()
@@ -149,6 +172,9 @@
         console.log(666666,record)
         this.visible = true
         this.showUploadList = false;
+        this.selectedDepartKeys1 = [];
+        this.checkedDepartKeys1 = [];
+        this.companyId=0
       },
       close() {
         this.$emit('ok')
@@ -168,8 +194,10 @@
       importExcelUrl(){
         var companyId = '';
         this.form.validateFields((err, values) => {
-          if(values.companyId){
-            companyId = values.companyId;
+          if (!err) {
+            if (this.selectedDepartKeys1[0]) {
+              companyId = this.companyId
+            }
           }
         })
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`+companyId;
@@ -243,6 +271,31 @@
         })
       },
 
+
+      //搜索企业
+      onSearch1(){
+        this.$refs.companyWindow.add(this.checkedDepartKeys1);
+      },
+      // 获取用户选择企业提交的返回数据
+      modalFormOk1 (formData) {
+        this.selectedDepartKeys1 = [];
+        for (let i = 0; i < formData.departIdList.length; i++) {
+          this.selectedDepartKeys1.push(formData.departIdList[i].key);
+          this.form.setFieldsValue({ companyName: formData.departIdList[i].title })
+        }
+        this.checkedDepartKeys1 = this.selectedDepartKeys1  //更新当前的选择keys
+        if(this.selectedDepartKeys1[0]){
+          this.companyId = this.selectedDepartKeys1[0];
+
+          getAction(this.url.queryBalance,{companyId:this.companyId}).then((res)=>{
+              console.log(4444,res)
+                 this.balance=res
+          });
+
+        }
+      },
+
+
     }
   }
 </script>

+ 1 - 6
src/views/requiremanager/modules/HwRequirementModal.vue

@@ -16,7 +16,6 @@
 
 
         <a-form-item label="发布企业" :labelCol="labelCol" :wrapperCol="wrapperCol" v-has="'require:saas'" :required="true">
-          <template v-if="!model.id">
             <a-input-search
               placeholder="选择企业"
               disabled
@@ -24,10 +23,6 @@
               @search="onSearch1">
               <a-button slot="enterButton" icon="search" v-if="!model.id">选择</a-button>
             </a-input-search>
-          </template>
-          <template v-else>
-            <a-input v-decorator="[ 'companyName', validatorRules.companyId]"  :disabled="true"></a-input>
-          </template>
         </a-form-item>
 
 
@@ -326,7 +321,7 @@
         this.edit({})
       },
       edit(record) {
-
+        this.form = this.$form.createForm(this)
         this.form.resetFields()
         this.model = Object.assign({}, record)
         console.log( 111,this.model)