页面修改

src/components/SalesModule/enrollTotal.vue

@@ -49,7 +49,12 @@
           <span><em>{{$t('fnc.ryxuanze')}}</em></span>
           <el-select class='w200' v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
             <el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
-            <el-option v-for='item in employeeList' :label='item.name' :value='item.empId' :key='item.empId'>
+            <el-option v-for="item in employeeList" :key="item.empId" :label="item.name" :value="item.empId">
+              <span style="float: left">{{ item.name }}
+                <template v-if="item.isLeave==1">
+                  <span style="color: red;">(已离职)</span>
+                </template>
+              </span>
             </el-option>
           </el-select>
         </li>

src/components/mall/goodlist.vue

@@ -77,16 +77,25 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
       layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
     </el-pagination>
-    <table>
+    <table v-loading="loading">
       <thead>
         <tr>
           <th style="width:100px;">编号</th>
           <th style="width:250px;">
             商品名称
           </th>
+          <th style="width:150px;">
+            库存
+          </th>
           <th style="width:150px;">
             售价
           </th>
+          <th>
+            分享赚
+          </th>
+          <th>
+            购买省
+          </th>
           <th style="width:200px;">
             操作
           </th>
@@ -100,9 +109,23 @@
           <td>
             {{item.name}}
           </td>
+          <td>
+            {{item.goods_stock}}
+          </td>
           <td>
             {{item.price}} 起
           </td>
+          <td>
+            <template v-if="item.erpgoodobj&&item.erpgoodobj.goods">
+              {{item.erpgoodobj.goods.share}}
+            </template>
+          </td>
+          <td>
+            <template v-if="item.erpgoodobj&&item.erpgoodobj.goods">
+              {{item.erpgoodobj.goods.myBuyCommission}}
+            </template>
+          </td>
+
           <td>
             <a>
               下单
@@ -123,6 +146,7 @@
         statusValue: 0, //请选择
         //数据列表
         DataList: [],
+        loading: false,
         //查询参数
         msg: {
           currentPage: 1,
@@ -132,19 +156,22 @@
           pageSize: 10,
           Name: "", //商品名称
           CategoryIds: "", //商品分类
-          IsGetShare:1,//获取分销
+          IsGetShare: 1, //获取分销
+          ERPUserId: "19992"
         },
       };
     },
     methods: {
       //获取商品列表
       getGoodList() {
+        this.loading = true;
         this.DataList = [];
         this.mallapipost(
           "/api/AppletGoods/GetAppletGoodsPageListForZY",
           this.msg,
           res => {
-            console.log("res.data.data", res.data);
+            this.loading = false;
+            console.log("res.data.data", res.data.data);
             if (res.data.resultCode == 1) {
               var tempArray = res.data.data.pageData;
               this.DataList = tempArray;