画像调整

src/HDrpManagement/customerPortrait/modules/detail.vue

@@ -246,6 +246,9 @@
                 <div v-if="scope.data.columnname == 'signAmount'">
                   {{scope.data.data.signAmount && tool.formatAmount(scope.data.data.signAmount || 0,2,'￥')  }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'enddate'">
+                  {{scope.data.data.begdate + '至' + scope.data.data.enddate }}
+                </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}
                 </div>
@@ -472,12 +475,13 @@ export default {
             "pageNumber": 1,
             "pageSize": 20,
             "isAll":1,
-            "sa_customersid":this.$route.query.id
+            "sa_customersid":this.$route.query.id,
+          "where":{
+            "begdate":'',
+            "enddate":''
+          }
         },
-        "where":{
-          "begdate":'',
-          "enddate":''
-        }
+
       },
       //关联合同
       param4: {
@@ -516,12 +520,13 @@ export default {
             "pageNumber": 1,
             "pageSize": 20,
             "isAll":1,
-            "sa_customersid":this.$route.query.id
+            "sa_customersid":this.$route.query.id,
+          "where":{
+            "begdate":'',
+            "enddate":''
+          }
         },
-        "where":{
-          "begdate":'',
-          "enddate":''
-        }
+
       },
       contractTypeList:[],
       orderTypeList:[],

src/HDrpManagement/customerPortrait/modules/myRadio.vue

@@ -1,21 +1,24 @@
 <template>
   <div class="btn-wrapper">
     <div class="btn-box">
-      <div :class="['btn-item',active == item.label ? 'active' : '']" v-for="item in btnOptions" @click="itemClick($event,item)" :key="item.value + 'a'">{{ item.label }}</div>
-      <el-date-picker
-          style="margin-left: 10px;width: 200px"
-          v-model="dateData"
-          @change="dateClick"
-          size="mini"
-          format="yyyy-MM"
-          value-format="yyyy-MM"
-          type="monthrange"
-          range-separator="至"
-          start-placeholder="开始月份"
-          end-placeholder="结束月份">
-      </el-date-picker>
+      <div class="btn-box">
+        <div :class="['btn-item',active == item.label ? 'active' : '']" v-for="item in btnOptions" @click="itemClick($event,item)" :key="item.value + 'a'">{{ item.label }}</div>
+      </div>
+      <div style="float: left;">
+        <el-date-picker
+            style="margin-left: 10px;width: 200px"
+            v-model="dateData"
+            @change="dateClick"
+            size="mini"
+            format="yyyy-MM"
+            value-format="yyyy-MM"
+            type="monthrange"
+            range-separator="至"
+            start-placeholder="开始月份"
+            end-placeholder="结束月份">
+        </el-date-picker>
+      </div>
     </div>
-
   </div>
 </template>
 
@@ -86,7 +89,6 @@ export default {
         }else if (this.value === 3){
           const now = new Date();
           const monthStartDate = new Date(now.getFullYear(), now.getMonth());
-       /*   const monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1);*/
           this.dateData = [monthStartDate,monthStartDate]
           this.value2.begdate = ''
           this.value2.enddate = ''
@@ -98,7 +100,7 @@ export default {
     dateClick(){
       console.log(this.dateData,'执行')
       if (this.dateData){
-        this.active = ''
+       /* this.active = ''*/
         this.value2.begdate = this.dateData[0]
         this.value2.enddate = this.dateData[1]
         this.value1[this.key1] = 99
@@ -145,6 +147,7 @@ export default {
 .btn-item:first-child {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
+  border-left: none;
 }
 .btn-item:last-child {
   border-top-right-radius: 5px;

src/HDrpManagement/projectPortrait/modules/detail.vue

@@ -335,6 +335,9 @@
                 <div v-if="scope.data.columnname == 'signAmount'">
                   {{scope.data.data.signAmount && tool.formatAmount(scope.data.data.signAmount || 0,2,'￥')  }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'enddate'">
+                  {{scope.data.data.begdate + '至' + scope.data.data.enddate }}
+                </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}
                 </div>

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -427,6 +427,9 @@
                 <div v-if="scope.data.columnname == 'signAmount'">
                   {{scope.data.data.signAmount && tool.formatAmount(scope.data.data.signAmount || 0,2,'￥')  }}
                 </div>
+                <div v-else-if="scope.data.columnname == 'enddate'">
+                  {{scope.data.data.begdate + '至' + scope.data.data.enddate }}
+                </div>
                 <div v-else>
                   {{ scope.data.data[scope.data.columnname] }}
                 </div>
@@ -462,7 +465,7 @@ export default {
       param1: {
         "id": 20230717100404,
         "content": {
-            "type":3,
+            "type":0,
             "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -476,7 +479,7 @@ export default {
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            "type":1,
+            "type":0,
             "hrid":this.$route.query.id,
             "where": {
               "type":'',
@@ -496,7 +499,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":3,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -510,7 +513,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":3,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -525,7 +528,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":3,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -539,7 +542,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":3,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -553,7 +556,7 @@ export default {
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            "type":3,
+            "type":0,
             "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -567,7 +570,7 @@ export default {
         "content": {
             "pageNumber": 1,
             "pageSize": 20,
-            "type":3,
+            "type":0,
             "hrid":this.$route.query.id,
           "where":{
             "begdate":'',
@@ -581,7 +584,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":1,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "type":"",
@@ -596,7 +599,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":1,
+          "type":0,
           "hrid":this.$route.query.id,
           "where":{
             "type":"",