123

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.html

@@ -580,13 +580,13 @@
 							<div style="clear:both;"></div>
 							<el-form-item v-if="editApply.customerType==\'ent\'" label-width="140px" label="公司名称"
 								style="width:493px;float:left;padding-right:50px;" prop="name">
-								<gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false"
+								<gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" allowcreate="true" showhistory="false"
 									@change="applierChange" size="medium" v-model="editApply.name"
 									refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
 									refModel="tool" labelField="entName" valueField="entName"
 									style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
 								</gsb-selectentjd>
-								<gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true"
+								<gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange" frombrowser="true" allowcreate="true"
 									showhistory="false" @change="applierChange" size="medium" v-model="editApply.name"
 									refMethod="getCompanyInfoByLikeName" autoComplete="true" isFilter="true"
 									refModel="tool" labelField="entName" valueField="entName"

igirl-channel-web/app/front/vues/pages/jdindentdetail/jdindentdetail.js

@@ -1203,12 +1203,12 @@
         },
         historyapplierchange(d){
             if (d) {
-                this.apply.name = d.entName || "";
-                this.apply.applyAddr = d.regLocation || "";
-                this.apply.code = d.creditCode || "";
-                this.apply.businessLicensePic = d.businessLicensePic || "";
-                this.apply.identityCardNo = d.identityCardNo || "";
-                this.apply.identityCardPic = d.identityCardPic || "";
+                this.editApply.name = d.entName || "";
+                this.editApply.applyAddr = d.regLocation || "";
+                this.editApply.code = d.creditCode || "";
+                this.editApply.businessLicensePic = d.businessLicensePic || "";
+                this.editApply.identityCardNo = d.identityCardNo || "";
+                this.editApply.identityCardPic = d.identityCardPic || "";
 
             }
         },

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -344,8 +344,16 @@
                         this.tableData = d.data;
                         this.countPage = d.data.length;
                         d.data.map((item, index) => {
-                            item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
-                            item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
+                            if(item.submitTime){
+                                item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
+                            }else{
+                                item.submitTime = '--';
+                            }
+                            if(item.CreateDate){
+                                item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
+                            }else{
+                                item.CreateDate = '--';
+                            }
                         });
                     } else {
                         console.log(d, "getTmOrderList...........");

igirl-channel-web/app/front/vues/pages/selftmreg/selftmreg.html

@@ -299,12 +299,12 @@
             <div style="clear:both;"></div>
             <el-form-item v-if="apply.customerType==\'ent\'" label-width="140px" label="公司名称"
               style="width:493px;float:left;padding-right:50px;" prop="name">
-              <gsb-selectentjd v-if="currentUser" allowcreate="true" showhistory="false" @change="applierChange"
+              <gsb-selectentjd v-if="currentUser" @historychange="historyapplierchange" allowcreate="true" showhistory="false" @change="applierChange"
                 size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName" autoComplete="true"
                 isFilter="true" refModel="tool" labelField="entName" valueField="entName"
                 style="position:relative;width:100%;" placeHolder="请输入选择公司名称">
               </gsb-selectentjd>
-              <gsb-selectentjd v-if="!currentUser" frombrowser="true" allowcreate="true" showhistory="false"
+              <gsb-selectentjd v-if="!currentUser" @historychange="historyapplierchange" frombrowser="true" allowcreate="true" showhistory="false"
                 @change="applierChange" size="medium" v-model="apply.name" refMethod="getCompanyInfoByLikeName"
                 autoComplete="true" isFilter="true" refModel="tool" labelField="entName" valueField="entName"
                 style="position:relative;width:100%;" placeHolder="请输入选择公司名称">