Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -186,11 +186,11 @@
         </div>
         <div style="margin-left:20px">
           <small><b>销售类别:</b>&nbsp;</small>
-          <el-select v-model="saletype" size="mini" placeholder="请选择">
+          <el-select v-model="saletype" size="small" placeholder="请选择">
             <el-option
               v-for="item in saleroptions"
               :key="item.value"
-              :label="item.value"
+              :label="item.remarks"
               :value="item.value">
             </el-option>
           </el-select>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -174,11 +174,11 @@
         </div>
         <div style="margin-left:20px">
           <small><b>销售类别:</b>&nbsp;</small>
-          <el-select v-model="saletype" size="mini" placeholder="请选择">
+          <el-select v-model="saletype" size="small" placeholder="请选择">
             <el-option
               v-for="item in saleroptions"
               :key="item.value"
-              :label="item.value"
+              :label="item.remarks"
               :value="item.value">
             </el-option>
           </el-select>