@@ -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(", ");
}
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 354a452..cad8941 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/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;
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index fa5f266..a7dfbaa 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -182,7 +182,7 @@
{{ apply.id }}
-->
-
+
{{ form.policy }}
@@ -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)
},
/**