Merge branch 'master' of git.echepei.com:liuxr/anpinjingyuan-ui

src/api/reportAnalysis/profitGeneralLedger.js

@@ -9,11 +9,13 @@ export function queryData(query) {
   })
 }
 // 查询项目名称
-export function queryItem(data) {
+export function queryItem(query) {
   return request({
-    url: '/basicdata/corps/getCorpName',
+    url: '/anpin/project/projectName',
     method: 'post',
-    data: data
+    data: {
+      projectName:query
+    }
   })
 }
 // 导出数据

src/views/reportAnalysis/profitGeneralLedger.vue

@@ -3,7 +3,7 @@
     <el-form :model="queryParams" :rules="rules" ref="rules" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
 
-          <el-form-item label="客户" prop="fGoodsid">
+          <el-form-item label="项目" prop="fGoodsid">
             <el-select
               v-model="queryParams.fGoodsid"
               filterable
@@ -11,12 +11,12 @@
               style="width: 200px"
               size="small"
               @keyup.enter.native="handleQuery"
-              placeholder="请选择客户项目"
+              placeholder="请选择项目"
             >
               <el-option
                 v-for="(item, index) in projectOption"
                 :key="index"
-                :label="item.fName"
+                :label="item.projectName"
                 :value="item.fId"
               ></el-option>
             </el-select>
@@ -291,8 +291,8 @@ export default {
         },
         {
           surface: "3",
-          label: "fCorpName",
-          name: "客户名称",
+          label: "projectName",
+          name: "项目名称",
           checked: 0,
           width: 300,
         },
@@ -317,6 +317,13 @@ export default {
           checked: 0,
           width: 300,
         },
+        {
+          surface: "7",
+          label: "profitMargin",
+          name: "利润率(%)",
+          checked: 0,
+          width: 300,
+        },
       ],
       allCheck: false,
       fFeetypeOptions: [],