公海线索、线索管理、通讯录、项目商机bug修复

src/Form/marketingExpenseMag/edit.vue

@@ -14,7 +14,7 @@
           <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('100px')" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item :label="$t(`业务员`)+':'" prop="hrid">
-                <popoverTable ref="salerRef"  :tablecols="tablecols" :param="salerParam" :placeholder="$t(`请选择业务员`)" :isInput="false" @rowClick="rowClick" height="calc(100vh - 300px)"></popoverTable>
+                <el-input v-model="form.name"  :placeholder="$t(`请输入备注内容`)" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -34,9 +34,11 @@
 </template>
 
 <script>
+import popoverTable from '@/template/popoverTable/index'
 export default {
   name: "edit",
   props:['data'],
+  components:{popoverTable},
   data(){
     return {
       dialogFormVisible:false,

src/HDrpManagement/collectionRule/components/edit.vue

@@ -98,6 +98,7 @@ export default {
     editBtn () {
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
+      console.log(this.form,'form11222')
       this.auditList = this.data.accountingnodes.ordercheck
       this.shipmentList = this.data.accountingnodes.logisticscheck
       this.invoiceList = this.data.accountingnodes.invoiceapplycheck
@@ -105,17 +106,8 @@ export default {
       this.shipmentIsUsed = this.shipmentList?this.shipmentList.length>0?'1':'0':'0'
       this.invoiceIsUsed = this.invoiceList?this.invoiceList.length>0?'1':'0':'0'
       this.$nextTick(()=>{
-        this.auditList.forEach(item=>{
-          item.amountrate = Math.round((item.amountrate * 100)*100)/100
-        })
         this.$refs.audit.list = this.auditList
-        this.shipmentList.forEach(item=>{
-          item.amountrate = Math.round((item.amountrate * 100)*100)/100
-        })
         this.$refs.shipment.list = this.shipmentList
-        this.invoiceList.forEach(item=>{
-          item.amountrate = Math.round((item.amountrate * 100)*100)/100
-        })
         this.$refs.invoice.list = this.invoiceList
       })
 

src/HDrpManagement/collectionRule/components/setInfo.vue

@@ -5,7 +5,7 @@
       <el-input type="number" style="width: 100px" v-model="item.days" :placeholder="$t(`请输入`)"></el-input>
       <span style="margin-left: 5px">{{$t(`天`)}}</span>
       <span style="margin-left: 20px">{{$t(`立账额度`)}}：</span>
-<!--      <el-input type="number" style="width: 100px" v-model="item.amountrate" :placeholder="$t(`请输入`)" :class="{ 'is-error': isErrorInvoiceapply }"  @change="checkAmountrate"></el-input>-->
+      <el-input type="number" style="width: 100px" v-model="item.amountrate" :placeholder="$t(`请输入`)" :class="{ 'is-error': isErrorInvoiceapply }"  @change="checkAmountrate"></el-input>
       <span style="margin-left: 5px">%</span>
       <el-checkbox style="margin-left: 20px" v-model="item.iswarranty" true-label="1" false-label="0" >{{$t(`质保金`)}}</el-checkbox>
       <el-button v-if="index === list.length -1" type="text" icon="el-icon-plus" style="margin-left: 10px" @click="addList"></el-button>

src/HDrpManagement/collectionRule/components/tableColumn.vue

@@ -3,7 +3,7 @@
     <div v-if="data.length > 0">
       <div v-for="(item,index) in data" :key="index">
         <div v-if="name === 'amountrate'">
-          <span>{{Math.round((item.amountrate * 100)*100)/100}}%</span>
+          <span>{{item.amountrate}}%</span>
           <div class="remarks-style-line" v-if="index !== data.length -1"></div>
         </div>
         <div v-else-if="name === 'days'">

src/HDrpManagement/collectionRule/index.vue

@@ -90,13 +90,19 @@ export default {
       this.list.forEach(item=>{
         if (item.accountingnodes){
           if (item.accountingnodes.ordercheck && item.accountingnodes.ordercheck.length > 0){
-            item.accountingnodes.ordercheck.amountrate = Math.round((item.accountingnodes.ordercheck.amountrate * 100)*100)/100
+            item.accountingnodes.ordercheck.forEach(item=>{
+              item.amountrate =  Math.round(( item.amountrate * 100)*100)/100
+            })
           }
           if (item.accountingnodes.logisticscheck && item.accountingnodes.logisticscheck.length > 0){
-            item.accountingnodes.logisticscheck.amountrate = Math.round((item.accountingnodes.logisticscheck.amountrate * 100)*100)/100
+            item.accountingnodes.logisticscheck.forEach(item=>{
+              item.amountrate =  Math.round(( item.amountrate * 100)*100)/100
+            })
           }
           if (item.accountingnodes.invoiceapplycheck && item.accountingnodes.invoiceapplycheck.length>0){
-            item.accountingnodes.invoiceapplycheck.amountrate = Math.round((item.accountingnodes.invoiceapplycheck.amountrate * 100)*100)/100
+            item.accountingnodes.invoiceapplycheck.forEach(item=>{
+              item.amountrate =  Math.round(( item.amountrate * 100)*100)/100
+            })
           }
         }
       })

src/HDrpManagement/publicCustomer/index.vue

@@ -271,7 +271,7 @@ export default {
           }
       },
     })
-      this.publicList = res.data
+      this.option.poolList = res.data
     },
     /* 获取省市县 */
     async query_arealist() {
@@ -425,7 +425,7 @@ export default {
   },
   created() {
     this.getSysOption()
-    this.getPublicList()
+    // this.getPublicList()
     this.query_arealist()
     this.typeList()
     this.gradeList()

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

@@ -7,7 +7,7 @@
           <p class="normal-margin">{{ $t('总共') }}:&nbsp;{{total2}}{{ $t('条') }}</p>
           <el-input class="normal-margin" size="small" prefix-icon="el-icon-search" style="width:180px" v-model="searchValue" :placeholder="$t(`输入搜索关键词`)" clearable @clear="(search = '',getMatchAgentList(selectRow))" @keyup.native.enter="getMatchAgentList(selectRow)"></el-input>
         </div>
-        <tableLayout :layout="tablecols2" :data="agentlist" :custom="true" :height="tableHieght">
+        <tableLayout :layout="tablecols2" :data="agentlist" :custom="true" :height="tableHieght" fixedName="operation">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'ismatch'">
               <p :style="scope.column.data.ismatch === 1?'color:#52c41a':''">{{scope.column.data.ismatch === 1?$t('是'):$t('否')}}</p>

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

@@ -7,7 +7,7 @@
           <p class="normal-margin">{{ $t('总共') }}:&nbsp;{{total2}}{{ $t('条') }}</p>
           <el-input class="normal-margin" size="small" prefix-icon="el-icon-search" style="width:180px" v-model="searchValue" :placeholder="$t(`输入搜索关键词`)" clearable @clear="(search = '',getMatchAgentList(selectRow))" @keyup.native.enter="getMatchAgentList(selectRow)"></el-input>
         </div>
-        <tableLayout :layout="tablecols2" :data="agentlist" :custom="true" :height="tableHieght">
+        <tableLayout :layout="tablecols2" :data="agentlist" :custom="true" :height="tableHieght" fixedName="operation">
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'ismatch'">
               <p :style="scope.column.data.ismatch === 1?'color:#52c41a':''">{{scope.column.data.ismatch === 1?$t('是'):$t('否')}}</p>

src/SDrpManagement/myaccountclass/index.vue

@@ -7,19 +7,19 @@
           <el-row :gutter="20">
             <el-col v-for="(item,index) in acountlist" :key="index" :span="6" class="mt-10" @click.native="handleClick(index)">
               <div class="acccounet__panel" :style="activeName == index?{border:'1px solid #d8dde8'}:''">
-                <p class="normal-margin" v-if="usertype == '1'">{{item.hraccountname}}</p>
-                <p class="normal-margin" v-else>{{item.accountname}}</p>
+                <p class="normal-margin" v-if="usertype == '1'">{{$t(item.hraccountname)}}</p>
+                <p class="normal-margin" v-else>{{$t(item.accountname)}}</p>
                 <p class="normal-title" style="font-size:29px" :style="activeName == index?{color:'#3874f6'}:''"><small>¥</small>&nbsp;{{tool.formatAmount(item.balance,2)}}</p>
                 <div class="score">
-                  <p style="margin-top:16px" v-if="usertype == '1'">预计金额:{{item.expectedReward}}</p>
-                  <p style="margin-top:16px" v-else>信用额度:{{item.creditquota}}</p>
+                  <p style="margin-top:16px" v-if="usertype == '1'">{{$t(`预计金额`)}}:{{item.expectedReward}}</p>
+                  <p style="margin-top:16px" v-else>{{$t(`信用额度`)}}:{{item.creditquota}}</p>
                 </div>
               </div>
             </el-col>
           </el-row>
           <template>
             <div  class="mt-10" style="float: left">
-              <label class="search__label">审核时间:</label>
+              <label class="search__label">{{$t(`审核时间`)}}:</label>
               <el-date-picker
                   style="margin-right: 24px !important;"
                   size="small"

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -8,6 +8,7 @@
       :mainAreaData="mainAreaData"
       turnPageId="20221012164402"
       idname="sa_customersid"
+      ownertable="sa_customers"
       tags=""
       :disabled="mainData.status == '已终止'"
       typeTask="我的客户"

src/components/normal-basic-layout-new/details/modules/followUp/followUp.vue

@@ -175,7 +175,7 @@
                 <span style="font-size: 14px;color: #3874F6;margin-left: 5px;vertical-align: middle">{{$t(`评论`)}}({{i.commentqty}})</span></el-button>
             </div>
             <div>
-              <marketingExpenses  v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
+              <marketingExpenses  v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"  class="inline-16" :ownertable="ownertable" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
               <el-popconfirm
                   :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -175,7 +175,7 @@
                 <span style="font-size: 14px;color: #3874F6;margin-left: 5px;vertical-align: middle">{{$t(`评论`)}}({{i.commentqty}})</span></el-button>
             </div>
             <div>
-              <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail') && !disabled"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
+              <marketingExpenses  v-if="($route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail') && !disabled"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess" :ownertable="ownertable"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid && !disabled" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
               <el-popconfirm
                   :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"

src/views/salesData/components/accountBalanceDetail.vue

@@ -39,7 +39,7 @@
               </el-select>
             </div>
             <span class="search__label">{{$t('搜索') + ':' }}</span>
-            <el-input style="width:200px;!important;" :placeholder="$t(`搜索企业、省市县、法人`)" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+            <el-input style="width:200px;!important;" :placeholder="$t(`搜索企业、省市县、法人`)" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.type,param.content.dataid,param.content.enddate,param.content.pageNUmber = 1)" @clear="listData(param.content.type,param.content.dataid,param.content.enddate,param.content.pageNUmber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
             </el-input>
           </div>
           <div style="float: right">

src/views/salesData/components/balanceDetail.vue

@@ -24,11 +24,14 @@
               </span>
               <span v-else>--</span>
             </p>
-            <p v-else-if="scope.column.columnname === 'balance'">
-              {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
+            <p v-else-if="scope.column.columnname === 'type'">
+              {{scope.column.data[scope.column.columnname] == '1'?'收入':'支出'}}
             </p>
-            <p v-else-if="scope.column.columnname === 'creditquota'">
-              {{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}
+            <p v-else-if="scope.column.columnname === 'amount'">
+              {{tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥')}}
+            </p>
+            <p v-else-if="scope.column.columnname === 'unwriteoffamount'">
+              {{tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥')}}
             </p>
             <p v-else>{{scope.column.data[scope.column.columnname]?$t(scope.column.data[scope.column.columnname]):'--'}}</p>
           </template>