画像新增退款金额，销售漏斗默认值调整

src/HDrpManagement/contactProfile/modules/detail.vue

@@ -334,27 +334,22 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'amount'">
-                    {{ scope.data.data.amount && tool.formatAmount(scope.data.data.amount || 0, 2, '￥') }}
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                    {{
-                      scope.data.data.writeoffamount ? '￥' + tool.formatAmount(scope.data.data.writeoffamount, 2) : '￥0.00'
-                    }}
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                    {{
-                      scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0, 2, '￥')
-                    }}
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                    {{
-                      scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0, 2, '￥')
-                    }}
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                    {{
-                      scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0, 2, '￥')
-                    }}
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'returnamount'">
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.data.columnname == 'status'">
                     <span v-if="scope.data.data[[scope.data.columnname]] == '新建'"

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -293,19 +293,22 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'sumamount'">
-                  {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                  {{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                  {{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                  {{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                  {{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'returnamount'">
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -375,19 +375,22 @@
             >
               <template v-slot:custom="scope">
                 <div v-if="scope.data.columnname == 'sumamount'">
-                  {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                  {{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                  {{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                  {{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                  {{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
+                </div>
+                <div v-else-if="scope.data.columnname == 'returnamount'">
+                  {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                 </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -128,16 +128,19 @@
                     {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '177'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '177'?'#3874F6':''}">{{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                    <span :style="{color:param2.content.sort[0].sortid == '176'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
+                    <span :style="{color:param2.content.sort[0].sortid == '176'?'#3874F6':''}">{{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}</span>
+                  </div>
+                  <div v-else-if="scope.data.columnname == 'returnamount'">
+                    {{scope.data.data[scope.data.columnname]?tool.formatAmount(scope.data.data[scope.data.columnname],2,'￥'):scope.data.data[scope.data.columnname] == 0?'￥ 0.00':'--'}}
                   </div>
                   <div v-else>
                     {{ scope.data.data[scope.data.columnname] }}

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -240,7 +240,7 @@ export default {
             "departmentid":"",
             "tradefield":"",
             "isleave":"0",
-            "unfinish":'0'
+            "unfinish":'1'
           }
         }
       },
@@ -258,7 +258,7 @@ export default {
             "enddate":"",
             "tradefield":"",
             "isleave":"0",
-            "unfinish":'0'
+            "unfinish":'1'
           }
         }
       },
@@ -266,7 +266,7 @@ export default {
       tradefield:'',
       isleave:'',
       tradefields:[],
-      unfinish:'0'
+      unfinish:'1'
     }
   },
   methods:{