Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

# Conflicts:
#	src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

src/HManagement/salesForecastTemplate/modules/modelDetail.vue

@@ -71,7 +71,7 @@ export default {
       this.mainAreaData = [
        {label:'提报要求',value:this.mainData.remarks},
         {label:'提报类型',value:this.mainData.isrepeat == 1 ?'月度提报':'单次提报'},
-        {label:'预测金额',value:this.mainData.sumprojectamount},
+        {label:'预测金额',value:this.mainData.outamountsum},
         {label:'负责人',value:this.mainData.createby},
         {label:'状态',value:this.mainData.status},
       ]

src/SDrpManagement/QuotedPrice/detail/modules/historicalQuotation/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"   >
+    <tableLayout :layout="tablecols" :data="list">
       <template v-slot:customcol="scope">
         <div v-if="scope.column.columnname === 'specialoffer'">
           <div v-if="scope.column.data.specialoffer === 0">
@@ -21,7 +21,10 @@
         </div>
       </template>
       <template v-slot:opreation="scope">
+<<<<<<< HEAD
+=======
         <el-button size="mini" type="text" @click="detailGo(scope.data)">详 情</el-button>
+>>>>>>> 8249ebd501a41de019c344a8d6bbb7e02b929bb0
       </template>
     </tableLayout>
     <div style="margin-top:16px;text-align:right">

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -29,7 +29,7 @@
         <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') "  :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
       <div slot="slot0" >
-        <detailed :data="mainData"  v-if="flag"></detailed>
+        <detailed ref="baseDetail" :data="mainData"></detailed>
       </div>
       <div slot="slot1" class=" normal-panel"  >
         <contacts :data="mainData"  @onSuccess="onSuccess" v-if="flag"></contacts>
@@ -118,8 +118,10 @@ export default {
       console.log("输出数据一")
       console.log(this.mainData)
       this.$refs['details'].param.content.type = this.$route.query.tabIndex
+      this.$refs['details'].param.content.isExport = false
       this.changeDataStructure()
-      this.flag = true
+      // this.flag = true
+      console.log(this.mainAreaData)
     },
     show(){
       this.visible = false
@@ -167,20 +169,15 @@ export default {
       this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     },
-    async queryTags(id){
-      const res = await this.$api.requested({
-        "id": 20220929085401,
-        "content": {
-          "ownertable":'sa_customers',
-          "ownerid":id
-        }
-      })
-      this.tags = res.data
-    },
     onSuccess(){
       this.visible = false
       this.queryMainData(this.$route.query.id)
       this.$emit('onSuccess')
+    },
+    statusChangeSuccess () {
+      this.$refs.details.refreshTag()
+      this.$refs.baseDetail.basicData(this.$route.query.id)
+      this.$refs.baseDetail.systemData(this.$route.query.id)
     }
   },
   mounted () {

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -49,8 +49,8 @@ export default {
     }
   },
   mounted() {
-    this.basicData(this.data.sa_customersid)
-    this.systemData(this.data.sa_customersid)
+    this.basicData(this.$route.query.id)
+    this.systemData(this.$route.query.id)
   },
   methods:{
     /*基本信息*/

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/statusChange.vue

@@ -79,7 +79,7 @@ export default {
         })
         this.tool.showMessage(res, ()=>{
           this.dialogForm = false
-          this.$emit("shareSuccess")
+          this.$emit("statusChangeSuccess")
         })
       })
     }

src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -72,7 +72,8 @@ export default {
       this.mainAreaData = [
         {label:'提报要求',value:this.mainData.remarks},
         {label:'提报类型',value:this.mainData.isrepeat == 1 ?'月度提报':'单次提报'},
-        {label:'预测金额',value:this.mainData.sumprojectamount},
+        {label:'提报时间',value:this.mainData.reportingperiod},
+        {label:'预测金额',value:this.mainData.sumamount},
         {label:'负责人',value:this.mainData.createby},
         {label:'状态',value:this.mainData.status},
       ]

src/components/normal-basic-layout/details/index.vue

@@ -164,6 +164,9 @@ export default {
     },
     onCollapse () {
       this.collapse?this.collapse = false:this.collapse = true
+    },
+    refreshTag () {
+      this.$refs.tag.queryTag()
     }
   },
   mounted () {

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -31,6 +31,13 @@ export default {
       this.$router.go(-1)
       this.$emit('onSuccess')
     }
+  },
+  mounted () {
+    window.addEventListener("popstate", function(e) {
+      if (this.closeDrawerTemp === true) {
+        this.$store.dispatch('changeDetailDrawer',false)
+      }
+    }, false);
   }
 }