Merge branch 'feat-two'

src/views/sales_policy/components/AddPolicy.vue

@@ -133,7 +133,7 @@
             inverse-current-row
             big-data-checkbox
             element-loading-text="Loading"
-            max-height="700"
+            height="700"
             border
             fit
             highlight-current-row
@@ -360,12 +360,12 @@
                 {{ scope.row.status ? '启用' : '作废' }}
               </template>
             </pl-table-column>
-            <pl-table-column fixed="right" label="操作" align="center" min-width="150">
+            <pl-table-column label="操作" align="center" min-width="150">
               <template slot-scope="scope">
                 <el-button
                   type="text"
                   class="textColor el-popover-left"
-                  @click="scope.row.fang = !scope.row.fang"
+                  @click="handleEdit(scope.row)"
                 >编辑</el-button>
                 <el-popconfirm
                   confirm-button-text="好的"
@@ -610,6 +610,12 @@ export default {
         this.$successMsg(status ? '启用' : '作废')
       })
     },
+    handleEdit(row) {
+      row.fang = !row.fang
+      this.$nextTick(() => {
+        this.$refs.plTable.doLayout()
+      })
+    },
     setText(e, index, row, name) {
       if (e) {
         if (name === 'priceType') {

src/views/sales_policy/components/editPolicy.vue

@@ -129,19 +129,17 @@
           <div class="table">
             <!-- v-el-select-loadmore="loadmore2" -->
             <pl-table
+              ref="plTable"
               v-loading="listLoading"
               :data="dataList"
               row-key="index"
               use-virtual
-              fixed-columns-roll
               :data-changes-scroll-top="false"
-              inverse-current-row
               big-data-checkbox
               element-loading-text="Loading"
-              max-height="700"
+              height="700"
               border
               fit
-              highlight-current-row
               stripe
             >
               <pl-table-column type="index" label="序号" width="50" align="left" />
@@ -363,12 +361,12 @@
                   {{ scope.row.status ? '启用' : '作废' }}
                 </template>
               </pl-table-column>
-              <pl-table-column fixed="right" label="操作" align="center" min-width="150">
+              <pl-table-column label="操作" align="center" min-width="150">
                 <template slot-scope="scope">
                   <el-button
                     type="text"
                     class="textColor el-popover-left"
-                    @click="scope.row.fang = !scope.row.fang"
+                    @click="handleEdit(scope.row)"
                   >编辑
                   </el-button>
                   <el-popconfirm
@@ -652,6 +650,12 @@ export default {
         this.$successMsg(status ? '启用' : '作废')
       })
     },
+    handleEdit(row) {
+      row.fang = !row.fang
+      this.$nextTick(() => {
+        this.$refs.plTable.doLayout()
+      })
+    },
     setText(e, index, row, name) {
       if (e) {
         if (name === 'priceType') {

src/views/supply/implement/implement_total_list.vue

@@ -20,37 +20,37 @@
                 </el-col> -->
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="产品编码" prop="goodsCode">
-                    <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
+                    <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="销售订单" prop="saleNum">
-                    <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
+                    <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="经销商" prop="dealer">
-                    <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+                    <el-input v-model="screenForm.dealer" placeholder="请输入经销商" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="产品名称" prop="goodsName">
-                    <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+                    <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="规格型号" prop="model">
-                    <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+                    <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="项目名称" prop="enginName">
-                    <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
+                    <el-input v-model="screenForm.enginName" placeholder="请输入项目名称" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="工程登录编号" prop="loginNum">
-                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -68,8 +68,7 @@
                         :key="item.number"
                         :label="item.name"
                         :value="item.number"
-                      >
-                      </el-option>
+                      />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -84,8 +83,7 @@
                       value-format="yyyy-MM-dd HH:mm:ss"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -99,48 +97,47 @@
                       value-format="yyyy-MM-dd HH:mm:ss"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
-                    >
-                    </el-date-picker>
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="表头业务员" prop="serviceName ">
-                    <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员"></el-input>
+                    <el-input v-model="screenForm.serviceName" placeholder="请输入表头业务员" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="表体业务员" prop="itemServiceName">
-                    <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
+                    <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="归属业务员" prop="newServiceName">
-                    <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
+                    <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="销售政策编号" prop="policyCode">
-                    <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号"></el-input>
+                    <el-input v-model="screenForm.policyCode" placeholder="请输入销售政策编号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="销售政策说明" prop="policyRemark">
-                    <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明"></el-input>
+                    <el-input v-model="screenForm.policyRemark" placeholder="请输入销售政策说明" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="发货是否完成" prop="isOver">
                     <el-select v-model="screenForm.isOver" clearable placeholder="请选择">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
+                      <el-option label="是" :value="true" />
+                      <el-option label="否" :value="false" />
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="是否置换过" prop="isDisplaceOrder">
                     <el-select v-model="screenForm.isDisplaceOrder" clearable placeholder="请选择">
-                      <el-option label="是" :value="true"></el-option>
-                      <el-option label="否" :value="false"></el-option>
+                      <el-option label="是" :value="true" />
+                      <el-option label="否" :value="false" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -166,7 +163,7 @@
       <div class="mymain-container">
         <div class="btn-group clearfix">
           <div class="fr">
-            <ExportButton :exUrl="'retail/exec/listTotalExport'" :exParams="exParams" />
+            <ExportButton :ex-url="'retail/exec/listTotalExport'" :ex-params="exParams" />
           </div>
         </div>
         <div class="table">
@@ -184,14 +181,26 @@
             <el-table-column align="left" label="标识" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-tag
+                  v-if="scope.row.isDisplaceOrder"
                   type="warning"
                   size="mini"
                   style="cursor: pointer"
                   @click="openDisplaceDetail(scope.row)"
-                  v-if="scope.row.isDisplaceOrder"
-                  >置换
+                >置换
+                </el-tag>
+                <el-tag v-if="scope.row.directTransferStatusName !== '非直调'" type="success" size="mini">直调</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="是否置换过" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag
+                  type="warning"
+                  size="mini"
+                  style="cursor: pointer"
+                  @click="openDisplaceDetail(scope.row)"
+                >
+                  {{ scope.row.isDisplaceOrder?'是':'否' }}
                 </el-tag>
-                <el-tag type="success" size="mini" v-if="scope.row.directTransferStatusName !== '非直调'">直调</el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -200,24 +209,24 @@
               prop="materialGroupName"
               min-width="200"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="制单日期"
               prop="createTime"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="订单日期"
               prop="theTime"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="left" label="销售订单" prop="id" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.id" />
+                <CopyButton :copy-text="scope.row.id" />
                 <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
@@ -229,13 +238,13 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerNumber" />
+                <CopyButton :copy-text="scope.row.customerNumber" />
                 <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.customerName" />
+                <CopyButton :copy-text="scope.row.customerName" />
                 <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
@@ -245,24 +254,24 @@
               prop="saleTypeName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="存货类别"
               prop="k3CategoryName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="金蝶部门"
               prop="k3OrgName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialCode" />
+                <CopyButton :copy-text="scope.row.materialCode" />
                 <span>{{ scope.row.materialCode }}</span>
               </template>
             </el-table-column>
@@ -274,19 +283,19 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <CopyButton :copy-text="scope.row.materialOldNumber" />
                 <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.materialName" />
+                <CopyButton :copy-text="scope.row.materialName" />
                 <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.specification" />
+                <CopyButton :copy-text="scope.row.specification" />
                 <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
@@ -296,50 +305,49 @@
               prop="directTransferStatusName"
               min-width="100"
               show-overflow-tooltip
-            >
-            </el-table-column>
+            />
             <el-table-column
               align="left"
               label="钱包"
               prop="walletName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="返利钱包"
               prop="rebateWalletName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="订单未发货数量"
               prop="refundableQty"
               min-width="120"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="总数量"
               prop="qty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="退订数量"
               prop="retiredQty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="退货数量"
               prop="refundProductQty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
@@ -372,14 +380,14 @@
               prop="hasSendQty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="right"
               label="直调数量"
               prop="directTransferQty"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="right" label="退订金额" prop="retiredAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.retiredAmount | numToFixed }}
@@ -402,7 +410,7 @@
               prop="totalDiscAmount"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="right" label="原供价" prop="orgPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.orgPrice | numToFixed }}
@@ -415,21 +423,21 @@
               prop="serviceName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="表体业务员"
               prop="itemServiceName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="归属业务员"
               prop="newServiceName"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
             <el-table-column
               align="left"
@@ -437,23 +445,23 @@
               prop="remark"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column
               align="left"
               label="表体备注"
               prop="itemRemark"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            />
             <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.policyTitle" />
+                <CopyButton :copy-text="scope.row.policyTitle" />
                 <span>{{ scope.row.policyTitle }}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="销售政策编码" prop="policyCode" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
-                <CopyButton :copyText="scope.row.policyCode" />
+                <CopyButton :copy-text="scope.row.policyCode" />
                 <span>{{ scope.row.policyCode }}</span>
               </template>
             </el-table-column>
@@ -463,27 +471,26 @@
               prop="customerGroupName"
               min-width="250"
               show-overflow-tooltip
-            ></el-table-column>
+            />
           </el-table>
         </div>
       </div>
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-sizes="[10, 20, 30, 50]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
-          >
-          </el-pagination>
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </div>
     </div>
 
-    <DisplaceDetail :listItem="queryItem" v-if="isShowDisplaceDetail" @backListFormDetail="backList" />
+    <DisplaceDetail v-if="isShowDisplaceDetail" :list-item="queryItem" @backListFormDetail="backList" />
   </div>
   <!-- <template-page
     ref="pageRef"
@@ -515,7 +522,7 @@ export default {
   filters: {
     statusFilter(val) {
       if (that.statusList.length) {
-        let obj = that.statusList.find(o => o.value == val)
+        const obj = that.statusList.find(o => o.value == val)
         return obj ? obj.label : ''
       }
       return ''
@@ -630,8 +637,8 @@ export default {
     operation() {
       return (h, { row, index, column }) => {
         return (
-          <div class="operation-btns">
-            <el-button size="mini" type="text" onClick={async () => {}}>
+          <div class='operation-btns'>
+            <el-button size='mini' type='text' onClick={async() => {}}>
               查看
             </el-button>
           </div>
@@ -643,7 +650,7 @@ export default {
     getList() {
       this.listLoading = true
 
-      let params = {
+      const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         type: this.screenForm.status,