Finish Hotfix-zh-82

src/views/sales_policy/components/AddCondition.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container class="app-container">
+  <el-container class="app-container mymian-container">
     <el-header height="50px" class="header">
       <el-page-header
         @back="handleBack"
@@ -41,7 +41,7 @@
                   >删除机型</el-button
                 >
               </el-row>
-              <el-row>
+              <el-row class="table">
                 <el-table
 
                   v-loading="listLoadingArr[`listLoading${index}`]"
@@ -124,7 +124,7 @@
             <h5 v-if="index == 0">限定机型</h5>
             <h5 v-if="index > 0">配提机型</h5>
             <el-row>
-              <el-row>
+              <el-row class="table">
                 <el-table style="width: 100%" :data="item" border>
                   <el-table-column
                     type="selection"
@@ -255,7 +255,7 @@
                 <el-col :xs="10" :ms="10" :lg="10">
                   <el-row>
                     <el-row> </el-row>
-                    <el-row>
+                    <el-row class="table">
                       <el-row class="title"> 可选产品列表 </el-row>
                       <el-table
                          ref="multipleTable"
@@ -378,7 +378,7 @@
                 <el-col :xs="10" :ms="10" :lg="10">
                   <el-row>
                     <el-row> </el-row>
-                    <el-row>
+                    <el-row class="table">
                       <el-row class="title"> 已选产品列表 </el-row>
                       <el-table
                         style="width: 100%"

src/views/sales_policy/components/Examine.vue

@@ -34,7 +34,7 @@
               <div class="value">
                 <el-select
                   v-model="detail.type"
-                  size="mini"
+                  size="small"
                   placeholder="销售政策类型"
                   class="select_height"
                 >
@@ -84,7 +84,7 @@
                   placeholder="生效日期"
                   default-time="00:00:00"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                />
+                /> </el-form-item>
               </div>
             </el-col>
             <el-col :span="24" class="item">
@@ -96,7 +96,7 @@
                   placeholder="生效日期"
                   default-time="00:00:00"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                />
+                /> </el-form-item>
               </div>
             </el-col>
           </el-row>
@@ -159,11 +159,11 @@
                   :file-list="importFileList"
                   :show-file-list="false"
                 >
-                  <el-button size="mini">导入货品价格表</el-button>
+                  <el-button size="small">导入货品价格表</el-button>
                 </el-upload>
               </el-col>
               <el-col :span="12" class="tr">
-                <!-- <el-button size="mini" @click="$parent.isShow = 10"
+                <!-- <el-button size="small" @click="$parent.isShow = 10"
                 >查看条件</el-button
               > -->
               </el-col>
@@ -245,7 +245,7 @@
                     v-if="item.type==='REBATE'"
                     style="margin: 5px"
                     type="success"
-                    size="mini"
+                    size="small"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -258,7 +258,7 @@
                    v-if="item.type==='COMMONLY'"
                     style="margin: 5px"
                     type="success"
-                    size="mini"
+                    size="small"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -337,7 +337,7 @@
                 <template v-if="$parent.isShow == 5">
                   <el-button
                     type="text"
-                    size="mini"
+                    size="small"
                     @click="getCommonApi(scope.row)"
                   >编辑</el-button>
                   <el-popconfirm
@@ -358,7 +358,7 @@
                 <el-button
                   v-else
                   type="text"
-                  size="mini"
+                  size="small"
                   @click="
                     ($parent.isShow = 10), ($parent.policyId = scope.row.id) ,
                     $parent.isShow ===8?detailFang = false :detailFang=true
@@ -493,25 +493,25 @@
               <el-col :span="4" class="middle_box" :offset="0">
                 <el-col>
                   <el-button
-                    size="mini"
+                    size="small"
                     :disabled="type == 2"
                     @click="handleAllAdd"
                   >全部添加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="mini"
+                    size="small"
                     :disabled="type == 2"
                     @click="handleAdd"
                   >增加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="mini"
+                    size="small"
                     :disabled="type == 1"
                     @click="handleDelete"
                   >删除</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="mini"
+                    size="small"
                     :disabled="type == 1"
                     @click="handleAllDelete"
                   >全部删除</el-button></el-col>
@@ -595,7 +595,7 @@
               <el-col :span="20" class="col value" style="padding-left: 10px">
                 <el-input
                   v-model="remark"
-                  size="mini"
+                  size="small"
                   placeholder="请输入内容"
                 />
               </el-col>
@@ -603,7 +603,7 @@
             <el-row>
               <el-button
                 type="primary"
-                size="mini"
+                size="small"
                 @click="handleSubmit"
               >审核通过</el-button>
             </el-row>

src/views/sales_policy/components/TabelTransfer.vue

@@ -687,7 +687,7 @@ export default {
   margin: 0 0 20px 0;
 }
 .import-btn {
-  margin: 0 20px;
+
 }
 .value {
   ::v-deep .el-input__prefix {

src/views/sales_policy/components/details.vue

@@ -578,6 +578,114 @@
               </el-col>
             </el-row>
           </template>
+           <template >
+               <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="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="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>
+      <!-- 分页 -->
+      <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="handleSizeChanges4"
+          @current-change="handleCurrentChanges4"
+        />
+      </div>
+    </div>
+          </template>
           </div>
           <div
             v-if="$parent.isShow == 8 && detail.examineStatus == 'WAIT'"
@@ -639,7 +747,8 @@ import {
   getMaterialList,
   getPolicyDetail,
   toExamine,
-  updatePolicy
+  updatePolicy,
+  getPolicyList
 } from '@/api/policy_list'
 import EditCondition from './EditCondition'
 import ImageUpload from '@/components/Common/image-upload.vue'
@@ -714,6 +823,16 @@ export default {
         }
       ],
       detailFang:false,
+          policyList: {
+        pageNum: 1,
+        pageSize: 10,
+        policyId: "",
+        keyword: "",
+        currentPages: 1,
+      },
+      list: [],
+      cTotal: 1,
+      clistLoading: false,
     }
   },
   computed: {
@@ -753,9 +872,23 @@ export default {
         // 获取条件政策
         this.getConditionList()
         this.getCond()
+          this.getPolicyList()
       })
     },
-
+getPolicyList() {
+      this.clistLoading = true;
+      getPolicyList({
+        pageNum: this.policyList.pageNum,
+        pageSize: this.policyList.pageSize,
+        policyId: this.$parent.id,
+        keyword: this.policyList.keyword,
+      }).then((res) => {
+        this.list = res.data.records;
+        console.log(this.list, "785787");
+        this.cTotal = res.data.total;
+        this.clistLoading = false;
+      });
+    },
     getCrList() {
       const customerParams = {
         pageNum: this.currentPage,
@@ -857,6 +990,17 @@ export default {
           console.error(err)
         })
     },
+        // 更改每页数量
+    handleSizeChanges4(val) {
+      this.policyList.pageSizes = val;
+      this.policyList.currentPages = 1;
+      this.getPolicyList();
+    },
+    // 更改当前页
+    handleCurrentChanges4(val) {
+      this.policyList.currentPages = val;
+      this.getPolicyList();
+    },
     // 导入
     async handleImport(param) {
       this.importLoading = true

src/views/sales_policy/components/editPolicy.vue

@@ -192,7 +192,7 @@
                 <span>{{scope.row.materialName}}</span>
               </template>
             </el-table-column>
-            </el-table-column>
+
             <el-table-column
 
               min-width="300"
@@ -412,6 +412,7 @@
             <el-table-column prop="name" label="限定条件" align="left">
               <template slot-scope="scope">
                 <el-input
+                size="mini"
                   v-model="scope.row.name"
                   style="text-align: center"
                   placeholder="请输入名称"

src/views/supply/policy/components/retail_form.vue

@@ -674,7 +674,7 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  {{ scope.row.qty * scope.row.price || 0  | numToFixed}}
+                  {{ scope.row.qty * scope.row.price   | numToFixed}}
                 </template>
               </el-table-column>
               <el-table-column
@@ -703,9 +703,9 @@
                   <el-col />
                   <el-col />
                   <el-col />
-                  <el-col>{{ totalQty }}</el-col>
-                  <el-col>{{ totalPrice }}</el-col>
-                  <el-col>{{ totalAmount }}</el-col>
+                  <el-col>{{ totalQty | numToFixed }}</el-col>
+                  <el-col>{{ totalPrice | numToFixed}}</el-col>
+                  <el-col>{{ totalAmount | numToFixed}}</el-col>
                 </el-row>
               </div>
             </template>