Merge remote-tracking branch 'origin/master'

src/views/hwpayment/modules/HwPaymentRecordModal.vue

@@ -10,7 +10,7 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <span style="color: rgba(0, 0, 0, 0.85);font-size: 16px;">{{comTitle}}</span>
-        <a-form-item label="服务商" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-top: 10px;" v-if="!model.subcontractType">
+        <a-form-item label="服务商" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-top: 10px;" v-if="model.subcontractType == null">
           {{model.subName}}
         </a-form-item>
         <a-form-item label="项目金额" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-top: 10px;">
@@ -27,10 +27,10 @@
 
         <a-form-item label="入账时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker placeholder="请选择入账时间" v-decorator="[ 'businessTime', validatorRules.businessTime]"
-                  style="width: 100%" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss" :defaultValue="businessDate"/>
+                  style="width: 100%" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss"/>
         </a-form-item>
 
-        <template v-if="model.subcontractType">
+        <template v-if="model.subcontractType != null">
           <span style="color: rgba(0, 0, 0, 0.85);font-size: 16px;">平台转入服务商</span>
           <a-form-item label="服务商" :labelCol="labelCol" :wrapperCol="wrapperCol" style="margin-top: 10px;">
             {{model.subName}}
@@ -45,7 +45,7 @@
 
           <a-form-item label="入账时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-date-picker placeholder="请选择入账时间" v-decorator="[ 'subBusinessTime', validatorRules.subBusinessTime]"
-                    style="width: 100%" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss" :defaultValue="businessDate"/>
+                    style="width: 100%" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss"/>
           </a-form-item>
         </template>
 
@@ -85,7 +85,6 @@
         show:true,//动态显示隐藏表单元素
         routeSwitch:true, //是否通过平台
         isThroughPlatform:1,//是否通过平台（0：否 1：是）
-        businessDate:new Date(),
         confirmLoading: false,
         validatorRules:{
           amount:{rules: [{ required: true, message: '请输入项目金额!' }]},
@@ -119,17 +118,17 @@
         this.visible = true;
         this.$nextTick(() => {
           this.form.setFieldsValue(pick(this.model,'paymentId','subId','paymentCompanyId','requirementId','subcontractType'));
+          //入账时间默认当前时间
+          this.form.setFieldsValue({businessTime: moment(new Date(), 'YYYY-MM-DD HH:mm:ss')}) //时间格式化
+          this.form.setFieldsValue({subBusinessTime: moment(new Date(), 'YYYY-MM-DD HH:mm:ss')}) //时间格式化
         });
-        if (record.subcontractType) {
+        if (record.subcontractType != null) {
           this.isThroughPlatform = 1;
           this.comTitle = '企业转入平台';
         } else {
           this.isThroughPlatform = 0;
           this.comTitle = '企业转入服务商';
         }
-        //入账时间默认当前时间
-        this.businessDate = moment(new Date(), 'YYYY-MM-DD HH:mm:ss')
-        console.log("dfg",this.model)
       },
       close () {
         this.$emit('close');