Merge branch 'testToMerge' of http://124.70.211.186:3000/zhangqi/yos_web into testToMerge

src/HDrpManagement/ProductGroupMag/index.vue

@@ -30,8 +30,8 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'isonsale'">
-          <span v-if="scope.data.column.data[scope.data.column.columnname] == 0" style="color:red">{{$t(`未上架`)}}</span>
-          <span v-if="scope.data.column.data[scope.data.column.columnname] == 1" style="color:rgb(82, 196, 26)">{{$t(`已上架`)}}</span>
+          <span v-if="scope.data.column.data[scope.data.column.columnname] == 0" style="color:#f56c6c">{{$t(`未上架`)}}</span>
+          <span v-if="scope.data.column.data[scope.data.column.columnname] == 1" style="color:#67c23a">{{$t(`已上架`)}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'sequence'">
           {{scope.data.column.data.sequence + 1}}

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -58,10 +58,11 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData);
-      
+
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
         {
           label:'商品组编号',
@@ -77,7 +78,21 @@ export default {
         },
         {
           label:'是否上架',
-          value:this.mainData.isonsale ? '上架' : '下架'
+          value:this.mainData.isonsale ? '上架' : '下架',
+          style:function () {
+            let style = {}
+            switch (that.mainData.isonsale) {
+              case 1:
+                style = {color:"#67c23a"}
+                break;
+              case 0:
+                style = {color:"#f56c6c"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         /*{
           label:'默认展示产品',
@@ -96,7 +111,7 @@ export default {
           value:this.mainData.itemclassname
         },*/
       ]
- 
+
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
@@ -115,4 +130,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/ProductMag/detail/index.vue

@@ -202,10 +202,10 @@ export default {
             let style = {}
             switch (that.mainData.isonsale) {
               case 1:
-                style = {color:"#3874f6"}
+                style = {color:"#67c23a"}
                 break;
               case 0:
-                style = {color:"#333333"}
+                style = {color:"#f56c6c"}
                 break;
               default:
                 break;
@@ -220,10 +220,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '审核':
-                style = {color:"#52C41A"}
+                style = {color:"#e6a23c"}
                 break;
               case '新建':
-                style = {color:"#000000"}
+                style = {color:"#3874F6"}
                 break;
               default:
                 break;

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

@@ -5,11 +5,11 @@
         <div slot="title" class="my-label__title">{{$t('基本信息')}}</div>
         <el-descriptions-item  :label="$t(`商品编码`)">{{ basic.itemno}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`商品名称`)">{{ basic.itemname}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t('状态')"><span :style="basic.status == '审核' ? 'color:#52C41A' : 'color:#000000'">{{ $t(basic.status)}}</span></el-descriptions-item>
+        <el-descriptions-item  :label="$t('状态')"><span :style="basic.status == '审核' ? 'color:#e6a23c' : 'color:#3874F6'">{{ $t(basic.status)}}</span></el-descriptions-item>
         <el-descriptions-item :label="$t('品号')">{{ basic.erpitemno}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`品名`)">{{ basic.erpitemname}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`外形尺寸`)">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>-->
-        <el-descriptions-item  :label="$t(`上/下架`)"><span :style="basic.isonsale ? 'color:#3874f6' : 'color:#333333'">{{ basic.isonsale ? $t('上架') : $t('下架')}}</span></el-descriptions-item>
+        <el-descriptions-item  :label="$t(`上/下架`)"><span :style="basic.isonsale ? 'color:#67c23a' : 'color:#f56c6c'">{{ basic.isonsale ? $t('上架') : $t('下架')}}</span></el-descriptions-item>
         <el-descriptions-item  :label="$t('型号')">{{ basic.model}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`规格尺寸`)">{{ basic.spec}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`计量单位组`)">{{ basic.unitname}}</el-descriptions-item>

src/HDrpManagement/ProductMag/index.vue

@@ -138,7 +138,7 @@
       </template>
       <template v-slot:tbList="scope">
         <div>
-        <p :style="scope.data.column.data.isonsale === 1?'color:#52c41a':'color:red'" v-if="scope.data.column.columnname === 'isonsale'">
+        <p :style="scope.data.column.data.isonsale === 1?'color:#67c23a':'color:#f56c6c'" v-if="scope.data.column.columnname === 'isonsale'">
           {{ scope.data.column.data.isonsale ? $t('上架') : $t('下架') }}
         </p>
         <p v-else-if="scope.data.column.columnname === 'cover'">
@@ -178,8 +178,8 @@
           {{scope.data.column.data[[scope.data.column.columnname]] === 0?$t('否'):$t('是')}}
         </p>
         <p v-else-if="scope.data.column.columnname === 'status'">
-          <span style="color:#52C41A" v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#000000" 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-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>
         </p>
         <p v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</p>
         </div>

src/HDrpManagement/contractManage/index.vue

@@ -91,9 +91,10 @@
       <template v-slot:tbList="scope">
         <div v-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:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已提交'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-          <span style="color:#000000" v-else>{{$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:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已终止'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+          <span style="color:#999999" v-else>{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'type'">
           <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '框架'">{{$t(`经销商合作协议`)}}</span>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -514,15 +514,18 @@ export default {
             style:function () {
             let style = {}
             switch (that.mainData.status) {
-                case '新建':
-                  style = {color:'#3874f6'}
-                  break;
-                case '已提交':
-                  style = {color:'#52c41a'}
-                  break;
-                case '审核':
-                  style = {color:'#333333'}
-                  break;
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '已提交':
+                style = {color:'#67C23A'}
+                break;
+              case '审核':
+                style = {color:'#e6a23c'}
+                break;
+              case '已终止':
+                style = {color:'#cccccc'}
+                break;
               case '已过期':
                 style = {color:'#999999'}
                 break;
@@ -596,10 +599,13 @@ export default {
                   style = {color:'#3874f6'}
                   break;
                 case '已提交':
-                  style = {color:'#52c41a'}
+                  style = {color:'#67C23A'}
                   break;
                 case '审核':
-                  style = {color:'#333333'}
+                  style = {color:'#e6a23c'}
+                  break;
+                case '已终止':
+                  style = {color:'#cccccc'}
                   break;
                 case '已过期':
                   style = {color:'#999999'}
@@ -680,10 +686,13 @@ export default {
                   style = {color:'#3874f6'}
                   break;
                 case '已提交':
-                  style = {color:'#52c41a'}
+                  style = {color:'#67C23A'}
                   break;
                 case '审核':
-                  style = {color:'#333333'}
+                  style = {color:'#e6a23c'}
+                  break;
+                case '已终止':
+                  style = {color:'#cccccc'}
                   break;
                 case '已过期':
                   style = {color:'#999999'}
@@ -760,10 +769,13 @@ export default {
                     style = {color:'#3874f6'}
                     break;
                   case '已提交':
-                    style = {color:'#52c41a'}
+                    style = {color:'#67C23A'}
                     break;
                   case '审核':
-                    style = {color:'#333333'}
+                    style = {color:'#e6a23c'}
+                    break;
+                  case '已终止':
+                    style = {color:'#cccccc'}
                     break;
                   case '已过期':
                     style = {color:'#999999'}
@@ -832,21 +844,24 @@ export default {
             style:function () {
             let style = {}
             switch (that.mainData.status) {
-                case '新建':
-                  style = {color:'#3874f6'}
-                  break;
-                case '已提交':
-                  style = {color:'#52c41a'}
-                  break;
-                case '审核':
-                  style = {color:'#333333'}
-                  break;
+              case '新建':
+                style = {color:'#3874f6'}
+                break;
+              case '已提交':
+                style = {color:'#67C23A'}
+                break;
+              case '审核':
+                style = {color:'#e6a23c'}
+                break;
+              case '已终止':
+                style = {color:'#cccccc'}
+                break;
               case '已过期':
                 style = {color:'#999999'}
                 break;
-                default:
-                  break;
-              }
+              default:
+                break;
+            }
               return style
             }
           },
@@ -923,10 +938,13 @@ export default {
                   style = {color:'#3874f6'}
                   break;
                 case '已提交':
-                  style = {color:'#52c41a'}
+                  style = {color:'#67C23A'}
                   break;
                 case '审核':
-                  style = {color:'#333333'}
+                  style = {color:'#e6a23c'}
+                  break;
+                case '已终止':
+                  style = {color:'#cccccc'}
                   break;
                 case '已过期':
                   style = {color:'#999999'}
@@ -1051,10 +1069,13 @@ export default {
                           style = {color:'#3874f6'}
                           break;
                         case '已提交':
-                          style = {color:'#52c41a'}
+                          style = {color:'#67C23A'}
                           break;
                         case '审核':
-                          style = {color:'#333333'}
+                          style = {color:'#e6a23c'}
+                          break;
+                        case '已终止':
+                          style = {color:'#cccccc'}
                           break;
                         case '已过期':
                           style = {color:'#999999'}
@@ -1161,10 +1182,13 @@ export default {
                           style = {color:'#3874f6'}
                           break;
                         case '已提交':
-                          style = {color:'#52c41a'}
+                          style = {color:'#67C23A'}
                           break;
                         case '审核':
-                          style = {color:'#333333'}
+                          style = {color:'#e6a23c'}
+                          break;
+                        case '已终止':
+                          style = {color:'#cccccc'}
                           break;
                         case '已过期':
                           style = {color:'#999999'}
@@ -1266,10 +1290,13 @@ export default {
                           style = {color:'#3874f6'}
                           break;
                         case '已提交':
-                          style = {color:'#52c41a'}
+                          style = {color:'#67C23A'}
                           break;
                         case '审核':
-                          style = {color:'#333333'}
+                          style = {color:'#e6a23c'}
+                          break;
+                        case '已终止':
+                          style = {color:'#cccccc'}
                           break;
                         case '已过期':
                           style = {color:'#999999'}
@@ -1367,10 +1394,13 @@ export default {
                               style = {color:'#3874f6'}
                               break;
                             case '已提交':
-                              style = {color:'#52c41a'}
+                              style = {color:'#67C23A'}
                               break;
                             case '审核':
-                              style = {color:'#333333'}
+                              style = {color:'#e6a23c'}
+                              break;
+                            case '已终止':
+                              style = {color:'#cccccc'}
                               break;
                             case '已过期':
                               style = {color:'#999999'}
@@ -1451,10 +1481,13 @@ export default {
                               style = {color:'#3874f6'}
                               break;
                             case '已提交':
-                              style = {color:'#52c41a'}
+                              style = {color:'#67C23A'}
                               break;
                             case '审核':
-                              style = {color:'#333333'}
+                              style = {color:'#e6a23c'}
+                              break;
+                            case '已终止':
+                              style = {color:'#cccccc'}
                               break;
                             case '已过期':
                               style = {color:'#999999'}
@@ -1558,10 +1591,13 @@ export default {
                               style = {color:'#3874f6'}
                               break;
                             case '已提交':
-                              style = {color:'#52c41a'}
+                              style = {color:'#67C23A'}
                               break;
                             case '审核':
-                              style = {color:'#333333'}
+                              style = {color:'#e6a23c'}
+                              break;
+                            case '已终止':
+                              style = {color:'#cccccc'}
                               break;
                             case '已过期':
                               style = {color:'#999999'}

src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -361,7 +361,10 @@ export default {
             let style = {};
             switch (that.mainData.status) {
               case "进行中":
-                style = { color: "#00B32B" };
+                style = { color: "#67C23A" };
+                break;
+              case "已截止":
+                style = { color: "#ccc" };
                 break;
               default:
                 break;

src/HDrpManagement/invoicePredictionManage/index.vue

@@ -38,10 +38,10 @@
       </template>
       <template v-slot:tbList="scope">
         <p v-if="scope.data.column.columnname === 'status'">
-          <span v-if="scope.data.column.data.status === '进行中'" style="color: #00B32B">
+          <span v-if="scope.data.column.data.status === '进行中'" style="color: #67C23A">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
-          <span v-else>
+          <span v-else style="color:#ccc;">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
         </p>

src/HDrpManagement/predictionRule/index.vue

@@ -24,10 +24,10 @@
               active-color="#00B32B"
               inactive-color="#E13333" @change="onChange(scope.data.column.data)">
           </el-switch>-->
-          <span v-if="scope.data.column.data.status === '开启'" style="color: #00B32B">
+          <span v-if="scope.data.column.data.status === '开启'" style="color: #67C23A">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
-          <span v-else style="color: #E13333">
+          <span v-else style="color: #f56c6c">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
         </p>

src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -299,8 +299,11 @@ export default {
           style: () => {
             let style = {};
             switch (that.mainData.status) {
-              case "进行中":
-                style = { color: "#00B32B" };
+              case '进行中':
+                style = {color:'#67C23A'}
+                break;
+              case '已截止':
+                style = {color:'#ccc'}
                 break;
               default:
                 break;

src/HDrpManagement/projectPredictionManage/index.vue

@@ -38,10 +38,10 @@
       </template>
       <template v-slot:tbList="scope">
         <p v-if="scope.data.column.columnname === 'status'">
-          <span v-if="scope.data.column.data.status === '进行中'" style="color: #00B32B">
+          <span v-if="scope.data.column.data.status === '进行中'" style="color: #67C23A">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
-          <span v-else>
+          <span v-else style="color: #ccc">
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
         </p>

src/HDrpManagement/promotion/index.vue

@@ -25,10 +25,10 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.data[[scope.data.column.columnname]]">
           <span v-if="scope.data.column.columnname == 'status'">
-            <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#b2c0ea" v-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#d90a0a" 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:#cccccc" v-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+            <span style="color:#e6a24c" 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>
           <span v-else>
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

src/HDrpManagement/promotion/modules/detail.vue

@@ -192,16 +192,16 @@ export default {
               let style = {}
               switch (that.mainData.status) {
                 case '新建':
-                  style = {color:'#000000'}
+                  style = {color:'#3874F6'}
                   break;
                 case '审核':
-                  style = {color:'#52C41A'}
+                  style = {color:'#e6a24c'}
                   break;
                 case '发布':
-                  style = {color:'#d90a0a'}
+                  style = {color:'#67C23A'}
                   break;
                 case '关闭':
-                  style = {color:'#b2c0ea'}
+                  style = {color:'#cccccc'}
                   break;
               }
               return style
@@ -265,16 +265,16 @@ export default {
               let style = {}
               switch (that.mainData.status) {
                 case '新建':
-                  style = {color:'#000000'}
+                  style = {color:'#3874F6'}
                   break;
                 case '审核':
-                  style = {color:'#52C41A'}
+                  style = {color:'#e6a24c'}
                   break;
                 case '发布':
-                  style = {color:'#d90a0a'}
+                  style = {color:'#67C23A'}
                   break;
                 case '关闭':
-                  style = {color:'#b2c0ea'}
+                  style = {color:'#cccccc'}
                   break;
               }
               return style

src/HDrpManagement/workReport/modules/aside/index.vue

@@ -14,7 +14,7 @@
           :style="
             currentStatus == ''
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('全部')}}
@@ -24,7 +24,7 @@
           :style="
             currentStatus == '0'
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('未读')}}
@@ -34,7 +34,7 @@
           :style="
             currentStatus == '1'
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('已读')}}
@@ -67,7 +67,9 @@
                 <p>{{ item.createdate }}</p>
               </div>
             </div>
-            <div class="item-right">{{ $t(item.reportname) }}</div>
+            <div class="item-right">
+              <span style="color: #3874F6">{{ $t(item.reportname) }}</span>
+            </div>
           </div>
         </div>
 
@@ -209,16 +211,16 @@ export default {
 .aside {
   font-size: 14px;
   height: calc(100vh - 250px);
-  background: #fafafa;
+  background-color: rgba(56,116,246,0.15);
   border-right: 1px solid #cccccc;
 }
 .aside .aside-header {
   display: flex;
   align-items: center;
-  background: #f2f2f2;
+  /*background: #f2f2f2;*/
   height: 40px;
   justify-content: space-between;
-  padding: 0 16px;
+  padding: 10px 10px 0 10px;
 }
 .select-btn {
   display: flex;
@@ -260,6 +262,7 @@ export default {
   cursor: pointer;
   transition: all 0.2s ease-in-out;
   position: relative;
+  background: #fff;
 }
 .list .no-read::before {
   content: "";
@@ -274,6 +277,7 @@ export default {
 .list .list-item .item-left {
   display: flex;
   align-items: center;
+  margin-left: 10px;
 }
 .list .list-item .item-left .item-avatar {
   background: #3874f6;
@@ -300,9 +304,9 @@ export default {
   transform: translateY(2px);
 }
 .list .list-item .item-right {
-  background: #e6f7ff;
-  color: #3874f6;
-  padding: 2px 4px;
+  background-color: rgba(56,116,246,0.15);
+  padding: 2px 10px;
   border-radius: 4px;
+  margin-right: 10px;
 }
 </style>

src/HDrpManagement/workReport/modules/reportComment/index.vue

@@ -6,7 +6,7 @@
     <div class="comment-publish">
       <el-input
         type="textarea"
-        style="font-size: 12px"
+        style="font-size: 12px;"
         :rows="8"
         :placeholder="$t(`发表评论`)"
         v-model="textarea"
@@ -52,10 +52,25 @@
           <div style="margin-left: 40px; font-size: 12px; margin-top: -10px">
             {{ item.content }}
           </div>
-          <div style="margin-left: 40px; margin-top: 10px">
-            <div style="float: right">
+          <div style="display: flex;justify-content: space-between;margin-left: 40px; margin-top: 10px">
+            <div style="font-size: 12px; color: #cccccc">
+              {{ item.createdate }}
+              <el-popconfirm :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
+                             :title="$t(`确定删除该评论吗？`)"
+                             @confirm="onDel(item)"
+              >
+                <el-button
+                    slot="reference"
+                    v-if="item.createuserid === userid"
+                    style="color: #666; font-size: 12px"
+                    type="text"
+                >{{ $t("删除") }}</el-button
+                >
+              </el-popconfirm>
+            </div>
+            <div>
               <el-button
-                style="color: #000000; font-size: 12px; padding: 0 !important"
+                style="color: #000000; font-size: 12px;"
                 type="text"
                 icon="el-icon-chat-dot-square"
                 @click="onReply(item)"
@@ -63,7 +78,7 @@
                 >{{ $t("回复") }}</el-button
               >
               <el-button
-                style="color: #000000; font-size: 12px; padding: 0 !important"
+                style="color: #000000; font-size: 12px;"
                 type="text"
                 icon="el-icon-chat-dot-square"
                 @click="onReply(item)"
@@ -71,32 +86,17 @@
                 >{{ $t("取消回复") }}</el-button
               >
             </div>
-            <div style="font-size: 12px; color: #cccccc">
-              {{ item.createdate }}
-              <el-popconfirm :confirm-button-text="$t('确定')" :cancel-button-text="$t('取消')"
-                :title="$t(`确定删除该评论吗？`)"
-                @confirm="onDel(item)"
-              >
-                <el-button
-                  slot="reference"
-                  v-if="item.createuserid === userid"
-                  style="color: #666; font-size: 12px; padding: 0 !important"
-                  type="text"
-                  >{{ $t("删除") }}</el-button
-                >
-              </el-popconfirm>
-            </div>
           </div>
           <div v-if="item.isReply">
             <el-input
               style="font-size: 12px"
               type="textarea"
               :rows="3"
-              :placeholder="this.$t('回复') + item.createby"
+              :placeholder="$t('回复') + item.createby"
               v-model="item.retextarea"
             >
             </el-input>
-            <div style="float: right; margin-top: 10px">
+            <div style="float: right; margin-top: 10px;margin-bottom: 10px">
               <el-button type="primary" size="small" @click="onReComment(item)"
                 >{{$t('发表')}}</el-button
               >
@@ -255,4 +255,7 @@ export default {
 /deep/ .el-textarea__inner {
   background-color: #f5f5f5;
 }
+/deep/  .el-textarea__inner {
+  background-color: #fff;
+}
 </style>

src/HManagement/archvies_mag/modules/delete.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-button icon="el-icon-delete" size="small" @click="clickDelete" :disabled="isRest">{{$t('删 除')}}</el-button>
+    <el-button icon="el-icon-delete" size="small" @click="clickDelete" :disabled="isRest" style="color: #f56c6c;">{{$t('删 除')}}</el-button>
 </template>
 
 <script>

src/HManagement/archvies_mag/modules/list.vue

@@ -5,7 +5,7 @@
         <slot name="upload"></slot>
         <slot name="add"></slot>
         <slot name="btngroup"></slot>
-        <el-button style="margin-left: 10px" :type="checkArray.length == list.length ? '' : 'primary'" size="small" @click="selectAll">{{checkArray.length == list.length ? $t('取消全选'):$t('全选')}}</el-button>
+<!--        <el-button style="margin-left: 10px" :type="checkArray.length == list.length ? '' : 'primary'" size="small" @click="selectAll">{{checkArray.length == list.length ? $t('取消全选'):$t('全选')}}</el-button>-->
       </div>
       <div class="flex-align-center">
         <el-input size="small" style="width:160px;margin-right:16px" prefix-icon="el-icon-search"
@@ -18,6 +18,8 @@
     </div>
     <div ref="ele" id="scroll" style="height:calc(100vh - 300px);overflow-y:scroll" class="container normal-panel">
       <bread-crumbs style="margin-bottom:10px" :tempFileData="tempFileData" @BreadCrumbsChange="BreadCrumbsChange"></bread-crumbs>
+      <el-checkbox class="mt-10" v-model="checkedAll"  true-label="1" false-label="0" @change="selectAll">{{$t(`全选`)}}</el-checkbox>
+      <span style="margin-left: 40px;color: #606266;font-size: 14px" v-if="selectNum > 0">{{$t(`已选中`)}}{{selectNum}}{{$t(`项`)}}</span>
       <el-row :gutter="10" >
         <el-col :span="2" v-for="folder in list" :key="folder.id">
 
@@ -121,11 +123,13 @@ export default {
        * @param data     : 文件夹id
        */
       tempFileData: [{
-        filename: '文件',
+        filename: '物料发布',
         id: null,
       }],
       seeFileData:'',
-      checkArray:[]
+      checkArray:[],
+      selectNum:0,
+      checkedAll:0
     }
   },
   methods: {
@@ -167,11 +171,18 @@ export default {
     },
     onChange(folder) {
       this.checkArray = []
+      this.selectNum = 0
       this.list.forEach((e, index) => {
         if (e.ischeck === true) {
           this.checkArray.push(e)
+          this.selectNum = this.selectNum + 1
         }
       })
+      if (this.selectNum == this.list.length){
+        this.checkedAll = '1'
+      }else {
+        this.checkedAll = '0'
+      }
       this.$emit('folderChecked', this.checkArray)
     },
     onSelect(folder){

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

@@ -211,10 +211,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '启用':
-                style = {color:"#52C41A"}
+                style = {color:"#67C23A"}
                 break;
               case '禁用':
-                style = {color:"#d90a0a"}
+                style = {color:"#ccc"}
                 break;
               default:
                 break;
@@ -228,7 +228,21 @@ export default {
         },
         {
           label:this.$t('合作状态'),
-          value: this.mainData.cooperationstatus
+          value: this.mainData.cooperationstatus,
+          style:function () {
+            let style = {}
+            switch (that.mainData.cooperationstatus) {
+              case '正式':
+                style = {color:"#67C23A"}
+                break;
+              case '意向':
+                style = {color:"#3874F6"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label:this.$t('合作伙伴类型'),

src/HManagement/marketing2/agent/index.vue

@@ -110,8 +110,12 @@
              </span>
             </p>
             <p v-else-if="scope.data.column.columnname === 'status'">
-              <span style="color:#d90a0a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '禁用'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-              <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '启用'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
+              <span style="color:#ccc" 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>
+            </p>
+            <p v-else-if="scope.data.column.columnname === 'cooperationstatus'">
+              <span style="color:#67C23A" 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>
             </p>
             <p v-else-if="scope.data.column.columnname === 'isservice'">
               {{scope.data.column.data.isservice ? $t('是') : $t('否')}}

src/HManagement/personalTarget/target/index.vue

@@ -23,8 +23,8 @@
         <div>
           <div v-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:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已下达'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#333333" 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 style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           </div>
           <div v-else>
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

src/HManagement/personalTarget/target/modules/edit/index.vue

@@ -138,10 +138,10 @@ export default {
                 style = {color:'#3874f6'}
                 break;
               case '已下达':
-                style = {color:'#52c41a'}
+                style = {color:'#67C23A'}
                 break;
               case '关闭':
-                style = {color:'#333333'}
+                style = {color:'#cccccc'}
                 break;
               default:
                 break;

src/HManagement/personalTarget/target/modules/edit/modules/detailedInformation/index.vue

@@ -6,10 +6,11 @@
         <el-descriptions-item  :label="$t('年度')">{{ mainData.year?mainData.year:"--" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`编制方式`)">{{ mainData.targettype?mainData.targettype:"--" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`人员数`)">{{ mainData.peoplecount?mainData.peoplecount:"--"}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('状态')">{{ mainData.status?mainData.status:"--" }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('状态')" >
+          <span :style="mainData.status == '新建'?'color:#3874f6':mainData.status == '已下达'?'color:#67C23A':'color:#cccccc'">{{ mainData.status?mainData.status:"--" }}</span>
+        </el-descriptions-item>
       </el-descriptions>
     </div>
-
     <div>
       <el-descriptions :column="2" labelClassName="my-label" contentClassName="my-content" border>
         <div slot="title" class="my-label__title">{{$t('系统信息')}}</div>

src/HManagement/projectTarget/target/index.vue

@@ -23,8 +23,8 @@
         <div>
           <div v-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:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已下达'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
-            <span style="color:#333333" 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 style="color:#cccccc" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
           </div>
           <div v-else>
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}

src/HManagement/projectTarget/target/modules/edit/index.vue

@@ -135,10 +135,10 @@ export default {
                 style = {color:'#3874f6'}
                 break;
               case '已下达':
-                style = {color:'#52c41a'}
+                style = {color:'#67C23A'}
                 break;
               case '关闭':
-                style = {color:'#333333'}
+                style = {color:'#cccccc'}
                 break;
               default:
                 break;

src/HManagement/projectTarget/target/modules/edit/modules/detailedInformation/index.vue

@@ -6,7 +6,9 @@
         <el-descriptions-item  :label="$t('年度')">{{ mainData.year?mainData.year:"--" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`编制方式`)">{{ mainData.targettype?mainData.targettype:"--" }}</el-descriptions-item>
         <el-descriptions-item :label="$t(`人员数`)">{{ mainData.peoplecount?mainData.peoplecount:"--"}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('状态')">{{ mainData.status?mainData.status:"--" }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('状态')">
+          <span :style="mainData.status == '新建'?'color:#3874f6':mainData.status == '已下达'?'color:#67C23A':'color:#cccccc'">{{ mainData.status?mainData.status:"--" }}</span>
+        </el-descriptions-item>
       </el-descriptions>
     </div>
 

src/SDrpManagement/invoicePrediction/detail/subordinate.vue

@@ -124,7 +124,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '进行中':
-                style = {color:'#00B32B'}
+                style = {color:'#67C23A'}
+                break;
+              case '已截止':
+                style = {color:'#ccc'}
                 break;
               default:
                 break;

src/SDrpManagement/invoicePrediction/index.vue

@@ -100,11 +100,11 @@
         <p v-if="scope.data.column.columnname === 'status'">
           <span
             v-if="scope.data.column.data.status === '进行中'"
-            style="color: #00b32b"
+            style="color: #67C23A"
           >
             {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
           </span>
-          <span v-else>
+          <span v-else style="color: #ccc">
             {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
           </span>
         </p>

src/SDrpManagement/projectPrediction/detail/subordinate.vue

@@ -116,7 +116,10 @@ export default {
             let style = {}
             switch (that.mainData.status) {
               case '进行中':
-                style = {color:'#00B32B'}
+                style = {color:'#67C23A'}
+                break;
+              case '已截止':
+                style = {color:'#ccc'}
                 break;
               default:
                 break;

src/SDrpManagement/projectPrediction/index.vue

@@ -100,11 +100,11 @@
         <p v-if="scope.data.column.columnname === 'status'">
           <span
             v-if="scope.data.column.data.status === '进行中'"
-            style="color: #00b32b"
+            style="color: #67C23A"
           >
             {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
           </span>
-          <span v-else>
+          <span v-else style="color: #ccc">
             {{ $t(scope.data.column.data[[scope.data.column.columnname]]) }}
           </span>
         </p>

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -213,7 +213,7 @@ export default {
     // 提交订单
     onSubmit(type) {
       this.$confirm(
-        `${$t("是否")}‘${$t(type)}’${$t("该订单")}`,
+        `${this.$t("是否")}‘${this.$t(type)}’${this.$t("该订单")}`,
         this.$t("提示"),
         {
           confirmButtonText: this.$t("确定"),

src/views/message/components/list.vue

@@ -104,11 +104,11 @@ export default {
   align-items: center;
 }
 .list .item-box .item .left .info .tag {
-  padding: 4px 6px;
+  padding: 0.2rem 0.9rem;
   border: 1px solid #3874F6;
+  border-radius: 4px 4px 4px 4px;
   color: #3874F6;
   font-size: 12px;
-  border-radius: 2px;
   margin-right: 10px;
 }
 .list .item-box .item .left .info .time {
@@ -125,8 +125,9 @@ export default {
   background: #FFEBEA;
   border-radius: 4px 4px 4px 4px;
   padding: 0.2rem 0.9rem;
+  border: 1px solid #FF3B30;
   color: #FF3B30;
-  font-size: 14px;
+  font-size: 12px;
 }
 .list .item-box .item .right .no-read {
   background: #EEEEEE;

src/views/message/index.vue

@@ -15,7 +15,7 @@
                    :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>-->
             </div>
             <div class="select_right">
-              <el-button @click="allRead" size="small">{{$t('全部阅读')}}</el-button>
+              <el-button @click="allRead" size="small">{{$t('全部标为已读')}}</el-button>
             </div>
           </div>
           <el-row style="margin-top: 10px">