销售预测新增字段，项目商机调整

src/Form/projectChange/add.vue

@@ -15,6 +15,7 @@
             <el-col :span="24">
               <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称" @blur="nameChange(param.content.pageNumber = 1)"></el-input>
+                <span style="color: red;font-size: 12px;margin-bottom: -10px" v-if="repeats.length > 0">疑似重复</span>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -309,7 +310,7 @@ export default {
       value:[],
       rules:{
         projectname:[
-          { required: true, validator:projectname, trigger: 'blur'},
+          { required: true, message: '请输入项目名称', trigger: 'blur'},
         ],
         /*projectnum:[
           { required: true, message: '输入项目编号', trigger: 'blur'}
@@ -486,6 +487,7 @@ export default {
           if (this.checkResults === 0){
             this.$emit('onSuccess')
             this.$refs['form'].resetFields();
+            this.repeats = []
             this.value = ''
             this.form={
               sa_projectid:0,
@@ -528,6 +530,7 @@ export default {
       })
       this.$emit('onSuccess')
       this.$refs['form'].resetFields();
+      this.repeats = []
       this.form={
         sa_projectid:0,
         projectname:"",
@@ -568,6 +571,7 @@ export default {
       this.$refs['form'].resetFields()
       this.dialogFormVisible = false
       this.$emit('onSuccess')
+      this.repeats = []
     },
     /*获取品牌*/
     async queryBrand(){
@@ -603,18 +607,21 @@ export default {
     },
     /*查询项目名称是否重复*/
     async nameChange(){
-      this.param.content.sa_projectid = 0
-      this.param.content.where.condition = this.form.projectname
-      const res = await this.$api.requested(this.param)
-      console.log(res.data,'是否重复')
-      this.repeats = res.data
-      this.total = res.total
-      this.$refs.form.validateField('projectname')
-      if (this.repeats.length > 0){
-        this.dialogTableVisible = true
-      }else {
-        this.dialogTableVisible = false
+      if (this.form.projectname !== ''){
+        this.param.content.sa_projectid = 0
+        this.param.content.where.condition = this.form.projectname
+        const res = await this.$api.requested(this.param)
+        console.log(res.data,'是否重复')
+        this.repeats = res.data
+        this.total = res.total
+        this.$refs.form.validateField('projectname')
+        if (this.repeats.length > 0){
+          this.dialogTableVisible = true
+        }else {
+          this.dialogTableVisible = false
+        }
       }
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/Form/projectChange/edit.vue

@@ -15,6 +15,7 @@
             <el-col :span="24">
               <el-form-item label="项目名称:" prop="projectname">
                 <el-input v-model="form.projectname" placeholder="请输入项目名称" @blur="nameChange(param.content.pageNumber = 1)" :disabled="flagTag != 0"></el-input>
+                <span style="color: red;font-size: 12px;margin-bottom: -10px" v-if="repeats.length > 0">疑似重复</span>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -319,7 +320,7 @@ export default {
       unitnameList:[],
       rules:{
         projectname:[
-          { required: true, validator:projectname, trigger: 'blur'},
+          { required: true, message: '请输入项目名称', trigger: 'blur'},
         ],
         /*projectnum:[
           { required: true, message: '输入项目编号', trigger: 'blur'}
@@ -494,6 +495,7 @@ export default {
           if (this.checkResults === 0){
             this.$emit('onSuccess')
             this.$refs['form'].resetFields();
+            this.repeats = []
             this.dialogFormVisible = false
             this.addChange = false
             this.checkResults = ''
@@ -517,6 +519,7 @@ export default {
       })
       this.$emit('onSuccess')
       this.$refs['form'].resetFields();
+      this.repeats = []
       this.dialogFormVisible = false
       this.checkResults = ''
     },
@@ -536,8 +539,10 @@ export default {
     },
     onClose(){
       this.$refs['form'].resetFields()
+      this.repeats = []
       this.dialogFormVisible = false
       this.$emit('onSuccess')
+      this.repeats = []
     },
     /*获取品牌*/
     async queryBrand(){
@@ -598,18 +603,21 @@ export default {
     },
     /*查询项目名称是否重复*/
     async nameChange(){
-      this.param.content.sa_projectid = this.$route.query.id
-      this.param.content.where.condition = this.form.projectname
-      const res = await this.$api.requested(this.param)
-      console.log(res.data,'是否重复')
-      this.repeats = res.data
-      this.total = res.total
-      this.$refs.form.validateField('projectname')
-      if (this.repeats.length > 0){
-        this.dialogTableVisible = true
-      }else {
-        this.dialogTableVisible = false
+      if (this.form.projectname !== ''){
+        this.param.content.sa_projectid = this.$route.query.id
+        this.param.content.where.condition = this.form.projectname
+        const res = await this.$api.requested(this.param)
+        console.log(res.data,'是否重复')
+        this.repeats = res.data
+        this.total = res.total
+        this.$refs.form.validateField('projectname')
+        if (this.repeats.length > 0){
+          this.dialogTableVisible = true
+        }else {
+          this.dialogTableVisible = false
+        }
       }
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/invoicePredictionManage/details/modules/order.vue

@@ -30,6 +30,12 @@
             <el-input size="mini" v-model="scope.column.data.invoiceamount" @change="onChange(scope.column.data.price,scope.$index,scope.column.data)"></el-input>
           </span>
         </div>
+        <div v-else-if="scope.column.columnname === 'unoutamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'uninvoiceamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
         <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
       <template v-slot:opreation="scope">
@@ -106,12 +112,12 @@ export default {
       const res = await this.$api.requested(this.param)
       console.log(res.data)
       this.list = res.data
-      if (this.isDisabled){
+      /*if (this.isDisabled){
         this.list.forEach(item=>{
           item.outamount = this.tool.formatAmount(item.outamount,2)
           item.invoiceamount = this.tool.formatAmount(item.invoiceamount,2)
         })
-      }
+      }*/
       if (this.list.length > 0){
         this.alloutamount = res.data[0].alloutamount
         this.allinvoiceamount = res.data[0].allinvoiceamount
@@ -261,9 +267,13 @@ export default {
     async onChange(val,index,data){
       if (data.outamount < 0){
         data.outamount = 0
+      }else if (data.outamount > Number(data.unoutamount)){
+        data.outamount = Number(data.unoutamount)
       }
       if (data.invoiceamount < 0){
         data.invoiceamount = 0
+      }else if (data.invoiceamount > Number(data.uninvoiceamount)){
+        data.invoiceamount = Number(data.uninvoiceamount)
       }
       const res = await this.$api.requested({
         "id": 20230705145204,

src/HDrpManagement/invoicePredictionManage/details/modules/orderDetail.vue

@@ -30,6 +30,12 @@
             <el-input size="mini" v-model="scope.column.data.invoiceamount" @change="onChange(scope.column.data.price,scope.$index,scope.column.data)"></el-input>
           </span>
         </div>
+        <div v-else-if="scope.column.columnname === 'unoutamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'uninvoiceamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
         <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
       <template v-slot:opreation="scope">
@@ -106,12 +112,12 @@ export default {
       const res = await this.$api.requested(this.param)
       console.log(res.data)
       this.list = res.data
-      if (this.isDisabled){
+     /* if (this.isDisabled){
         this.list.forEach(item=>{
           item.outamount = this.tool.formatAmount(item.outamount,2)
           item.invoiceamount = this.tool.formatAmount(item.invoiceamount,2)
         })
-      }
+      }*/
       if (this.list.length > 0){
         this.alloutamount = res.data[0].alloutamount
         this.allinvoiceamount = res.data[0].allinvoiceamount
@@ -261,9 +267,13 @@ export default {
     async onChange(val,index,data){
       if (data.outamount < 0){
         data.outamount = 0
+      }else if (data.outamount > Number(data.unoutamount)){
+        data.outamount = Number(data.unoutamount)
       }
       if (data.invoiceamount < 0){
         data.invoiceamount = 0
+      }else if (data.invoiceamount > Number(data.uninvoiceamount)){
+        data.invoiceamount = Number(data.uninvoiceamount)
       }
       const res = await this.$api.requested({
         "id": 20230705145204,

src/HDrpManagement/invoicePredictionManage/index.vue

@@ -48,7 +48,10 @@
         <p v-else-if="scope.data.column.columnname === 'period'">
           {{scope.data.column.data.periodstart + '至' + scope.data.column.data.periodend }}
         </p>
-        <p v-else-if="scope.data.column.columnname === 'projectamount'">
+        <p v-else-if="scope.data.column.columnname === 'orderinvoamount'">
+          {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
+        </p>
+        <p v-else-if="scope.data.column.columnname === 'orderoutamount'">
           {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
         </p>
         <p v-else>

src/HDrpManagement/projectPredictionManage/details/modules/projectList.vue

@@ -7,7 +7,7 @@
       <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="projectParam.content.where.condition?projectParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="projectParam.content.where.condition"
                  @keyup.native.enter="listData(projectParam.content.pageNumber = 1)" @clear="listData(projectParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
-      <tableList :height="'200px'" ref="projectRef" style="margin-top: 10px" :checkbox="true"  :layout="projectCols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
+      <tableList :height="'190px'" ref="projectRef" style="margin-top: 10px" :checkbox="true"  :layout="projectCols" :data="list" :opwidth="200" :custom="true"  fixedName="operation"
                  highlight-current-row @selectionChange="selectionChange" @rowClick="rowClick" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
@@ -53,7 +53,7 @@
           <span style="float: right;line-height: 40px;height:40px;font-size:13px;vertical-align: auto">折扣(%)：</span>
         </el-col>
       </el-row>
-      <tableList :height="'calc(100vh - 800px)'" style="margin-top: 10px" :checkbox="true"  :layout="productCols" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
+      <tableList :height="'calc(100vh - 720px)'" style="margin-top: 10px" :checkbox="true"  :layout="productCols" :data="productList" :opwidth="200" :custom="true"  fixedName="operation"
                  @selectionChange="selectionChangePro">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'operation'">
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import tableList from '@/components/table/index5'
+import tableList from '@/components/table/index6'
 import addProject from '@/template/prediction/addProjectTemp'
 import addProduct from '@/template/prediction/addProductTemp'
 export default {

src/HDrpManagement/projectPredictionManage/details/modules/projectListDetail.vue

@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import tableList from '@/components/table/index5'
+import tableList from '@/components/table/index6'
 import addProject from '@/template/prediction/addProjectTemp'
 import addProduct from '@/template/prediction/addProductTemp'
 export default {

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -17,7 +17,7 @@
       </div>
       <div slot="customOperation">
         <edit class="inline-16" :data="mainData" @onSuccess="queryMainData" v-if="tool.checkAuth($route.name,'update') && mainData.allocationstatus == '待分配'"/>
-        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution') && mainData.allocationstatus == '待分配'" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
+        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution') && mainData.allocationstatus == '待分配'" :status="mainData.status"  @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
         <recall class="inline-16" v-if="mainData.allocationstatus != '待分配' && mainData.status === '待跟进' || mainData.status === '跟进中' && mainData.isTeam !== '团队' && tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall>
       </div>
       <div slot="slot1" class="container normal-panel">

src/HManagement/clueManage/clue_private/modules/distobutionOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button type="primary" size="mini" @click="getMatchAgentList">分 配</el-button>
+    <el-button  size="mini" @click="getMatchAgentList" :type="status === '已过期'?'':'primary'" :disabled="status === '已过期'">分 配</el-button>
     <el-drawer title="匹配业务员" append-to-body :visible.sync="dialogTableVisible2" size="80%" top="30px" :show-close="false">
       <div class="container">
         <div class="flex-align-center flex-between">
@@ -28,6 +28,7 @@
 
 <script>
 export default {
+  props:["status"],
   data () {
     return{
       dialogTableVisible2:false,
@@ -98,7 +99,7 @@ export default {
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['distributionSalerTable'].tablecols
     this.tablecols2 = this.tool.tabelCol(this.$route.name)['canSelectSalerTable'].tablecols
-    
+
   }
 }
 
@@ -110,4 +111,4 @@ export default {
   color:#999;
   cursor: pointer;
 }
-</style>
+</style>

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
+    <el-button size="mini" :type="data.status === '已过期'?'':'primary'" @click="onShow" :disabled="data.status === '已过期'">编 辑</el-button>
     <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="800px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">

src/HManagement/clueManage/clue_public/index.vue

@@ -22,6 +22,13 @@
           </el-option>
         </el-select>
       </div>
+      <div class="label_center">
+        <p class="search__label">跟进状态:</p>
+        <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-option label="待跟进"  value="待跟进"></el-option>
+          <el-option label="已过期"  value="已过期"></el-option>
+        </el-select>
+      </div>
     </div>
       <div slot="titleRight" >
         <!-- <distribution class="inline-16" v-if="tool.checkAuth($route.name,'distribution')" @onSuccess="$refs.basicLayout.listData()"></distribution> -->

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -18,7 +18,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution')" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
+        <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution')" :status="mainData.status" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
         <!-- <recall v-if="tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall> -->
       </div>
       <div slot="slot1" class="container normal-panel">

src/HManagement/clueManage/clue_public/modules/distobutionOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button size="mini" @click="getMatchAgentList" type="primary">分 配</el-button>
+    <el-button size="mini" @click="getMatchAgentList" :type="status === '已过期'?'':'primary'" :disabled="status === '已过期'">分 配</el-button>
     <el-drawer title="匹配业务员" append-to-body :visible.sync="dialogTableVisible2"  :show-close="false" size="80%" top="30px">
       <div class="container">
         <div class="flex-align-center flex-between">
@@ -28,6 +28,7 @@
 
 <script>
 export default {
+  props:["status"],
   data () {
     return{
       dialogTableVisible2:false,
@@ -98,7 +99,7 @@ export default {
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['distributionSalerTable'].tablecols
     this.tablecols2 = this.tool.tabelCol(this.$route.name)['canSelectSalerTable'].tablecols
-    
+
   }
 }
 
@@ -110,4 +111,4 @@ export default {
   color:#999;
   cursor: pointer;
 }
-</style>
+</style>

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -102,12 +102,12 @@ export default {
       this.act_saler = scope.data
       this.selectRow.sales = [this.act_saler]
       console.log(this.selectRow);
-      
+
       this.dialogTableVisible2 = false
     },
     async onSubmit () {
       let arr = []
-      arr = this.list.filter(e=> e.sales.length > 0).map(e=> {
+      arr = this.list.filter(e=> e.sales.length === 1).map(e=> {
         console.log(e)
         return {sat_orderclueid:e.sat_orderclueid,hrid:e.sales[0].hrid}
       });
@@ -127,7 +127,7 @@ export default {
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['distributionSalerTable'].tablecols
     this.tablecols2 = this.tool.tabelCol(this.$route.name)['canSelectSalerTable'].tablecols
-    
+
   }
 }
 
@@ -139,4 +139,4 @@ export default {
   color:#999;
   cursor: pointer;
 }
-</style>
+</style>

src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
+    <el-button size="mini" :type="data.status === '已过期'?'':'primary'" @click="onShow" :disabled="data.status === '已过期'">编 辑</el-button>
     <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="800px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">

src/HManagement/clueManage/clue_rule/index.vue

@@ -3,11 +3,11 @@
     <setRule v-if="tool.checkAuth($route.name,'update')" ref="setRule">
       <!-- <el-button slot="save" type="warning" size="small" @click="onSave">保 存</el-button> -->
     </setRule>
-    <el-card class="box-card" style="margin:16px">
+<!--    <el-card class="box-card" style="margin:16px">
       <div slot="header" class="clearfix">
         <div class="my-tabs" >
           <el-tabs v-model="activeName" @tab-click="handleClick" type="card">
-            <!-- <el-tab-pane label="经销商目录" name="first"></el-tab-pane> -->
+            &lt;!&ndash; <el-tab-pane label="经销商目录" name="first"></el-tab-pane> &ndash;&gt;
             <el-tab-pane label="业务员目录" name="second"></el-tab-pane>
           </el-tabs>
         </div>
@@ -30,12 +30,12 @@
         </setSaler>
         <selectSaler ref="selectSaler" @onSuccess="onSalerSuccess"></selectSaler>
       </div>
-    </el-card>
+    </el-card>-->
+
+
 
 
 
-    
-    
   </div>
 </template>
 
@@ -90,4 +90,4 @@ export default {
   padding-left: 0 !important;
   font-size: 16px;
 }
-</style>
+</style>

src/HManagement/clueManage/clue_rule/modules/setRule.vue

@@ -5,7 +5,7 @@
     </div>
     <div style="overflow-x:hidden">
       <el-row :gutter="20">
-        <el-col :span="10">
+        <el-col :span="24">
           <el-card class="box-card" >
             <div slot="header" class="clearfix">
               <p class="font-16">分配规则</p>
@@ -30,7 +30,7 @@
             </div>
           </el-card>
         </el-col>
-        <el-col :span="14">
+        <el-col :span="24" style="margin-top: 40px">
           <el-card class="box-card" >
             <div slot="header" class="clearfix">
               <p class="font-16">到期规则</p>
@@ -99,7 +99,7 @@ export default {
           this.form.distributionbyagentaddress = 1
           this.form.distributionbyagentauthority = 0
           break;
-      
+
         default:
           this.form.distributionbyagentaddress = 0
           this.form.distributionbyagentauthority = 1
@@ -133,4 +133,4 @@ export default {
 /deep/.el-card__body {
   padding-bottom: 0;
 }
-</style>
+</style>

src/SDrpManagement/invoicePrediction/detail/orderDetail.vue

@@ -30,6 +30,12 @@
             <el-input size="mini" v-model="scope.column.data.invoiceamount" @change="onChange(scope.column.data.price,scope.$index,scope.column.data)"></el-input>
           </span>
         </div>
+        <div v-else-if="scope.column.columnname === 'unoutamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'uninvoiceamount'">
+          <span >¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
         <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
       <template v-slot:opreation="scope">
@@ -106,12 +112,12 @@ export default {
       const res = await this.$api.requested(this.param)
       console.log(res.data)
       this.list = res.data
-      if (this.isDisabled){
+      /*if (this.isDisabled){
         this.list.forEach(item=>{
           item.outamount = this.tool.formatAmount(item.outamount,2)
           item.invoiceamount = this.tool.formatAmount(item.invoiceamount,2)
         })
-      }
+      }*/
       if (this.list.length > 0){
         this.alloutamount = res.data[0].alloutamount
         this.allinvoiceamount = res.data[0].allinvoiceamount
@@ -261,9 +267,13 @@ export default {
     async onChange(val,index,data){
       if (data.outamount < 0){
         data.outamount = 0
+      }else if (data.outamount > Number(data.unoutamount)){
+        data.outamount = Number(data.unoutamount)
       }
       if (data.invoiceamount < 0){
         data.invoiceamount = 0
+      }else if (data.invoiceamount > Number(data.uninvoiceamount)){
+        data.invoiceamount = Number(data.uninvoiceamount)
       }
       const res = await this.$api.requested({
         "id": 20230705145204,

src/SDrpManagement/invoicePrediction/index.vue

@@ -48,7 +48,10 @@
         <p v-else-if="scope.data.column.columnname === 'period'">
           {{scope.data.column.data.periodstart + '至' + scope.data.column.data.periodend }}
         </p>
-        <p v-else-if="scope.data.column.columnname === 'projectamount'">
+        <p v-else-if="scope.data.column.columnname === 'orderinvoamount'">
+          {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
+        </p>
+        <p v-else-if="scope.data.column.columnname === 'orderoutamount'">
           {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
         </p>
         <p v-else>

src/SDrpManagement/projectPrediction/detail/projectListDetail.vue

@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import tableList from '@/components/table/index5'
+import tableList from '@/components/table/index6'
 import addProject from '@/template/prediction/addProjectTemp'
 import addProduct from '@/template/prediction/addProductTemp'
 export default {

src/components/newDetailTemp/index.vue

@@ -24,7 +24,7 @@
         </div>
       </el-col>
       <el-col :span="16">
-        <div style="margin:10px 10px 0 5px;border-radius:5px;position:relative;min-width: 1020px" class="container normal-panel sticky" >
+        <div style="margin:10px 10px 0 5px;border-radius:5px;position:relative;" class="container normal-panel sticky" >
           <slot name="bottomRight"></slot>
         </div>
         <div style="margin:10px 10px 0 5px;border-radius:5px;position:relative" class="container normal-panel sticky" >