Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexinggonggaoxingao.vue

@@ -133,7 +133,7 @@ export default {
       // 分公司
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
-          this.listQuery.params.useOrgSid = res.data.sid
+          this.listQuery.params.useOrgSid = res.data
           this.getList() // 加载列表
         }
       })
@@ -160,7 +160,7 @@ export default {
       this.listLoading = true
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
-          this.listQuery.params.useOrgSid = res.data.sid
+          this.listQuery.params.useOrgSid = res.data
           pagerList(this.listQuery).then((response) => {
             this.listLoading = false
             if (response.success && response.data && response.data.total > 0) {

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/gongggaoxinghao.vue

@@ -150,7 +150,7 @@ export default {
         aa.push({
           announcementmodelParamSid: element.announcementmodelParamSid,
           announcementmodelSid: element.announcementmodelSid,
-          sid : '',
+          sid: '',
           useOrgSid: this.listQuery.params.useOrgSid,
           vehModelSid: this.modelSid
         })

anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue

@@ -264,8 +264,6 @@ export default {
             noticeModel: e.noticeModel,
             vehicleAlias: e.vehicleAlias,
             vehModelSid: e.vehModelSid,
-            vehicleStateKey: e.vehicleStateKey,
-            vehicleStateValue: e.vehicleStateValue,
             vinNo: e.vinNo
           }
         }
@@ -276,8 +274,6 @@ export default {
       this.formobj.vehModelSid = bb.vehModelSid
       this.formobj.brandName = bb.brandName
       this.formobj.brandSid = bb.brandSid
-      this.formobj.vehicleStateValue = bb.vehicleStateValue
-      this.formobj.vehicleStateKey = bb.vehicleStateKey
     },
     handleSave() {
       console.log(this.formobj)