Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/MyCustomer.vue

@@ -708,7 +708,7 @@
             </div>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="6">
             <el-form-item label="平台用户名">
               <div style="display: flex;flex-wrap: nowrap;justify-content: space-between;">
                 <div style="display: flex; flex-wrap: wrap;align-items: center;">
@@ -736,15 +736,38 @@
                   <el-button v-else class="button-new-tag" size="small" @click="showInput(1)">+ 添加</el-button>
             </div>
                 </div>
-                <div style="flex-shrink: 0;">
-                  <span class="q-pl-lg text-grey-8" style="cursor: pointer;margin-left: 10px;color: gray;"
-                @click="isShow=!isShow">{{isShow?'收起':'展开'}}</span>
-                </div>
               </div>
 
             </el-form-item>
 
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="签约月结客户" prop="SigningType">
+              <div style="display: flex;flex-wrap: nowrap;">
+                <div>
+                  <el-checkbox v-model='addMsg.SigningType'>
+                  </el-checkbox>
+                </div>
+                <div v-if="addMsg.SigningType">
+                  <el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
+                    style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
+                    :show-file-list="false" action="">
+                    <el-button size="small" type="primary">上传签约资料</el-button>
+                  </el-upload>
+                  <div v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
+                    <template v-for="(subItem,subIndex) in saveMsg">
+                      <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
+                        @click="downloadFile(subItem.URL,subItem.FileName)">{{subItem.FileName}}</a>
+
+                      <a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
+                        @click="DeleteFile(subIndex)">删除</a>
+                    </template>
+                  </div>
+                </div>
+              </div>
+
+            </el-form-item>
+          </el-col>
           <template v-if="isShow">
             <el-col :span="6">
               <el-form-item :label="$t('salesModule.CustomerSource')" prop="CustomerSourceType">
@@ -779,36 +802,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="签约月结客户" prop="SigningType">
-                <div style="display: flex;flex-wrap: nowrap;">
-                  <div>
-                    <el-checkbox v-model='addMsg.SigningType'>
-                    </el-checkbox>
-                  </div>
-                  <div v-if="addMsg.SigningType">
-                    <el-upload v-if="!saveMsg || !saveMsg.length" class="upload-demo" :disabled="!addMsg.SigningType"
-                      style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
-                      :show-file-list="false" action="">
-                      <el-button size="small" type="primary">上传签约资料</el-button>
-                    </el-upload>
-                    <div v-if="addMsg.SigningType && saveMsg&& saveMsg.length>0">
-                      <template v-for="(subItem,subIndex) in saveMsg">
-                        <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
-                          @click="downloadFile(subItem.URL,subItem.FileName)">{{subItem.FileName}}</a>
-
-                        <a :key="subIndex+1000" style="margin-left:20px;color:blue;cursor:pointer;"
-                          @click="DeleteFile(subIndex)">删除</a>
-                      </template>
-                    </div>
-                  </div>
-                </div>
 
-              </el-form-item>
-            </el-col>
             <el-col :span="6">
               <el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
-                <el-input v-model="addMsg.remark" type="textarea" maxlength="500"></el-input>
+                <el-input v-model="addMsg.remark" autosize type="textarea" maxlength="500"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -835,8 +832,6 @@
                 </el-upload>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-            </el-col>
         </template>
         </el-row>
       </el-form>