修改问题

src/views/main/Customer/addForm.vue

@@ -261,7 +261,7 @@
           <span v-if="row.addrType==='factory'">工厂地址</span>
         </template>
         <template #edit="{ row }">
-          <vxe-select v-model="row.addrType" transfer>
+          <vxe-select clearable v-model="row.addrType" transfer>
             <vxe-option value="factory" label="工厂地址"></vxe-option>
           </vxe-select>
         </template>
@@ -575,8 +575,7 @@ export default {
 .CsForm {
   background: #fff;
   padding: 25px;
-  height: 760px;
-  overflow-y: auto !important;
+  position: sticky;
 }
 .CsForm .ant-form-item {
   margin-bottom: 10px;

src/views/main/Customer/editForm.vue

@@ -250,17 +250,17 @@
           <vxe-input v-model="row.addr" type="text"></vxe-input>
         </template>
       </vxe-column>
-      <vxe-column field="addrName" title="地址简称" :edit-render="{}">
+      <vxe-column width="200" field="addrName" title="地址简称" :edit-render="{}">
         <template #edit="{ row }">
           <vxe-input v-model="row.addrName" type="text"></vxe-input>
         </template>
       </vxe-column>
-      <vxe-column field="addrType" title="地址类型" :edit-render="{}">
+      <vxe-column width="200" field="addrType" title="地址类型" :edit-render="{}">
         <template #default="{ row }">
           <span v-if="row.addrType==='factory'">工厂地址</span>
         </template>
         <template #edit="{ row }">
-          <vxe-select v-model="row.addrType" transfer>
+          <vxe-select clearable v-model="row.addrType" transfer>
             <vxe-option value="factory" label="工厂地址"></vxe-option>
           </vxe-select>
         </template>
@@ -396,6 +396,9 @@ export default {
           res.data.contacts.forEach((item, index) => {
             item.WebKey = index + 1
           })
+          res.data.addrs.forEach((item, index) => {
+            item.WebKey = index + 1
+          })
           // 后端返回的 ID 类型不一致 在此处 转为一致
           const UserArr = ['saleid', 'opid', 'docid', 'custserviceid']
           UserArr.forEach(item => {
@@ -622,8 +625,8 @@ export default {
 .CsForm {
   background: #fff;
   padding: 25px;
-  height: 760px;
   overflow-y: auto !important;
+  position: sticky;
 }
 .CsFormTitle {
   border-bottom: 1px solid #c9c9c9;

src/views/main/SendCar/addForm.vue

@@ -302,25 +302,28 @@
                 :wrapperCol="{
                   xs: { span: 25 },
                   sm: { span: 19 }
-                }"
-                has-feedback>
-                <a-select
-                  show-search
-                  placeholder="请选择工厂"
-                  v-decorator="['factoryName']"
-                  @select="ChangeFactory"
-                  :default-active-first-option="false"
-                  :show-arrow="false"
-                  @search="getFactoryData"
-                  @blur="getFactoryData"
-                  :filter-option="filterOption"
-                  :not-found-content="null"
-                  :filterOption="filterOption"
-                  allowClear>
-                  <a-select-option v-for="item in inFactory" :key="item.id" :value="item.shortName">
-                    {{ item.shortName }}
-                  </a-select-option>
-                </a-select>
+                }">
+                <div style="display: flex;align-items: center;">
+                  <a-select
+                    show-search
+                    placeholder="请选择工厂"
+                    v-decorator="['factoryName']"
+                    @change="ChangeFactory"
+                    :default-active-first-option="false"
+                    :show-arrow="false"
+                    @search="getFactoryData"
+                    @blur="getFactoryData"
+                    :filter-option="filterOption"
+                    style="width: 80%;margin-right: 20px;"
+                    :not-found-content="null"
+                    :filterOption="filterOption"
+                    allowClear>
+                    <a-select-option v-for="item in inFactory" :key="item.id" :value="item.shortName">
+                      {{ item.shortName }}
+                    </a-select-option>
+                  </a-select>
+                  <a v-if="addrList.length>0" @click="addrsFlag=true">地址</a>
+                </div>
               </a-form-item>
             </a-col>
           </a-row>
@@ -657,8 +660,8 @@ export default {
       id: null,
       columns: [
         {
-          dataIndex: 'addrName',
-          key: 'addrName',
+          dataIndex: 'addr',
+          key: 'addr',
           ellipsis: true,
           width: 250,
           title: '详细地址'
@@ -825,7 +828,6 @@ export default {
   mounted() { },
   methods: {
     ChangeFactory(e, option) {
-      console.log(e)
       if (e !== undefined) {
         this.inFactory.forEach(item => {
         if (item.id == option.key) {
@@ -840,6 +842,7 @@ export default {
             const fullNameEN = item.fullNameEN ? item.fullNameEN : ''
             const addr = item.addr ? item.addr : ''
             const tel = item.tel ? item.tel : ''
+            this.addrList = []
             this.form.setFieldsValue({ factoryAddr: fullNameEN + addr })
             this.form.setFieldsValue({ factoryContact: chief + tel })
           }