Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue

@@ -57,7 +57,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}?path=cooperationRecord`" tag="a"
                                class="wordprimary" v-html="scope.row.name"></router-link>
                 </div>
               </div>

dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue

@@ -59,7 +59,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a"
+                  <router-link :to="`/enterprise/${encodeStr(scope.row.id)}?path=cooperationRecord`" tag="a"
                                class="wordprimary" v-html="scope.row.name"></router-link>
                 </div>
               </div>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -106,7 +106,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -111,7 +111,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -100,7 +100,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -101,7 +101,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

@@ -101,7 +101,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -101,7 +101,7 @@
             <template slot-scope="scope">
               <div class="renling">
                 <div style="display:flex;align-items:center">
-                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a"
+                  <router-link v-if="scope.row.companyId" :to="`/enterprise/${encodeStr(scope.row.companyId)}?path=cooperationRecord&companyName=${scope.row.customerName}`" tag="a"
                                class="wordprimary" v-html="scope.row.customerName"></router-link>
                   <span v-else v-html="scope.row.customerName"></span>
                 </div>