Merge pull request '排序、批量修改加启用禁用' (#28) from master-模板替换 into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/28

src/views/emis/emisCommissionQuote/batchCommissionQuotePriceUpdateForm.vue

@@ -18,24 +18,32 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="启用状态" prop="blOpen">
+              <el-radio-group v-model="form.blOpen">
+                <el-radio :label="'1'">启用</el-radio>
+                <el-radio :label="'0'">停用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-col>
         <el-col :span="18">
           <el-row>
-          <el-col :span="24" :xs="24" style="padding: 5px;">
+            <el-col :span="24" :xs="24" style="padding: 5px;">
-            <el-row :gutter="0">
+              <el-row :gutter="0">
-              <el-col :span="24">
+                <el-col :span="24">
-                <el-button size="mini" type="primary" @click="handelSelectStaff">选择员工</el-button>
+                  <el-button size="mini" type="primary" @click="handelSelectStaff">选择员工</el-button>
-                <el-button size="mini" type="primary" @click="handelSelectAllStaff">全部员工</el-button>
+                  <el-button size="mini" type="primary" @click="handelSelectAllStaff">全部员工</el-button>
-              </el-col>
+                </el-col>
-            </el-row>
+              </el-row>
-            <el-row>
+              <el-row>
-              <el-col :span="24">
+                <el-col :span="24">
-                <el-form-item label="" prop="empName" label-width="0px" style="margin-bottom: 0px;">
+                  <el-form-item label="" prop="empName" label-width="0px" style="margin-bottom: 0px;">
-                  <el-input v-model="form.empName" rows="6" type="textarea" placeholder="" disabled />
+                    <el-input v-model="form.empName" rows="6" type="textarea" placeholder="" disabled />
-                </el-form-item>
+                  </el-form-item>
-              </el-col>
+                </el-col>
-            </el-row>
+              </el-row>
-          </el-col>
+            </el-col>
           </el-row>
         </el-col>
       </el-row>
@@ -139,6 +147,7 @@ export default {
         status:null,
         empCode:null,
         empName:null,
+        blOpen:null,
       };
       this.resetForm("form");
     },
@@ -154,6 +163,7 @@ export default {
                 endDate:this.form.endDate,
                 empCode:this.form.empCode,
                 empName:this.form.empName,
+                blOpen:this.form.blOpen,
               }
               updList.push(item);
               await batchUpdate(updList);
@@ -167,6 +177,7 @@ export default {
                 endDate:this.form.endDate,
                 empCode:this.form.empCode,
                 empName:this.form.empName,
+                blOpen:this.form.blOpen,
               }
               updList.push(item);
             }

src/views/emis/emisCommissionQuote/index.vue

@@ -162,7 +162,7 @@
                   :disabled="multiple"
                   @click="handleBatchUpdate"
                   v-hasPermi="['emis:emisQuotePrice:edit']"
-                >批量修改报价时间</el-button>
+                >批量修改</el-button>
               </el-col>
 
           </el-row>
@@ -260,8 +260,8 @@
         </el-table-column>
       <!-- <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> -->
       <el-table-column :label="$t('提成员工范围')" align="center" prop="empName" min-width="150"  :show-overflow-tooltip="true"  />
-      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" min-width="170" />
+      <el-table-column :label="$t('开始日期')" align="center" prop="startDate" :sortable="true" min-width="170" />
-      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" min-width="170" />
+      <el-table-column :label="$t('结束日期')" align="center" prop="endDate" :sortable="true" min-width="170" />
       <!-- <el-table-column :label="$t('优先级')" align="center" prop="priorityLevel" min-width="100" /> -->
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
@@ -271,7 +271,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
       <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime" :sortable="true" width="170"/>
 
     </XdTable>
 
@@ -279,7 +279,7 @@
       <emisCommissionQuoteForm :key="resetRefreshId" :quoteId="currentId" :isCopy="isCopy" @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCommissionQuoteForm>
     </el-dialog>
 
-    <!-- 批量修改报价开始时间、结束时间 -->
+    <!-- 批量修改报价 -->
     <el-dialog :title="titleBatchForm" :visible.sync="openBatchUpdateForm" width="90%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
       <batchCommissionQuotePriceUpdateForm :ids="ids"  @on-changed="handleBatchFormChanged" @on-cancel="cancelBatchForm"></batchCommissionQuotePriceUpdateForm>
     </el-dialog>