Merge branch 'xiaoqin' into trycode1

src/HDrpManagement/projectData/index.vue

@@ -2296,10 +2296,6 @@ export default {
 *{
   box-sizing: border-box;
 }
-.panel-select {
-  display: flex;
-  align-items: center;
-}
 .data-all {
   padding: 24rem 20rem;
   width: 100%;

src/views/clueData/modules/clueChange.vue

@@ -55,7 +55,6 @@ export default {
       this.renderPie(val)
     },
     async queryModel(val){
-      console.log('执行111')
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
       const res = await this.$api.requested(this.param)

src/views/clueData/modules/clueFollow.vue

@@ -87,7 +87,6 @@ export default {
       this.queryModel(val)
     },
     changeDate(){
-      console.log(this.endDate,'日期')
       this.queryModel(this.param.content.dataid)
     },
     /*选择部门*/

src/views/clueData/modules/clueUnFollow.vue

@@ -29,7 +29,10 @@
       <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="list.length < 5 ? '242px':'842px'">
         <template v-slot:customcol="scope">
           <p v-if="scope.column.columnname === 'province'">
-            {{scope.column.data.province+scope.column.data.city+scope.column.data.county}}
+            {{scope.column.data.province !== '' && scope.column.data.city !== '' && scope.column.data.county !== ''?scope.column.data.province+scope.column.data.city+scope.column.data.county:'--'}}
+          </p>
+          <p v-else-if="scope.column.columnname === 'unqty'">
+            <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
           </p>
           <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
         </template>
@@ -87,10 +90,8 @@ export default {
       this.renderPie(val)
     },
     async queryTable(val){
-      console.log(val,'11111')
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
-      console.log(this.param,'param122')
       const res = await this.$api.requested(this.param)
       if (res.data.length === 1){
         if (res.data[0].isEmpty == 1){
@@ -113,7 +114,6 @@ export default {
       this.param.content.dataid = val || this.dataid
       this.param.content.enddate = this.enddate
       this.param.content.pageNumber = 1
-      console.log(this.param,'param')
       const res = await this.$api.requested(this.param)
       if (res.data.length <=1){
         if (res.data[0].isEmpty == 1){

src/views/salesData/components/allSalesTemplate.vue

@@ -114,6 +114,18 @@
                 <span class="highlight-color" v-if="title === '回款'"> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
                 <span v-else> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
               </p>
+              <p v-else-if="scope.column.columnname === 'customersqty'">
+                <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+              </p>
+              <p v-else-if="scope.column.columnname === 'outcustomer'">
+                <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+              </p>
+              <p v-else-if="scope.column.columnname === 'projectqty'">
+                <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+              </p>
+              <p v-else-if="scope.column.columnname === 'outproejct'">
+                <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+              </p>
               <p v-else-if="scope.column.columnname === 'rowindex'">
                 <span style="font-weight: bold">{{scope.column.data[scope.column.columnname]}}</span>
               </p>
@@ -194,7 +206,6 @@ export default {
     showVisible(){
       this.visible = true
       this.title = '订单'
-      console.log(this.dataid,'dataid111')
       this.param.content.pageNumber = 1
       this.param.content.pageSize = 50
       this.queryOptions()

src/views/salesData/components/balanceDetail.vue

@@ -85,7 +85,6 @@ export default {
   },
   methods:{
     visibleShow(){
-      console.log(this.enddate,'enddate')
       this.visible = true
       this.param.content.sa_accountclassid = this.sa_accountclassid
       this.param.content.sys_enterpriseid = this.sys_enterpriseid

src/views/salesData/components/boxLine.vue

@@ -128,7 +128,6 @@ export default {
   },
   watch: {
     windowWidth (val) {
-      console.log("实时屏幕宽度1111：",val );
     }
   },
   methods:{

src/views/salesData/components/salesTemplate.vue

@@ -66,6 +66,18 @@
             <span class="highlight-color" v-if="title === '回款'"> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
             <span v-else> ¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
           </p>
+          <p v-else-if="scope.column.columnname === 'customersqty'">
+            <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+          </p>
+          <p v-else-if="scope.column.columnname === 'outcustomer'">
+            <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+          </p>
+          <p v-else-if="scope.column.columnname === 'projectqty'">
+            <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+          </p>
+          <p v-else-if="scope.column.columnname === 'outproejct'">
+            <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+          </p>
           <p v-else-if="scope.column.columnname === 'rowindex'">
             <span style="font-weight: bold">{{scope.column.data[scope.column.columnname]}}</span>
           </p>

src/views/salesData/modules/customerAccountBalanceAnalysis.vue

@@ -133,7 +133,6 @@ export default {
         ],
         tooltip: {
           formatter: (datum) => {
-            console.log(datum,'datum')
             return {
               name:datum.name,
               value:datum.name != '同比增长率(%)'?'¥' + this.tool.formatAmount(datum.value,2) :datum.value

src/views/salesData/modules/customerSales.vue

@@ -37,7 +37,6 @@ export default {
   methods:{
     listData(val){
       this.param.content.dataid = val || this.dataid
-      console.log(this.param,'客户')
       this.$refs.sales.listData()
     }
   },

src/views/salesData/modules/financialCollectionAnalysis.vue

@@ -105,7 +105,7 @@ export default {
       this.chartData = res.data.map(item=>{
         return {
           key: item.key,
-          typr: item.typr,
+          type: item.type,
           value: Math.round(((item.value)*100)/100)
         }
       })
@@ -116,11 +116,10 @@ export default {
         data:this.chartData,
         isStack: true,
         xField: 'value',
-        yField: 'typr',
+        yField: 'type',
         seriesField: 'key',
         tooltip: {
           formatter: (datum) => {
-            console.log(datum,'datum')
             return {
               name:datum.key,
               value:'¥'+this.tool.formatAmount(datum.value,2)
@@ -133,7 +132,7 @@ export default {
         this.hoverData = ev.data.items[0]
       })
       this.chartBar.on('plot:click',ev=>{
-        this.tableParam.content.unwriteoffamounttype = this.hoverData.data.typr
+        this.tableParam.content.unwriteoffamounttype = this.hoverData.data.type
         this.tableParam.content.pageNumber = 1
         this.tableData(this.param.content.dataid)
       })

src/views/salesData/modules/orderType.vue

@@ -34,9 +34,11 @@
           <template v-slot:customcol="scope">
             <p v-if="scope.column.columnname === 'operation'">
             </p>
+            <p v-else-if="scope.column.columnname === 'qty'">
+              <span> {{scope.column.data[scope.column.columnname] == 0?0:scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</span>
+            </p>
             <p v-else-if="scope.column.columnname === 'amount'">
-              <span v-if="scope.column.data[scope.column.columnname]">¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
-              <span v-else>--</span>
+              <span>¥{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
             </p>
             <p v-else>{{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:'--'}}</p>
           </template>

src/views/salesData/modules/quotationAnalysis.vue

@@ -141,7 +141,6 @@ export default {
       return result;
     },
     renderPie(val){
-      console.log(this.plotList,'plotData')
       this.chartLine = new Line('quotationAnalysisChart',{
         data:this.processData(this.plotList, ['newtotalqty', 'newcusqty','newproqty','oldtotalqty','oldcusqty','oldproqty']),
         xField: 'date',

src/views/salesData/modules/shippingUninvoiceAnalysis.vue

@@ -141,7 +141,6 @@ export default {
         },
         tooltip: {
           formatter: (datum) => {
-            console.log(datum,'datum')
             return {
               name:datum.key,
               value:'¥'+this.tool.formatAmount(datum.value,2)