消息显示调整，标签颜色调整，项目商机分页

src/HDrpManagement/projectChange/index.vue

@@ -122,12 +122,12 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tag'">
           <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/HDrpManagement/projectChange/modules/modules/productSet/add.vue

@@ -24,7 +24,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
-              height="930"
+              height="calc(100vh - 370px)"
               :data="tableData"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -23,7 +23,7 @@
           ref="multipleTable"
           :data="list"
           style="width: 100%"
-          :height="tableHieght"
+          height="calc(100vh - 550px)"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
@@ -178,7 +178,7 @@
       </el-table>
       <div style="margin-top:16px;">
         <div style="float: left">
-          <span>金额(元)：{{tool.formatAmount(totalPrice,2)}}</span>
+          <span>金额(元)：{{totalPrice?tool.formatAmount(totalPrice,2):'0.00'}}</span>
         </div>
         <div style="float: right">
           <el-pagination

src/HDrpManagement/publicCustomer/index.vue

@@ -120,12 +120,12 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tag'">
           <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -26,6 +26,9 @@
         </div>
         <div v-else-if="scope.column.columnname == 'costofconstruction'">
           <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'leadername'">
+          <span>{{scope.column.data.leader ?scope.column.data.leader[0].name:'--'}}</span>
         </div>
           <div v-else-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>

src/HManagement/siteManage/securityConfig/index.vue

@@ -46,7 +46,7 @@
             <p class="explain-tips">当前设置：{{productImage.length === 0 ? '还未上传产品默认图':'已上传产品默认图'}}</p>
           </div>
         </div>
-        <productImage @setProductImage="productImage"></productImage>
+        <productImage @setProductImage="queryProductImage"></productImage>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -56,7 +56,7 @@
             width="80"
         >
           <template slot-scope="scope">
-            <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
+            <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -122,7 +122,7 @@
             width="100"
         >
           <template slot-scope="scope">
-            <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
+            <p><span>{{tool.formatAmount(scope.row.discountDifferenceAmount)}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -136,33 +136,27 @@
             width="180">
         </el-table-column>
         <el-table-column
-            label="型号"
+            prop="erpitemno"
+            label="品号"
             width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.model}}</span></p>
-          </template>
         </el-table-column>
         <el-table-column
-            label="规格"
-            width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.spec}}</span></p>
-          </template>
+            prop="standards"
+            label="标准"
+            width="100">
         </el-table-column>
         <el-table-column
-            prop="caliber"
-            label="口径"
+            label="型号"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.caliber?scope.row.caliber:'--'}}</span></p>
+            <p><span>{{scope.row.model}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="pressure"
-            label="压力"
+            label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.pressure?scope.row.pressure:'--'}}</span></p>
+            <p><span>{{scope.row.spec}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -283,17 +277,16 @@
         </el-table-column>
       </el-table>
       <div style="height: 35px;margin-top: 20px">
-        <div style="float: left">总金额(元)：{{ totalPrice }}</div>
+        <div style="float: left">总金额(元)：{{ tool.formatAmount(totalPrice,2) }}</div>
         <div style="float: right">
           <el-pagination
               background
-              small
-              style="text-align: right;"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="param.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :current-page="param.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -334,7 +327,7 @@ export default {
         "content": {
           "sa_quotedpriceid":'',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -117,12 +117,12 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tag'">
           <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -3,9 +3,9 @@
     <!-- <p class="detail__head__label">标签展示:</p> -->
     <div class="flex-align-center">
       <p v-if="systemtag.length === 0 && datatag.length === 0"  style="margin-right:5px;color:#ccc" >暂无标签</p>
-      <el-tag style="margin-right:5px" color="#FA8C16" v-for="item in systemtag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+      <el-tag style="margin-right:5px" color="#3874F6" v-for="item in systemtag" :key="item.rowindex" size="small" type="primary" effect="dark">{{item}}</el-tag>
       <div v-if="showTag">
-        <el-tag style="margin-right:5px" color="#FAAB16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+        <el-tag style="margin-right:5px" color="#FA8C16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
       </div>
       <el-select
         v-if="!showTag"

src/views/message/components/list.vue

@@ -87,10 +87,10 @@ export default {
   font-size: 12px;
   font-weight: 400;
   color: #666666;
-  max-width: 1000px;
+ /* max-width: 120px;
   white-space: nowrap;
   overflow: hidden;
-  text-overflow: ellipsis;
+  text-overflow: ellipsis;*/
 }
 .list .item-box .item .left .info {
   display: flex;
@@ -112,14 +112,14 @@ export default {
 .list .item-box .item .right .read {
   background: #FFEBEA;
   border-radius: 4px 4px 4px 4px;
-  padding: 6px 16px;
+  padding: 0.2rem 0.9rem;
   color: #FF3B30;
   font-size: 14px;
 }
 .list .item-box .item .right .no-read {
   background: #EEEEEE;
   border-radius: 4px 4px 4px 4px;
-  padding: 6px 16px;
+  padding: 0.2rem 0.9rem;
   color: #999999;
   font-size: 14px;
 }

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-            target: 'http://192.168.3.9:8080',
+          target: 'http://61.164.207.46:8000',  // target host*/
+          //   target: 'http://192.168.3.9:8080',
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets