Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -87,20 +87,20 @@
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-
-                <el-form-item prop="address">
+                <el-form-item prop="address" >
                   <el-input
                     v-model.trim="form.address"
                     placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                    style="width: 436px"
+                    style="width: 263%"
                   />
                 </el-form-item>
-              </el-col>
-              <!--              <el-col :span="8">-->
-              <!--              -->
-              <!--              </el-col>-->
+
+              </el-col >
+
+
+
               <el-col :span="8">
                 <el-form-item label="单位时段服务数" prop="useNum">
                   <el-input-number
@@ -251,7 +251,7 @@
                       type="textarea"
                       placeholder="请输入备注（2~200字）"
                       maxlength="200"
-                      style="width:1050px;"
+                      style="width:705%;"
                       :rows="4"
                     />
                   </el-form-item>
@@ -291,7 +291,7 @@
           </el-form>
           <el-row>
             <el-col style="display: flex;justify-content: center;margin-top: 20px">
-              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm" :disabled="loading">
+              <el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" :disabled="loading" @click="submitForm">
                 <span v-if="!loading">提交</span>
                 <span v-else>提交...</span>
               </el-button>

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -75,7 +75,7 @@
             <!--            3-->
             <el-row>
 
-              <el-col :span="8">
+              <el-col :span="16">
                 <el-form-item label="服务地点">
                   <el-cascader
                     ref="serviceArea"
@@ -90,21 +90,31 @@
                     @change="handleChangeAddress"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item >
+                <el-form-item prop="address">
                   <el-input
                     v-model.trim="form.address"
-                    placeholder="暂无数据"
+                    placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
+                    style="width: 263%"
                     disabled
-                    style="width: 400px"
-                  >
-                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
+<!--              <el-col :span="8">-->
+<!--                <el-form-item >-->
+<!--                  <el-input-->
+<!--                    v-model.trim="form.address"-->
+<!--                    placeholder="暂无数据"-->
+<!--                    maxlength="40"-->
+<!--                    clearable-->
+<!--                    disabled-->
+<!--                    style="width: 263%"-->
+<!--                  >-->
+<!--                    <template v-if="addtions.names !== ''" slot="prepend">{{ addtions.names }}</template>-->
+<!--                  </el-input>-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="8">
                 <el-form-item label="单位时段服务数">
                   <el-input-number
@@ -257,7 +267,7 @@
                       type="textarea"
                       placeholder="暂无数据"
                       maxlength="200"
-                      style="width:1050px;"
+                      style="width:705%;"
                       :rows="4"
                     />
                   </el-form-item>
@@ -411,7 +421,7 @@
                     placeholder="请输入详细地址地址(街道、楼牌号等)"
                     maxlength="40"
                     clearable
-                    style="width: 400px"
+                    style="width: 263%"
                   />
                 </el-form-item>
               </el-col>
@@ -562,7 +572,7 @@
                       type="textarea"
                       placeholder="请输入备注（2~200字）"
                       maxlength="200"
-                      style="width:1050px;"
+                      style="width:705%;"
                       :rows="4"
                     />
                   </el-form-item>