Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -113,7 +113,7 @@
             <p v-else>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice,2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname === 'defaultamount'">
-            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultamount,2)}}</p>
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice * scope.column.data.qty,2)}}</p>
           </div>
           <div v-else-if="scope.column.columnname === 'price'">
             <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -142,7 +142,7 @@
                 {title:'线索数',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].orderclueSize,bg:'#F3F9FC',color:'#3874F6'},
                 {title:'新增线索数',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].insertOrderclue,bg:'#E8F7EC',color:'#78B32B'},
                 {title:'线索转化率',value:$refs.xiansuo && $refs.xiansuo.list[0] && $refs.xiansuo.list[0].ordercluezhl,bg:'#F9F2E5',color:'#FF7603'},
-                {title:'跟进次数',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].createdate,bg:'#F3F9FC',color:'#3874F6'},
+                {title:'跟进次数',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followSize,bg:'#F3F9FC',color:'#3874F6'},
                 // {title:'跟进频率',value:$refs.fllow && $refs.fllow.list[0] && $refs.fllow.list[0].followfrequency,descript:'平均跟进天数，跟进频率=（总跟进天数-节假日）÷总跟进次数',bg:'#FDF3F3',color:'#E85B5B'},
               ]"
             >

src/SDrpManagement/salerOrder/modules/add.vue

@@ -211,7 +211,7 @@ export default {
     drawer (val) {
       if (!val) {
         this.refresh()
-        this.$refs.form.resetFields()
+        this.resetForm()
       }
     }
   },
@@ -254,6 +254,7 @@ export default {
     },
     resetForm() {
       this.$refs['form'].resetFields()
+      if (this.$refs.enterprise) this.$refs.enterprise.form.enterprisename = ''
     },
     async pageData () {
       const res = await this.$api.requested({

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -564,6 +564,7 @@ export default {
         "type": this.data.type, //订单类型
         "items": this.tableData
       },()=>{
+        console.log(row);
          this.$set(this.tableData,index,row)
       })
     },