bug修复

src/Form/projectChange/edit.vue

@@ -79,7 +79,7 @@
                 <el-date-picker
                     style="width: 100%"
                     v-model="form.signdate_due"
-                    type="date"
+                    type="month"
                     placeholder="选择月份"
                     @change="timeChange">
                 </el-date-picker>

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -22,11 +22,13 @@
             ></previewImage>
           </div>
           <div v-else-if="scope.column.columnname == 'discountrate'">
-            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @input="discountrateChange($event,scope.column.data)"></el-input>
+<!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @input="discountrateChange($event,scope.column.data)"></el-input>-->
+            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.discountrate" @change="discountrateChange($event,scope.column.data)"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
-            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @input="priceChange($event,scope.column.data)"></el-input>
+<!--            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @input="priceChange($event,scope.column.data)"></el-input>-->
+            <el-input size="mini" v-if="editIndex == scope.column.data.sa_contract_itemsid" v-model="form.price" @change="priceChange($event,scope.column.data)"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'countPrice'">
@@ -103,6 +105,9 @@ export default {
     async listData(){
       this.params.content.sa_contractid = this.$route.query.id
       const res = await this.$api.requested(this.params)
+      res.data.forEach((e,index)=>{
+        res.data[index].discountrate = Math.round((e.discountrate * 100)*100)/100
+      })
       this.list = res.data
       this.total = res.total
       this.$emit('priceChange')
@@ -117,16 +122,29 @@ export default {
       
     },
     discountrateChange (num,data) {
-      this.form.discountrate = num      
-      this.form.price = this.form.discountrate / 100 * data.marketprice
+      if (num > 100){
+        this.form.discountrate = 100
+      }else if (num < 1){
+        this.form.discountrate = 1
+      }else {
+        this.form.discountrate = Math.round(num*100)/100
+      }
+      this.form.price = Math.round((this.form.discountrate / 100 * data.marketprice) *100)/100
     },
     priceChange (num,data) {
-      this.form.price = num
-      this.form.discountrate = this.form.price / data.marketprice * 100
+      if (num > data.marketprice){
+        this.form.price = data.marketprice
+      }else if (num < data.marketprice * 0.01){
+        this.form.price = data.marketprice * 0.01
+      }else {
+        this.form.price = Math.round(num*100)/100
+      }
+      this.form.discountrate = Math.round((this.form.price / data.marketprice * 100)*100)/100
       console.log(this.form.price,data.marketprice);
       
     },
     async save () {
+      this.form.discountrate = (this.form.discountrate/100).toFixed(4)
       let res = await this.$api.requested({
         "id": 20221122200302,
         "content": {

src/HDrpManagement/contractManage/index.vue

@@ -71,7 +71,7 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#000000" v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -294,7 +294,7 @@ export default {
                 case '新建':
                   style = {color:'#3874f6'}
                   break;
-                case '提交':
+                case '已提交':
                   style = {color:'#52c41a'}
                   break;
                 case '审核':
@@ -369,7 +369,7 @@ export default {
                 case '新建':
                   style = {color:'#3874f6'}
                   break;
-                case '提交':
+                case '已提交':
                   style = {color:'#52c41a'}
                   break;
                 case '审核':
@@ -414,7 +414,7 @@ export default {
           },
           {
             label:'折扣(%)',
-            value:this.mainData.discountrate * 100
+            value:Math.round((this.mainData.discountrate * 100)*100)/100
           },
           {
             label:'合同有效期',
@@ -445,7 +445,7 @@ export default {
                 case '新建':
                   style = {color:'#3874f6'}
                   break;
-                case '提交':
+                case '已提交':
                   style = {color:'#52c41a'}
                   break;
                 case '审核':
@@ -517,7 +517,7 @@ export default {
                 case '新建':
                   style = {color:'#3874f6'}
                   break;
-                case '提交':
+                case '已提交':
                   style = {color:'#52c41a'}
                   break;
                 case '审核':
@@ -577,7 +577,7 @@ export default {
           },
           {
             label:this.mainData.calculatemodel == 1 ? '订单金额比例(%)' : '产品折扣(%)',
-            value:this.mainData.calculatemodel == 1 ? this.mainData.orderratio * 100 : this.mainData.productdiscount *100
+            value:this.mainData.calculatemodel == 1 ? Math.round((this.mainData.orderratio * 100)*100)/100 : Math.round((this.mainData.productdiscount *100)*100)/100
           },
           {
             label:'创建时间',
@@ -596,7 +596,7 @@ export default {
                 case '新建':
                   style = {color:'#3874f6'}
                   break;
-                case '提交':
+                case '已提交':
                   style = {color:'#52c41a'}
                   break;
                 case '审核':
@@ -668,7 +668,7 @@ export default {
                         case '新建':
                           style = {color:'#3874f6'}
                           break;
-                        case '提交':
+                        case '已提交':
                           style = {color:'#52c41a'}
                           break;
                         case '审核':
@@ -749,7 +749,7 @@ export default {
                         case '新建':
                           style = {color:'#3874f6'}
                           break;
-                        case '提交':
+                        case '已提交':
                           style = {color:'#52c41a'}
                           break;
                         case '审核':
@@ -808,7 +808,7 @@ export default {
                   },
                   {
                     label:'折扣(%)',
-                    value:this.mainData.discountrate * 100
+                    value:Math.round((this.mainData.discountrate * 100)*100)/100
                   },
                   {
                     label:'合同有效期',
@@ -831,7 +831,7 @@ export default {
                         case '新建':
                           style = {color:'#3874f6'}
                           break;
-                        case '提交':
+                        case '已提交':
                           style = {color:'#52c41a'}
                           break;
                         case '审核':
@@ -909,7 +909,7 @@ export default {
                             case '新建':
                               style = {color:'#3874f6'}
                               break;
-                            case '提交':
+                            case '已提交':
                               style = {color:'#52c41a'}
                               break;
                             case '审核':
@@ -983,7 +983,7 @@ export default {
                       },
                       {
                         label:this.mainData.calculatemodel == 1 ? '订单金额比例(%)' : '产品折扣(%)',
-                        value:this.mainData.calculatemodel == 1 ? this.mainData.orderratio * 100 : this.mainData.productdiscount *100
+                        value:this.mainData.calculatemodel == 1 ? Math.round((this.mainData.orderratio * 100)*100)/100 : Math.round((this.mainData.productdiscount *100)*100)/100
                       },
                       {
                         label:'状态',
@@ -994,7 +994,7 @@ export default {
                             case '新建':
                               style = {color:'#3874f6'}
                               break;
-                            case '提交':
+                            case '已提交':
                               style = {color:'#52c41a'}
                               break;
                             case '审核':

src/HDrpManagement/publicCustomer/index.vue

@@ -12,7 +12,7 @@
       }"
       >
       <template #titleRight>
-        <importCustomer style="margin-left:10px" @onSuccess="onSuccess"></importCustomer>
+        <importCustomer style="margin-left:10px" @onSuccess="onSuccess" v-if="tool.checkAuth($route.name,'import')"></importCustomer>
       </template>
       <template #custom>
       <div class="mt-10">
@@ -60,7 +60,7 @@
         </el-select>
       </div>
       <div  class="mt-10">
-        <label class="search__label">客户状态:</label>
+        <label class="search__label">合作状态:</label>
         <el-select class="inline-16" v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
               v-for="item in option.status"

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -29,7 +29,7 @@
         </div>
       </div>
       <div slot="slot0" >
-        <detailed :data="mainData"></detailed>
+        <detailed :data="mainData" ref="detailed"></detailed>
       </div>
       <div slot="slot1">
         <contacts :data="mainData"></contacts>
@@ -137,13 +137,15 @@ export default {
       const res = await this.$api.requested({
         "id": "20221012164302",
         "content": {
-          "sa_customersid":id
+          "sa_customersid":this.$route.query.id
         }
       })
        this.$refs.details.param.content.where.sa_customerpoolid = this.$route.query.tabIndex
       this.$refs.details.param.content.isExport = false
       this.mainData = res.data
       this.length = this.mainData.leader.length
+      this.$refs.detailed.basicData(this.$route.query.id)
+      this.$refs.detailed.systemData(this.$route.query.id)
       this.getDataTag(this.mainData.sa_customersid)
       this.changeDataStructure()
     },

src/SManagement/orderclue_detail/components/followDetail.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="detail" v-if="follow.length > 0">
       <div class="item" v-for="(item,index) in follow" :key="index">
-        <p>{{index + 1}}.{{item.createdate}},&nbsp;由<span style="font-weight:bold;margin:0 6px;font-size:13px">{{item.createby}}</span>开始跟进,跟进方式:<span style="font-weight:bold;margin:0 5px">{{item.followupmode}}</span>,{{handleTxt[item.logtype]}}</p>
+        <p>{{index + 1}}.{{item.createdate}},&nbsp;由<span style="font-weight:bold;margin:0 6px;font-size:13px">{{item.createby}}</span>开始跟进,跟进方式:<span style="font-weight:bold;margin:0 5px">{{item.followupmode}}</span>{{handleTxt[item.logtype]}}</p>
         <div class="content">
           <div style="margin-bottom:10px">
             <p v-if="item.competitor">已购买品牌:{{item.competitor}}</p>

src/SManagement/orderclue_detail/index.vue

@@ -16,7 +16,7 @@
         @onEditSuccess="queryMainData($route.query.id)"
         @detailCreate="detailCreate">
       <div slot="customOperation">
-        <edit class="inline-16" v-if="Object.keys(mainData).length > 0 && tool.checkAuth($route.name,'update')" :disabled="!isHandle" :data="mainData"/>
+        <edit class="inline-16" v-if="Object.keys(mainData).length > 0 && tool.checkAuth($route.name,'update')" :disabled="!isHandle" :data="mainData" @onSuccess="queryMainData"/>
         <follow :detailInfo="mainData" 
           v-if="tool.checkAuth($route.name,'follow')"
           @updataList="queryMainData();$refs.followDetail.getFollowDetail()" @onSuccess="onFollow" :disabled="!isHandle"></follow>