bug修复

src/HDrpManagement/contractManage/components/taskTarget/taskTarget.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="normal-panel">
     <div class="flex-align-center" style="margin-bottom:10px">
-      <el-date-picker
+<!--      <el-date-picker
           class="inline-16"
           :clearable=false
           v-model="year"
@@ -10,7 +10,7 @@
           placeholder="选择年"
           value-format="yyyy"
           @change="queryData">
-      </el-date-picker>
+      </el-date-picker>-->
       <slot name="addTarget" :data="year"/>
     </div>
     <el-table
@@ -18,6 +18,13 @@
         style="width: 100%"
         height="calc(100vh - 182px)"
         size="small">
+      <el-table-column label="年度">
+
+        <template slot-scope="scope">
+          <p class="center d-text">{{scope.row.year}}</p>
+        </template>
+
+      </el-table-column>
       <el-table-column label="年度(万元)">
         <el-table-column
             prop="y1l"
@@ -373,7 +380,7 @@ export default {
       val == '' && this.queryData()
     },
     async queryData () {
-      this.param.content.where.year = this.year
+      /*this.param.content.where.year = this.year*/
       this.param.content.sa_contractid = this.$route.query.id
       this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
       /*this.param.content.where.condition = this.condition*/

src/HDrpManagement/publicCustomer/index.vue

@@ -7,10 +7,14 @@
       idName="sa_customersid" 
       :apiId="{query:20221011133602,del:''}"
       :options="options"
+      @checkboxCallBack="checkboxCallBack"
       :detailPath="{
         path:'/PublicCustomerDetail'
       }"
       >
+      <template #titleLight>
+        <el-button :type="selectCustomer.length === 0?'':'primary'" :disabled="selectCustomer.length === 0"  size="small" v-if="tool.checkAuth($route.name,'deletePublic')" @click="deleteData" class="inline-16">删 除</el-button>
+      </template>
       <template #titleRight>
         <importCustomer style="margin-left:10px" @onSuccess="onSuccess" v-if="tool.checkAuth($route.name,'import')"></importCustomer>
       </template>
@@ -164,7 +168,8 @@ export default {
         startdate: "",
         enddate: ""
       },
-      dateSelect:''
+      dateSelect:'',
+      selectCustomer:[]
     }
   },
   provide () {
@@ -294,6 +299,38 @@ export default {
     },
     onSuccess(){
       this.$refs.basicLayout.listData()
+    },
+    /*选择的客户*/
+    checkboxCallBack(val){
+      this.selectCustomer = []
+      val.forEach((item,index)=>{
+        this.selectCustomer[index] = item.sa_customersid
+      })
+    },
+    /*删除客户*/
+    deleteData(){
+      this.$confirm('是否确认彻底删除数据，一旦删除，无法恢复?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal:false,
+        type: 'warning'
+      }).then(async() => {
+        const res = await this.$api.requested({
+          "id": 20230103131204,
+          "content": {
+            "sys_object": 2,//1-线索,2-客户,3-合同,4-项目商机,5-报价单
+            "ownerids": this.selectCustomer
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$refs.basicLayout.listData()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     }
   },
   created() {

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -24,9 +24,10 @@
         <div class="inline-16" v-if="tool.checkAuth($route.name,'distribution') && length === 0">
           <distribution  :data="mainData"  @setSuccess="onSuccess"></distribution>
         </div>
-        <div class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')">
+<!--        <div class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')">
           <to_void  :id="mainData.sa_customersid"  @toVoidSuccess="onSuccess"></to_void>
-        </div>
+        </div>-->
+        <el-button  type="primary" size="small" v-if="tool.checkAuth($route.name,'deletePublic')" @click="deleteData" class="inline-16">删 除</el-button>
       </div>
       <div slot="slot0" >
         <detailed :data="mainData" ref="detailed"></detailed>
@@ -249,6 +250,31 @@ export default {
     },
     receiveSuccess(){
       this.$store.dispatch('changeDetailDrawer',false)
+    },
+    /*删除客户*/
+    deleteData(){
+      this.$confirm('是否确认彻底删除数据，一旦删除，无法恢复?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal:false,
+        type: 'warning'
+      }).then(async() => {
+        const res = await this.$api.requested({
+          "id": 20230103131204,
+          "content": {
+            "sys_object": 2,//1-线索,2-客户,3-合同,4-项目商机,5-报价单
+            "ownerids": [this.mainData.sa_customersid]
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$store.dispatch('changeDetailDrawer',false)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
     }
   },
   mounted () {

src/SDrpManagement/QuotedPrice/components/edit/quotedPriceProduct.vue

@@ -116,7 +116,7 @@
             fixed="right"
             width="180">
           <template slot-scope="scope">
-            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index,scope.row.orderaddqty)"></el-input-number>
+            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -133,12 +133,7 @@
             fixed="right"
             width="100">
           <template slot-scope="scope">
-            <div v-if="scope.row.discountDifferenceAmount > 0">
-              <el-input :style="[setTopColor]" v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
-            </div>
-            <div v-else-if="scope.row.discountDifferenceAmount < 0">
-              <el-input :style="[setDownColor]" v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
-            </div>
+            <el-input  v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -259,13 +254,13 @@ export default {
       this.total = res.total
       this.totalPrice = 0
       for (var i=0 ;i<res.data.length;i++){
-        this.list[i].discountrate = res.data[i].discountrate * 100
-        this.list[i].mindiscountrate = res.data[i].mindiscountrate * 100
-        this.list[i].price = res.data[i].price.toFixed(2)
-        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
+        this.list[i].mindiscountrate = Math.round((res.data[i].mindiscountrate * 100) * 100)/100
+        this.list[i].price = Math.round(res.data[i].price * 100)/100
+        this.list[i].discountDifferenceAmount = Math.round(res.data[i].discountDifferenceAmount * 100)/100
         this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
-      this.totalPrice = this.totalPrice.toFixed(2)
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     handleSizeChange(val) {
@@ -309,28 +304,30 @@ export default {
       this.$refs.quoterPrice.queryProduct(sa_quotedpriceid,type)
       this.$refs.quoterPriceProject.queryProduct(sa_quotedpriceid,type)
     },
-    onChangeNum (val,data,index,step) {
-      data.amount = val * data.price
-      data.discountDifferenceAmount = (data.marketprice * (data.mindiscountrate/100) - data.marketprice * (data.discountrate/100))
+    onChangeNum (val,data,index) {
+      data.qty = Math.round(val *100)/100
+      data.amount = Math.round((data.qty * data.price) * 100)/100
+      data.discountDifferenceAmount = Math.round((data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
       if (val > 100){
         data.discountrate = 100
-        val = 100
-      }else if (val <= 10){
-        data.discountrate = 10
-        val = 10
+      }else if (val <= 0){
+        data.discountrate = 1
+      }else {
+        data.discountrate = Math.round(val * 100)/100
       }
-      data.price = data.marketprice * (val / 100)
-      data.amount = (data.qty * data.price).toFixed(2)
-      data.discountDifferenceAmount = (data.discountrate - data.mindiscountrate)/100 * data.marketprice
+      data.price = Math.round((data.marketprice * (data.discountrate / 100)) *100)/100
+      data.amount = Math.round((data.qty * data.price)*100)/100
+      data.discountDifferenceAmount =  Math.round(( data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
       if (data.discountDifferenceAmount < 0){
         data.specialoffer =1
       }
@@ -339,23 +336,30 @@ export default {
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     onChangePrice(val,data,index){
+      data.specialoffer = 0
       if (val > data.marketprice) {
         data.price = data.marketprice
-        val = data.marketprice
-      }else if (val < 0){
-        data.price = data.marketprice * 0.1
-        val = data.marketprice * 0.1
+      }else if (val < data.marketprice * 0.01){
+        data.price = data.marketprice * 0.01
+      }else {
+        data.price = Math.round(data.price * 100)/100
+      }
+      data.discountrate = Math.round(((data.price / data.marketprice) * 100) *100)/100
+      data.discountDifferenceAmount =  Math.round(( data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
+      data.amount = Math.round((data.qty * data.price)*100)/100
+      if (data.discountDifferenceAmount < 0){
+        data.specialoffer =1
       }
-      data.discountrate = ((val / data.marketprice) * 100).toFixed(2)
-      data.amount = (data.qty * data.price).toFixed(2)
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     objSet(data){

src/SDrpManagement/QuotedPrice/components/quotedPriceProduct.vue

@@ -116,7 +116,7 @@
             fixed="right"
             width="180">
           <template slot-scope="scope">
-            <el-input-number  v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index,scope.row.orderaddqty)"></el-input-number>
+            <el-input-number  v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
@@ -263,9 +263,14 @@ export default {
       this.total = res.total
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
-        this.list[i].discountrate = this.list[i].discountrate * 100
-        this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
+        this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
+        this.list[i].mindiscountrate = Math.round((res.data[i].mindiscountrate * 100) * 100)/100
+        this.list[i].price = Math.round(res.data[i].price * 100)/100
+        this.list[i].discountDifferenceAmount = Math.round(res.data[i].discountDifferenceAmount * 100)/100
+        this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
+      this.$emit('productData',this.list)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -318,27 +323,30 @@ export default {
       btntype === 'project'?this.$refs.quoterPriceProject.queryProduct(sa_quotedpriceid,type):this.$refs.quoterPrice.queryProduct(sa_quotedpriceid,type)
 
     },
-    onChangeNum (val,data,index,step) {
-      data.amount = val * data.price
+    onChangeNum (val,data,index) {
+      data.qty = Math.round(val *100)/100
+      data.amount = Math.round((data.qty * data.price) * 100)/100
+      data.discountDifferenceAmount = Math.round((data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
       if (val > 100){
         data.discountrate = 100
-        val = 100
-      }else if (val <= 10){
-        data.discountrate = 10
-        val = 10
+      }else if (val <= 0){
+        data.discountrate = 1
+      }else {
+        data.discountrate = Math.round(val * 100)/100
       }
-      data.price = data.marketprice * (val / 100)
-      data.amount = (data.qty * data.price).toFixed(2)
-      data.discountDifferenceAmount = (data.discountrate - (data.mindiscountrate * 100))/100 * data.marketprice
+      data.price = Math.round((data.marketprice * (data.discountrate / 100)) *100)/100
+      data.amount = Math.round((data.qty * data.price)*100)/100
+      data.discountDifferenceAmount =  Math.round(( data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
       if (data.discountDifferenceAmount < 0){
         data.specialoffer =1
       }
@@ -347,23 +355,30 @@ export default {
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     onChangePrice(val,data,index){
+      data.specialoffer = 0
       if (val > data.marketprice) {
         data.price = data.marketprice
-        val = data.marketprice
-      }else if (val < 0){
-        data.price = data.marketprice * 0.1
-        val = data.marketprice * 0.1
+      }else if (val < data.marketprice * 0.01){
+        data.price = data.marketprice * 0.01
+      }else {
+        data.price = Math.round(data.price * 100)/100
+      }
+      data.discountrate = Math.round(((data.price / data.marketprice) * 100) *100)/100
+      data.discountDifferenceAmount =  Math.round(( data.marketprice * (data.discountrate/100) - data.marketprice * (data.mindiscountrate/100)) * 100)/100
+      data.amount = Math.round((data.qty * data.price)*100)/100
+      if (data.discountDifferenceAmount < 0){
+        data.specialoffer =1
       }
-      data.discountrate = ((val / data.marketprice) * 100).toFixed(2)
-      data.amount = data.qty * data.price
       this.$set(this.list,index,data)
       this.totalPrice = 0
       for (var i=0 ;i<this.list.length;i++){
         this.totalPrice = this.totalPrice + this.list[i].qty * this.list[i].price
       }
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
     },
     objSet(data){

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -179,6 +179,10 @@ export default {
             
           }
         },
+        {
+          label:'是否特价',
+          value:this.mainData.specialoffer === 1?'是':'否'
+        },
         /*{
           label:'邮箱',
           value:this.mainData.email

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

@@ -14,6 +14,7 @@
         <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
         <el-descriptions-item label="状态">{{ basic.status?basic.status:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="是否特价">{{ basic.specialoffer === 1?'是':'否' }}</el-descriptions-item>
       </el-descriptions>
     </div>
 

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

@@ -261,13 +261,13 @@ export default {
       this.total = res.total
       this.totalPrice = 0
       for (var i=0 ;i<res.data.length;i++){
-        this.list[i].discountrate = (res.data[i].discountrate * 100).toFixed(2)
-        this.list[i].mindiscountrate = (res.data[i].mindiscountrate * 100).toFixed(2)
-        this.list[i].price = res.data[i].price.toFixed(2)
-        this.list[i].discountDifferenceAmount = res.data[i].discountDifferenceAmount.toFixed(2)
+        this.list[i].discountrate = Math.round((res.data[i].discountrate * 100)*100)/100
+        this.list[i].mindiscountrate = Math.round((res.data[i].mindiscountrate * 100) * 100)/100
+        this.list[i].price = Math.round(res.data[i].price * 100)/100
+        this.list[i].discountDifferenceAmount = Math.round(res.data[i].discountDifferenceAmount * 100)/100
         this.totalPrice = this.totalPrice + res.data[i].qty * res.data[i].price
       }
-      this.totalPrice = this.totalPrice.toFixed(2)
+      this.totalPrice = Math.round(this.totalPrice * 100)/100
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SDrpManagement/salerPrivatecustomer/detail/modules/addressManage/list.vue

@@ -2,7 +2,7 @@
   <div>
     
     <div class="flex-align-center normal-margin">
-      <add class="inline-16" :data="data" @insertSuccess="onSuccess" v-if="tool.checkAuth($route.name,'customerAddressManage') && data.disable"></add>
+      <add class="inline-16" :data="data" @insertSuccess="onSuccess" v-if="tool.checkAuth($route.name,'customerAddressManage') && data.disabled"></add>
       <el-input
           style="width:300px"
           placeholder="请输入内容"
@@ -22,8 +22,8 @@
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-        <edit  :data="scope.data" @updateSuccess="onSuccess" :disable="data.disable"></edit>
-        <toVoid  :data="scope.data" @toVoidSuccess="onSuccess" :disable="data.disable"></toVoid>
+        <edit  :data="scope.data" @updateSuccess="onSuccess" :disable="data.disabled"></edit>
+        <toVoid  :data="scope.data" @toVoidSuccess="onSuccess" :disable="data.disabled"></toVoid>
       </template>
     </tableLayout>
     <div style="margin-top:16px;text-align:right">

src/SDrpManagement/salerPrivatecustomer/detail/modules/addressManage/modules/toVoid.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="inline-16">
     <el-popconfirm
-        title="确定要作废该客户地址嘛？"
-        @confirm="toVoidRow()">
-      <el-button slot="reference" size="small" type="text" :disabled="!tool.checkAuth($route.name,'customerAddressManage') || !disable">作 废</el-button>
+        title="确定要删除该客户地址嘛？"
+        @confirm="onSubmit()">
+      <el-button slot="reference" size="small" type="text" :disabled="!tool.checkAuth($route.name,'customerAddressManage') || !disable">删 除</el-button>
     </el-popconfirm>
     <el-dialog
         :visible.sync="dialogToVoidVisible"
@@ -58,18 +58,17 @@ export default {
       this.form.sys_enterpriseid = this.data.sys_enterpriseid
       this.form.contactsid = this.data.contactsid
     },
-    onSubmit(){
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": "20221018145502",
-          "content": this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$emit("toVoidSuccess")
-          this.$refs['form'].resetFields()
-          this.dialogToVoidVisible = false
-        })
+    async onSubmit(){
+      this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      this.form.contactsid = this.data.contactsid
+      const res = await this.$api.requested({
+        "id": "20221018145502",
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit("toVoidSuccess")
+        this.$refs['form'].resetFields()
+        this.dialogToVoidVisible = false
       })
     }
   }

src/SManagement/orderclue_detail/index.vue

@@ -24,7 +24,7 @@
           v-if="userInfo.isAuth == 1 ? mainData.status == '待跟进' || mainData.status == '跟进中' : ''"></move> -->
         <changeProject v-if="mainData.isproject == 0 && tool.checkAuth($route.name,'changeProject')" :data="mainData" :disabled="!isHandle" class="inline-16"/>
         <changeCustomer v-if="mainData.iscustomer == 0 && tool.checkAuth($route.name,'changeCutomer')" :data="mainData" :disabled="!isHandle" class="inline-16" @onChangeCustomer="onChangeCustomer"></changeCustomer>
-        <el-button :type="!isHandle?'':'primary'" v-if="tool.checkAuth($route.name,'goBack') && mainData.status != '已转化'" :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
+        <el-button :type="!isHandle?'':'primary'" v-if="tool.checkAuth($route.name,'goBack') && mainData.status != '已转化' && mainData.isprivate !== 1" :disabled="!isHandle" class="inline-16" size="mini" @click="goBack">退 回</el-button>
         <noNull v-if="tool.checkAuth($route.name,'change') && mainData.status != '已转化'" class="inline-16" :disabled="!isHandle" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid"/>
         <Del v-if="tool.checkAuth($route.name,'delete') && mainData.status != '已转化'" class="inline-16" :disabled="!isHandle" :idName="20221123193702" @onSuccess="$store.dispatch('changeDetailDrawer',false);$router.replace('/orderclue')" :id="mainData.sat_orderclueid" idKey="sat_orderclueids"/>
       </div>

src/SManagement/project_target/modules/detailInfo.vue

@@ -49,7 +49,8 @@
                 placeholder="选择月"
                 :picker-options="pickerOptions">
             </el-date-picker>
-            <p v-else>{{scope.column.data.point > 10?scope.column.data.year + '-' + scope.column.data.point:scope.column.data.year + '-0' + scope.column.data.point}}</p>
+            <p v-else-if="scope.column.data.point !== 0">{{scope.column.data.point >= 10?scope.column.data.year + '-' + scope.column.data.point:scope.column.data.year + '-0' + scope.column.data.point}}</p>
+            <p v-else>--</p>
           </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
@@ -62,10 +63,10 @@
       </tableLayout>
       <div>
         <div  class="container normal-panel" style="text-align:right">
-          <div style="float: left">
+<!--          <div style="float: left">
             <label class="search__label">项目总数：</label>
-            {{total}}</div>
-          <div style="float: left;margin-left: 20px">
+            {{total}}</div>-->
+          <div style="float: left;margin-left: -40px">
             <label class="search__label" style="width: 160px">项目基本目标(万元)：</label>{{target_l}}</div>
           <div style="float: left;margin-left: 20px" ><label class="search__label" style="width: 160px">项目挑战目标(万元)：</label>{{target_h}}</div>
           <el-pagination

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

@@ -12,11 +12,12 @@
               </div>
             </div>
             <div style="margin:0 8px"></div>
-            <slot name="titleLight"></slot>
+
             <div class="flex-align-center">
               <div v-if="oldFormPath || formPath">
                 <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               </div>
+              <slot name="titleLight"></slot>
               <el-button-group v-if="tool.checkAuth($route.name,'delete')" class="inline-16">
                 <el-button :type="selection.length === 0?'':'primary'" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
               </el-button-group>