Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!597

src/views/business/spd/bo/plan/add.vue

@@ -75,7 +75,7 @@
               :rules="{ required: true, message: '请选择销售区域', trigger: 'blur' }">
               <el-select clearable v-model="basicForm.marketingAreaName" size="mini" :disabled="sonDisable"
                 @focus="choose('MK_SALESAREA_PARAM', true, '请选择销售区域')" style="width: 200px">
-                <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.code">
+                <el-option v-for="item in salesAreaOptions" :key="item.id" :label="item.name" :value="item.code">
                 </el-option>
               </el-select>
             </el-form-item>