feature(客户): 编辑时允许地区为空

src/views/customer/components/Edit.vue

@@ -222,11 +222,6 @@
         if (!params.province.id) return this.$message.warning('请选择所在省')
         if (!params.city.id) return this.$message.warning('请选择所在市')
         if (!params.region.id) return this.$message.warning('请选择所在区')
-        let arr = []
-        arr.push(params.province.distName)
-        if (params.city.id) arr.push(params.city.distName)
-        if (params.region.id) arr.push(params.region.distName)
-        params.custLocation = arr.join('/')
         params.custProvinceId = params.province.id
         params.custProvince = params.province.distName
         params.custCityId = params.city.id
@@ -253,17 +248,14 @@
         if (!params.province.id) return this.$message.warning('请选择所在省')
         if (!params.city.id) return this.$message.warning('请选择所在市')
         // if (!params.region.id) return this.$message.warning('请选择所在区')
-        let arr = []
-        arr.push(params.province.distName)
-        if (params.city.id) arr.push(params.city.distName)
-        if (params.region.id) arr.push(params.region.distName)
-        params.custLocation = arr.join('/')
         params.custProvinceId = params.province.id
         params.custProvince = params.province.distName
         params.custCityId = params.city.id
         params.custCity = params.city.distName
-        params.custRegionId = params.region.id
-        params.custRegion = params.region.distName
+        if (params.region) {
+          params.custRegionId = params.region.id
+          params.custRegion = params.region.distName
+        }
         if (!params.followUpDate) params.followUpDate = null
         const [err, res] = await to(api.updateCostomer(params))
         if (err) return

src/views/proj/business/components/BusinessEdit.vue

@@ -70,7 +70,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="经销商/代理商" prop="distributorName">
+          <el-form-item
+            label="经销商/代理商"
+            prop="distributorName"
+            :required="form.salesModel && form.salesModel !== '10'">
             <el-input
               v-model="form.distributorName"
               :disabled="form.salesModel === '10'"
@@ -234,8 +237,7 @@
     },
     data() {
       const validateDistributor = (rule, value, callback) => {
-        if ('' === value && this.form.salesModel !== '10')
-          callback(new Error(this.translateTitle('请选择经销商/代理商')))
+        if (!value && this.form.salesModel && this.form.salesModel !== '10') callback(new Error('请选择经销商/代理商'))
         else callback()
       }
       return {

src/views/proj/business/index.vue

@@ -12,9 +12,9 @@
     <vab-query-form>
       <vab-query-form-top-panel>
         <el-form ref="queryForm" :inline="true" :model="queryForm" @submit.native.prevent>
-          <el-form-item prop="nboName">
-            <el-input v-model="queryForm.nboName" clearable placeholder="项目名称" @keyup.enter.native="queryData" />
-          </el-form-item>
+          <!--          <el-form-item prop="nboName">-->
+          <!--            <el-input v-model="queryForm.nboName" clearable placeholder="项目名称" @keyup.enter.native="queryData" />-->
+          <!--          </el-form-item>-->
 
           <el-form-item prop="custName">
             <el-input