zhangqiOMG 2 gadi atpakaļ
vecāks
revīzija
479038754e

+ 1 - 1
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},
       ]

+ 1 - 3
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">
@@ -18,8 +18,6 @@
         </div>
       </template>
       <template v-slot:opreation="scope">
-        <!--        <edit v-if="tool.checkAuth($route.name,'update')" :data="scope.data" @updateSuccess="onSuccess"></edit>
-                <toVoid v-if="tool.checkAuth($route.name,'toVoid')" :data="scope.data" @toVoidSuccess="onSuccess"></toVoid>-->historicalQuotation
       </template>
     </tableLayout>
     <div style="margin-top:16px;text-align:right">

+ 2 - 1
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},
       ]

+ 3 - 0
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 () {

+ 7 - 0
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);
   }
 }