运维管理修改

src/views/maintenance/priceManagement/configuration/customerContact.json

@@ -32,7 +32,7 @@
         }
       ]
     },{
-      "label": "大字",
+      "label": "品号",
       "prop": "bigCharacter",
       "index": 1,
       "width":120,

src/views/maintenance/priceManagement/configuration/mainList.json

@@ -13,58 +13,57 @@
     "viewBtn": false,
     "editBtn": false,
     "delBtn": false,
-    "menuWidth": 300,
+    "menuWidth": 130,
     "dialogClickModal": false,
     "searchLabelWidth": 120,
     "column":[
         {
-            "label": "大字(规格编码)",
+            "label": "品号",
             "prop": "code",
             "search": true,
             "index": 1,
-            "width":120
+            "width":120,
+          "overHidden": true
         },
         {
             "label": "名称",
             "prop": "bigCharacter",
             "search": true,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "花纹",
             "prop": "brandItem",
             "search": true,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "产地",
             "prop": "placeProduction",
             "search": true,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "规格",
             "prop": "typeno",
             "search": true,
             "index": 1,
-            "width":100
-        },
-        {
-            "label": "规格1",
-            "prop": "typenoOne",
-            "search": true,
-            "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "品牌",
             "prop": "brand",
             "search": true,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "销售价格",
@@ -72,7 +71,8 @@
             "search": false,
             "index": 1,
             "width":100,
-            "cell": true
+            "cell": false,
+          "overHidden": true
         },
         {
             "label": "采购价格",
@@ -80,42 +80,66 @@
             "search": false,
             "index": 1,
             "width":100,
-            "cell": true
+            "cell": false,
+          "overHidden": true
         },
+      {
+        "label": "运费价格",
+        "prop": "freightFees",
+        "search": false,
+        "index": 1,
+        "width":100,
+        "cell": false,
+        "overHidden": true
+      },
+      {
+        "label": "标签价格",
+        "prop": "labelFees",
+        "search": false,
+        "index": 1,
+        "width":100,
+        "cell": false,
+        "overHidden": true
+      },
         {
             "label": "供应商",
             "prop": "corpName",
             "search": false,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "创建日期",
             "prop": "createTime",
             "search": true,
             "index": 1,
-            "width":100
+            "width":100,
+            "overHidden": true
         },
         {
             "label": "创建人",
             "prop": "createUserName",
             "search": false,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "更新日期",
             "prop": "updateTime",
             "search": false,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         },
         {
             "label": "更新人",
             "prop": "updateUserName",
             "search": false,
             "index": 1,
-            "width":100
+            "width":100,
+          "overHidden": true
         }
     ]
 }

src/views/maintenance/priceManagement/detailsPageEdit.vue

@@ -120,7 +120,7 @@ export default {
       basicData: {
         column: [
           {
-            label: '大字（规格编码）',
+            label: '品号',
             prop: 'bigCharacter',
             rules: [
               {

src/views/maintenance/priceManagement/index.vue

@@ -8,6 +8,46 @@
         @search-change="searchChange"
         @on-load="onLoad"
         @row-update="rowUpdate">
+      <template slot-scope="{ row, index }" slot="salesPrice">
+        <el-input
+          v-if="row.$cellEdit"
+          v-model.trim="row.salesPrice"
+          size="small"
+          clearable
+          v-input-limit="2"
+        ></el-input>
+        <span v-else>{{ row.salesPrice }}</span>
+      </template>
+      <template slot-scope="{ row, index }" slot="purchasePrice">
+        <el-input
+          v-if="row.$cellEdit"
+          v-model.trim="row.purchasePrice"
+          size="small"
+          clearable
+          v-input-limit="2"
+        ></el-input>
+        <span v-else>{{ row.purchasePrice }}</span>
+      </template>
+      <template slot-scope="{ row, index }" slot="freightFees">
+        <el-input
+          v-if="row.$cellEdit"
+          v-model.trim="row.freightFees"
+          size="small"
+          clearable
+          v-input-limit="2"
+        ></el-input>
+        <span v-else>{{ row.freightFees }}</span>
+      </template>
+      <template slot-scope="{ row, index }" slot="labelFees">
+        <el-input
+          v-if="row.$cellEdit"
+          v-model.trim="row.labelFees"
+          size="small"
+          clearable
+          v-input-limit="2"
+        ></el-input>
+        <span v-else>{{ row.labelFees }}</span>
+      </template>
       <template slot-scope="{row,index}" slot="menu">
         <el-button
             type="text"

src/views/maintenance/rebate/config/mainList.json

@@ -20,31 +20,39 @@
   "column": [
     {
       "label": "客户",
-      "prop": "corpId",
+      "prop": "cname",
       "search": true,
       "index": 1,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },{
-      "label": "增加",
-      "prop": "inOverpayment",
+      "label": "总返利",
+      "prop": "profitReturn",
       "search": false,
       "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },{
-      "label": "使用",
-      "prop": "outOverpaymen",
+      "label": "已用返利",
+      "prop": "usedProfit",
       "search": false,
       "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
     },{
-      "label": "余额",
-      "prop": "balanceOverpaymen",
+      "label": "可用返利",
+      "prop": "surplusProfit",
+      "search": false,
+      "index": 4,
+      "minWidth": 80,
+      "overHidden": true,
+      "searchSpan": 8
+    },{
+      "label": "本月待到账",
+      "prop": "monthProfit",
       "search": false,
       "index": 4,
       "minWidth": 80,

src/views/maintenance/rebate/index.vue

@@ -47,7 +47,7 @@
 
 <script>
 import option from './config/mainList.json';
-import {getList, overpaymentDetail} from '@/api/maintenance/overpayment';
+import {customerList} from "@/api/basicData/customerInformation";
 
 export default {
   name: "index",
@@ -97,26 +97,23 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page, this.search);
     },
-    onLoad(page, params) {
+    onLoad(page, params = { parentId: 0 }) {
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false)
       })
+      let queryParams = Object.assign({}, params, {
+        size: page.pageSize,
+        current: page.currentPage,
+        corpsTypeId: '',
+        corpType: 'KH'
+      });
       this.loading = true;
-      getList(page.currentPage, page.pageSize, params)
-        .then(res => {
-          this.dataList = res.data.data.records ? res.data.data.records : [];
-          this.page.total = res.data.data.total;
-          if (this.page.total) {
-            this.option.height = window.innerHeight - 260;
-          }
-          this.dataList.forEach(item => {
-            this.$set(item,'insideList',[])
-            this.$set(item,'loading', true)
-          })
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+      customerList(queryParams).then(res => {
+        this.dataList = res.data.data.records;
+        this.page.total = res.data.data.total;
+      }).finally(() => {
+        this.loading = false;
+      });
     },
     // 表格展开触发
     expandChange(row, index) {