1

src/components/FirstJob/detail.vue

@@ -456,7 +456,7 @@
 							<i>企业详情</i>
 						</h1>
 					</div>
-					<div class="companylocation" style="text-align: center; padding: 0 20px 20px" v-if="positionInfo.lng">
+					<div class="companylocation" style="text-align: center; padding: 0 20px 20px" v-if="positionInfo.lng || positionInfo.storeLng">
 						<h2 style="padding: 16px 0; font-weight: 600">{{ store.storeName || "-" }}</h2>
 						<p style="padding-bottom: 20px; border-bottom: 1px solid #eee; font-size: 16px; text-indent: 16px; color: #4d575ecc; white-space: pre-line; text-align: left">{{ store.storeInfo || "-" }}</p>
 						<div class="imgbox">
@@ -845,14 +845,23 @@ export default {
 					this.agency = data.data.agency;
 					this.customServiceUsers = data.data.customServiceUsers;
 
-					if (data.data.store) {
+					if (this.jobClassify == 1) {
 						this.positionInfo = data.data.store;
 						this.store = data.data.store;
 						this.positionInfo.desc = this.positionInfo.detailPosition;
 						this.positionInfo.containerName = "mapContainer";
 						this.positionInfo.name = this.positionInfo.aliasName;
 						this.jobDetail.district = disposeJobListData(data.data.store).district;
-					}
+					}else{
+            this.positionInfo = data.data.record;
+						this.store = data.data.record;
+						this.positionInfo.desc = this.positionInfo.storeAddr;
+						this.positionInfo.containerName = "mapContainer";
+						this.positionInfo.name = this.positionInfo.storeName;
+						this.positionInfo.lat = this.positionInfo.storeLat;
+						this.positionInfo.lng = this.positionInfo.storeLng;
+						this.jobDetail.district = this.positionInfo.storeDistrict
+          }
 					if (data.data.onSiteUsers) {
 						this.onSiteUsersInfo = data.data.onSiteUsers.map((item) => `${item.aliasName} ${item.tel}`).join(", ");
 					}

src/components/FirstJob/joblist.vue

@@ -2029,7 +2029,7 @@ export default {
 		getHotStoreList(item) {
 			// console.log(item);
 			this.searchValue = item.storeName;
-			this.formvalue.aliasName = item.storeName;
+			this.formvalue.keys = item.storeName;
 
 			this.isdownHotStoreShow = false;
 			// this.formvalue.hotStoreId = item.storeId;
@@ -3469,7 +3469,7 @@ export default {
 			overflow: hidden;
 			position: relative;
 			width: 240px;
-			height: 200px;
+			height: 220px;
 			// height: 114px;
 			// padding: 0 20px 20px 20px;
 			border-radius: 6px;

src/components/FirstJob/recordBill.vue

@@ -182,7 +182,7 @@
             <a-select-option :value="apply.id">{{ apply.id }}</a-select-option>
           </a-select>
         </a-form-model-item>-->
-				<a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+				<a-form-model-item ref="policy" label="财务结算" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
 					<div class="policy" style="min-height: 30px !important">{{ form.policy }}</div>
 					<div style class="mb20 mt12">
 						<a-radio-group v-model="currentPolicy" class="fss policyRadios" @change="policyChange($event)">
@@ -458,9 +458,21 @@ export default {
 		console.log(this.proxyinfo);
 		this.getProxyInfo(this.proxyinfo.id);
 		this.getJob(this.firminfo);
-		this.getPolicyByJobId(this.firminfo.id || "").then(() => {
-			this.getJobDetail(this.firminfo.id || "");
-		});
+
+
+    if(this.jobClassify == 1){
+        this.getPolicyByJobId(this.firminfo.id).then(() => {
+          this.getJobDetail(this.firminfo.id);
+        });
+      }else{
+        this.getPolicyByJobIdDaotian(this.firminfo.id).then(() => {
+          this.getJobDetail(this.firminfo.id);
+        });
+      }
+
+		// this.getPolicyByJobId(this.firminfo.id || "").then(() => {
+		// 	this.getJobDetail(this.firminfo.id || "");
+		// });
 		// this.getPolicyListByJobId(this.firminfo.id)
 	},
 	/**