Browse Source

feat: 政策列表排版

zh 2 years ago
parent
commit
25acfefbbd

+ 215 - 195
src/views/sales_policy/components/Examine.vue

@@ -192,78 +192,78 @@
           </el-row>
           <div class="table">
             <el-table
-            v-loading="listLoading"
-            :data="dataList"
-            element-loading-text="Loading"
-            border
-            max-height="700"
-            fit
-            highlight-current-row
-            stripe
-          >
-            <el-table-column fixed type="index" label="序号" width="50" align="left" />
-            <el-table-column prop="materialNumber" label="物料编码" min-width="160" show-overflow-tooltip align="left">
-              <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialNumber" />
-                <span>{{ scope.row.materialNumber }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="materialName" label="产品名称" min-width="160" show-overflow-tooltip align="left">
-              <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialName" />
-                <span>{{ scope.row.materialName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="specification" label="规格型号" min-width="300" show-overflow-tooltip align="left">
-              <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.specification" />
-                <span>{{ scope.row.specification }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              prop="saleTypeCode"
-              label="销售类型编码"
-              min-width="160"
-              show-overflow-tooltip
-              align="left"
-            />
-            <el-table-column prop="saleTypeName" label="销售类型" min-width="160" show-overflow-tooltip align="left" />
-            <el-table-column prop="discAmount" label="格力折扣" align="right" />
-            <el-table-column prop="price" label="单价" align="right" />
-            <el-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
-              <template slot-scope="scope">
-                {{ scope.row.orgPrice }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="priceType" label="价格类型" align="left" min-width="150">
-              <template slot-scope="scope">
-                {{ scope.row.priceType }}
-              </template>
-            </el-table-column>
-            <el-table-column label="返利钱包" align="left" min-width="200" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <template v-for="item in scope.row.walletRelaList">
-                  <el-tag v-if="item.type === 'REBATE'" style="margin: 5px" type="success" size="small">{{
-                    item.walletName
-                  }}</el-tag>
+              v-loading="listLoading"
+              :data="dataList"
+              element-loading-text="Loading"
+              border
+              max-height="700"
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column fixed type="index" label="序号" width="50" align="left" />
+              <el-table-column prop="materialNumber" label="物料编码" min-width="160" show-overflow-tooltip align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.materialNumber" />
+                  <span>{{ scope.row.materialNumber }}</span>
                 </template>
-              </template>
-            </el-table-column>
-            <el-table-column label="现金钱包" align="left" min-width="200" show-overflow-tooltip>
-              <template slot-scope="scope">
-                <template v-for="item in scope.row.walletRelaList">
-                  <el-tag v-if="item.type === 'COMMONLY'" style="margin: 5px" type="success" size="small">{{
-                    item.walletName
-                  }}</el-tag>
+              </el-table-column>
+              <el-table-column prop="materialName" label="产品名称" min-width="160" show-overflow-tooltip align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.materialName" />
+                  <span>{{ scope.row.materialName }}</span>
                 </template>
-              </template>
-            </el-table-column>
-            <el-table-column prop="status" label="状态" align="left" show-overflow-tooltip min-width="150">
-              <template slot-scope="scope">
-                {{ scope.row.status ? '启用' : '作废' }}
-              </template>
-            </el-table-column>
-          </el-table>
+              </el-table-column>
+              <el-table-column prop="specification" label="规格型号" min-width="300" show-overflow-tooltip align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.specification" />
+                  <span>{{ scope.row.specification }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="saleTypeCode"
+                label="销售类型编码"
+                min-width="160"
+                show-overflow-tooltip
+                align="left"
+              />
+              <el-table-column prop="saleTypeName" label="销售类型" min-width="160" show-overflow-tooltip align="left" />
+              <el-table-column prop="discAmount" label="格力折扣" align="right" />
+              <el-table-column prop="price" label="单价" align="right" />
+              <el-table-column prop="orgPrice" label="原供价" align="right" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.orgPrice }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="priceType" label="价格类型" align="left" min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.priceType }}
+                </template>
+              </el-table-column>
+              <el-table-column label="返利钱包" align="left" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <template v-for="item in scope.row.walletRelaList">
+                    <el-tag v-if="item.type === 'REBATE'" style="margin: 5px" type="success" size="small">{{
+                      item.walletName
+                    }}</el-tag>
+                  </template>
+                </template>
+              </el-table-column>
+              <el-table-column label="现金钱包" align="left" min-width="200" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <template v-for="item in scope.row.walletRelaList">
+                    <el-tag v-if="item.type === 'COMMONLY'" style="margin: 5px" type="success" size="small">{{
+                      item.walletName
+                    }}</el-tag>
+                  </template>
+                </template>
+              </el-table-column>
+              <el-table-column prop="status" label="状态" align="left" show-overflow-tooltip min-width="150">
+                <template slot-scope="scope">
+                  {{ scope.row.status ? '启用' : '作废' }}
+                </template>
+              </el-table-column>
+            </el-table>
           </div>
           <!-- 分页 -->
           <div style="margin: 20px 0">
@@ -369,31 +369,31 @@
                 <h5>未选经销商</h5>
                 <el-divider direction="horizontal" content-position="left" />
                 <div class="table">
-                <el-table
-                  ref="multipleTable"
-                  :data="dataL"
-                  element-loading-text="Loading"
-                  border
-                  height="480px"
-                  fit
-                  highlight-current-row
-                  @select-all="handleSelectionAllChange"
-                  @selection-change="handleSelectionChange"
-                >
-                  <el-table-column type="selection" width="55" :selectable="selectable" align="left" />
-                  <el-table-column prop="number" label="经销商编码" align="left">
-                    <template slot-scope="scope">
-                      <CopyButton :copy-text="scope.row.number" />
-                      <span>{{ scope.row.number }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="name" label="经销商名称" align="left">
-                    <template slot-scope="scope">
-                      <CopyButton :copy-text="scope.row.name" />
-                      <span>{{ scope.row.name }}</span>
-                    </template>
-                  </el-table-column>
-                </el-table>
+                  <el-table
+                    ref="multipleTable"
+                    :data="dataL"
+                    element-loading-text="Loading"
+                    border
+                    height="480px"
+                    fit
+                    highlight-current-row
+                    @select-all="handleSelectionAllChange"
+                    @selection-change="handleSelectionChange"
+                  >
+                    <el-table-column type="selection" width="55" :selectable="selectable" align="left" />
+                    <el-table-column prop="number" label="经销商编码" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.number" />
+                        <span>{{ scope.row.number }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="经销商名称" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.name" />
+                        <span>{{ scope.row.name }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
                 </div>
                 <!-- 分页 -->
                 <div style="margin: 20px 0">
@@ -422,31 +422,31 @@
 
                 <div class="table">
                   <el-table
-                  v-loading="listLoading"
-                  :data="custoList"
-                  element-loading-text="Loading"
-                  border
-                  height="480px"
-                  fit
-                  highlight-current-row
-                  stripe
-                  @select-all="handleSelectionAllChange2"
-                  @selection-change="handleSelectionChange2"
-                >
-                  <el-table-column type="selection" width="55" align="left" />
-                  <el-table-column prop="customerNumber" label="经销商编码" align="left">
-                    <template slot-scope="scope">
-                      <CopyButton :copy-text="scope.row.customerNumber" />
-                      <span>{{ scope.row.customerNumber }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="customerName" label="经销商名称" align="left">
-                    <template slot-scope="scope">
-                      <CopyButton :copy-text="scope.row.customerName" />
-                      <span>{{ scope.row.customerName }}</span>
-                    </template>
-                  </el-table-column>
-                </el-table>
+                    v-loading="listLoading"
+                    :data="custoList"
+                    element-loading-text="Loading"
+                    border
+                    height="480px"
+                    fit
+                    highlight-current-row
+                    stripe
+                    @select-all="handleSelectionAllChange2"
+                    @selection-change="handleSelectionChange2"
+                  >
+                    <el-table-column type="selection" width="55" align="left" />
+                    <el-table-column prop="customerNumber" label="经销商编码" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.customerNumber" />
+                        <span>{{ scope.row.customerNumber }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="customerName" label="经销商名称" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.customerName" />
+                        <span>{{ scope.row.customerName }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
                 </div>
                 <!-- 分页 -->
                 <!-- <div style="margin: 20px 0">
@@ -469,82 +469,102 @@
             <el-divider />
           </div>
           <div>
-            <div class="table">
-              <el-table
-                v-loading="clistLoading"
-                :data="list"
-                element-loading-text="Loading"
-                border
-                fit
-                highlight-current-row
-                stripe
-                @select-all="handleSelectionAllChange2"
-                @selection-change="handleSelectionChange2"
-              >
-                <!-- <el-table-column type="selection" width="55" align="left" /> -->
-                <el-table-column
-                  prop="customerNumber"
-                  label="经销商编号
-"
-                  align="left"
-                >
-                  <template slot-scope="scope">
-                    <CopyButton :copy-text="scope.row.customerNumber" />
-                    <span>{{ scope.row.customerNumber }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="customerName" label="经销商名称" align="left">
-                  <template slot-scope="scope">
-                    <CopyButton :copy-text="scope.row.customerName" />
-                    <span>{{ scope.row.customerName }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="materialName"
-                  label="物料名称
-
-"
-                  align="left"
-                >
-                  <template slot-scope="scope">
-                    <CopyButton :copy-text="scope.row.materialName" />
-                    <span>{{ scope.row.materialName }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="materialNumber"
-                  label="物料编号
-"
-                  align="left"
-                >
-                  <template slot-scope="scope">
-                    <CopyButton :copy-text="scope.row.materialNumber" />
-                    <span>{{ scope.row.materialNumber }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="examineOrderNums"
-                  label="已审订单数
-"
-                  align="left"
-                >
-                  <template slot-scope="scope">
-                    {{ scope.row.examineOrderNums | numToFixed }}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="limitQty"
-                  label="购买量上限
+            <el-table
+              v-if="detail.type == 'PROVISION'"
+              v-loading="clistLoading"
+              :data="list"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+              @select-all="handleSelectionAllChange2"
+              @selection-change="handleSelectionChange2"
+            >
+              <el-table-column prop="customerName" label="经销商名称" align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.customerName" />
+                  <span>{{ scope.row.customerName }}</span>
+                </template>
+              </el-table-column>
 
-"
-                  align="left"
-                >
-                  <template slot-scope="scope">
-                    {{ scope.row.limitQty | numToFixed }}
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+              <el-table-column prop="maxBuyNum" label="最大提货套数" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.maxBuyNum }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.examineOrderNums }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="orderNums" label="已下订单数" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.orderNums }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="materialName" label="物料名称" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.materialName }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="materialNumber" label="物料编号" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.materialNumber }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="limitQty" label="订货上限" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.limitQty }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-else
+              v-loading="clistLoading"
+              :data="list"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+              @select-all="handleSelectionAllChange2"
+              @selection-change="handleSelectionChange2"
+            >
+              <el-table-column type="index" label="序号" align="left" />
+              <el-table-column prop="customerNumber" label="经销商编号" align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.customerNumber" />
+                  <span>{{ scope.row.customerNumber }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="customerName" label="经销商名称" align="left">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.customerName" />
+                  <span>{{ scope.row.customerName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="minBuyNum" label="最少起提数" align="left">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.minBuyNum }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="maxBuyNum" label="最大提货组数" align="left">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.maxBuyNum }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="orderNums" label="已下订单数" align="left">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.orderNums }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.examineOrderNums }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
             <!-- 分页 -->
             <div style="margin: 20px 0">
               <el-pagination

+ 11 - 30
src/views/sales_policy/components/TabelTransfer.vue

@@ -179,12 +179,8 @@
             @select-all="handleSelectionAllChange2"
             @selection-change="handleSelectionChange2"
           >
-            <el-table-column
-              prop="customerNumber"
-              label="经销商编号
-"
-              align="left"
-            >
+            <el-table-column type="index" label="序号" align="left" />
+            <el-table-column prop="customerNumber" label="经销商编号" align="left">
               <template slot-scope="scope">
                 <CopyButton :copy-text="scope.row.customerNumber" />
                 <span>{{ scope.row.customerNumber }}</span>
@@ -196,39 +192,24 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="materialName"
-              label="物料名称
-
-"
-              align="left"
-            >
+            <el-table-column prop="minBuyNum" label="最少起提数" align="left">
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialName" />
-                <span>{{ scope.row.materialName }}</span>
+                <span>{{ scope.row.minBuyNum }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="materialNumber"
-              label="物料编号
-"
-              align="left"
-            >
+            <el-table-column prop="maxBuyNum" label="最大提货组数" align="left">
               <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.materialNumber" />
-                <span>{{ scope.row.materialNumber }}</span>
+                <span>{{ scope.row.maxBuyNum }}</span>
               </template>
             </el-table-column>
-
-            <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+            <el-table-column prop="orderNums" label="已下订单数" align="left">
               <template slot-scope="scope">
-                {{ scope.row.examineOrderNums | numToFixed }}
+                <span>{{ scope.row.orderNums }}</span>
               </template>
             </el-table-column>
-
-            <el-table-column prop="limitQty" label="购买量上限" align="left">
+            <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
               <template slot-scope="scope">
-                {{ scope.row.limitQty | numToFixed }}
+                <span>{{ scope.row.examineOrderNums }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -314,7 +295,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="maxBuyNum" label="最大配套套数" align="left">
+            <el-table-column prop="maxBuyNum" label="最大提货套数" align="left">
               <template slot-scope="scope">
                 {{ scope.row.maxBuyNum }}
               </template>

+ 48 - 1
src/views/sales_policy/components/details.vue

@@ -505,6 +505,7 @@
               <div>
                 <div class="table">
                   <el-table
+                    v-if="detail.type == 'PROVISION'"
                     v-loading="clistLoading"
                     :data="list"
                     element-loading-text="Loading"
@@ -522,7 +523,7 @@
                       </template>
                     </el-table-column>
 
-                    <el-table-column prop="maxBuyNum" label="最大配套套数" align="left">
+                    <el-table-column prop="maxBuyNum" label="最大提货套数" align="left">
                       <template slot-scope="scope">
                         {{ scope.row.maxBuyNum }}
                       </template>
@@ -553,6 +554,52 @@
                       </template>
                     </el-table-column>
                   </el-table>
+                  <el-table
+                    v-else
+                    v-loading="clistLoading"
+                    :data="list"
+                    element-loading-text="Loading"
+                    border
+                    fit
+                    highlight-current-row
+                    stripe
+                    @select-all="handleSelectionAllChange2"
+                    @selection-change="handleSelectionChange2"
+                  >
+                    <el-table-column type="index" label="序号" align="left" />
+                    <el-table-column prop="customerNumber" label="经销商编号" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.customerNumber" />
+                        <span>{{ scope.row.customerNumber }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="customerName" label="经销商名称" align="left">
+                      <template slot-scope="scope">
+                        <CopyButton :copy-text="scope.row.customerName" />
+                        <span>{{ scope.row.customerName }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="minBuyNum" label="最少起提数" align="left">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.minBuyNum }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="maxBuyNum" label="最大提货组数" align="left">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.maxBuyNum }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="orderNums" label="已下订单数" align="left">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.orderNums }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+                      <template slot-scope="scope">
+                        <span>{{ scope.row.examineOrderNums }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
                 </div>
                 <!-- 分页 -->
                 <div style="margin: 20px 0">