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

src/router/moudules/myBusiness.js

@@ -42,7 +42,7 @@ export default {
         name: 'MyBusinessSupplementaryInfoSee',
         component: () => import('@/views/myBusiness/supplementaryInfo/index'),
         hidden: true,
-        meta: { title: '供应商企业信息' }
+        meta: { title: '供应商企业信息', activeMenu: '/myBusiness' }
       },
       {
         path: '/myBusiness/projectInfo/:id',

src/router/moudules/myTrade.js

@@ -112,35 +112,35 @@ export default {
           path: '/acceptanceFormAdd/:id',
           name: 'AcceptanceFormAdd',
           component: () => import('@/views/myTrade/acceptanceManagement/acceptanceAdd'),
-          meta: { title: '新建验收单', icon: 'tree' },
+          meta: { title: '新建验收单', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/acceptanceFormView/:id',
           name: 'AcceptanceFormView',
           component: () => import('@/views/myTrade/acceptanceManagement/acceptanceView'),
-          meta: { title: '验收单查看', icon: 'tree' },
+          meta: { title: '验收单查看', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/acceptanceFormViewTemp/:id',
           name: 'AcceptanceFormViewTemp',
           component: () => import('@/views/myTrade/acceptanceManagement/acceptanceViewTemp'),
-          meta: { title: '验收单查看', icon: 'tree' },
+          meta: { title: '验收单查看', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/acceptanceSign/:id',
           name: 'AcceptanceSign',
           component: () => import('@/views/myTrade/acceptanceManagement/acceptanceSign'),
-          meta: { title: '签署确认', icon: 'tree' },
+          meta: { title: '签署确认', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {
           path: '/changePrice/:id',
           name: 'ChangePrice',
           component: () => import('@/views/myTrade/acceptanceManagement/changePrice'),
-          meta: { title: '验收单单价调整', icon: 'tree' },
+          meta: { title: '验收单单价调整', icon: 'tree', activeMenu: '/myTrade' },
           hidden: true
         },
         {

src/styles/index.scss

@@ -100,3 +100,7 @@ div:focus {
 .iconCharacters {
   font-size: 16px !important;
 }
+.option-label-tip {
+  font-size: 12px;
+  color: #838080;
+}

src/views/myBusiness/components/EnterpriseInspection.vue

@@ -13,6 +13,7 @@
         <custom-select
           :value.sync="ruleForm.corporateName"
           :disabled="disabled"
+          :placeholder="placeholder"
           @search-click="searchClick"
           @search-change="searchChange"
         >
@@ -94,6 +95,10 @@ export default {
     detailsInfo: {
       type: Object,
       default: () => {}
+    },
+    placeholder: {
+      type: String,
+      default: '请选择公司名称'
     }
   },
   data() {

src/views/myBusiness/projectInfo/components/Project.vue

@@ -14,9 +14,11 @@
             <el-option
               v-for="item in projectTypes"
               :key="item.value"
-              :label="item.label"
+              :label="item.label.split(':')[0]"
               :value="item.value"
-            />
+            >
+              <span>{{ item.label.split(':')[0] }}</span><span class="option-label-tip">（{{ item.label.split(':')[1] }}）</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="项目名称" class="two-form-item" prop="projectName">
@@ -52,15 +54,15 @@ export default {
       },
       projectTypes: [
         {
-          label: '固定项目',
+          label: '固定项目:货物与项目一一对应，非集采公司采购',
           value: 'c_project_type_1'
         },
         {
-          label: '集采项目',
+          label: '集采项目:货物与项目非一一对应，集采公司采购',
           value: 'c_project_type_2'
         },
         {
-          label: '无项目',
+          label: '无项目:暂无具体项目',
           value: 'c_project_type_3'
         }
       ],
@@ -117,8 +119,9 @@ export default {
 
 <style lang="scss" scoped>
 .project-box {
-.el-form {
-  padding: 10px 20px;
-}
+  .el-form {
+    padding: 10px 20px;
+  }
+
 }
 </style>

src/views/myBusiness/projectInfo/index.vue

@@ -5,7 +5,7 @@
     <project ref="projectInfo" />
     <cy-info-title type="collapse" name="核心企业">
       <!-- <core-enterprise ref="coreEnterprise" /> -->
-      <enterprise-inspection ref="enterpriseInspection" :inspection-data="inspectionData" class="enterprise-content" :source="'projectAdd'" />
+      <enterprise-inspection ref="enterpriseInspection" :inspection-data="inspectionData" class="enterprise-content" :source="'projectAdd'" :placeholder="'本次拟合作下游买方'" />
     </cy-info-title>
     <div class="submit-btn">
       <el-button type="primary" @click="nextClick">下一步</el-button>

src/views/myBusiness/projectSupplement/components/ProjectInfo.vue

@@ -107,9 +107,11 @@
           <el-option
             v-for="item in purposeList"
             :key="item.code"
-            :label="item.name"
+            :label="item.name.split(':')[0]"
             :value="item.code"
-          />
+          >
+            <span>{{ item.name.split(':')[0] }}</span><span class="option-label-tip">（{{ item.name.split(':')[1] }}）</span>
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="具体用途" class="one-form-item" prop="purposeDetail">

src/views/myFinancing/applyFinancing/index.vue

@@ -508,7 +508,6 @@ export default {
     goodsSubmit() {
       const multipleList = this.$refs.goodsTable.multipleSelection
       const list = deduplicateArray(multipleList, 'signConfirm')
-
       if (!multipleList.length) {
         this.$message.warning('请选择已验收的货物')
         return

src/views/mySettlement/divideAccountsManage/see.vue

@@ -255,7 +255,7 @@ export default {
           label: '是否计提(履约保证金)',
           prop: 'accrual',
           showTooltip: true,
-          width: '80',
+          width: '100',
           render: (h, row) => {
             return <el-select v-model={ row.accrual } disabled={this.disabled} onChange={() => { this.oneCalc('click') }} placeholder='请选择是否计提'>
               <el-option label='是' value={true}></el-option>
@@ -286,10 +286,10 @@ export default {
           }
         },
         {
-          label: '是否分配融资利息',
+          label: '是否分配融资利息和管理费',
           prop: 'hasAssignInterest',
           showTooltip: true,
-          width: '80',
+          width: '110',
           render: (h, row) => {
             return <el-select disabled={this.disabled} v-model={ row.hasAssignInterest } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
               <el-option label='是' value={true}></el-option>
@@ -307,18 +307,18 @@ export default {
             return <span> { this.handlerMoneyEmpty(row.financingInterest) }</span>
           }
         },
-        {
-          label: '是否分配管理费',
-          prop: 'hasAssignManagementFee',
-          showTooltip: true,
-          width: '80',
-          render: (h, row) => {
-            return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
-              <el-option label='是' value={true}></el-option>
-              <el-option label='否' value={false}></el-option>
-            </el-select>
-          }
-        },
+        // {
+        //   label: '是否分配管理费',
+        //   prop: 'hasAssignManagementFee',
+        //   showTooltip: true,
+        //   width: '80',
+        //   render: (h, row) => {
+        //     return <el-select disabled={this.disabled} v-model={ row.hasAssignManagementFee } onChange={() => { this.oneCalc('click') }} placeholder='请选择是否'>
+        //       <el-option label='是' value={true}></el-option>
+        //       <el-option label='否' value={false}></el-option>
+        //     </el-select>
+        //   }
+        // },
         {
           label: '融资管理费',
           prop: 'financingManagementFee',

src/views/myTrade/acceptanceManagement/index.vue

@@ -1,50 +1,44 @@
 <template>
   <div class="acceptance-management">
     <template>
-      <div class="tempalte-content">
-        <div class="search">
-          <div class="left" />
-          <div class="right">
-            <template>
-              <div>
-                <el-input v-model="search.businessNumber" style="width: 250px" placeholder="请输入验收单编号/业务编号" clearable />
-              </div>
-              <div>
-                <el-select v-model="search.status" placeholder="请选择状态">
-                  <el-option
-                    v-for="item in constant.projectInitiationStatus"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
-                </el-select>
-              </div>
-              <div>
-                <el-input v-model="search.fastSearch" style="width: 300px" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
-              </div>
-              <div class="leftBtn">
-                <el-button type="primary" @click="fetchData">查询</el-button>
-              </div>
-              <div>
-                <el-button type="primary" icon="el-icon-plus" @click="modifyClick('create')">创建验收单</el-button>
-              </div>
-            </template>
+      <div class="search">
+        <div class="left" />
+        <div class="right">
+          <div>
+            <el-input v-model="search.businessNumber" placeholder="请输入验收单编号/业务编号" clearable />
+          </div>
+          <div>
+            <el-select v-model="search.status" placeholder="请选择状态">
+              <el-option
+                v-for="item in constant.projectInitiationStatus"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </div>
+          <div>
+            <el-input v-model="search.fastSearch" placeholder="请输入项目名称/主企业名称/核心企业名称" clearable />
+          </div>
+          <div class="right-btn">
+            <el-button type="primary" @click="fetchData">查询</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="modifyClick('create')">创建验收单</el-button>
           </div>
         </div>
-        <cy-comm-table
-          ref="commTable"
-          v-loading="loading"
-          :columns="columns"
-          :table-options="tableOptions"
-          :data="tableData"
-          :count="total"
-          parent-component="AcceptanceManagement"
-        />
       </div>
+      <cy-comm-table
+        ref="commTable"
+        v-loading="loading"
+        :columns="columns"
+        :table-options="tableOptions"
+        :data="tableData"
+        :count="total"
+        parent-component="AcceptanceManagement"
+      />
     </template>
 
-    <!-- 申请审核 -->
-    <cy-dialog ref="receiveDialog" title="申请审核">
+    <!-- 申请融资 -->
+    <cy-dialog ref="receiveDialog" title="申请融资">
       <p style="text-align: center;">确认申请验收单审核，完成后续融资流程么?</p>
       <div class="submit-btn">
         <el-button @click="$refs.receiveDialog.show = false">关闭</el-button>
@@ -124,9 +118,9 @@ export default {
               taskId: row.taskId
             }
           })
-        } else {
-          this.apply(row)
         }
+      } else if (type === 'apply') {
+        this.apply(row)
       }
 
       if (type === 'change') {

src/views/myTrade/acceptanceManagement/indexTable.js

@@ -90,9 +90,9 @@ export default {
                 })
               } else {
                 btnList.push({
-                  msg: '申请审核',
+                  msg: '申请融资',
                   icon: 'iconfont icon-orange icon-a-Group8151',
-                  category: 'edit'
+                  category: 'apply'
                 })
               }
             } else if (row.status === '处理中') {
@@ -102,7 +102,14 @@ export default {
                 icon: 'iconfont icon-orange icon-a-Group957',
                 category: 'see'
               })
-              if (row.stage === '录入验收单' || row.stage === '签署确认') {
+              if (row.businessApprovalStatus === 1 && row.stage === '录入验收单') {
+                btnList.push({
+                  msg: '申请融资',
+                  icon: 'iconfont icon-orange icon-a-Group8151',
+                  category: 'apply'
+                })
+              }
+              if ((row.stage === '录入验收单' || row.stage === '签署确认') && !row.businessApprovalStatus) {
                 btnList.push({
                   msg: '处理',
                   icon: 'iconfont icon-orange icon-a-Group8151',