Merge branch 'dev1.0.1' of http://222.90.211.174:3000/suf/factoring-trade-c-front-end into dev1.0.1

src/router/moudules/myTrade.js

@@ -77,28 +77,28 @@ export default {
           path: '/purchaseContractManagement/PurchaseContractAdd/:id',
           name: 'PurchaseContractAdd',
           component: () => import('@/views/myTrade/purchaseContractManagement/purchaseContractAdd'),
-          meta: { title: '创建采购合同', icon: 'tree' },
+          meta: { title: '创建采购合同', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/purchaseContractManagement/PurchaseContractSign/:id',
           name: 'PurchaseContractSign',
           component: () => import('@/views/myTrade/purchaseContractManagement/purchaseContractSign'),
-          meta: { title: '签署确认', icon: 'tree' },
+          meta: { title: '签署确认', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/purchaseContractManagement/PurchaseContractChange/:id',
           name: 'PurchaseContractChange',
           component: () => import('@/views/myTrade/purchaseContractManagement/purchaseContractUpdate'),
-          meta: { title: '采购合同变更', icon: 'tree' },
+          meta: { title: '采购合同变更', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/purchaseContractManagement/PurchaseContractDetail/:id',
           name: 'PurchaseContractDetail',
           component: () => import('@/views/myTrade/purchaseContractManagement/detail'),
-          meta: { title: '采购合同详情', icon: 'tree' },
+          meta: { title: '采购合同详情', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         // {
@@ -147,21 +147,21 @@ export default {
           path: 'settlementDocumentManagement',
           name: 'SettlementDocumentManagement',
           component: () => import('@/views/myTrade/settlementDocumentManagement/index'),
-          meta: { title: '结算单管理', icon: 'tree' },
+          meta: { title: '结算单管理', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/addSettlement/:id',
           name: 'AddSettlement',
           component: () => import('@/views/myTrade/settlementDocumentManagement/add'),
-          meta: { title: '新建结算单', icon: 'tree' },
+          meta: { title: '新建结算单', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/settlementDetail/:id',
           name: 'SettlementDetail',
           component: () => import('@/views/myTrade/settlementDocumentManagement/detail'),
-          meta: { title: '查看', icon: 'tree' },
+          meta: { title: '查看', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         // {
@@ -175,14 +175,14 @@ export default {
           path: '/signSettlement/:id',
           name: 'SignSettlement',
           component: () => import('@/views/myTrade/settlementDocumentManagement/signSettlement'),
-          meta: { title: '结算单签署', icon: 'tree' },
+          meta: { title: '结算单签署', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/editSettlement/:id',
           name: 'EditSettlement',
           component: () => import('@/views/myTrade/settlementDocumentManagement/editPrice'),
-          meta: { title: '单价调整', icon: 'tree' },
+          meta: { title: '单价调整', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         }
       ]

src/views/myTrade/purchaseContractManagement/components/PersonnelInformation.vue

@@ -12,7 +12,7 @@
           <el-table-column type="index" label="序号" />
           <el-table-column label="姓名" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].name`" style="width: 100%; margin-bottom: 15px;" 
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].name`" style="width: 100%; margin: 15px 0;" 
                 :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.name"
@@ -23,7 +23,7 @@
           </el-table-column>
           <el-table-column label="身份证号" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].idCard`" style="width: 100%; margin-bottom: 15px;"
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].idCard`" style="width: 100%; margin: 15px 0;"
                 :rules="[{ required: true, message: '请输入身份证号', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.idCard"
@@ -34,7 +34,7 @@
           </el-table-column>
           <el-table-column label="联系方式" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].contact`" style="width: 100%; margin-bottom: 15px;"
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].contact`" style="width: 100%; margin: 15px 0;"
                 :rules="[{ required: true, message: '请输入联系方式', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.contact"

src/views/myTrade/purchaseContractManagement/detailComponents/PersonInfo.vue

@@ -9,7 +9,7 @@
           <el-table-column type="index" label="序号" />
           <el-table-column label="姓名" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].name`" style="width: 100%;" 
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].name`" style="width: 100%; margin: 15px 0;" 
                 :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.name"
@@ -20,7 +20,7 @@
           </el-table-column>
           <el-table-column label="身份证号" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].idCard`" style="width: 100%;"
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].idCard`" style="width: 100%; margin: 15px 0;"
                 :rules="[{ required: true, message: '请输入身份证号', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.idCard"
@@ -31,7 +31,7 @@
           </el-table-column>
           <el-table-column label="联系方式" label-class-name="rule-required">
             <template slot-scope="scope">
-              <el-form-item label="" :prop="`personInfoList[${scope.$index}].contact`" style="width: 100%;"
+              <el-form-item label="" :prop="`personInfoList[${scope.$index}].contact`" style="width: 100%; margin: 15px 0;"
                 :rules="[{ required: true, message: '请输入联系方式', trigger: 'blur' }]">
                 <el-input
                   v-model="scope.row.contact"

src/views/myTrade/purchaseContractManagement/index.vue

@@ -6,10 +6,10 @@
           <div class="left" />
           <div class="right">
             <div>
-              <el-input v-model="search.businessNumber" style="width: 250px" placeholder="采购合同编号/业务编号" clearable />
+              <el-input v-model="search.businessNumber" style="width: 100%" placeholder="采购合同编号/业务编号" clearable />
             </div>
             <div>
-              <el-select v-model="search.status" style="width: 250px" placeholder="请选择状态" clearable>
+              <el-select v-model="search.status" style="width: 100%" placeholder="请选择状态" clearable>
                 <el-option
                   v-for="item in constant.projectInitiationStatus"
                   :key="item.code"
@@ -19,12 +19,12 @@
               </el-select>
             </div>
             <div>
-              <el-input v-model="search.fastSearch" style="width: 250px" placeholder="项目名称/主企业名称/核心企业名称" clearable />
+              <el-input v-model="search.fastSearch" style="width: 100%" placeholder="项目名称/主企业名称/核心企业名称" clearable />
             </div>
-            <div class="leftBtn">
+            <div class="right-btn">
               <el-button type="primary" @click="fetchData">查询</el-button>
-            </div>
-            <div class="leftBtn">
+            <!-- </div>
+            <div class="leftBtn"> -->
               <el-button type="primary" icon="el-icon-plus" @click="createContract">创建采购合同</el-button>
             </div>
           </div>

src/views/myTrade/purchaseContractManagement/purchaseContractSign.vue

@@ -41,7 +41,11 @@
           <td>{{ item.contractName }}</td>
           <td colspan="2">
             签署状态：{{ item.signStatus ? '已签署' : '未签署' }}
-            <span style="color: #169bd5; float: right; margin-right: 10px; cursor: pointer;" @click="refreshStatus(2, item.id)">刷新</span>
+            <div style="float: right;">
+              <span style="color: #b9b9b9;"><span style="color: #ff1a1a;">*</span>签署后点击「刷新」按钮”</span>
+              <span style="color: #169bd5; margin: 0 10px 0 20px; cursor: pointer;" @click="refreshStatus(2, item.id)">刷新</span>
+            </div>
+            <!-- <span style="color: #169bd5; float: right; margin-right: 10px; cursor: pointer;" @click="refreshStatus(2, item.id)">刷新</span> -->
           </td>
         </tr>
       </table>

src/views/myTrade/settlementDocumentManagement/add.vue

@@ -71,6 +71,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="referencePrice" label="参考价格" width="150">
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="网价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>参考价格</span>
+            </template>
             <template slot-scope="scope">
               <el-form-item label="" :prop="`goodsList[${scope.$index}].referencePrice`" style="width: 100%;"
                 :rules="[{ required: true, message: '请输入参考价格', trigger: 'blur' }]">
@@ -90,6 +96,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="floatingPrice" label="浮动价格" width="150">
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="合约中约定的上下浮动差价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>浮动价格</span>
+            </template>
             <template slot-scope="scope">
               <el-form-item label="" :prop="`goodsList[${scope.$index}].floatingPrice`" style="width: 100%;"
                 :rules="[{ required: true, message: '请输入浮动价格', trigger: 'blur' }]">
@@ -155,7 +167,7 @@
       </cy-info-title>
       <div style="width: 100%; margin-bottom: 20px;">
         <el-table :data="ruleForm.repayList" style="width: 100%;">
-          <el-table-column type="index" label="编号" show-overflow-tooltip/>
+          <el-table-column type="index" label="编号" width="300" show-overflow-tooltip/>
           <el-table-column prop="repaymentDate" label="回款日期" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.repaymentDate ? scope.row.repaymentDate.split(' ')[0] : '' }}</span>
@@ -762,4 +774,15 @@ export default {
     }
   }
 }
+.table-tip-icon {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-radius: 7px;
+  line-height: 14px;
+  text-align: center;
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  margin-right: 5px;
+}
 </style>

src/views/myTrade/settlementDocumentManagement/components/add.vue

@@ -49,8 +49,28 @@
           <el-table-column prop="goodsType" label="型号" show-overflow-tooltip/>
           <el-table-column prop="goodsUnit" label="单位" show-overflow-tooltip/>
           <el-table-column prop="goodsQuantity" label="数量" show-overflow-tooltip/>
-          <el-table-column prop="referencePrice" label="参考价格" show-overflow-tooltip/>
-          <el-table-column prop="floatingPrice" label="浮动价格" show-overflow-tooltip/>
+          <el-table-column prop="referencePrice" label="参考价格" show-overflow-tooltip>
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="网价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>参考价格</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.referencePrice || 0 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="floatingPrice" label="浮动价格" show-overflow-tooltip>
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="合约中约定的上下浮动差价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>浮动价格</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.floatingPrice || 0 }}
+            </template>
+          </el-table-column>
           <el-table-column prop="salesPrice" label="销售单价" show-overflow-tooltip/>
           <el-table-column prop="salesTotalPrice" label="销售总价" show-overflow-tooltip/>
           <el-table-column prop="salesGuaranteeMoney" label="销售质保金" show-overflow-tooltip/>
@@ -77,7 +97,7 @@
       </cy-info-title>
       <div style="width: 100%; margin-bottom: 20px;">
         <el-table :data="ruleForm.repayList" style="width: 100%;">
-          <el-table-column type="index" label="编号" show-overflow-tooltip/>
+          <el-table-column type="index" label="编号" width="300" show-overflow-tooltip/>
           <el-table-column prop="repaymentDate" label="回款日期" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ scope.row.repaymentDate ? scope.row.repaymentDate.split(' ')[0] : '' }}</span>
@@ -392,4 +412,15 @@ export default {
     }
   }
 }
+.table-tip-icon {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-radius: 7px;
+  line-height: 14px;
+  text-align: center;
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  margin-right: 5px;
+}
 </style>

src/views/myTrade/settlementDocumentManagement/components/edit.vue

@@ -40,8 +40,28 @@
           <el-table-column prop="goodsType" label="型号" show-overflow-tooltip/>
           <el-table-column prop="goodsUnit" label="单位" show-overflow-tooltip/>
           <el-table-column prop="goodsQuantity" label="数量" show-overflow-tooltip/>
-          <el-table-column prop="referencePrice" label="参考价格" show-overflow-tooltip/>
-          <el-table-column prop="floatingPrice" label="浮动价格" show-overflow-tooltip/>
+          <el-table-column prop="referencePrice" label="参考价格" show-overflow-tooltip>
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="网价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>参考价格</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.referencePrice || 0 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="floatingPrice" label="浮动价格" show-overflow-tooltip>
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="合约中约定的上下浮动差价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>浮动价格</span>
+            </template>
+            <template slot-scope="scope">
+              {{ scope.row.floatingPrice || 0 }}
+            </template>
+          </el-table-column>
           <el-table-column prop="salesPrice" label="销售单价" show-overflow-tooltip/>
           <el-table-column prop="salesTotalPrice" label="销售总价" show-overflow-tooltip/>
           <el-table-column prop="salesGuaranteeMoney" label="销售质保金" show-overflow-tooltip/>
@@ -204,4 +224,15 @@ export default {
     }
   }
 }
+.table-tip-icon {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-radius: 7px;
+  line-height: 14px;
+  text-align: center;
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  margin-right: 5px;
+}
 </style>

src/views/myTrade/settlementDocumentManagement/editPrice.vue

@@ -58,6 +58,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="referencePrice" label="参考价格" width="150">
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="网价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>参考价格</span>
+            </template>
             <template slot-scope="scope">
               <el-form-item label="" :prop="`goodsList[${scope.$index}].referencePrice`" style="width: 100%;"
                 :rules="[{ required: true, message: '请输入参考价格', trigger: 'blur' }]">
@@ -76,6 +82,12 @@
             </template>
           </el-table-column>
           <el-table-column prop="floatingPrice" label="浮动价格" width="150">
+            <template slot="header" slot-scope="scope">
+              <el-tooltip class="item" effect="dark" content="合约中约定的上下浮动差价" placement="top">
+                <span class="table-tip-icon">!</span>
+              </el-tooltip>
+              <span>浮动价格</span>
+            </template>
             <template slot-scope="scope">
               <el-form-item label="" :prop="`goodsList[${scope.$index}].floatingPrice`" style="width: 100%;"
                 :rules="[{ required: true, message: '请输入浮动价格', trigger: 'blur' }]">
@@ -348,4 +360,16 @@ export default {
     }
   }
 }
+
+.table-tip-icon {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border-radius: 7px;
+  line-height: 14px;
+  text-align: center;
+  border: 1px solid #ff0000;
+  color: #ff0000;
+  margin-right: 5px;
+}
 </style>

src/views/myTrade/settlementDocumentManagement/index.vue

@@ -6,10 +6,10 @@
           <div class="left" />
           <div class="right">
             <div>
-              <el-input v-model="search.businessNo" style="width: 250px" placeholder="结算单编号/业务编号" clearable />
+              <el-input v-model="search.businessNo" style="width: 100%" placeholder="结算单编号/业务编号" clearable />
             </div>
             <div>
-              <el-select v-model="search.status" style="width: 250px" placeholder="请选择状态" clearable>
+              <el-select v-model="search.status" style="width: 100%" placeholder="请选择状态" clearable>
                 <el-option
                   v-for="item in statusList"
                   :key="item.code"
@@ -19,26 +19,28 @@
               </el-select>
             </div>
             <div>
-              <el-input v-model="search.customerName" style="width: 300px" placeholder="项目名称/主企业名称/核心企业名称" clearable />
+              <el-input v-model="search.customerName" style="width: 100%" placeholder="项目名称/主企业名称/核心企业名称" clearable />
             </div>
-            <div class="leftBtn">
+            <div class="right-btn">
               <el-button type="primary" @click="fetchData('search')">查询</el-button>
-            </div>
-            <div class="leftBtn">
+            <!-- </div>
+            <div class="leftBtn"> -->
               <el-button type="primary" icon="el-icon-plus" @click="createSettle">新建结算单</el-button>
             </div>
           </div>
         </div>
+        <div class="table-box">
+          <cy-comm-table
+            ref="commTable"
+            v-loading="loading"
+            :columns="columns"
+            :table-options="tableOptions"
+            :data="tableData"
+            :count="total"
+            parentComponent="SettlementDocumentManagement"
+          />
+        </div>
       </div>
-      <cy-comm-table
-        ref="commTable"
-        v-loading="loading"
-        :columns="columns"
-        :table-options="tableOptions"
-        :data="tableData"
-        :count="total"
-        parentComponent="SettlementDocumentManagement"
-      />
     </template>
     
     <router-view />

src/views/myTrade/settlementDocumentManagement/signSettlement.vue

@@ -40,7 +40,10 @@
           <td>结算单</td>
           <td colspan="2">
             签署状态：{{ detailInfo.signStatus ? '已签署' : '未签署' }}
-            <span style="color: #169bd5; float: right; margin-right: 10px; cursor: pointer;" @click="refreshStatus(2)">刷新</span>
+            <div style="float: right;">
+              <span style="color: #b9b9b9;"><span style="color: #ff1a1a;">*</span>签署后点击「刷新」按钮”</span>
+              <span style="color: #169bd5; margin: 0 10px 0 20px; cursor: pointer;" @click="refreshStatus(2)">刷新</span>
+            </div>
           </td>
         </tr>
       </table>