fix: 政策页面调整

src/views/sales_policy/components/Examine.vue

@@ -469,91 +469,60 @@
               @select-all="handleSelectionAllChange2"
               @selection-change="handleSelectionChange2"
             >
+              <el-table-column type="index" width="50" />
+              <el-table-column
+                prop="customerNumber"
+                label="经销商编号
+"
+                align="left"
+                width="300"
+              >
+                <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" width="300">
                 <template slot-scope="scope">
                   <CopyButton :copy-text="scope.row.customerName" />
                   <span>{{ scope.row.customerName }}</span>
                 </template>
               </el-table-column>
-
-              <el-table-column prop="maxBuyNum" label="最大提货套数" align="left">
+              <el-table-column prop="minBuyNum" label="最小提货数量" align="left" width="200">
+                <template slot-scope="scope">
+                  {{ scope.row.minBuyNum }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="maxBuyNum" label="最大提货数量" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.maxBuyNum }}
                 </template>
               </el-table-column>
-
-              <el-table-column prop="materialName" label="物料名称" align="left">
+              <el-table-column prop="materialName" label="物料名称" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.materialName }}
                 </template>
               </el-table-column>
-              <el-table-column prop="materialNumber" label="物料编号" align="left">
+              <el-table-column prop="materialNumber" label="物料编号" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.materialNumber }}
                 </template>
               </el-table-column>
-              <el-table-column prop="limitQty" label="订货上限" align="left">
+              <el-table-column prop="limitQty" label="订货上限" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.limitQty }}
                 </template>
               </el-table-column>
-              <el-table-column prop="orderNums" label="已下订单数" align="left">
+              <el-table-column prop="orderNums" label="已下订单数" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.orderNums }}
                 </template>
               </el-table-column>
-              <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+              <el-table-column prop="examineOrderNums" label="已审订单数" align="left" width="200">
                 <template slot-scope="scope">
                   {{ scope.row.examineOrderNums }}
                 </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" width="300">
-                <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" width="300">
-                <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">
@@ -907,7 +876,7 @@ export default {
       this.currentPage = 1
       this.getCrList()
     },
-      // 更改当前页
+    // 更改当前页
     handleCurrentChanges(val) {
       this.currentPage = val
       this.getCrList()
@@ -939,7 +908,7 @@ export default {
     openPdf(pdfUrl) {
       window.open(this.$imageUrl + pdfUrl)
     },
-  
+
     // 更改每页数量
     handleSizeChange2(val) {
       this.dpageSize = val

src/views/sales_policy/components/TabelTransfer.vue

@@ -132,152 +132,92 @@
       </el-col>
     </el-row>
     <!-- 销售政策类型 ———— 限量-->
-    <div v-if="policyType === 'LIMIT'">
-      <div>
-        <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
-        <el-divider />
-      </div>
-      <div style="margin: 20px 0">
-        <el-upload
-          class="import-btn cus-btn"
-          :action="baseURL + 'student/import'"
-          :http-request="handleImports"
-          :file-list="importFileList"
-          :show-file-list="false"
-        >
-          <el-button type="primary" size="mini">导入经销商</el-button>
-        </el-upload>
-        <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicy">下载模板</el-button>
-      </div>
-      <el-row type="flex" style="margin: 20px 0">
-        <el-col :xs="24" :sm="12" :lg="14">
-          <el-input v-model="keyword2" placeholder="查找经销商" size="mini" />
-        </el-col>
-        <el-col
-          :xs="24"
-          :sm="1"
-          :lg="1"
-          style="margin-left: 10px"
-        ><el-button size="mini" @click="submitScreenForm2">确定</el-button></el-col>
-        <el-col
-          :xs="24"
-          :sm="1"
-          :lg="1"
-          style="margin-left: 20px"
-        ><el-button size="mini" @click="resetScreenForm2">重置</el-button></el-col>
-      </el-row>
-      <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="index" label="序号" align="left" />
-            <el-table-column prop="customerNumber" label="经销商编号" align="left" width="300">
-              <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" width="300">
-              <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" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.minBuyNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="maxBuyNum" label="最大提货组数" align="left" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.maxBuyNum }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="orderNums" label="已下订单数" align="left" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.orderNums }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="examineOrderNums" label="已审订单数" align="left" width="200">
-              <template slot-scope="scope">
-                <span>{{ scope.row.examineOrderNums }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+    <div>
+      <div v-if="policyType === 'LIMIT'">
+        <div>
+          <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
+          <el-divider />
         </div>
-        <!-- 分页 -->
         <div style="margin: 20px 0">
-          <el-pagination
-            :current-page="policyList.currentPages"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="10"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="cTotal"
-            @size-change="handleSizeChanges2"
-            @current-change="handleCurrentChanges2"
-          />
+          <el-upload
+            class="import-btn cus-btn"
+            :action="baseURL + 'student/import'"
+            :http-request="handleImports"
+            :file-list="importFileList"
+            :show-file-list="false"
+          >
+            <el-button type="primary" size="mini">导入经销商</el-button>
+          </el-upload>
+          <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicy">下载模板</el-button>
         </div>
+        <el-row type="flex" style="margin: 20px 0">
+          <el-col :xs="24" :sm="12" :lg="14">
+            <el-input v-model="keyword2" placeholder="查找经销商" size="mini" />
+          </el-col>
+          <el-col
+            :xs="24"
+            :sm="1"
+            :lg="1"
+            style="margin-left: 10px"
+          ><el-button size="mini" @click="submitScreenForm2">确定</el-button></el-col>
+          <el-col
+            :xs="24"
+            :sm="1"
+            :lg="1"
+            style="margin-left: 20px"
+          ><el-button size="mini" @click="resetScreenForm2">重置</el-button></el-col>
+        </el-row>
       </div>
-    </div>
-    <!-- 销售政策类型 ————  配提 综合 -->
-    <div v-else>
-      <div>
-        <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
-        <el-divider />
-      </div>
-      <div style="margin: 20px 0">
-        <el-upload
-          class="import-btn cus-btn"
-          :action="baseURL + 'student/import'"
-          :http-request="handleImports"
-          :file-list="importFileList"
-          :show-file-list="false"
-        >
-          <el-button type="primary" size="mini">导入经销商</el-button>
-        </el-upload>
-        <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicy">下载模板</el-button>
-      </div>
-      <el-row style="margin: 20px 0">
-        <el-col :span="12">
-          <el-input v-model="keyword2" placeholder="查找经销商" size="mini" />
-        </el-col>
-        <el-col :span="10" style="margin-left: 20px">
-          <el-button size="mini" @click="submitScreenForm2">确定</el-button>
-          <el-button size="mini" @click="resetScreenForm2">重置</el-button>
-          <template v-if="batch">
-            <el-button
-              v-if="list.length"
-              type="primary"
-              size="mini"
-              @click="()=>{
-                visible = true
-                handelBatchData()
-              }"
-            >批量修改上限</el-button>
-            <el-button
-              v-if="list.length"
-              type="primary"
-              size="mini"
-              @click="()=>{
-                maxBuyNumVisible = true
-                handelBatchData()
-              }"
-            >批量修改组数</el-button>
-          </template>
-        </el-col>
-      </el-row>
+      <div v-else>
+        <div>
+          <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
+          <el-divider />
+        </div>
+        <div style="margin: 20px 0">
+          <el-upload
+            class="import-btn cus-btn"
+            :action="baseURL + 'student/import'"
+            :http-request="handleImports"
+            :file-list="importFileList"
+            :show-file-list="false"
+          >
+            <el-button type="primary" size="mini">导入经销商</el-button>
+          </el-upload>
+          <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicy">下载模板</el-button>
+        </div>
+        <el-row style="margin: 20px 0">
+          <el-col :span="12">
+            <el-input v-model="keyword2" placeholder="查找经销商" size="mini" />
+          </el-col>
+          <el-col :span="10" style="margin-left: 20px">
+            <el-button size="mini" @click="submitScreenForm2">确定</el-button>
+            <el-button size="mini" @click="resetScreenForm2">重置</el-button>
+            <template v-if="batch">
+              <el-button
+                v-if="list.length"
+                type="primary"
+                size="mini"
+                @click="()=>{
+                  visible = true
+                  handelBatchData()
+                }"
+              >批量修改上限</el-button>
+              <el-button
+                v-if="list.length"
+                type="primary"
+                size="mini"
+                @click="()=>{
+                  maxBuyNumVisible = true
+                  handelBatchData()
+                }"
+              >批量修改组数</el-button>
+            </template>
+          </el-col>
+        </el-row>
 
-      <div style="font-size: 14px">
-        注：经销商最大提货套数仅与经销商相关联，与机型没有限制关联；机型订货上线仅对机型做限制
+        <div style="font-size: 14px">
+          注：经销商最大提货套数仅与经销商相关联，与机型没有限制关联；机型订货上线仅对机型做限制
+        </div>
       </div>
       <div>
         <div class="table">
@@ -311,8 +251,12 @@
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-
-            <el-table-column prop="maxBuyNum" label="最大提货套数" align="left" width="200">
+            <el-table-column prop="minBuyNum" label="最小提货数量" align="left" width="200">
+              <template slot-scope="scope">
+                {{ scope.row.minBuyNum }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="maxBuyNum" label="最大提货数量" align="left" width="200">
               <template slot-scope="scope">
                 {{ scope.row.maxBuyNum }}
               </template>
@@ -357,255 +301,256 @@
           />
         </div>
       </div>
-
-      <div>
-        <h4 style="display: inline-block; margin-right: 20px">经销商配提套数上限</h4>
-        <el-divider />
-      </div>
-      <div style="margin: 20px 0">
-        <el-upload
-          class="import-btn cus-btn"
-          :action="baseURL + 'policy/limit/group/import'"
-          :http-request="handleImportPolicyLimitGroupPolicy"
-          :file-list="importFileList"
-          :show-file-list="false"
-        >
-          <el-button type="primary" size="mini">导入经销商配提套数</el-button>
-        </el-upload>
-        <ExportButton
-          style="display: inline-block;margin-right: 10px;"
-          :ex-url="'policy/limit/group/export'"
-          ex-text="导出经销商配提套数"
-          :ex-params="{ policyId: comCode || code }"
-        />
-        <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicyLimitGroupPolicy">下载模板</el-button>
-        <el-button
-          v-if="policyLimitGroupList.length"
-          type="primary"
-          size="mini"
-          @click="()=>{
-            limitGroupvisible = true
-            handelLimitGroupData()
-          }"
-        >批量修改配提套数上限</el-button>
-      </div>
-      <el-row style="margin: 20px 0">
-        <el-col :span="12">
-          <el-input v-model="policyKeyWord" placeholder="查找经销商" size="mini" />
-        </el-col>
-        <el-col :span="10" style="margin-left: 20px">
-          <el-button size="mini" @click="getPolicyLimitGroupList">确定</el-button>
-          <el-button size="mini" @click="onPolicyReset">重置</el-button>
-        </el-col>
-      </el-row>
-      <div>
-        <div class="table">
-          <el-table
-            v-loading="policyLoading"
-            :data="policyLimitGroupList"
-            element-loading-text="Loading"
-            border
-            fit
-            highlight-current-row
-            stripe
+      <div v-if="policyType !== 'LIMIT'">
+        <div>
+          <h4 style="display: inline-block; margin-right: 20px">经销商配提套数上限</h4>
+          <el-divider />
+        </div>
+        <div style="margin: 20px 0">
+          <el-upload
+            class="import-btn cus-btn"
+            :action="baseURL + 'policy/limit/group/import'"
+            :http-request="handleImportPolicyLimitGroupPolicy"
+            :file-list="importFileList"
+            :show-file-list="false"
           >
-            <el-table-column type="index" width="50" />
-            <el-table-column
-              prop="customerNumber"
-              label="经销商编号
-"
-              align="left"
-              width="300"
+            <el-button type="primary" size="mini">导入经销商配提套数</el-button>
+          </el-upload>
+          <ExportButton
+            style="display: inline-block;margin-right: 10px;"
+            :ex-url="'policy/limit/group/export'"
+            ex-text="导出经销商配提套数"
+            :ex-params="{ policyId: comCode || code }"
+          />
+          <el-button type="primary" size="mini" @click="hanleDownloadFilesPolicyLimitGroupPolicy">下载模板</el-button>
+          <el-button
+            v-if="policyLimitGroupList.length"
+            type="primary"
+            size="mini"
+            @click="()=>{
+              limitGroupvisible = true
+              handelLimitGroupData()
+            }"
+          >批量修改配提套数上限</el-button>
+        </div>
+        <el-row style="margin: 20px 0">
+          <el-col :span="12">
+            <el-input v-model="policyKeyWord" placeholder="查找经销商" size="mini" />
+          </el-col>
+          <el-col :span="10" style="margin-left: 20px">
+            <el-button size="mini" @click="getPolicyLimitGroupList">确定</el-button>
+            <el-button size="mini" @click="onPolicyReset">重置</el-button>
+          </el-col>
+        </el-row>
+        <div>
+          <div class="table">
+            <el-table
+              v-loading="policyLoading"
+              :data="policyLimitGroupList"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
             >
-              <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" width="300">
-              <template slot-scope="scope">
-                <CopyButton :copy-text="scope.row.customerName" />
-                <span>{{ scope.row.customerName }}</span>
-              </template>
-            </el-table-column>
+              <el-table-column type="index" width="50" />
+              <el-table-column
+                prop="customerNumber"
+                label="经销商编号
+"
+                align="left"
+                width="300"
+              >
+                <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" width="300">
+                <template slot-scope="scope">
+                  <CopyButton :copy-text="scope.row.customerName" />
+                  <span>{{ scope.row.customerName }}</span>
+                </template>
+              </el-table-column>
 
-            <el-table-column prop="groupLimitNum" label="配提上限组数" align="left" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.groupLimitNum }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="orderNums" label="配提上限已下订单数" align="left" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.orderNums }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="examineOrderNums" label="配提上限已审订单数" align="left" width="200">
-              <template slot-scope="scope">
-                {{ scope.row.examineOrderNums }}
-              </template>
-            </el-table-column>
-          </el-table>
+              <el-table-column prop="groupLimitNum" label="配提上限组数" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.groupLimitNum }}
+                </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="examineOrderNums" label="配提上限已审订单数" align="left">
+                <template slot-scope="scope">
+                  {{ scope.row.examineOrderNums }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <!-- 分页 -->
+          <div style="margin: 20px 0">
+            <el-pagination
+              :current-page="policyCurrentPages"
+              :page-sizes="[10, 20, 30, 50]"
+              :page-size="10"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="policyListTotal"
+              @size-change="handlePolicySizeChanges"
+              @current-change="handlePolicyCurrentChanges"
+            />
+          </div>
         </div>
-        <!-- 分页 -->
+      </div>
+      </div>
+      <!-- 操作按钮 -->
+      <slot name="footer">
+        <el-row style="margin: 20px 0 0 0">
+          <el-button type="primary" size="mini" @click="handleSave">
+            {{ comCode ? '保存' : '提交审核' }}
+          </el-button>
+          <el-button type="primary" size="mini" @click="handleReset">重置</el-button>
+        </el-row>
+      </slot>
+      <el-dialog
+        title="批量修改"
+        :visible.sync="visible"
+        width="50%"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+        @close="handleDialogVisible"
+      >
+        <el-row :gutter="20">
+          <el-col :span="24" style="display: flex; align-items: center; margin-bottom: 20px">
+            <el-col :span="4" :offset="0"> 购买量上限 </el-col>
+            <el-col :span="8" :offset="0"> <el-input v-model="limitQty" size="mini" /></el-col>
+          </el-col>
+          <el-col :span="24" :offset="0" style="margin-bottom: 20px">
+            <div style="display: flex">
+              <el-input v-model="limitQtyKeyWord" placeholder="输入关键字搜索" size="mini" />
+              <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelBatchData('search')">查询</el-button>
+              <el-button size="mini" @click="onReset">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
+
+        <zj-table
+          :table-attributes="tableAttributes"
+          :table-events="tableEvents"
+          :is-drop="true"
+          :columns="columns"
+          :table-data="tableData"
+        />
         <div style="margin: 20px 0">
           <el-pagination
-            :current-page="policyCurrentPages"
+            :current-page="batchCurrentPages"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
-            :total="policyListTotal"
-            @size-change="handlePolicySizeChanges"
-            @current-change="handlePolicyCurrentChanges"
+            :total="batchTotal"
+            @size-change="handleBatchSizeChanges"
+            @current-change="handleBatchCurrentChanges"
           />
         </div>
-      </div>
-    </div>
-    <!-- 操作按钮 -->
-    <slot name="footer">
-      <el-row style="margin: 20px 0 0 0">
-        <el-button type="primary" size="mini" @click="handleSave">
-          {{ comCode ? '保存' : '提交审核' }}
-        </el-button>
-        <el-button type="primary" size="mini" @click="handleReset">重置</el-button>
-      </el-row>
-    </slot>
-    <el-dialog
-      title="批量修改"
-      :visible.sync="visible"
-      width="50%"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      @close="handleDialogVisible"
-    >
-      <el-row :gutter="20">
-        <el-col :span="24" style="display: flex; align-items: center; margin-bottom: 20px">
-          <el-col :span="4" :offset="0"> 购买量上限 </el-col>
-          <el-col :span="8" :offset="0"> <el-input v-model="limitQty" size="mini" /></el-col>
-        </el-col>
-        <el-col :span="24" :offset="0" style="margin-bottom: 20px">
-          <div style="display: flex">
-            <el-input v-model="limitQtyKeyWord" placeholder="输入关键字搜索" size="mini" />
-            <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelBatchData('search')">查询</el-button>
-            <el-button size="mini" @click="onReset">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
-
-      <zj-table
-        :table-attributes="tableAttributes"
-        :table-events="tableEvents"
-        :is-drop="true"
-        :columns="columns"
-        :table-data="tableData"
-      />
-      <div style="margin: 20px 0">
-        <el-pagination
-          :current-page="batchCurrentPages"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="batchTotal"
-          @size-change="handleBatchSizeChanges"
-          @current-change="handleBatchCurrentChanges"
-        />
-      </div>
-      <span slot="footer">
-        <el-button @click="handleDialogVisible">取消</el-button>
-        <el-button type="primary" @click="onSubmit('limit')">确定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      title="批量修改"
-      :visible.sync="maxBuyNumVisible"
-      width="50%"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      @close="handleDialogVisible"
-    >
-      <el-row :gutter="20">
-        <el-col :span="24" style="display: flex; align-items: cente; margin-bottom: 20px">
-          <el-col :span="5" :offset="0"> 最大提货组数 </el-col>
-          <el-col :span="8" :offset="0"> <el-input v-model="maxBuyNum" size="mini" /></el-col>
-        </el-col>
-        <el-col :span="24" :offset="0" style="margin-bottom: 20px">
-          <div style="display: flex">
-            <el-input v-model="maxBuyNumKeyWord" placeholder="输入关键字搜索" size="mini" clearable />
-            <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelBatchData('search')">查询</el-button>
-            <el-button size="mini" @click="onReset">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+        <span slot="footer">
+          <el-button @click="handleDialogVisible">取消</el-button>
+          <el-button type="primary" @click="onSubmit('limit')">确定</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog
+        title="批量修改"
+        :visible.sync="maxBuyNumVisible"
+        width="50%"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+        @close="handleDialogVisible"
+      >
+        <el-row :gutter="20">
+          <el-col :span="24" style="display: flex; align-items: cente; margin-bottom: 20px">
+            <el-col :span="5" :offset="0"> 最大提货组数 </el-col>
+            <el-col :span="8" :offset="0"> <el-input v-model="maxBuyNum" size="mini" /></el-col>
+          </el-col>
+          <el-col :span="24" :offset="0" style="margin-bottom: 20px">
+            <div style="display: flex">
+              <el-input v-model="maxBuyNumKeyWord" placeholder="输入关键字搜索" size="mini" clearable />
+              <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelBatchData('search')">查询</el-button>
+              <el-button size="mini" @click="onReset">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
 
-      <zj-table
-        :table-attributes="tableAttributes"
-        :table-events="tableEvents"
-        :is-drop="true"
-        :columns="columns"
-        :table-data="tableData"
-      />
-      <div style="margin: 20px 0">
-        <el-pagination
-          :current-page="batchCurrentPages"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="batchTotal"
-          @size-change="handleBatchSizeChanges"
-          @current-change="handleBatchCurrentChanges"
+        <zj-table
+          :table-attributes="tableAttributes"
+          :table-events="tableEvents"
+          :is-drop="true"
+          :columns="columns"
+          :table-data="tableData"
         />
-      </div>
-      <span slot="footer">
-        <el-button @click="handleDialogVisible">取消</el-button>
-        <el-button type="primary" @click="onSubmit">确定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog
-      title="批量修改"
-      :visible.sync="limitGroupvisible"
-      width="50%"
-      :append-to-body="true"
-      :close-on-click-modal="false"
-      @close="handleLimitDialogVisible"
-    >
-      <el-row :gutter="20">
-        <el-col :span="24" style="display: flex; align-items: center; margin-bottom: 20px">
-          <el-col :span="4" :offset="0"> 配提套数上限 </el-col>
-          <el-col :span="8" :offset="0"> <el-input v-model="limitGroupNum" size="mini" /></el-col>
-        </el-col>
-        <el-col :span="24" :offset="0" style="margin-bottom: 20px">
-          <div style="display: flex">
-            <el-input v-model="limitGroupKeyWord" placeholder="输入关键字搜索" size="mini" />
-            <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelLimitGroupData('search')">查询</el-button>
-            <el-button size="mini" @click="onLimitReset">重置</el-button>
-          </div>
-        </el-col>
-      </el-row>
+        <div style="margin: 20px 0">
+          <el-pagination
+            :current-page="batchCurrentPages"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="batchTotal"
+            @size-change="handleBatchSizeChanges"
+            @current-change="handleBatchCurrentChanges"
+          />
+        </div>
+        <span slot="footer">
+          <el-button @click="handleDialogVisible">取消</el-button>
+          <el-button type="primary" @click="onSubmit">确定</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog
+        title="批量修改"
+        :visible.sync="limitGroupvisible"
+        width="50%"
+        :append-to-body="true"
+        :close-on-click-modal="false"
+        @close="handleLimitDialogVisible"
+      >
+        <el-row :gutter="20">
+          <el-col :span="24" style="display: flex; align-items: center; margin-bottom: 20px">
+            <el-col :span="4" :offset="0"> 配提套数上限 </el-col>
+            <el-col :span="8" :offset="0"> <el-input v-model="limitGroupNum" size="mini" /></el-col>
+          </el-col>
+          <el-col :span="24" :offset="0" style="margin-bottom: 20px">
+            <div style="display: flex">
+              <el-input v-model="limitGroupKeyWord" placeholder="输入关键字搜索" size="mini" />
+              <el-button style="margin-left: 20px" type="primary" size="mini" @click="handelLimitGroupData('search')">查询</el-button>
+              <el-button size="mini" @click="onLimitReset">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
 
-      <zj-table
-        :table-attributes="tableAttributes"
-        :table-events="tableEvents"
-        :is-drop="true"
-        :columns="columns"
-        :table-data="limitTableData"
-      />
-      <div style="margin: 20px 0">
-        <el-pagination
-          :current-page="limitCurrentPages"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="limitTotal"
-          @size-change="handleLimitSizeChanges"
-          @current-change="handleLimitCurrentChanges"
+        <zj-table
+          :table-attributes="tableAttributes"
+          :table-events="tableEvents"
+          :is-drop="true"
+          :columns="columns"
+          :table-data="limitTableData"
         />
-      </div>
-      <span slot="footer">
-        <el-button @click="handleLimitDialogVisible">取消</el-button>
-        <el-button type="primary" @click="onLimitSubmit('limit')">确定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
+        <div style="margin: 20px 0">
+          <el-pagination
+            :current-page="limitCurrentPages"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="limitTotal"
+            @size-change="handleLimitSizeChanges"
+            @current-change="handleLimitCurrentChanges"
+          />
+        </div>
+        <span slot="footer">
+          <el-button @click="handleLimitDialogVisible">取消</el-button>
+          <el-button type="primary" @click="onLimitSubmit('limit')">确定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+  </div></template>
 
 <script>
 import {

src/views/sales_policy/components/details.vue

@@ -511,7 +511,6 @@
               <div>
                 <div class="table">
                   <el-table
-                    v-if="detail.type == 'PROVISION'"
                     v-loading="clistLoading"
                     :data="list"
                     element-loading-text="Loading"
@@ -522,89 +521,61 @@
                     @select-all="handleSelectionAllChange2"
                     @selection-change="handleSelectionChange2"
                   >
+                    <el-table-column type="index" width="50" />
+                    <el-table-column
+                      prop="customerNumber"
+                      label="经销商编号
+"
+                      align="left"
+                      width="300"
+                    >
+                      <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" width="300">
                       <template slot-scope="scope">
                         <CopyButton :copy-text="scope.row.customerName" />
                         <span>{{ scope.row.customerName }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="maxBuyNum" label="最大提货套数" align="left">
+                    <el-table-column prop="minBuyNum" label="最小提货数量" align="left" width="200">
+                      <template slot-scope="scope">
+                        {{ scope.row.minBuyNum }}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="maxBuyNum" label="最大提货数量" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.maxBuyNum }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="materialName" label="物料名称" align="left">
+                    <el-table-column prop="materialName" label="物料名称" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.materialName }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="materialNumber" label="物料编号" align="left">
+                    <el-table-column prop="materialNumber" label="物料编号" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.materialNumber }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="limitQty" label="订货上限" align="left">
+                    <el-table-column prop="limitQty" label="购买量上限" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.limitQty }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="orderNums" label="已下订单数" align="left">
+                    <el-table-column prop="orderNums" label="已下订单数" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.orderNums }}
                       </template>
                     </el-table-column>
-                    <el-table-column prop="examineOrderNums" label="已审订单数" align="left">
+                    <el-table-column prop="examineOrderNums" label="已审订单数" align="left" width="200">
                       <template slot-scope="scope">
                         {{ scope.row.examineOrderNums }}
                       </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" width="300">
-                      <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" width="300">
-                      <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">