fix: 解决同步冲突

Signed-off-by: Howie <zhouhao@zfire.com>

src/views/commercialEngineering/components/base.vue

@@ -133,6 +133,7 @@
               v-model="formData.customerName"
               disabled
               placeholder="请填写"
+
               clearable
             />
             <el-input
@@ -140,6 +141,7 @@
               v-model="formData.customerName"
               disabled
               placeholder="请填写"
+
               clearable
             />
             <el-select
@@ -249,14 +251,25 @@
                   v-model="formData.homeProjectNameArea"
                   class="my-width"
                   placeholder="请填写"
+
                   clearable
                 />小区
                 <el-input
                   v-model="formData.homeProjectNameSeat"
                   class="my-width"
                   placeholder="请填写"
+
+                  clearable
+                />座
+                <el-input
                   v-model="formData.homeProjectNameNumber"
+                  class="my-width"
                   placeholder="请填写"
+
+                  clearable
+                />号
+                <CopyButton
+                  v-if="module !== 'add'"
                   :copyText="
                     formData.homeProjectNameArea +
                     '小区' +
@@ -270,6 +283,7 @@
               <el-radio label="SELF">
                 <el-input
                   v-model="formData.homeProjectNameArea2"
+                  class="my-width"
                   placeholder="请填写"
 
                   clearable
@@ -281,18 +295,25 @@
                   v-model="formData.homeProjectNameArea3"
                   class="my-width"
                   placeholder="请填写"
+
                   clearable
                 />小区
                 <el-input
                   v-model="formData.homeProjectNameNumber3"
                   class="my-width"
                   placeholder="请填写"
+
+                  clearable
+                />号别墅
+                <CopyButton
+                  v-if="module !== 'add'"
                   :copyText="formData.homeProjectNameArea3 + '小区' + formData.homeProjectNameNumber3 + '号'"
                 />
               </el-radio>
             </el-radio-group>
           </div>
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">工程（建筑）地址*：</div>
           <div class="value">
             <el-select v-model="formData.provinceId" placeholder="请选择省" class="my-width" @change="changeProvince">

src/views/commercialEngineering/crossDistrict/examine.vue

@@ -65,11 +65,7 @@ export default {
         return
       }
 
-<<<<<<< HEAD
-      if (params.loginStatus === 'REJECT' && !params.examineNote && !params.note) {
-=======
       if (params.loginStatus === 'REJECT' && !params.note) {
->>>>>>> sync_supply_front_master
         this.$errorMsg('请填写审核备注')
         return
       }