fix(冲突):解决冲突

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/myBusiness/supplementaryInfo/index.vue

@@ -171,6 +171,9 @@ export default {
           })
         } else {
           this.$message.success('暂存成功')
+          this.$router.push({
+            name: 'MyBusiness'
+          })
         }
       })
     }

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

@@ -92,7 +92,7 @@ export default {
         id: ''
       },
       rules: {
-        contractName: [{ required: true, message: '请输入公司名称', trigger: 'blur' }],
+        contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
         repurchMethod: [{ required: true, message: '请选择回购方式', trigger: 'change' }],
         contractPlanAmountType: [{ required: true, message: '请选择合同约定金额类型', trigger: 'change' }],
         contractPlanAmount: [{ required: true, message: '请输入合同约定金额', trigger: 'blur' }]

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

@@ -87,7 +87,7 @@ export default {
         id: ''
       },
       rules: {
-        contractName: [{ required: true, message: '请输入公司名称', trigger: 'blur' }],
+        contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
         repurchMethod: [{ required: true, message: '请选择回购方式', trigger: 'change' }],
         contractPlanAmountType: [{ required: true, message: '请选择合同约定金额类型', trigger: 'change' }],
         contractPlanAmount: [{ required: true, message: '请输入合同约定金额', trigger: 'blur' }]

src/views/myTrade/settlementDocumentManagement/add.vue

@@ -450,6 +450,7 @@ export default {
         item.acceptanceGoodInfos[0].colspanLength = item.acceptanceGoodInfos.length
         this.ruleForm.goodsList = this.ruleForm.goodsList.concat(item.acceptanceGoodInfos)
       })
+      this.calculateTotal()
       this.$refs.chooseGood.show = false
     },
     deleteGoods(id) {