Finish Hotfix-zh-79

src/api/policy_list.js

@@ -437,4 +437,12 @@ export function getWalletRebateSaletypeUpdate(data) {
   });
 }
 
+// 经销商购买上限-列表
 
+export function getPolicyList(params) {
+  return request({
+    url: "/policy/limit/list",
+    method: "get",
+    params,
+  });
+}

src/views/basic_data/material/components/modify_list-apply.vue

@@ -14,7 +14,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号">
-              <el-input
+              <el-input size="mini"
                 v-model="base.updPriceBillId"
                 placeholder="系统自动生成"
                 disabled
@@ -40,7 +40,7 @@
                    </el-col>
                    <el-col :xs="24" :sm="12" :lg="6">
                      <el-form-item label="调价部门">
-                       <el-input
+                       <el-input size="mini"
                          placeholder="调价部门"
                          disabled
                          v-model="adminCompanyName"
@@ -64,7 +64,7 @@
                    </el-col> -->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码">
-              <el-input v-model="base.remark" placeholder="请输入" />
+              <el-input size="mini" v-model="base.remark" placeholder="请输入" />
             </el-form-item>
           </el-col>
 
@@ -95,8 +95,8 @@
     </div>
     <div class="mymain-container">
       <!-- 列表 -->
-      <div class="table">
         <el-form v-if="!detail.length" size="small" label-position="left">
+          <div class="table">
           <el-table
             v-loading="listLoading"
             :data="items"
@@ -117,6 +117,7 @@
               <!-- <el-button type="text" class="textColor">修改</el-button> -->
               <template slot-scope="scope">
                 <el-button
+
                   type="text"
                   class="textColor"
                   @click="hanleDeleInd(scope.$index, scope.row.cid,scope.row.materialId)"
@@ -134,6 +135,7 @@
                 <el-form-item>
                   <template v-if="!cid">
                     <el-select
+                    size="mini"
                       v-model="scope.row.mainId"
                       placeholder="请选择销售类型"
                       @change="
@@ -150,6 +152,7 @@
 
                   <template v-else>
                     <el-select
+                    size="mini"
                       v-model="scope.row.saleTypeId"
                       placeholder="请选择销售类型"
                       @change="handleSale($event, scope.$index, scope.row.id)"
@@ -173,7 +176,8 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input
+                  <el-input size="mini"
+
                     v-model="scope.row.materialNumber"
                     disabled
                   />
@@ -189,7 +193,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input
+                  <el-input size="mini"
                     v-model="scope.row.materialName"
                     disabled
                   />
@@ -205,7 +209,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input
+                  <el-input size="mini"
                     v-model="scope.row.specification"
                     disabled
                   />
@@ -221,7 +225,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.unit" disabled />
+                  <el-input size="mini" v-model="scope.row.unit" disabled />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -234,7 +238,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.batchPrice" placeholder="请输入批发价" />
+                  <el-input size="mini" v-model="scope.row.batchPrice" placeholder="请输入批发价" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -246,7 +250,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.discAmount" placeholder="请输入格力折扣" />
+                <el-input size="mini" v-model="scope.row.discAmount" placeholder="请输入格力折扣" />
               </el-form-item>
             </template>
             </el-table-column>
@@ -259,6 +263,7 @@
             ><template slot-scope="scope">
               <el-form-item>
                 <el-select
+                size="mini"
                   v-model="scope.row.walletRebateId"
                   multiple
                   :disabled="scope.row.fang"
@@ -285,6 +290,7 @@
             ><template slot-scope="scope">
               <el-form-item>
                 <el-date-picker
+                size="mini"
                   v-model="scope.row.startDate"
                   type="date"
                   placeholder="请输入调价日期"
@@ -296,6 +302,7 @@
             <el-table-column
               align="center"
               label="失效日期"
+
               prop="endDate"
               min-width="160"
               show-overflow-tooltip
@@ -304,6 +311,7 @@
                 <el-date-picker
                   v-model="scope.row.endDate"
                   type="date"
+                        size="mini"
                   placeholder="请输入调价日期"
                   value-format="yyyy-MM-dd"
                 />
@@ -340,7 +348,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.qty" placeholder="请输入数量" />
+                <el-input size="mini" v-model="scope.row.qty" placeholder="请输入数量" />
               </el-form-item>
             </template>
             </el-table-column>
@@ -354,6 +362,7 @@
               <el-form-item>
                 <template v-if="!cid">
                   <el-select
+                  size="mini"
                     v-model="scope.row.walletsId"
                     multiple
                     clearable
@@ -374,6 +383,7 @@
                     v-model="scope.row.walletsId"
                     multiple
                     clearable
+                    size="mini"
                     placeholder="请选择现金钱包"
                     @change="handelWallets($event, scope.$index, scope.row)"
                     @remove-tag="
@@ -398,6 +408,7 @@
             ><template slot-scope="scope">
               <el-form-item>
                 <el-select
+                size="mini"
                   v-model="scope.row.isPublish"
                   placeholder="请选择是否发布"
                 >
@@ -412,6 +423,7 @@
             </template>
             </el-table-column>
           </el-table>
+          </div>
         </el-form>
         <el-form v-else :model="detail" size="small" label-position="left">
           <el-table
@@ -473,7 +485,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.materialNumber" />
+                  <el-input size="mini" v-model="scope.row.materialNumber" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -486,7 +498,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.materialName" />
+                  <el-input size="mini" v-model="scope.row.materialName" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -499,7 +511,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.specification" />
+                  <el-input size="mini" v-model="scope.row.specification" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -512,7 +524,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.SalesType" />
+                  <el-input size="mini" v-model="scope.row.SalesType" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -525,7 +537,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.batchPrice" />
+                  <el-input size="mini" v-model="scope.row.batchPrice" />
                 </el-form-item>
               </template>
             </el-table-column>
@@ -537,7 +549,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.retailPrice" />
+                <el-input size="mini" v-model="scope.row.retailPrice" />
               </el-form-item>
             </template>
             </el-table-column>
@@ -549,7 +561,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.rebateUseRate" />
+                <el-input size="mini" v-model="scope.row.rebateUseRate" />
               </el-form-item>
             </template>
             </el-table-column>
@@ -643,7 +655,7 @@
               show-overflow-tooltip
             ><template slot-scope="scope">
               <el-form-item>
-                <el-input v-model="scope.row.qty" />
+                <el-input size="mini" v-model="scope.row.qty" />
               </el-form-item>
             </template>
             </el-table-column>
@@ -724,7 +736,6 @@
             <el-button type="primary" @click="hanleAdd">确 定</el-button>
           </span>
         </el-dialog>
-      </div>
     </div>
     <div class="btn-group clearfix">
       <template v-if="!cid">
@@ -762,7 +773,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="名称" prop="keyword">
-                <el-input
+                <el-input size="mini"
                   v-model="screenForm.keyword"
                   placeholder="请输入名称"
                 />
@@ -770,7 +781,7 @@
             </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="物料编码" prop="materialNumber">
-                <el-input
+                <el-input size="mini"
                   v-model="screenForm.materialNumber"
                   placeholder="请输入物料编码"
                 />
@@ -778,7 +789,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="规格" prop="specification">
-                <el-input
+                <el-input size="mini"
                   v-model="screenForm.specification"
                   placeholder="请输入规格"
                 />
@@ -828,7 +839,7 @@
             />
             <el-table-column
               align="center"
-              label="编码"
+              label="物料编码"
               prop="number"
               min-width="100"
               label-class-name="bianma"
@@ -1226,7 +1237,7 @@ export default {
         pageSize: 10 || this.pageSize,
         keyword: this.screenForm.keyword,
         specification: this.screenForm.specification,
-        materialNumber:this.screenForm.materialNumber,
+        number:this.screenForm.materialNumber,
         bindMain: true,
       }
       getMaterialList(params).then((res) => {

src/views/basic_data/material/components/modify_list-detail.vue

@@ -119,7 +119,7 @@
                       <el-tag
                         type="success"
                         style="margin: 0 10px"
-                        size="small"
+                        size="mini"
                         :key="index"
                       >
                         {{ item.walletName }}
@@ -141,7 +141,7 @@
                       <el-tag
                         type="success"
                         style="margin: 0 10px"
-                        size="small"
+                       size="mini"
                         :key="index"
                       >
                         {{ item.walletName }}
@@ -194,8 +194,8 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <el-tag type="success" v-if="scope.row.isPublish">是</el-tag>
-                  <el-tag type="danger" v-else>否</el-tag>
+                  <el-tag type="success" size="mini" v-if="scope.row.isPublish">是</el-tag>
+                  <el-tag type="danger" size="mini" v-else>否</el-tag>
                 </template>
               </el-table-column>
             </el-table>

src/views/basic_data/material/modify_list.vue

@@ -79,6 +79,7 @@
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品品类" prop="categoryId">
                   <el-select
+                  style="width:100%"
                     placeholder="请选择产品品类"
                     v-model="screenForm.mainId"
                   >

src/views/basic_data/material/price_list.vue

@@ -121,7 +121,25 @@
     </div>
     <!-- 按钮 -->
     <div class="btn-group clearfix">
-      <div class="fr">
+      <div >
+           <el-popconfirm
+           v-if="$checkBtnRole('del', $route.meta.roles)"
+            confirm-button-text="好的"
+            cancel-button-text="不用了"
+            icon="el-icon-info"
+            icon-color="red"
+            title="内容确定删除吗？"
+            @onConfirm="handleDelete"
+          >
+            <el-button
+              type="primary"
+              size="mini"
+                icon="el-icon-delete"
+              slot="reference"
+              class="el-popover-left"
+              >删除</el-button
+            >
+          </el-popconfirm>
 <!--        <el-button type="primary" size="mini">导出</el-button>-->
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
@@ -136,7 +154,14 @@
           border
           fit
           stripe
+             @select-all="hanleSelectAll"
+            @select="hanleSelectAll"
         >
+           <el-table-column
+              type="selection"
+              align="left"
+              width="50"
+            ></el-table-column>
 <!--          <el-table-column type="selection" align="left" />-->
           <!-- <el-table-column
             align="left"

src/views/basic_data/warehouse.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <keep-alive>
+
     <router-view />
-    </keep-alive>
+
   </div>
 </template>

src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -14,7 +14,7 @@
             <div class="value">{{ details.refEnginRecordNo }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">项目类型</div>
+            <div class="label">项目类别</div>
             <div class="value">{{ details.refProjectName }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -21,7 +21,7 @@
               <div class="value">{{ details.refEnginRecordNo }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">项目类型</div>
+              <div class="label">项目类别</div>
               <div class="value">{{ details.refProjectName }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">
@@ -138,7 +138,7 @@
 
             <el-table-column
               align="left"
-              label="厂工程编码"
+              label="跨区厂编号"
               prop="factoryNo"
               min-width="160"
               show-overflow-tooltip

src/views/sales/sales_policy.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <keep-alive>
+
     <router-view />
-    </keep-alive>
+
   </div>
 </template>

src/views/sales/sales_rebate.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <keep-alive>
+
     <router-view />
-    </keep-alive>
+
   </div>
 </template>

src/views/sales_policy/codealer_list.vue

@@ -48,10 +48,10 @@
         </el-row>
       </el-form>
     </el-header>
-    <el-main class="mymain-container">
+    <div class="mymain-container">
       <div class="table">
-      <el-table :data="dataList" border style="width: 100%">
-        <el-table-column prop="name" label="操作" width="120" align="center">
+      <el-table :data="dataList" border >
+        <el-table-column prop="name" label="操作" width="120" align="center" class="table">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -132,7 +132,7 @@
           @current-change="handleCurrentChange"
         />
       </div>
-    </el-main>
+    </div>
 
   </el-container>
   <Distributor v-else :cid="id" />
@@ -186,7 +186,9 @@ export default {
 .mg {
   margin: 20px 0;
 }
-
+.app-main{
+  margin-top: 100%;
+}
 .btn {
   text-align: right;
 }

src/views/sales_policy/components/AddPolicy.vue

@@ -476,9 +476,11 @@
           <TabelTransfer
             @handlEditPolicy="handleAddPolicy"
             @handleReset="handleReset"
+             v-if="searchForm.code" :code="searchForm.code"
           />
           <!--          <Transfer @handleAddPolicy="handleAddPolicy" @handleReset="handleReset" />-->
         </div>
+
       </div>
     </div>
     <AddCondition

src/views/sales_policy/components/Distributor.vue

@@ -12,7 +12,7 @@
         :model="details"
         ref="details"
         label-width="120px"
-        size="small"
+        size="mini"
         label-position="left"
         class="demo-ruleForm"
       >
@@ -100,7 +100,8 @@
         >
       </div>
     </div>
-    <el-main>
+    <el-main class="mymain-container">
+      <div class="table">
       <el-table
         v-loading="listLoading"
         :data="dataList"
@@ -174,6 +175,7 @@
 
         </el-table-column>
       </el-table>
+      </div>
       <!-- 分页 -->
       <div class="fr" style="margin-top: 20px">
         <el-pagination

src/views/sales_policy/components/TabelTransfer.vue

@@ -24,7 +24,7 @@
           size="small"
           @click="hanleDownloadFiles"
         >下载模板</el-button>
-      
+
       </el-row>
       <el-row type="flex">
         <el-col :xs="24" :sm="12" :lg="14">
@@ -155,6 +155,106 @@
         </el-table>
       </el-col>
     </el-row>
+       <div style="margin:20px 0;">
+          <el-upload
+          class="import-btn"
+          :action="baseURL + 'student/import'"
+          :http-request="handleImports"
+          :file-list="importFileList"
+          :show-file-list="false"
+        >
+          <el-button
+            type="primary"
+            size="small"
+          >导入经销商</el-button>
+         </el-upload>
+           <el-button
+          type="primary"
+          size="small"
+          @click="hanleDownloadFilesPolicy"
+        >下载模板</el-button>
+
+        </div>
+        <div>
+            <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="limitQty"
+            label="购买量上限
+
+"
+            align="left"
+          >
+
+          </el-table-column>
+        </el-table>
+           <!-- 分页 -->
+        <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"
+          />
+        </div>
+        </div>
     <slot name="footer">
       <el-row style="margin:20px  0 0 0;">
         <el-button
@@ -170,7 +270,7 @@
 </template>
 
 <script>
-import { deleteCondition, deleteMaterialPolicy, getConditionList, getCrList, getCustomerList } from '@/api/policy_list'
+import { deleteCondition, deleteMaterialPolicy, getConditionList, getCrList, getCustomerList,getPolicyList } from '@/api/policy_list'
 import { downloadFiles, handleImport } from '@/utils/util'
 import EditCondition from './EditCondition'
 import ImageUpload from '@/components/Common/image-upload.vue'
@@ -243,7 +343,17 @@ export default {
           label: '限量'
         }
       ],
-      comCode: ''
+      comCode: '',
+      policyList:{
+         pageNum:1,
+          pageSize:10,
+          policyId:'',
+          keyword:'',
+          currentPages:1
+      },
+      list:[],
+      cTotal:1,
+      clistLoading:false
     }
   },
   watch: {
@@ -255,11 +365,13 @@ export default {
     this.comCode = this.code
     if (this.comCode) {
       this.getCond()
+      this.getPolicyList()
     }
   },
   methods: {
     getList() {
       this.getCrList()
+
     },
     getCrList() {
       const customerParams = {
@@ -286,6 +398,33 @@ export default {
         this.clistTotal = res.data.total
       })
     },
+    getPolicyList(){
+      this.clistLoading = true
+      getPolicyList(
+        {
+          pageNum:this.policyList.pageNum,
+          pageSize:this.policyList.pageSize,
+          policyId:this.comCode || this.code,
+          keyword:'',
+        }
+      ).then(res=>{
+          this.list = res.data.records
+          console.log(this.list,'785787');
+           this.cTotal = res.data.total
+           this.clistLoading = false
+      })
+    },
+        // 更改每页数量
+    handleSizeChanges2(val) {
+      this.policyList.pageSizes = val
+      this.policyList.currentPages = 1
+      this.getPolicyList()
+    },
+    // 更改当前页
+    handleCurrentChanges2(val) {
+      this.policyList.currentPages = val
+      this.getPolicyList()
+    },
     // 更改每页数量
     handleSizeChanges(val) {
       this.pageSizes = val
@@ -343,10 +482,37 @@ export default {
         })
       }
     },
+    async handleImports(param){
+       this.importLoading = true
+      const file = param.file
+      const formData = new FormData()
+      formData.append('file', file)
+
+      formData.append('policyId', this.comCode || this.code)
+      // formData.append("mainId", this.searchForm.mainId);
+      const result = await handleImport('/policy/limit/import', formData)
+      console.log(result)
+      this.importLoading = false
+      this.importFileList = []
+      if (result.code === 200) {
+        await this.$alert(result.message, '导入成功', {
+          confirmButtonText: '确定'
+        })
+          this.list = result.data
+            this.getPolicyList()
+      } else {
+        await this.$alert(result.message, '导入失败', {
+          confirmButtonText: '确定'
+        })
+      }
+    },
     // 下载经销商模板
     hanleDownloadFiles() {
       downloadFiles('/policy/downloadCustomer')
     },
+    hanleDownloadFilesPolicy(){
+       downloadFiles('/policy/limit/download')
+    },
     getCommonApi(row) {
       (this.isEdit = 2), (this.cid = row.id), (this.cpolicyId = row.policyId)
       console.log(