Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/contactProfile/modules/detail.vue

@@ -84,18 +84,21 @@
               <el-descriptions-item :label="$t(`生日`)">
                 {{ detailInfo.birthday }}</el-descriptions-item
               >
-              <el-descriptions-item :label="$t('负责人')"
-                ><span
-                  style="color: #e85b5b; font-size: 16px; font-weight: bold"
-                  >{{ detailInfo.leadername }}</span
-                >
-              </el-descriptions-item>
               <el-descriptions-item :label="$t(`家庭住址`)">
                 {{ detailInfo.homeaddress }}</el-descriptions-item
               >
+              <el-descriptions-item :label="$t('负责人')"
+              ><span
+                  style="color: #e85b5b; font-size: 16px; font-weight: bold"
+              >{{ detailInfo.leadername }}</span
+              >
+              </el-descriptions-item>
               <el-descriptions-item :label="$t('部门')">
                 {{ detailInfo.depname }}</el-descriptions-item
               >
+              <el-descriptions-item :label="$t(`群组`)">{{
+                  detailInfo.groupname
+                }}</el-descriptions-item>
               <el-descriptions-item :label="$t(`未跟进天数`)"
                 ><span
                   style="
@@ -119,9 +122,6 @@
                   <i class="el-icon-warning-outline"></i>
                 </el-tooltip>
               </el-descriptions-item>
-              <el-descriptions-item :label="$t(`群组`)">{{
-                detailInfo.groupname
-              }}</el-descriptions-item>
               <el-descriptions-item :label="$t('职位')">
                 {{ detailInfo.position }}</el-descriptions-item
               >

src/HDrpManagement/publicCustomer/index.vue

@@ -161,9 +161,9 @@
           <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
-          <span style="color:#e6a23c" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874F6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -247,13 +247,13 @@ export default {
             let style = {}
             switch (that.mainData.tradingstatus) {
               case '已成交':
-                style = {color:'#3874f6'}
+                style = {color:'#67c23a'}
                 break;
               case '未成交':
-                style = {color:'#e6a23c'}
+                style = {color:'#3874f6'}
                 break;
               case '多次成交':
-                style = {color:'#e6a23c'}
+                style = {color:'#67c23a'}
                 break;
               default:
                 break;

src/HDrpManagement/publicCustomer/modules/detail/detailedData.vue

@@ -100,13 +100,13 @@ export default {
       let style = {}
       switch (val) {
         case '已成交':
-          style = {color:'#3874f6'}
+          style = {color:'#67c23a'}
           break;
         case '未成交':
-          style = {color:'#e6a23c'}
+          style = {color:'#3874f6'}
           break;
         case '多次成交':
-          style = {color:'#e6a23c'}
+          style = {color:'#67c23a'}
           break;
         default:
           break;

src/HManagement/addressList/mycontact/modules/delGroup.vue

@@ -3,7 +3,7 @@
     <el-popconfirm :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
       :title="$t(`确定删除当前分组吗？`)"
       @confirm="deleteRow()">
-      <el-button slot="reference" type="text" icon="el-icon-delete" size="small" style="color:#333">{{$t('删 除')}}</el-button>
+      <el-button slot="reference" type="text" icon="el-icon-delete" size="small" style="color:#F56C6C">{{$t('删 除')}}</el-button>
     </el-popconfirm>
 
   </div>

src/HManagement/addressList/mycontact/modules/editGroup.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" icon="el-icon-edit" size="small" class="inline-16" style="color:#333" @click="onShow()">{{$t('编 辑')}}</el-button>
+    <el-button type="text" icon="el-icon-edit" size="small" class="inline-16" style="color:#3874f6" @click="onShow()">{{$t('编 辑')}}</el-button>
     <el-dialog :title="$t(`编辑群组`)" append-to-body :visible.sync="dialogFormVisible" width="600px">
       <el-form :model="form" ref="form" label-position="right" :label-width="tool.onlyZh('80px')" size="small">
         <el-form-item :label="$t(`群组名称`)" prop="groupname" :rules="[

src/HManagement/addressList/mycontact/modules/group.vue

@@ -24,18 +24,27 @@
       </div>
       <div style="overflow: auto;max-height: calc(100vh - 482px)">
         <ul>
-          <li @click="clickGroup(item)" v-for="item in myGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between">
-            <div class="flex-align-stretch">
-              <div style="display: flex;justify-content: space-between;">
+          <li @click="clickGroup(item)" v-for="item in myGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between" style="">
+            <div>
+              <div style="display: flex;justify-content: left;">
                 <img width="50px" height="50px" src="../../../../assets/icons/my_group.png" alt="">
-                <div class="r_flex">
+                <div class="r_flex" style="width:200px">
                   <sapn class="groupname" style="word-break: break-all;white-space: pre-wrap;min-width: 95px">{{$t(item.groupname)}}</sapn>
-                  <small class="color-grey">{{$t('已有')}}{{item.count}} {{$t('人')}}</small>
-                </div>
-                <div style="display:flex;margin-left: 10px">
-                  <slot name="edit" :data="item" class="inline-16"></slot>
-                  <slot name="del" :data="item" class="inline-16"></slot>
+                  <div style="display: flex;justify-content: space-between;">
+                    <div>
+                      <small class="color-grey">{{$t('已有')}}{{item.count}} {{$t('人')}}</small>
+                    </div>
+                    <div style="display: flex;justify-content: right">
+                      <slot name="edit" :data="item" class="inline-16"></slot>
+                      <slot name="del" :data="item" class="inline-16"></slot>
+                    </div>
+                  </div>
+
                 </div>
+<!--                <div style="display:flex;margin-left: 10px">-->
+<!--                  <slot name="edit" :data="item" class="inline-16"></slot>-->
+<!--                  <slot name="del" :data="item" class="inline-16"></slot>-->
+<!--                </div>-->
               </div>
             </div>
           </li>

src/HManagement/ecycle/customer/index.vue

@@ -108,16 +108,16 @@
           </div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
-          <span style="color:#e6a23c" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#3874F6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#3874F6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '多次成交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '潜在'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#67C23A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '合作中'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span style="color:#e6a23c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '暂缓'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#f56c6c" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           <span v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'contact'">

src/HManagement/marketing2/agent/details/modules/contract/index.vue

@@ -26,11 +26,16 @@
             <span v-else-if="scope.column.data[[scope.column.columnname]] == '工具借用'">{{$t(`工具使用协议`)}}</span>
             <span v-else-if="scope.column.data[[scope.column.columnname]] == '居间'">{{$t(`居间协议`)}}</span>
           </div>
-           <div v-else-if="scope.column.columnname == 'status'">
+          <div v-if="scope.column.columnname === 'billno'">
+            <el-button type="text" @click="detailGo(scope.column.data)">
+              {{ $t(scope.column.data[scope.column.columnname]) }}
+            </el-button>
+          </div>
+          <div v-else-if="scope.column.columnname == 'status'">
             <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
             <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '提交'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
             <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-             <span style="color:#000000" v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#000000" v-else>{{$t(scope.column.data[[scope.column.columnname]])}}</span>
           </div>
           <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">--</p>
@@ -114,6 +119,38 @@ export default {
         this.currentItem = ''
       })
     },
+    detailGo(data) {
+      let type
+      data.type == '项目'
+          ? data.typemx == '直销'
+              ? type = '直销项目' : type = '经销项目'
+          : type = data.type
+      JSON.parse(sessionStorage.getItem('module_info')).forEach(item1 => {
+        item1.modules.forEach(item2 => {
+          if(item2.systemmodulename == "合同管理") {
+            let route = this.$route
+            if (route.path !== '/contractDetail') {
+              this.oldRoute = {path:route.path,query:route.query}
+              this.$store.dispatch('setHistoryRouter',this.oldRoute)
+            }
+            /*let listqueryid = sessionStorage.getItem('listqueryid')*/
+            sessionStorage.setItem('active_modules',JSON.stringify(item2))
+            // sessionStorage.setItem('listqueryid',this.listqueryid)
+            // sessionStorage.setItem('isGo','1')
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:data.sa_contractid,
+                rowindex:data.rowindex,
+                // listqueryid:this.listqueryid,
+                type:type,
+                // fieldname:'sa_contract'
+              }})
+            // this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
+            return
+          }
+        })
+      })
+    },
     async listData(){
       this.params.content.sys_enterpriseid = this.data.sys_enterpriseid
       const res = await this.$api.requested(this.params)

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -384,13 +384,13 @@ export default {
             let style = {};
             switch (that.mainData.tradingstatus) {
               case "已成交":
-                style = { color: "#3874f6" };
+                style = { color: "#67c23a" };
                 break;
               case "未成交":
-                style = { color: "#e6a23c" };
+                style = { color: "#3874f6" };
                 break;
               case "多次成交":
-                style = { color: "#e6a23c" };
+                style = { color: "#67c23a" };
                 break;
               default:
                 break;
@@ -414,7 +414,7 @@ export default {
                 style = { color: "#e6a23c" };
                 break;
               case "已终止":
-                style = { color: "#f56c6c" };
+                style = { color: "#ccc" };
                 break;
               default:
                 break;

src/SDrpManagement/salerPrivatecustomer/detail/modules/detailedData.vue

@@ -240,8 +240,8 @@ export default {
   mounted() {
     // this.dataData(this.$route.query.id)
     this.systemData();
-    this.style(this.data);
-    this.styleStatus(this.data);
+    this.style(this.data.tradingstatus);
+    this.styleStatus(this.data.status);
   },
   methods: {
     /*基本信息*/
@@ -261,13 +261,13 @@ export default {
       let style = {};
       switch (val) {
         case "已成交":
-          style = { color: "#3874f6" };
+          style = { color: "#67c23a" };
           break;
         case "未成交":
-          style = { color: "#e6a23c" };
+          style = { color: "#3874f6" };
           break;
         case "多次成交":
-          style = { color: "#e6a23c" };
+          style = { color: "#67c23a" };
           break;
         default:
           break;
@@ -288,7 +288,7 @@ export default {
           style = { color: "#e6a23c" };
           break;
         case "已终止":
-          style = { color: "#f56c6c" };
+          style = { color: "#ccc" };
           break;
         default:
           break;

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -265,7 +265,7 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
           <span
-            style="color: #e6a23c"
+            style="color: #3874F6"
             v-if="
               scope.data.column.data[[scope.data.column.columnname]] == '未成交'
             "
@@ -274,7 +274,7 @@
             }}</span
           >
           <span
-            style="color: #3874F6"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '已成交'
             "
@@ -283,7 +283,7 @@
             }}</span
           >
           <span
-            style="color: #e6a23c"
+            style="color: #67C23A"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] ==
               '多次成交'
@@ -328,7 +328,7 @@
             }}</span
           >
           <span
-            style="color: #f56c6c"
+            style="color: #cccccc"
             v-else-if="
               scope.data.column.data[[scope.data.column.columnname]] == '已终止'
             "

src/SManagement/notice/index.vue

@@ -32,8 +32,8 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div v-if="scope.data.column.columnname == 'cover'">
-          <img style="width:100px;height:100px" :src="scope.data.column.data[scope.data.column.columnname] || require('@/assets/notify.png')" alt="">
+        <div v-if="scope.data.column.columnname == 'cover'" style="width: 80px;height: 80px">
+          <img style="width:60px;height:60px;margin-top: 10px" :src="scope.data.column.data[scope.data.column.columnname] || require('@/assets/notify.png')" alt="">
 
           <!-- <el-image
               style="margin-top: 6px"