销售漏斗项目数字段调整，报价单详情调整

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -34,10 +34,10 @@
         <toVoid class="inline-16" v-if="tool.checkAuth($route.name,'toVoid') && mainData.status === '新建'" :disabled="disabledFlag.disabled" :data="mainData.sa_quotedpriceid" ></toVoid>
       </div>
       <div slot="slot2" class=" normal-panel">
-        <detailed :data="mainData" :totalPrice="totalPrice"  v-if="flag"></detailed>
+        <detailed :basic="mainData" :totalPrice="totalPrice"  v-if="mainData"></detailed>
       </div>
       <div slot="slot0" class=" normal-panel">
-        <productInventory ref="productList" :data="mainData" v-if="flag" :disabled="disabledFlag.disabled" :isLeader="isLeader" @productSuccess="productSuccess">
+        <productInventory ref="productList" :data="mainData" v-if="flag" :disabled="disabledFlag.disabled" :isLeader="isLeader" @productSuccess="queryMainData">
           <template v-slot:cooperate="scope">
             <el-button class="inline-16" :disabled="mainData.status !== '新建'" size="small" :type="mainData.status === '新建'?'primary':''" @click="cooperateVisible = true" v-if="tool.checkAuth($route.name,'productDetails') && disabledFlag.disabled">同步合作协议</el-button>
             <el-dialog title="同步合作协议" :visible.sync="cooperateVisible" append-to-body width="703px">
@@ -226,19 +226,10 @@ export default {
           "sa_quotedpriceid":this.$route.query.id
         }
       })
-      /*this.mainData = res.data*/
       this.mainData = res.data
       this.mainDataNew = res.data
       this.mainData = Object.assign({},this.mainData,this.disabledFlag)
-      this.productList()
-      /*this.$refs.productList.productData()*/
-      this.$nextTick(()=>{
-        this.$refs.productList.productData()
-      })
-
-
-     /* this.changeDataStructure()*/
-     /* this.$refs.detailed.detailedList(this.mainData)*/
+      this.changeDataStructure()
       this.flag = true
     },
     // 监听切换数据,上一页,下一页
@@ -402,27 +393,10 @@ export default {
             },
           ]
     },
-    /*产品配置信息*/
-    async productList(){
-      const res = await this.$api.requested({
-        "id": 20221020165203,
-        "content": {
-          nocache:true,
-          "sa_quotedpriceid":this.$route.query.id
-        }
-      })
-      this.mainData = res.data
-      this.mainDataNew = res.data
-      this.mainData = Object.assign({},this.mainData,this.disabledFlag)
-      this.changeDataStructure()
-    },
     onSuccess(){
       this.queryMainData(this.$route.query.id)
 
     },
-    productSuccess(){
-      this.productList()
-    },
     /*同步合作协议*/
     async onCooperate(){
       const res = await this.$api.requested({

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

@@ -27,7 +27,7 @@
 
         <el-descriptions-item label="是否特价">{{ basic.specialoffer === 1?'是':'否' }}</el-descriptions-item>
         <el-descriptions-item label="状态" >
-          <p :style="colorStyle">{{ basic.status?basic.status:"--" }}</p>
+          <p :style="style(basic.status)">{{ basic.status?basic.status:"--" }}</p>
         </el-descriptions-item>
         <el-descriptions-item label="负责人">{{ basic.leader?basic.leader.length !== 0?basic.leader[0].name:"--":"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
@@ -51,7 +51,7 @@
         <el-descriptions-item label="复核人">{{ basic.recheckby?basic.recheckby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="复核时间">{{ basic.recheckdate?basic.recheckdate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="作废原因">{{ basic.deleteReason?basic.deleteReason.length !== 0?basic.deleteReason[0].deletereason:'--':"--"}}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="转手次数">{{ data.leader?data.leader.length !== 0?data.leader[0].leadernum === 0?'0':data.leader[0].leadernum:'--':"--" }}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="转手次数">{{ basic.leader?basic.leader.length !== 0?basic.leader[0].leadernum === 0?'0':basic.leader[0].leadernum:'--':"--" }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>
@@ -60,32 +60,17 @@
 <script>
 export default {
   name: "index",
-  props:["data","totalPrice"],
+  props:["basic","totalPrice"],
   data(){
     return {
-      basic:[],
       colorStyle:{
         color:''
       }
     }
   },
+  mounted() {
+  },
   methods:{
-    async basicData(id){
-      const res = await this.$api.requested({
-        "id": 20221020165203,
-        "version":1,
-        "content": {
-          "sa_quotedpriceid":id
-        }
-      })
-      this.basic = res.data
-      this.style(this.basic.status)
-    },
-    detailedList(data){
-      console.log("输出")
-      console.log(data)
-      this.basicData(data.sa_quotedpriceid)
-    },
     style(val) {
       let style = {}
       console.log(val,'执行了')
@@ -105,17 +90,11 @@ export default {
         default:
           break;
       }
-      console.log(style)
       this.colorStyle.color = style.color
-      console.log(this.colorStyle)
       return style
 
     }
   },
-  created() {
-    console.log(this.data)
-    this.basicData(this.data.sa_quotedpriceid)
-  }
 }
 </script>
 

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

@@ -235,13 +235,10 @@ export default {
         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*/
       }
       if (this.total !== 0){
         this.totalPrice = Math.round(res.data[0].rowstotal[0].sumamount * 100)/100
       }
-      this.$emit('productSuccess')
-
     },
     /*批量添加商品*/
     async addProducts(item){
@@ -269,6 +266,7 @@ export default {
         this.productData()
         this.$refs.addProduct.listData()
         this.$refs.addProductProject.listData()
+        this.$emit('productSuccess')
 
       })
     },
@@ -295,6 +293,7 @@ export default {
         this.productData()
         this.$refs.addProduct.listData()
         this.$refs.addProductProject.listData()
+        this.$emit('productSuccess')
       })
     },
     /*一键全选*/
@@ -317,6 +316,7 @@ export default {
       }
       this.productData()
       this.$refs.addProduct.listData()
+      this.$emit('productSuccess')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -458,7 +458,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  项目总数: ${datum.sequence1} 当前项目数: ${datum.projectqty} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -499,7 +499,7 @@ export default {
                 ${items.map((item) => `
                 <li>
                 <p style="margin-bottom:10px">${title}</p>
-                <p>项目数:${item.data.projectqty}</p>
+                <p>项目总数:${item.data.projectqty}</p>
                 </li>`).join('')}
               </ul>
             </div>`;
@@ -548,7 +548,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  项目总数: ${datum.sequence1} 当前项目数: ${datum.projectqty} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -589,7 +589,7 @@ export default {
                 ${items.map((item) => `
                 <li>
                 <p style="margin-bottom:10px">${title}</p>
-                <p>项目数:${item.data.projectqty}</p>
+                <p>项目总数:${item.data.projectqty}</p>
                 </li>`).join('')}
               </ul>
             </div>`;
@@ -638,7 +638,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  项目总数: ${datum.sequence1} 当前项目数: ${datum.projectqty} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -679,7 +679,7 @@ export default {
                 ${items.map((item) => `
                 <li>
                 <p style="margin-bottom:10px">${title}</p>
-                <p>项目数:${item.data.projectqty}</p>
+                <p>项目总数:${item.data.projectqty}</p>
                 </li>`).join('')}
               </ul>
             </div>`;
@@ -729,7 +729,7 @@ export default {
               const group = new G.Group({});
               const content = ()=>{
                 if (this.tableData[0]) {
-                  const text = `${datum.stagename}  当前项目数: ${datum.projectqty} 项目数: ${datum.sequence1} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
+                  const text = `${datum.stagename}  项目总数: ${datum.sequence1} 当前项目数: ${datum.projectqty} 转化率: ${datum.zhl?Math.round((datum.zhl* 100)*100)/100 + '%':'--'}  预计签约金额: ${datum.signamount_due}万元  项目成交金额: ${datum.dealamount}万元`
                   const lines = text.split('  ');
                   return lines.join('\n');
                 }
@@ -770,7 +770,7 @@ export default {
                 ${items.map((item) => `
                 <li>
                 <p style="margin-bottom:10px">${title}</p>
-                <p>项目数:${item.data.projectqty}</p>
+                <p>项目总数:${item.data.projectqty}</p>
                 </li>`).join('')}
               </ul>
             </div>`;