Merge remote-tracking branch 'origin/master'

src/views/system/store/add_store.vue

@@ -1,228 +1,272 @@
 <template>
-    <div v-loading="dialogLoading" :element-loading-text="loadingText">
-        <el-row :gutter="15" style="margin-bottom: 80px; width: 90%; margin-left: 5%">
-            <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="top">
-                <el-col :span="12">
-                    <el-form-item label="门店名称" prop="name">
-                        <el-input v-model="formData.name" placeholder="请输入门店名称" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="门店免洗额度" prop="balance">
-                        <el-input v-model="formData.balance" placeholder="请输入门店免洗额度" :disabled="isEditMode" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="门店编码" prop="code">
-                        <el-input v-model="formData.code" :maxlength="4" @input="handleInput" :disabled="isEditMode" placeholder="请输入门店编码" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col>
+  <div v-loading="dialogLoading" :element-loading-text="loadingText">
+    <el-row :gutter="15" style="margin-bottom: 80px; width: 90%; margin-left: 5%">
+      <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" label-position="top">
+        <el-col :span="12">
+          <el-form-item label="门店名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入门店名称" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="门店免洗额度" prop="balance">
+            <el-input v-model="formData.balance" placeholder="请输入门店免洗额度" :disabled="isEditMode" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="门店编码" prop="code">
+            <el-input v-model="formData.code" :maxlength="4" @input="handleInput" :disabled="isEditMode"
+                      placeholder="请输入门店编码" clearable :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="8">
-                    <el-form-item label="门店类型" prop="storeType">
-                        <el-select v-model="formData.storeType" placeholder="请选择门店类型" @change="changeStoreType" :disabled="isEditMode" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in storeTypeOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="所属工厂" prop="factoryId">
-                        <el-select v-model="formData.factoryId" placeholder="请选择所属工厂" :disabled="isEditMode" :style="{ width: '100%' }">
-                            <el-option v-for="item in factorys" :label="item.factoryName" :value="item.id" :key="item.factoryName"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="8">
+          <el-form-item label="门店类型" prop="storeType">
+            <el-select v-model="formData.storeType" placeholder="请选择门店类型" @change="changeStoreType"
+                       :disabled="isEditMode" :style="{ width: '100%' }">
+              <el-option v-for="(item, index) in storeTypeOptions" :key="index" :label="item.label" :value="item.value"
+                         :disabled="item.disabled"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属工厂" prop="factoryId">
+            <el-select v-model="formData.factoryId" placeholder="请选择所属工厂" :disabled="isEditMode"
+                       :style="{ width: '100%' }">
+              <el-option v-for="item in factorys" :label="item.factoryName" :value="item.id"
+                         :key="item.factoryName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="8">
-                    <el-form-item label="门店状态" prop="status">
-                        <el-select v-model="formData.status" placeholder="请选择门店状态" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                
-                
-                <!-- <el-col :span="8">
-                    <el-form-item label-width="127px" label="是否打印小票" prop="isPrint">
-                        <el-select v-model="formData.isPrint" placeholder="请选择是否打印小票" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in isPrintOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col> 
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="是否参与结算" prop="isSettlement">
-                        <el-select v-model="formData.isSettlement" placeholder="请选择是否参与结算" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in isSettlementOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="条码打印姓名" prop="isCarCodePrintName">
-                        <el-select v-model="formData.isCarCodePrintName" placeholder="请选择条码是否打印姓名" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in isCarCodePrintNameOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="小票打印姓名" prop="isPrintName">
-                        <el-select v-model="formData.isPrintName" placeholder="请选择小票是否打印客户姓名" :style="{ width: '100%' }">
-                            <el-option v-for="(item, index) in isPrintNameOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="小票打印数量" prop="printNum">
-                        <el-input-number v-model="formData.printNum" placeholder="请输入小票打印数量" :min="0" :step-strictly="true" :style="{ width: '100%' }"> </el-input-number>
-                    </el-form-item>
-                </el-col> -->
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人姓名" prop="contactName">
-                        <el-input v-model="formData.contactName" placeholder="请输入负责人姓名" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人职务" prop="contactPost">
-                        <el-input v-model="formData.contactPost" placeholder="请输入负责人职务" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="负责人身份证" prop="contactIdcard">
-                        <el-input v-model="formData.contactIdcard" placeholder="请输入负责人身份证" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人电话" prop="contactWorkTel">
-                        <el-input v-model="formData.contactWorkTel" placeholder="请输入负责人电话" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人手机" prop="contactPhone">
-                        <el-input v-model="formData.contactPhone" placeholder="请输入负责人手机" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人传真" prop="contactFax">
-                        <el-input v-model="formData.contactFax" placeholder="请输入负责人传真" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人邮箱" prop="contactEmail">
-                        <el-input v-model="formData.contactEmail" placeholder="请输入负责人邮箱" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="113px" label="负责人邮编" prop="contactZipCode">
-                        <el-input v-model="formData.contactZipCode" placeholder="请输入负责人邮编" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="8">
+          <el-form-item label="门店状态" prop="status">
+            <el-select v-model="formData.status" placeholder="请选择门店状态" :style="{ width: '100%' }">
+              <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.label" :value="item.value"
+                         :disabled="item.disabled"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
-                <!-- <el-col :span="8">
-                    <el-form-item label-width="106px" label="负责人QQ" prop="contactQq">
-                        <el-input v-model="formData.contactQq" placeholder="请输入负责人QQ" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col> -->
 
-                <el-col :span="8">
-                    <el-form-item label="开店时间" prop="openDate">
-                        <el-date-picker v-model="formData.openDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :style="{ width: '100%' }" placeholder="请选择开店时间" clearable></el-date-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="开始营业时间" prop="businessStartTime">
-                        <el-time-picker v-model="formData.businessStartTime" format="HH:mm" value-format="HH:mm" :picker-options="{ selectableRange: '00:00:00-23:59:59' }" :style="{ width: '100%' }" placeholder="请选择开始营业时间" clearable></el-time-picker>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label-width="127px" label="结束营业时间" prop="businessEndTime">
-                        <el-time-picker v-model="formData.businessEndTime" format="HH:mm" value-format="HH:mm" :picker-options="{ selectableRange: '00:00:00-23:59:59' }" :style="{ width: '100%' }" placeholder="请选择结束营业时间" clearable></el-time-picker>
-                    </el-form-item>
-                </el-col>
+        <!-- <el-col :span="8">
+            <el-form-item label-width="127px" label="是否打印小票" prop="isPrint">
+                <el-select v-model="formData.isPrint" placeholder="请选择是否打印小票" :style="{ width: '100%' }">
+                    <el-option v-for="(item, index) in isPrintOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label-width="127px" label="是否参与结算" prop="isSettlement">
+                <el-select v-model="formData.isSettlement" placeholder="请选择是否参与结算" :style="{ width: '100%' }">
+                    <el-option v-for="(item, index) in isSettlementOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label-width="127px" label="条码打印姓名" prop="isCarCodePrintName">
+                <el-select v-model="formData.isCarCodePrintName" placeholder="请选择条码是否打印姓名" :style="{ width: '100%' }">
+                    <el-option v-for="(item, index) in isCarCodePrintNameOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label-width="127px" label="小票打印姓名" prop="isPrintName">
+                <el-select v-model="formData.isPrintName" placeholder="请选择小票是否打印客户姓名" :style="{ width: '100%' }">
+                    <el-option v-for="(item, index) in isPrintNameOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label-width="127px" label="小票打印数量" prop="printNum">
+                <el-input-number v-model="formData.printNum" placeholder="请输入小票打印数量" :min="0" :step-strictly="true" :style="{ width: '100%' }"> </el-input-number>
+            </el-form-item>
+        </el-col> -->
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人姓名" prop="contactName">
+            <el-input v-model="formData.contactName" placeholder="请输入负责人姓名" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人职务" prop="contactPost">
+            <el-input v-model="formData.contactPost" placeholder="请输入负责人职务" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="127px" label="负责人身份证" prop="contactIdcard">
+            <el-input v-model="formData.contactIdcard" placeholder="请输入负责人身份证" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人电话" prop="contactWorkTel">
+            <el-input v-model="formData.contactWorkTel" placeholder="请输入负责人电话" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人手机" prop="contactPhone">
+            <el-input v-model="formData.contactPhone" placeholder="请输入负责人手机" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人传真" prop="contactFax">
+            <el-input v-model="formData.contactFax" placeholder="请输入负责人传真" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人邮箱" prop="contactEmail">
+            <el-input v-model="formData.contactEmail" placeholder="请输入负责人邮箱" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="113px" label="负责人邮编" prop="contactZipCode">
+            <el-input v-model="formData.contactZipCode" placeholder="请输入负责人邮编" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="8">
-                    <el-form-item label="所属省份" prop="provinceId">
-                        <el-select size="small" style="width: 200px" v-model="formData.provinceId" placeholder="请选择省份（直辖市）" v-on:change="changeProvince()">
-                            <el-option v-for="item in provinces" :label="item.areaName" :value="item.areaId" :key="item.areaName"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="所属城市" prop="cityId">
-                        <el-select size="small" style="width: 200px; margin-left: 10px" v-model="formData.cityId" placeholder="请选择城市" v-on:change="changeCity">
-                            <el-option v-for="item in citys" :label="item.areaName" :value="item.areaId" :key="item.areaName"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                    <el-form-item label="所属地区" prop="areaId">
-                        <el-select size="small" style="width: 200px; margin-left: 10px" v-model="formData.areaId" placeholder="请选择区（县）" v-on:change="changeArea">
-                            <el-option v-for="item in areas" :label="item.areaName" :value="item.areaId" :key="item.areaName"> </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                    <el-form-item label="搜索地址" prop="address">
-                        <el-autocomplete style="width: 100%" popper-class="autoAddressClass" v-model="formData.address" :fetch-suggestions="querySearchAsync" :trigger-on-focus="false" placeholder="详细地址" @select="handleSelect" clearable>
-                            <template slot-scope="{ item }">
-                                <em class="el-icon-search fl mgr10" />
-                                <div style="overflow: hidden">
-                                    <div class="title" style="display: table-cell">{{ item.title }}</div>
-                                    <span class="address ellipsis">{{ item.address }}</span>
-                                </div>
-                            </template>
-                        </el-autocomplete>
-                        <div id="baidu-map-container" style="width: 100%; margin-top: 20px; margin-bottom: 20px; height: 400px"></div>
-                    </el-form-item>
-                </el-col>
+        <!-- <el-col :span="8">
+            <el-form-item label-width="106px" label="负责人QQ" prop="contactQq">
+                <el-input v-model="formData.contactQq" placeholder="请输入负责人QQ" clearable :style="{ width: '100%' }"> </el-input>
+            </el-form-item>
+        </el-col> -->
 
-                <el-col :span="24">
-                    <el-form-item label="门牌号" prop="addressDetail">
-                        <el-input v-model="formData.addressDetail" placeholder="请输入门牌号" clearable :style="{ width: '100%' }" size="medium"></el-input>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="8">
+          <el-form-item label="开店时间" prop="openDate">
+            <el-date-picker v-model="formData.openDate" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                            :style="{ width: '100%' }" placeholder="请选择开店时间" clearable></el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="127px" label="开始营业时间" prop="businessStartTime">
+            <el-time-picker v-model="formData.businessStartTime" format="HH:mm" value-format="HH:mm"
+                            :picker-options="{ selectableRange: '00:00:00-23:59:59' }" :style="{ width: '100%' }"
+                            placeholder="请选择开始营业时间" clearable></el-time-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label-width="127px" label="结束营业时间" prop="businessEndTime">
+            <el-time-picker v-model="formData.businessEndTime" format="HH:mm" value-format="HH:mm"
+                            :picker-options="{ selectableRange: '00:00:00-23:59:59' }" :style="{ width: '100%' }"
+                            placeholder="请选择结束营业时间" clearable></el-time-picker>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="12">
-                    <el-form-item label="企业性质" prop="companyType">
-                        <el-input v-model="formData.companyType" placeholder="请输入企业性质" clearable :style="{ width: '100%' }"> </el-input>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属省份" prop="provinceId">
+            <el-select size="small" style="width: 200px" v-model="formData.provinceId" placeholder="请选择省份（直辖市）"
+                       v-on:change="changeProvince()">
+              <el-option v-for="item in provinces" :label="item.areaName" :value="item.areaId"
+                         :key="item.areaName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属城市" prop="cityId">
+            <el-select size="small" style="width: 200px; margin-left: 10px" v-model="formData.cityId"
+                       placeholder="请选择城市" v-on:change="changeCity">
+              <el-option v-for="item in citys" :label="item.areaName" :value="item.areaId"
+                         :key="item.areaName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="所属地区" prop="areaId">
+            <el-select size="small" style="width: 200px; margin-left: 10px" v-model="formData.areaId"
+                       placeholder="请选择区（县）" v-on:change="changeArea">
+              <el-option v-for="item in areas" :label="item.areaName" :value="item.areaId"
+                         :key="item.areaName"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="搜索地址" prop="address">
+            <el-autocomplete style="width: 100%" popper-class="autoAddressClass" v-model="formData.address"
+                             :fetch-suggestions="querySearchAsync" :trigger-on-focus="false" placeholder="详细地址"
+                             @select="handleSelect" clearable>
+              <template slot-scope="{ item }">
+                <em class="el-icon-search fl mgr10" />
+                <div style="overflow: hidden">
+                  <div class="title" style="display: table-cell">{{ item.title }}</div>
+                  <span class="address ellipsis">{{ item.address }}</span>
+                </div>
+              </template>
+            </el-autocomplete>
+            <div id="baidu-map-container"
+                 style="width: 100%; margin-top: 20px; margin-bottom: 20px; height: 400px"></div>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="12">
-                    <el-form-item label="办公面积" prop="officeArea">
-                        <el-input v-model="formData.officeArea" oninput="value=value.replace(/[^0-9]/g,'')" placeholder="请输入办公面积" clearable :style="{ width: '100%' }">
-                            <template slot="append">（平米）</template>
-                        </el-input>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="24">
+          <el-form-item label="门牌号" prop="addressDetail">
+            <el-input v-model="formData.addressDetail" placeholder="请输入门牌号" clearable :style="{ width: '100%' }"
+                      size="medium"></el-input>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="24">
-                    <el-form-item label="企业业务" prop="companyDetail">
-                        <el-input v-model="formData.companyDetail" type="textarea" placeholder="请输入企业业务" clearable :style="{ width: '100%' }"></el-input>
-                    </el-form-item>
-                </el-col>
+        <el-col :span="12">
+          <el-form-item label="企业性质" prop="companyType">
+            <el-input v-model="formData.companyType" placeholder="请输入企业性质" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
 
-                <el-col :span="12">
-                    <el-form-item label="门店图片" prop="companyPic">
-                        <el-upload ref="companyPic" :file-list="companyPicfileList" :action="companyPicAction" :before-upload="companyPicBeforeUpload" :on-success="companyPicUploadSuccess" :on-remove="companyPicOnRemove" list-type="picture" accept="image/*">
-                            <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-                            <div slot="tip" class="el-upload__tip">只能上传不超过 2MB 的文件</div>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                    <el-form-item label="营业执照" prop="companyLicencePic">
-                        <el-upload ref="companyLicencePic" :file-list="companyLicencePicfileList" :action="companyLicencePicAction" :before-upload="companyLicencePicBeforeUpload" :on-success="companyLicencePicUploadSuccess" :on-remove="companyLicencePicOnRemove" list-type="picture" accept="image/*">
-                            <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-                            <div slot="tip" class="el-upload__tip">只能上传不超过 2MB 的文件</div>
-                        </el-upload>
-                    </el-form-item>
-                </el-col>
-            </el-form>
-        </el-row>
-        <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>
-            <el-button @click="closeDialog">取 消</el-button>
-        </div>
+        <el-col :span="12">
+          <el-form-item label="办公面积" prop="officeArea">
+            <el-input v-model="formData.officeArea" oninput="value=value.replace(/[^0-9]/g,'')"
+                      placeholder="请输入办公面积" clearable :style="{ width: '100%' }">
+              <template slot="append">（平米）</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24">
+          <el-form-item label="企业业务" prop="companyDetail">
+            <el-input v-model="formData.companyDetail" type="textarea" placeholder="请输入企业业务" clearable
+                      :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="门店图片" prop="companyPic">
+            <el-upload ref="companyPic" :file-list="companyPicfileList" :action="companyPicAction"
+                       :before-upload="companyPicBeforeUpload" :on-success="companyPicUploadSuccess"
+                       :on-remove="companyPicOnRemove" list-type="picture" accept="image/*">
+              <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传不超过 2MB 的文件</div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="营业执照" prop="companyLicencePic">
+            <el-upload ref="companyLicencePic" :file-list="companyLicencePicfileList" :action="companyLicencePicAction"
+                       :before-upload="companyLicencePicBeforeUpload" :on-success="companyLicencePicUploadSuccess"
+                       :on-remove="companyLicencePicOnRemove" list-type="picture" accept="image/*">
+              <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
+              <div slot="tip" class="el-upload__tip">只能上传不超过 2MB 的文件</div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="同城配送门店id" prop="wxStoreId">
+            <el-input v-model="formData.wxStoreId" placeholder="请输入微信同城配送门店id" clearable :style="{ width: '100%' }">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>
+      <el-button @click="closeDialog">取 消</el-button>
     </div>
+  </div>
 </template>
 <script>
 import { getStore, addStore, updateStore } from '@/api/system/store'
@@ -230,643 +274,647 @@ import { listArea } from '@/api/system/area'
 import { listFactory } from '@/api/system/factory'
 
 export default {
-    components: {},
-    props: [],
-    data() {
-        return {
-            dialogLoading: true,
-            loadingText: '查询中',
-            formData: {
-                code: undefined,
-                name: undefined,
-                factoryId: undefined,
-                storeType: '0',
-                status: '0',
-                isPrint: '0',
-                isSettlement: '0',
-                isCarCodePrintName: '0',
-                isPrintName: '0',
-                printNum: 0,
-                contactName: undefined,
-                contactPost: undefined,
-                contactIdcard: undefined,
-                contactWorkTel: undefined,
-                contactPhone: undefined,
-                contactFax: undefined,
-                contactEmail: undefined,
-                contactZipCode: undefined,
-                officeArea: 0,
-                openDate: null,
-                businessStartTime: '09:00:00',
-                businessEndTime: '17:30:00',
-                companyType: undefined,
-                contactQq: undefined,
-                companyDetail: undefined,
-                companyPic: null,
-                companyLicencePic: null,
-                province: '', // 省
-                city: '', // 市
-                area: '', // 区
-                address: '',
-                addressDetail: ''
-            },
-            rules: {
-                code: [
-                    {
-                        required: true,
-                        message: '请输入门店编码',
-                        trigger: 'blur'
-                    }
-                ],
-                name: [
-                    {
-                        required: true,
-                        message: '请输入门店名称',
-                        trigger: 'blur'
-                    }
-                ],
-                factoryId: [
-                    {
-                        required: true,
-                        message: '请选择所属工厂',
-                        trigger: 'change'
-                    }
-                ],
-                contactName: [
-                    {
-                        required: true,
-                        message: '请输入负责人姓名',
-                        trigger: 'blur'
-                    }
-                ],
-                contactPost: [
-                    {
-                        required: true,
-                        message: '请输入负责人职务',
-                        trigger: 'blur'
-                    }
-                ],
-                contactIdcard: [
-                    {
-                        required: true,
-                        trigger: 'blur',
-                        validator: this.checkIdCardNumber
-                    }
-                ],
-                contactPhone: [
-                    {
-                        required: true,
-                        trigger: 'blur',
-                        validator: this.checkPhone
-                    }
-                ],
-                contactEmail: [
-                    {
-                        trigger: 'blur',
-                        validator: this.checkEmail
-                    }
-                ],
-                openDate: [
-                    {
-                        required: true,
-                        message: '请选择开店时间',
-                        trigger: 'change'
-                    }
-                ],
-                businessStartTime: [
-                    {
-                        required: true,
-                        message: '请选择开始营业时间',
-                        trigger: 'change'
-                    }
-                ],
-                businessEndTime: [
-                    {
-                        required: true,
-                        message: '请选择结束营业时间',
-                        trigger: 'change'
-                    }
-                ],
-                companyType: [
-                    {
-                        required: true,
-                        message: '请输入企业性质',
-                        trigger: 'blur'
-                    }
-                ],
+  components: {},
+  props: [],
+  data() {
+    return {
+      dialogLoading: true,
+      loadingText: '查询中',
+      formData: {
+        code: undefined,
+        name: undefined,
+        factoryId: undefined,
+        storeType: '0',
+        status: '0',
+        isPrint: '0',
+        isSettlement: '0',
+        isCarCodePrintName: '0',
+        isPrintName: '0',
+        printNum: 0,
+        contactName: undefined,
+        contactPost: undefined,
+        contactIdcard: undefined,
+        contactWorkTel: undefined,
+        contactPhone: undefined,
+        contactFax: undefined,
+        contactEmail: undefined,
+        contactZipCode: undefined,
+        officeArea: 0,
+        openDate: null,
+        businessStartTime: '09:00:00',
+        businessEndTime: '17:30:00',
+        companyType: undefined,
+        contactQq: undefined,
+        companyDetail: undefined,
+        companyPic: null,
+        companyLicencePic: null,
+        province: '', // 省
+        city: '', // 市
+        area: '', // 区
+        address: '',
+        addressDetail: '',
+        wxStoreId: ''
+      },
+      rules: {
+        code: [
+          {
+            required: true,
+            message: '请输入门店编码',
+            trigger: 'blur'
+          }
+        ],
+        name: [
+          {
+            required: true,
+            message: '请输入门店名称',
+            trigger: 'blur'
+          }
+        ],
+        factoryId: [
+          {
+            required: true,
+            message: '请选择所属工厂',
+            trigger: 'change'
+          }
+        ],
+        contactName: [
+          {
+            required: true,
+            message: '请输入负责人姓名',
+            trigger: 'blur'
+          }
+        ],
+        contactPost: [
+          {
+            required: true,
+            message: '请输入负责人职务',
+            trigger: 'blur'
+          }
+        ],
+        contactIdcard: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: this.checkIdCardNumber
+          }
+        ],
+        contactPhone: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: this.checkPhone
+          }
+        ],
+        contactEmail: [
+          {
+            trigger: 'blur',
+            validator: this.checkEmail
+          }
+        ],
+        openDate: [
+          {
+            required: true,
+            message: '请选择开店时间',
+            trigger: 'change'
+          }
+        ],
+        businessStartTime: [
+          {
+            required: true,
+            message: '请选择开始营业时间',
+            trigger: 'change'
+          }
+        ],
+        businessEndTime: [
+          {
+            required: true,
+            message: '请选择结束营业时间',
+            trigger: 'change'
+          }
+        ],
+        companyType: [
+          {
+            required: true,
+            message: '请输入企业性质',
+            trigger: 'blur'
+          }
+        ],
 
-                companyDetail: [
-                    {
-                        required: true,
-                        message: '请输入企业业务',
-                        trigger: 'blur'
-                    }
-                ],
-                provinceId: [
-                    {
-                        required: true,
-                        message: '请选择所属省份',
-                        trigger: 'change'
-                    }
-                ],
-                cityId: [
-                    {
-                        required: true,
-                        message: '请选择所属城市',
-                        trigger: 'change'
-                    }
-                ],
-                areaId: [
-                    {
-                        required: true,
-                        message: '请选择所属地区',
-                        trigger: 'change'
-                    }
-                ],
-                address: [
-                    {
-                        required: true,
-                        message: '请输入具体地址',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            storeTypeOptions: [
-                {
-                    label: '直营店',
-                    value: '0'
-                },
-                {
-                    label: '加盟店',
-                    value: '1'
-                }
-            ],
-            statusOptions: [
-                {
-                    label: '正常',
-                    value: '0'
-                },
-                {
-                    label: '禁用',
-                    value: '1'
-                }
-            ],
-            isPrintOptions: [
-                {
-                    label: '是',
-                    value: '0'
-                },
-                {
-                    label: '否',
-                    value: '1'
-                }
-            ],
-            isSettlementOptions: [
-                {
-                    label: '是',
-                    value: '0'
-                },
-                {
-                    label: '否',
-                    value: '1'
-                }
-            ],
-            isCarCodePrintNameOptions: [
-                {
-                    label: '是',
-                    value: '0'
-                },
-                {
-                    label: '否',
-                    value: '1'
-                }
-            ],
-            isPrintNameOptions: [
-                {
-                    label: '是',
-                    value: '0'
-                },
-                {
-                    label: '否',
-                    value: '1'
-                }
-            ],
-            companyPicfileList: [],
-            companyLicencePicfileList: [],
-            companyPicAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
-            companyLicencePicAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
-            provinces: [],
-            citys: [],
-            areas: [],
-            factorys: [],
-            isEditMode: false,
-            isEditFactory: false
-        }
-    },
-    computed: {},
-    watch: {},
-    created() {
-        this.getProvince(1)
-        this.getFactoryList()
-    },
-    async mounted() {
-        await this.loadBMap('muIMwle2eOkTHf453rwRNgMa0W83j2PX') //加载引入BMap
-        this.initBaiduMap()
-    },
-    methods: {
-        /** 获取所属工厂 */
-        getFactoryList() {
-            listFactory().then((response) => {
-                this.factorys = response.rows
-            })
+        companyDetail: [
+          {
+            required: true,
+            message: '请输入企业业务',
+            trigger: 'blur'
+          }
+        ],
+        provinceId: [
+          {
+            required: true,
+            message: '请选择所属省份',
+            trigger: 'change'
+          }
+        ],
+        cityId: [
+          {
+            required: true,
+            message: '请选择所属城市',
+            trigger: 'change'
+          }
+        ],
+        areaId: [
+          {
+            required: true,
+            message: '请选择所属地区',
+            trigger: 'change'
+          }
+        ],
+        address: [
+          {
+            required: true,
+            message: '请输入具体地址',
+            trigger: 'blur'
+          }
+        ]
+      },
+      storeTypeOptions: [
+        {
+          label: '直营店',
+          value: '0'
         },
-        checkTel(rule, value, callback) {
-            const regex = /^\d{3}-\d{3}-\d{4}$/ // 电话正则表达式
-            if (!regex.test(value)) {
-                callback(new Error('请输入正确的电话号'))
-            } else {
-                callback()
-            }
-        },
-        checkEmail(rule, value, callback) {
-            const regex = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // 邮箱正则表达式
-            if (!regex.test(value) && value != '') {
-                callback(new Error('请输入正确的邮箱'))
-            } else {
-                callback()
-            }
+        {
+          label: '加盟店',
+          value: '1'
+        }
+      ],
+      statusOptions: [
+        {
+          label: '正常',
+          value: '0'
         },
-        checkPhone(rule, value, callback) {
-            const regex = /^1[0-9]{10}$/ // 手机号正则表达式
-            if (!regex.test(value)) {
-                callback(new Error('请输入正确的手机号'))
-            } else {
-                callback()
-            }
+        {
+          label: '禁用',
+          value: '1'
+        }
+      ],
+      isPrintOptions: [
+        {
+          label: '是',
+          value: '0'
         },
-        checkIdCardNumber(rule, value, callback) {
-            const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}[0-9Xx]$/ // 身份证正则表达式
-            if (!regex.test(value)) {
-                callback(new Error('请输入正确的身份证号码'))
-            } else {
-                callback()
-            }
+        {
+          label: '否',
+          value: '1'
+        }
+      ],
+      isSettlementOptions: [
+        {
+          label: '是',
+          value: '0'
         },
-        changeStoreType() {
-            if (this.formData.storeType === '0') {
-                this.formData.factoryId = 1
-                this.isEditFactory = true
-            } else {
-                this.isEditFactory = false
-                this.formData.factoryId = null
-            }
+        {
+          label: '否',
+          value: '1'
+        }
+      ],
+      isCarCodePrintNameOptions: [
+        {
+          label: '是',
+          value: '0'
         },
-        handleInput() {
-            if (this.inputValue.length > 4) {
-                this.inputValue = this.inputValue.slice(0, 4)
-            }
-            this.inputValue = this.inputValue.replace(/\D/g, '')
+        {
+          label: '否',
+          value: '1'
+        }
+      ],
+      isPrintNameOptions: [
+        {
+          label: '是',
+          value: '0'
         },
-        setInitData(storeId) {
-            this.id = storeId
-            this.companyPicList = []
-            this.companyLicencePicList = []
-            if (storeId != undefined && storeId != '') {
-                this.dialogLoading = true
-                this.loadingText = '查询中'
-                getStore(this.id)
-                    .then((res) => {
-                        this.formData = res.data
-                        this.isEditMode = true
-                        //获取所属城市和所属地区
-                        this.getProvince(2, this.formData.provinceId)
-                        this.getProvince(3, this.formData.cityId)
-                        this.dialogLoading = false
-                        //地图定位
-                        var point = new BMap.Point(this.formData.longitude, this.formData.latitude)
-                        this.map.centerAndZoom(point, 19)
-                        this.mk = new BMap.Marker(point, {
-                            enableDragging: true
-                        }) //创建一个图像标注实例，enableDragging：是否启用拖拽，默认为false
-                        this.map.addOverlay(this.mk) //将覆盖物添加到地图中
+        {
+          label: '否',
+          value: '1'
+        }
+      ],
+      companyPicfileList: [],
+      companyLicencePicfileList: [],
+      companyPicAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
+      companyLicencePicAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
+      provinces: [],
+      citys: [],
+      areas: [],
+      factorys: [],
+      isEditMode: false,
+      isEditFactory: false
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.getProvince(1)
+    this.getFactoryList()
+  },
+  async mounted() {
+    await this.loadBMap('muIMwle2eOkTHf453rwRNgMa0W83j2PX') //加载引入BMap
+    this.initBaiduMap()
+  },
+  methods: {
+    /** 获取所属工厂 */
+    getFactoryList() {
+      listFactory().then((response) => {
+        this.factorys = response.rows
+      })
+    },
+    checkTel(rule, value, callback) {
+      const regex = /^\d{3}-\d{3}-\d{4}$/ // 电话正则表达式
+      if (!regex.test(value)) {
+        callback(new Error('请输入正确的电话号'))
+      } else {
+        callback()
+      }
+    },
+    checkEmail(rule, value, callback) {
+      const regex = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/ // 邮箱正则表达式
+      if (!regex.test(value) && value != '') {
+        callback(new Error('请输入正确的邮箱'))
+      } else {
+        callback()
+      }
+    },
+    checkPhone(rule, value, callback) {
+      const regex = /^1[0-9]{10}$/ // 手机号正则表达式
+      if (!regex.test(value)) {
+        callback(new Error('请输入正确的手机号'))
+      } else {
+        callback()
+      }
+    },
+    checkIdCardNumber(rule, value, callback) {
+      const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}[0-9Xx]$/ // 身份证正则表达式
+      if (!regex.test(value)) {
+        callback(new Error('请输入正确的身份证号码'))
+      } else {
+        callback()
+      }
+    },
+    changeStoreType() {
+      if (this.formData.storeType === '0') {
+        this.formData.factoryId = 1
+        this.isEditFactory = true
+      } else {
+        this.isEditFactory = false
+        this.formData.factoryId = null
+      }
+    },
+    handleInput() {
+      if (this.inputValue.length > 4) {
+        this.inputValue = this.inputValue.slice(0, 4)
+      }
+      this.inputValue = this.inputValue.replace(/\D/g, '')
+    },
+    setInitData(storeId) {
+      this.id = storeId
+      this.companyPicList = []
+      this.companyLicencePicList = []
+      if (storeId != undefined && storeId != '') {
+        this.dialogLoading = true
+        this.loadingText = '查询中'
+        getStore(this.id)
+          .then((res) => {
+            this.formData = res.data
+            this.isEditMode = true
+            //获取所属城市和所属地区
+            this.getProvince(2, this.formData.provinceId)
+            this.getProvince(3, this.formData.cityId)
+            this.dialogLoading = false
+            //地图定位
+            var point = new BMap.Point(this.formData.longitude, this.formData.latitude)
+            this.map.centerAndZoom(point, 19)
+            this.mk = new BMap.Marker(point, {
+              enableDragging: true
+            }) //创建一个图像标注实例，enableDragging：是否启用拖拽，默认为false
+            this.map.addOverlay(this.mk) //将覆盖物添加到地图中
 
-                        if (this.formData.companyPic) {
-                            this.companyPicfileList = [
-                                {
-                                    url: this.formData.companyPic
-                                }
-                            ]
-                        }
-                        if (this.formData.companyLicencePic) {
-                            this.companyLicencePicfileList = [
-                                {
-                                    url: this.formData.companyLicencePic
-                                }
-                            ]
-                        }
-                        this.resetForm('elForm')
-                    })
-                    .catch((e) => {
-                        this.dialogLoading = false
-                        this.$message.error(e.data.msg)
-                    })
-            } else {
-                this.dialogLoading = false
-                this.formData.factoryId = 1
-                this.isEditFactory = true
-            }
-        },
-        /** 获取省份 */
-        getProvince(level, parentId) {
-            let provinceParams = {
-                level: level,
-                parentId: parentId
-            }
-            listArea(provinceParams).then((response) => {
-                if (level === 1) {
-                    this.provinces = response.data
-                } else if (level === 2) {
-                    this.citys = response.data
-                } else {
-                    this.areas = response.data
+            if (this.formData.companyPic) {
+              this.companyPicfileList = [
+                {
+                  url: this.formData.companyPic
                 }
-            })
-        },
-        /** 获取城市 */
-        changeProvince() {
-            let cityParams = {
-                parentId: this.formData.provinceId
-            }
-            const selectedOption = this.provinces.find((option) => option.areaId === this.formData.provinceId)
-            this.formData.provinceName = selectedOption ? selectedOption.areaName : null
-            listArea(cityParams).then((response) => {
-                this.citys = response.data
-            })
-            if (this.formData.cityId != null) {
-                this.formData.cityId = null
-                this.formData.areaId = null
-                this.areas = []
-            }
-        },
-        /** 获取区县 */
-        changeCity() {
-            let cityParams = {
-                parentId: this.formData.cityId
+              ]
             }
-            const selectedOption = this.citys.find((option) => option.areaId === this.formData.cityId)
-            this.formData.cityName = selectedOption ? selectedOption.areaName : null
-            listArea(cityParams).then((response) => {
-                this.areas = response.data
-            })
-            if (this.formData.areaId != null) {
-                this.formData.areaId = null
+            if (this.formData.companyLicencePic) {
+              this.companyLicencePicfileList = [
+                {
+                  url: this.formData.companyLicencePic
+                }
+              ]
             }
-        },
-        /** 获取区县 */
-        changeArea() {
-            const selectedOption = this.areas.find((option) => option.areaId === this.formData.areaId)
-            this.formData.areaName = selectedOption ? selectedOption.areaName : null
-        },
-        submitForm() {
-            this.$refs['elForm'].validate((valid) => {
-                if (!valid) return
-                // TODO 提交表单
-                // TODO 提交表单
-                console.log(this.formData)
+            this.resetForm('elForm')
+          })
+          .catch((e) => {
+            this.dialogLoading = false
+            this.$message.error(e.data.msg)
+          })
+      } else {
+        this.dialogLoading = false
+        this.formData.factoryId = 1
+        this.isEditFactory = true
+      }
+    },
+    /** 获取省份 */
+    getProvince(level, parentId) {
+      let provinceParams = {
+        level: level,
+        parentId: parentId
+      }
+      listArea(provinceParams).then((response) => {
+        if (level === 1) {
+          this.provinces = response.data
+        } else if (level === 2) {
+          this.citys = response.data
+        } else {
+          this.areas = response.data
+        }
+      })
+    },
+    /** 获取城市 */
+    changeProvince() {
+      let cityParams = {
+        parentId: this.formData.provinceId
+      }
+      const selectedOption = this.provinces.find((option) => option.areaId === this.formData.provinceId)
+      this.formData.provinceName = selectedOption ? selectedOption.areaName : null
+      listArea(cityParams).then((response) => {
+        this.citys = response.data
+      })
+      if (this.formData.cityId != null) {
+        this.formData.cityId = null
+        this.formData.areaId = null
+        this.areas = []
+      }
+    },
+    /** 获取区县 */
+    changeCity() {
+      let cityParams = {
+        parentId: this.formData.cityId
+      }
+      const selectedOption = this.citys.find((option) => option.areaId === this.formData.cityId)
+      this.formData.cityName = selectedOption ? selectedOption.areaName : null
+      listArea(cityParams).then((response) => {
+        this.areas = response.data
+      })
+      if (this.formData.areaId != null) {
+        this.formData.areaId = null
+      }
+    },
+    /** 获取区县 */
+    changeArea() {
+      const selectedOption = this.areas.find((option) => option.areaId === this.formData.areaId)
+      this.formData.areaName = selectedOption ? selectedOption.areaName : null
+    },
+    submitForm() {
+      this.$refs['elForm'].validate((valid) => {
+        if (!valid) return
+        // TODO 提交表单
+        // TODO 提交表单
+        console.log(this.formData)
 
-                if (this.companyPicfileList && this.companyPicfileList.length > 0) {
-                    this.formData.companyPic = this.companyPicfileList[0].url
-                } else {
-                    this.formData.companyPic = ''
-                }
-                if (this.companyLicencePicfileList && this.companyLicencePicfileList.length > 0) {
-                    this.formData.companyLicencePic = this.companyLicencePicfileList[0].url
-                } else {
-                    this.formData.companyLicencePic = ''
-                }
+        if (this.companyPicfileList && this.companyPicfileList.length > 0) {
+          this.formData.companyPic = this.companyPicfileList[0].url
+        } else {
+          this.formData.companyPic = ''
+        }
+        if (this.companyLicencePicfileList && this.companyLicencePicfileList.length > 0) {
+          this.formData.companyLicencePic = this.companyLicencePicfileList[0].url
+        } else {
+          this.formData.companyLicencePic = ''
+        }
 
-                if (this.formData.hasOwnProperty('addrPoint')) {
-                    this.formData.longitude = this.formData.addrPoint.lng
-                    this.formData.latitude = this.formData.addrPoint.lat
-                }
+        if (this.formData.hasOwnProperty('addrPoint')) {
+          this.formData.longitude = this.formData.addrPoint.lng
+          this.formData.latitude = this.formData.addrPoint.lat
+        }
 
-                this.dialogLoading = true
-                this.loadingText = '保存中'
-                if (this.id == undefined || this.id == '') {
-                    addStore(this.formData)
-                        .then((res) => {
-                            this.$message('添加成功')
-                            this.dialogLoading = false
-                            this.$emit('closeDialog')
-                            this.$root.$emit('refreshList')
-                        })
-                        .catch((e) => {
-                            this.dialogLoading = false
-                            this.$message.error(e.data.msg)
-                        })
-                } else {
-                    updateStore(this.formData)
-                        .then((res) => {
-                            this.$message('保存成功')
-                            this.dialogLoading = false
-                            this.$emit('closeDialog')
-                            this.$root.$emit('refreshList')
-                        })
-                        .catch((e) => {
-                            this.dialogLoading = false
-                            this.$message.error(e.data.msg)
-                        })
-                }
-            })
-        },
-        closeDialog() {
-            var ctx = this
-            this.$confirm('是否关闭表单，关闭后数据将丢失？')
-                .then(function () {
-                    ctx.$emit('closeDialog')
-                })
-                .then(() => {})
-                .catch(() => {})
-        },
-        onOpen() {},
-        onClose() {
-            this.$refs['elForm'].resetFields()
-        },
-        close() {
-            this.$emit('update:visible', false)
-        },
-        resetForm() {
-            this.$refs['elForm'].resetFields()
-        },
-        companyPicBeforeUpload(file) {
-            let isRightSize = file.size / 1024 / 1024 < 2
-            if (!isRightSize) {
-                this.$message.error('文件大小超过 2MB')
-            }
-            return isRightSize
-        },
-        companyPicUploadSuccess(response, file, fileList) {
-            this.companyPicfileList = fileList
-            if (this.companyPicfileList.length > 1) {
-                this.companyPicfileList.splice(0, 1)
-            }
-            this.companyPicfileList[0].url = this.companyPicfileList[0].response.data.src
-        },
-        companyPicOnRemove(file, fileList) {
-            this.companyPicfileList = fileList
-        },
-        companyLicencePicBeforeUpload(file) {
-            let isRightSize = file.size / 1024 / 1024 < 2
-            if (!isRightSize) {
-                this.$message.error('文件大小超过 2MB')
-            }
-            return isRightSize
-        },
-        companyLicencePicUploadSuccess(response, file, fileList) {
-            this.companyLicencePicfileList = fileList
-            if (this.companyLicencePicfileList.length > 1) {
-                this.companyLicencePicfileList.splice(0, 1)
-            }
-            this.companyLicencePicfileList[0].url = this.companyLicencePicfileList[0].response.data.src
-        },
-        companyLicencePicOnRemove(file, fileList) {
-            this.companyLicencePicfileList = fileList
-        },
-        // 初始化百度地图
-        initBaiduMap() {
-            var that = this
-            this.map = new BMap.Map('baidu-map-container', {
-                enableMapClick: false
-            }) //新建地图实例，enableMapClick:false ：禁用地图默认点击弹框
-            var point = new BMap.Point(113.30765, 23.12005)
-            this.map.centerAndZoom(point, 19)
-            this.mk = new BMap.Marker(point, {
-                enableDragging: true
-            }) //创建一个图像标注实例，enableDragging：是否启用拖拽，默认为false
-            this.map.addOverlay(this.mk) //将覆盖物添加到地图中
-            this.mk.addEventListener('dragend', function (e) {
-                that.getAddrByPoint(e.point) //拖拽结束后调用逆地址解析函数，e.point为拖拽后的地理坐标
+        this.dialogLoading = true
+        this.loadingText = '保存中'
+        if (this.id == undefined || this.id == '') {
+          addStore(this.formData)
+            .then((res) => {
+              this.$message('添加成功')
+              this.dialogLoading = false
+              this.$emit('closeDialog')
+              this.$root.$emit('refreshList')
             })
-            var navigationControl = new BMap.NavigationControl({
-                //创建一个特定样式的地图平移缩放控件
-                anchor: BMAP_ANCHOR_TOP_RIGHT, //靠右上角位置
-                type: BMAP_NAVIGATION_CONTROL_SMALL //SMALL控件类型
+            .catch((e) => {
+              this.dialogLoading = false
+              this.$message.error(e.data.msg)
             })
-            this.map.addControl(navigationControl) //将控件添加到地图
-            var geolocationControl = new BMap.GeolocationControl({
-                anchor: BMAP_ANCHOR_BOTTOM_LEFT
-            }) //创建一个地图定位控件
-            geolocationControl.addEventListener('locationSuccess', function (e) {
-                //绑定定位成功后事件
-                that.getAddrByPoint(e.point) //定位成功后调用逆地址解析函数
+        } else {
+          updateStore(this.formData)
+            .then((res) => {
+              this.$message('保存成功')
+              this.dialogLoading = false
+              this.$emit('closeDialog')
+              this.$root.$emit('refreshList')
             })
-            geolocationControl.addEventListener('locationError', function (e) {
-                //绑定定位失败后事件
-                console.log(e.message)
-            })
-            this.map.addControl(geolocationControl) //将控件添加到地图
-            this.map.addEventListener('click', function (e) {
-                //给地图绑定点击事件
-                that.getAddrByPoint(e.point) //点击后调用逆地址解析函数
-            })
-            this.geolocation()
-        },
-        /**
-         * 浏览器定位函数
-         */
-        geolocation() {
-            var that = this
-            var geolocation = new BMap.Geolocation()
-            geolocation.getCurrentPosition(
-                function (res) {
-                    if (this.getStatus() == BMAP_STATUS_SUCCESS) {
-                        that.getAddrByPoint(res.point) //当成功时，调用逆地址解析函数
-                    } else {
-                        console.log('failed' + this.getStatus()) //失败时，弹出失败状态码
-                    }
-                },
-                {
-                    enableHighAccuracy: true
-                }
-            ) //enableHighAccuracy：是否要求浏览器获取最佳效果，默认为false
-        },
-        /** 逆向解析地址 point */
-        getAddrByPoint(point) {
-            var that = this
-            var geco = new BMap.Geocoder()
-            geco.getLocation(point, function (res) {
-                console.log(res) //内容见下图
-                that.mk.setPosition(point) //重新设置标注的地理坐标
-                that.map.panTo(point) //将地图的中心点更改为给定的点
-                that.addressInfo.address = res.address //记录该点的详细地址信息
-                that.addressInfo.addrPoint = point //记录当前坐标点
+            .catch((e) => {
+              this.dialogLoading = false
+              this.$message.error(e.data.msg)
             })
+        }
+      })
+    },
+    closeDialog() {
+      var ctx = this
+      this.$confirm('是否关闭表单，关闭后数据将丢失？')
+        .then(function() {
+          ctx.$emit('closeDialog')
+        })
+        .then(() => {
+        })
+        .catch(() => {
+        })
+    },
+    onOpen() {
+    },
+    onClose() {
+      this.$refs['elForm'].resetFields()
+    },
+    close() {
+      this.$emit('update:visible', false)
+    },
+    resetForm() {
+      this.$refs['elForm'].resetFields()
+    },
+    companyPicBeforeUpload(file) {
+      let isRightSize = file.size / 1024 / 1024 < 2
+      if (!isRightSize) {
+        this.$message.error('文件大小超过 2MB')
+      }
+      return isRightSize
+    },
+    companyPicUploadSuccess(response, file, fileList) {
+      this.companyPicfileList = fileList
+      if (this.companyPicfileList.length > 1) {
+        this.companyPicfileList.splice(0, 1)
+      }
+      this.companyPicfileList[0].url = this.companyPicfileList[0].response.data.src
+    },
+    companyPicOnRemove(file, fileList) {
+      this.companyPicfileList = fileList
+    },
+    companyLicencePicBeforeUpload(file) {
+      let isRightSize = file.size / 1024 / 1024 < 2
+      if (!isRightSize) {
+        this.$message.error('文件大小超过 2MB')
+      }
+      return isRightSize
+    },
+    companyLicencePicUploadSuccess(response, file, fileList) {
+      this.companyLicencePicfileList = fileList
+      if (this.companyLicencePicfileList.length > 1) {
+        this.companyLicencePicfileList.splice(0, 1)
+      }
+      this.companyLicencePicfileList[0].url = this.companyLicencePicfileList[0].response.data.src
+    },
+    companyLicencePicOnRemove(file, fileList) {
+      this.companyLicencePicfileList = fileList
+    },
+    // 初始化百度地图
+    initBaiduMap() {
+      var that = this
+      this.map = new BMap.Map('baidu-map-container', {
+        enableMapClick: false
+      }) //新建地图实例，enableMapClick:false ：禁用地图默认点击弹框
+      var point = new BMap.Point(113.30765, 23.12005)
+      this.map.centerAndZoom(point, 19)
+      this.mk = new BMap.Marker(point, {
+        enableDragging: true
+      }) //创建一个图像标注实例，enableDragging：是否启用拖拽，默认为false
+      this.map.addOverlay(this.mk) //将覆盖物添加到地图中
+      this.mk.addEventListener('dragend', function(e) {
+        that.getAddrByPoint(e.point) //拖拽结束后调用逆地址解析函数，e.point为拖拽后的地理坐标
+      })
+      var navigationControl = new BMap.NavigationControl({
+        //创建一个特定样式的地图平移缩放控件
+        anchor: BMAP_ANCHOR_TOP_RIGHT, //靠右上角位置
+        type: BMAP_NAVIGATION_CONTROL_SMALL //SMALL控件类型
+      })
+      this.map.addControl(navigationControl) //将控件添加到地图
+      var geolocationControl = new BMap.GeolocationControl({
+        anchor: BMAP_ANCHOR_BOTTOM_LEFT
+      }) //创建一个地图定位控件
+      geolocationControl.addEventListener('locationSuccess', function(e) {
+        //绑定定位成功后事件
+        that.getAddrByPoint(e.point) //定位成功后调用逆地址解析函数
+      })
+      geolocationControl.addEventListener('locationError', function(e) {
+        //绑定定位失败后事件
+        console.log(e.message)
+      })
+      this.map.addControl(geolocationControl) //将控件添加到地图
+      this.map.addEventListener('click', function(e) {
+        //给地图绑定点击事件
+        that.getAddrByPoint(e.point) //点击后调用逆地址解析函数
+      })
+      this.geolocation()
+    },
+    /**
+     * 浏览器定位函数
+     */
+    geolocation() {
+      var that = this
+      var geolocation = new BMap.Geolocation()
+      geolocation.getCurrentPosition(
+        function(res) {
+          if (this.getStatus() == BMAP_STATUS_SUCCESS) {
+            that.getAddrByPoint(res.point) //当成功时，调用逆地址解析函数
+          } else {
+            console.log('failed' + this.getStatus()) //失败时，弹出失败状态码
+          }
         },
-        querySearchAsync(str, cb) {
-            var options = {
-                onSearchComplete: function (res) {
-                    //检索完成后的回调函数
-                    var s = []
-                    if (local.getStatus() == BMAP_STATUS_SUCCESS) {
-                        for (var i = 0; i < res.getCurrentNumPois(); i++) {
-                            s.push(res.getPoi(i))
-                        }
-                        cb(s) //获取到数据时，通过回调函数cb返回到<el-autocomplete>组件中进行显示
-                    } else {
-                        cb(s)
-                    }
-                }
+        {
+          enableHighAccuracy: true
+        }
+      ) //enableHighAccuracy：是否要求浏览器获取最佳效果，默认为false
+    },
+    /** 逆向解析地址 point */
+    getAddrByPoint(point) {
+      var that = this
+      var geco = new BMap.Geocoder()
+      geco.getLocation(point, function(res) {
+        console.log(res) //内容见下图
+        that.mk.setPosition(point) //重新设置标注的地理坐标
+        that.map.panTo(point) //将地图的中心点更改为给定的点
+        that.addressInfo.address = res.address //记录该点的详细地址信息
+        that.addressInfo.addrPoint = point //记录当前坐标点
+      })
+    },
+    querySearchAsync(str, cb) {
+      var options = {
+        onSearchComplete: function(res) {
+          //检索完成后的回调函数
+          var s = []
+          if (local.getStatus() == BMAP_STATUS_SUCCESS) {
+            for (var i = 0; i < res.getCurrentNumPois(); i++) {
+              s.push(res.getPoi(i))
             }
-            var local = new BMap.LocalSearch(this.map, options) //创建LocalSearch构造函数
-            local.search(str) //调用search方法，根据检索词str发起检索
-        },
-        handleSelect(item) {
-            this.formData.address = item.address + item.title //记录详细地址，含建筑物名
-            this.formData.addrPoint = item.point //记录当前选中地址坐标
-            this.map.clearOverlays() //清除地图上所有覆盖物
-            this.mk = new BMap.Marker(item.point) //根据所选坐标重新创建Marker
-            this.map.addOverlay(this.mk) //将覆盖物重新添加到地图中
-            this.map.panTo(item.point) //将地图的中心点更改为选定坐标点
-        },
-        /**
-         * 确认选择
-         */
-        confirmSelect() {
-            this.$emit('confirmMapAddress', this.addressInfo)
-            this.openMap = false
-        },
+            cb(s) //获取到数据时，通过回调函数cb返回到<el-autocomplete>组件中进行显示
+          } else {
+            cb(s)
+          }
+        }
+      }
+      var local = new BMap.LocalSearch(this.map, options) //创建LocalSearch构造函数
+      local.search(str) //调用search方法，根据检索词str发起检索
+    },
+    handleSelect(item) {
+      this.formData.address = item.address + item.title //记录详细地址，含建筑物名
+      this.formData.addrPoint = item.point //记录当前选中地址坐标
+      this.map.clearOverlays() //清除地图上所有覆盖物
+      this.mk = new BMap.Marker(item.point) //根据所选坐标重新创建Marker
+      this.map.addOverlay(this.mk) //将覆盖物重新添加到地图中
+      this.map.panTo(item.point) //将地图的中心点更改为选定坐标点
+    },
+    /**
+     * 确认选择
+     */
+    confirmSelect() {
+      this.$emit('confirmMapAddress', this.addressInfo)
+      this.openMap = false
+    },
 
-        /**
-         * 取消选择
-         */
-        cancel() {
-            this.$emit('cancelMap')
-        },
-        /**
-         * 动态加载百度地图api函数
-         * @param {String} ak  百度地图AK，必传
-         */
-        loadBMap(ak) {
-            return new Promise(function (resolve, reject) {
-                if (typeof window.BMap !== 'undefined') {
-                    resolve(window.BMap)
-                    return true
-                }
-                window.onBMapCallback = function () {
-                    resolve(window.BMap)
-                }
-                let script = document.createElement('script')
-                script.type = 'text/javascript'
-                script.src = 'https://api.map.baidu.com/api?v=3.0&ak=' + ak + '&callback=onBMapCallback'
-                script.onerror = reject
-                document.head.appendChild(script)
-            })
+    /**
+     * 取消选择
+     */
+    cancel() {
+      this.$emit('cancelMap')
+    },
+    /**
+     * 动态加载百度地图api函数
+     * @param {String} ak  百度地图AK，必传
+     */
+    loadBMap(ak) {
+      return new Promise(function(resolve, reject) {
+        if (typeof window.BMap !== 'undefined') {
+          resolve(window.BMap)
+          return true
+        }
+        window.onBMapCallback = function() {
+          resolve(window.BMap)
         }
+        let script = document.createElement('script')
+        script.type = 'text/javascript'
+        script.src = 'https://api.map.baidu.com/api?v=3.0&ak=' + ak + '&callback=onBMapCallback'
+        script.onerror = reject
+        document.head.appendChild(script)
+      })
     }
+  }
 }
 </script>
 <style>
 .el-upload__tip {
-    line-height: 1.2;
+  line-height: 1.2;
 }
 </style>

src/views/workbench/workAppointmentOrder/index.vue

@@ -1,327 +1,361 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-            <el-form-item prop="orderNo">
-                <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item prop="appointmentTime">
-                <el-date-picker clearable v-model="queryParams.appointmentTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择创建时间"> </el-date-picker>
-            </el-form-item>
-            <el-form-item prop="contactName">
-                <el-input v-model="queryParams.contactName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
-            </el-form-item>
-            <el-form-item prop="contactPhone" label-width="90px">
-                <el-input v-model="queryParams.contactPhone" placeholder="请输入客户手机号" clearable @keyup.enter.native="handleQuery" />
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item prop="orderNo">
+        <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="appointmentTime">
+        <el-date-picker clearable v-model="queryParams.appointmentTime" type="date" value-format="yyyy-MM-dd"
+                        placeholder="请选择创建时间"></el-date-picker>
+      </el-form-item>
+      <el-form-item prop="contactName">
+        <el-input v-model="queryParams.contactName" placeholder="请输入客户名称" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item prop="contactPhone" label-width="90px">
+        <el-input v-model="queryParams.contactPhone" placeholder="请输入客户手机号" clearable
+                  @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-tabs type="border-card" v-model="virtualListStatus" @tab-click="changeOrderStatus">
+      <el-tab-pane label="待接单" :name="1"></el-tab-pane>
+      <el-tab-pane label="取衣中" :name="2"></el-tab-pane>
+      <el-tab-pane label="待支付" :name="3"></el-tab-pane>
+      <el-tab-pane label="待入厂" :name="4"></el-tab-pane>
+      <el-tab-pane label="清洗中" :name="5"></el-tab-pane>
+      <el-tab-pane label="待上挂" :name="6"></el-tab-pane>
+      <el-tab-pane label="待送衣" :name="7"></el-tab-pane>
+      <el-tab-pane label="送衣中" :name="8"></el-tab-pane>
+      <el-tab-pane label="已完成" :name="10"></el-tab-pane>
+
+      <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothList">
+        <el-table-column label="预约单号" align="center" prop="orderNo" width="200px" />
+        <el-table-column label="预约时间" align="center" prop="appointmentTime" width="160px" />
+        <el-table-column label="是否大件" align="center" width="100px">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isLargeItem" />
+          </template>
+        </el-table-column>
+        <el-table-column label="是否拆装" align="center" width="100px">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isDisassemblyAndAssembly" />
+          </template>
+        </el-table-column>
+        <el-table-column label="件数" align="center" prop="appointmentCount" width="80px" />
+        <el-table-column label="客户信息" align="center" prop="contactName" width="120px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.orderClothAddress ? scope.row.orderClothAddress.contactName : '--' }}</span>
+            <br />
+            <span>{{ scope.row.orderClothAddress ? scope.row.orderClothAddress.contactPhone : '' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="地址明细" align="center" width="220px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.orderClothAddress != null">{{ scope.row.orderClothAddress.province
+              }}{{ scope.row.orderClothAddress.city }}{{ scope.row.orderClothAddress.area }}</span>
+            <br />
+            <span v-if="scope.row.orderClothAddress != null">{{ scope.row.orderClothAddress.address
+              }}{{ scope.row.orderClothAddress.addressDetail }}</span>
+            <span>--</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="取衣方式" align="center" width="100px">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.cloth_take_type" :value="scope.row.takeClothWay" />
+          </template>
+        </el-table-column>
+        <el-table-column label="配送方式" align="center" width="100px" v-if="queryParams.appointmentStatus != 0">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.order_cloth_delivery_way" :value="scope.row.deliveryWay" />
+          </template>
+        </el-table-column>
+        <el-table-column label="派送员" align="center" width="100px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.takeClothAppUserId == null || scope.row.takeClothAppUserId == ''">- -</span>
+            <span
+              v-if="scope.row.takeClothAppUserId != null || scope.row.takeClothAppUserId != ''">{{ scope.row.takeClothAppUserName
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派送员手机号" align="center" width="120px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.takeClothAppUserId == null || scope.row.takeClothAppUserId == ''">- -</span>
+            <span
+              v-if="scope.row.takeClothAppUserId != null || scope.row.takeClothAppUserId != ''">{{ scope.row.takeClothAppUserPhone
+              }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                       v-if="queryParams.appointmentStatus == '1' || queryParams.appointmentStatus == '8'">派单
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleCancel(scope.row)"
+                       v-if="queryParams.appointmentStatus == '1'">取消订单
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                  @pagination="getList" />
+
+      <!-- 添加或修改洗衣订单对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
+        <el-row :gutter="15">
+          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+            <el-col :span="24">
+              <el-form-item label="配送方式" prop="service_trans_id">
+                <el-radio-group v-model="form.service_trans_id">
+                  <el-radio-button key="0" label="0">第三方配送</el-radio-button>
+                  <el-radio-button key="1" label="1">门店配送</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="form.service_trans_id == 1">
+              <el-form-item label="配送员" prop="takeClothAppUserId">
+                <el-select v-model="form.takeClothAppUserId" placeholder="请选择配送员" clearable>
+                  <el-option v-for="man in deliveryManList" :key="man.appUserId" :label="man.realName"
+                             :value="man.appUserId" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+        <div>
+          <el-button type="primary" @click="submitForm" style="margin-left: 40%">提交</el-button>
+        </div>
+      </el-dialog>
+    </el-tabs>
+
+    <!-- 添加或修改商品品牌管理对话框 -->
+    <el-dialog title="同城配送信息" :visible.sync="intracityExpressOpen" size="50%" append-to-body>
+      <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
+        <el-col :span="24">
+          <el-descriptions class="margin-top" :column="2" border>
+            <el-descriptions-item>
+              <template slot="label"> 配送公司</template>
+              <dict-tag :options="dict.type.express_service_type" :value="intracityExpressOrderInfo.service_trans_id" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送订单状态</template>
+              <dict-tag :options="dict.type.intracity_express_order_status"
+                        :value="intracityExpressOrderInfo.order_status" />
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送距离</template>
+              <span v-if="intracityExpressOrderInfo.distance < 1000">{{ intracityExpressOrderInfo.distance }}米</span>
+              <span v-else>{{ intracityExpressOrderInfo.distance / 1000 }}千米</span>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 支付费用</template>
+              {{ intracityExpressOrderInfo.actualfee / 100 }}元
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 违约金</template>
+              {{ intracityExpressOrderInfo.deductfee / 100 }}元
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"></template>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 发单时间</template>
+              {{ transDate(intracityExpressOrderInfo.create_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送员接单时间</template>
+              {{ transDate(intracityExpressOrderInfo.accept_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送员取货时间</template>
+              {{ transDate(intracityExpressOrderInfo.fetch_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送员送达时间</template>
+              {{ transDate(intracityExpressOrderInfo.finish_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 取消时间</template>
+              {{ transDate(intracityExpressOrderInfo.cancel_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 预期送达时间</template>
+              {{ transDate(intracityExpressOrderInfo.expected_finish_time) }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送员姓名</template>
+              {{ intracityExpressOrderInfo.transporter_info ? intracityExpressOrderInfo.transporter_info.transporter_name : ''
+              }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 配送员手机</template>
+              {{ intracityExpressOrderInfo.transporter_info ? intracityExpressOrderInfo.transporter_info.transporter_phone : ''
+              }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 取件人姓名</template>
+              {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.store_name : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 取件人电话</template>
+              {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.phone_num : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label"> 取件地址</template>
+              {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.address : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 收件人姓名</template>
+              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.receiver_name : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 收件人电话</template>
+              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.phone_num : '' }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="2">
+              <template slot="label"> 收件地址</template>
+              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.address : '' }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel" style="margin-left: 5%">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 订单出货对话框 -->
+    <el-dialog title="订单出货信息" :visible.sync="openDeliveryPage" size="40%" append-to-body
+               :before-close="deliveryClose">
+      <el-row :gutter="15">
+        <el-form ref="deliveryVo" :model="deliveryVo" :rules="deliveryRules" label-width="120px">
+          <el-col :span="24">
+            <el-form-item label="快递公司" prop="deliveryCompany">
+              <el-radio-group v-model="deliveryVo.deliveryCompany" @input="changeDeliveryId">
+                <el-radio-button v-for="dict in deliveryData" :label="dict.deliveryName"
+                                 :key="dict.deliveryName"></el-radio-button>
+              </el-radio-group>
             </el-form-item>
-            <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+
+            <el-form-item label="服务类型" prop="serviceType">
+              <div class="servicecard" v-for="del in serviceData" :key="del.serviceType" @click="checkserviceId(del)"
+                   :class="{ active: deliveryVo.serviceType == del.serviceType }">
+                <div class="check"><i class="el-icon-check"></i></div>
+                {{ del.serviceName }}
+              </div>
             </el-form-item>
-        </el-form>
-        <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
 
-        <el-tabs type="border-card" v-model="appointmentStatus" @tab-click="changeOrderStatus">
-            <el-tab-pane label="预约待取" name="1"></el-tab-pane>
-            <el-tab-pane label="待上门" name="2"></el-tab-pane>
-            <el-tab-pane label="已取物" name="3"></el-tab-pane>
-            <el-tab-pane label="待配送" name="4"></el-tab-pane>
-            <el-tab-pane label="配送中" name="5"></el-tab-pane>
-            <el-tab-pane label="已完成" name="9"></el-tab-pane>
-            <el-tab-pane label="已取消" name="100"></el-tab-pane>
-
-            <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothList">
-                <el-table-column label="预约单号" align="center" prop="orderNo" width="200px" />
-                <el-table-column label="预约时间" align="center" prop="appointmentTime" width="160px" />
-                <el-table-column label="是否大件" align="center" width="100px">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isLargeItem" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="是否拆装" align="center" width="100px">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isDisassemblyAndAssembly" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="件数" align="center" prop="appointmentCount" width="80px" />
-                <el-table-column label="客户信息" align="center" prop="contactName" width="120px">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.orderClothAddress ? scope.row.orderClothAddress.contactName : '--' }}</span>
-                        <br />
-                        <span>{{ scope.row.orderClothAddress ? scope.row.orderClothAddress.contactPhone : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="地址明细" align="center" width="220px" show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.orderClothAddress != null">{{ scope.row.orderClothAddress.province }}{{ scope.row.orderClothAddress.city }}{{ scope.row.orderClothAddress.area }}</span>
-                        <br />
-                        <span v-if="scope.row.orderClothAddress != null">{{ scope.row.orderClothAddress.address }}{{ scope.row.orderClothAddress.addressDetail }}</span>
-                        <span>--</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="取衣方式" align="center" width="100px">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.cloth_take_type" :value="scope.row.takeClothWay" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="配送方式" align="center" width="100px" v-if="queryParams.appointmentStatus != 0">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.order_cloth_delivery_way" :value="scope.row.deliveryWay" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="派送员" align="center" width="100px">
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.takeClothAppUserId == null || scope.row.takeClothAppUserId == ''">- -</span>
-                        <span v-if="scope.row.takeClothAppUserId != null || scope.row.takeClothAppUserId != ''">{{ scope.row.takeClothAppUserName }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="派送员手机号" align="center" width="120px">
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.takeClothAppUserId == null || scope.row.takeClothAppUserId == ''">- -</span>
-                        <span v-if="scope.row.takeClothAppUserId != null || scope.row.takeClothAppUserId != ''">{{ scope.row.takeClothAppUserPhone }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
-                    <template slot-scope="scope">
-                        <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="queryParams.appointmentStatus == '1' || queryParams.appointmentStatus == '8'">派单</el-button>
-                        <el-button type="text" icon="el-icon-delete" @click="handleCancel(scope.row)" v-if="queryParams.appointmentStatus == '1'">取消订单</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
-            <!-- 添加或修改洗衣订单对话框 -->
-            <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
-                <el-row :gutter="15">
-                    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-                        <el-col :span="24">
-                            <el-form-item label="配送方式" prop="service_trans_id">
-                                <el-radio-group v-model="form.service_trans_id">
-                                    <el-radio-button key="0" label="0">第三方配送</el-radio-button>
-                                    <el-radio-button key="1" label="1">门店配送</el-radio-button>
-                                </el-radio-group>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="24" v-if="form.service_trans_id == 1">
-                            <el-form-item label="配送员" prop="takeClothAppUserId">
-                                <el-select v-model="form.takeClothAppUserId" placeholder="请选择配送员" clearable>
-                                    <el-option v-for="man in deliveryManList" :key="man.appUserId" :label="man.realName" :value="man.appUserId" />
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                    </el-form>
-                </el-row>
-                <div>
-                    <el-button type="primary" @click="submitForm" style="margin-left: 40%">提交</el-button>
-                </div>
-            </el-dialog>
-        </el-tabs>
-
-        <!-- 添加或修改商品品牌管理对话框 -->
-        <el-dialog title="同城配送信息" :visible.sync="intracityExpressOpen" size="50%" append-to-body>
-            <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
-                <el-col :span="24">
-                    <el-descriptions class="margin-top" :column="2" border>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送公司 </template>
-                            <dict-tag :options="dict.type.express_service_type" :value="intracityExpressOrderInfo.service_trans_id" />
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送订单状态 </template>
-                            <dict-tag :options="dict.type.intracity_express_order_status" :value="intracityExpressOrderInfo.order_status" />
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送距离 </template>
-                            <span v-if="intracityExpressOrderInfo.distance < 1000">{{ intracityExpressOrderInfo.distance }}米</span>
-                            <span v-else>{{ intracityExpressOrderInfo.distance / 1000 }}千米</span>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 支付费用 </template>
-                            {{ intracityExpressOrderInfo.actualfee / 100 }}元
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 违约金 </template>
-                            {{ intracityExpressOrderInfo.deductfee / 100 }}元
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> </template>
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 发单时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.create_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送员接单时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.accept_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送员取货时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.fetch_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送员送达时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.finish_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 取消时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.cancel_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 预期送达时间 </template>
-                            {{ transDate(intracityExpressOrderInfo.expected_finish_time) }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送员姓名 </template>
-                            {{ intracityExpressOrderInfo.transporter_info ? intracityExpressOrderInfo.transporter_info.transporter_name : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 配送员手机 </template>
-                            {{ intracityExpressOrderInfo.transporter_info ? intracityExpressOrderInfo.transporter_info.transporter_phone : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 取件人姓名 </template>
-                            {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.store_name : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 取件人电话 </template>
-                            {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.phone_num : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item :span="2">
-                            <template slot="label"> 取件地址 </template>
-                            {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.address : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 收件人姓名 </template>
-                            {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.receiver_name : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item>
-                            <template slot="label"> 收件人电话 </template>
-                            {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.phone_num : '' }}
-                        </el-descriptions-item>
-                        <el-descriptions-item :span="2">
-                            <template slot="label"> 收件地址 </template>
-                            {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.address : '' }}
-                        </el-descriptions-item>
-                    </el-descriptions>
-                </el-col>
-            </el-row>
-
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="cancel" style="margin-left: 5%">取 消</el-button>
-            </div>
-        </el-dialog>
-
-        <!-- 订单出货对话框 -->
-        <el-dialog title="订单出货信息" :visible.sync="openDeliveryPage" size="40%" append-to-body :before-close="deliveryClose">
-            <el-row :gutter="15">
-                <el-form ref="deliveryVo" :model="deliveryVo" :rules="deliveryRules" label-width="120px">
-                    <el-col :span="24">
-                        <el-form-item label="快递公司" prop="deliveryCompany">
-                            <el-radio-group v-model="deliveryVo.deliveryCompany" @input="changeDeliveryId">
-                                <el-radio-button v-for="dict in deliveryData" :label="dict.deliveryName" :key="dict.deliveryName"></el-radio-button>
-                            </el-radio-group>
-                        </el-form-item>
-
-                        <el-form-item label="服务类型" prop="serviceType">
-                            <div class="servicecard" v-for="del in serviceData" :key="del.serviceType" @click="checkserviceId(del)" :class="{ active: deliveryVo.serviceType == del.serviceType }">
-                                <div class="check"><i class="el-icon-check"></i></div>
-                                {{ del.serviceName }}
-                            </div>
-                        </el-form-item>
-
-                        <el-form-item label="预期揽件时间" prop="expectTime">
-                            <el-date-picker
-                                type="datetime"
-                                placeholder="选择预期揽件时间"
-                                v-model="deliveryVo.expectTime"
-                                style="width: 100%"
-                                value-format="yyyy-MM-dd HH:mm"
-                                format="yyyy-MM-dd HH:mm"
-                                :picker-options="{
+            <el-form-item label="预期揽件时间" prop="expectTime">
+              <el-date-picker
+                type="datetime"
+                placeholder="选择预期揽件时间"
+                v-model="deliveryVo.expectTime"
+                style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm"
+                format="yyyy-MM-dd HH:mm"
+                :picker-options="{
                                     disabledDate: (time) => {
                                         return time.getTime() < Date.now() - 3600 * 1000 * 24
                                     },
                                     selectableRange: startTimeRange
                                 }"
-                                :default-time="deliTime"
-                                class="date_picker"
-                                :editable="false"
-                            ></el-date-picker>
-                        </el-form-item>
-
-                        <!-- <el-form-item label="包裹数量" prop="count">
-              <el-input v-model="deliveryVo.count" type="number" placeholder="请输入包裹数量" clearable></el-input>
-            </el-form-item> -->
-
-                        <el-form-item label="货物高度" prop="spaceHeight">
-                            <el-input v-model="deliveryVo.spaceHeight" placeholder="请输入货物高度" clearable>
-                                <template slot="append">厘米(cm)</template>
-                            </el-input>
-                        </el-form-item>
-
-                        <el-form-item label="货物长度" prop="spaceLength">
-                            <el-input v-model="deliveryVo.spaceLength" placeholder="请输入货物长度" clearable>
-                                <template slot="append">厘米(cm)</template>
-                            </el-input>
-                        </el-form-item>
-
-                        <el-form-item label="货物宽度" prop="spaceWidth">
-                            <el-input v-model="deliveryVo.spaceWidth" placeholder="请输入货物宽度" clearable>
-                                <template slot="append">厘米(cm)</template>
-                            </el-input>
-                        </el-form-item>
-
-                        <el-form-item label="货物总重量" prop="weight">
-                            <el-input v-model="deliveryVo.weight" placeholder="请输入货物总重量" clearable>
-                                <template slot="append">千克 (kg)</template>
-                            </el-input>
-                        </el-form-item>
-
-                        <el-form-item label="备注信息" prop="customRemark">
-                            <el-input v-model="deliveryVo.customRemark" rows="5" type="textarea" placeholder="请输入备注信息，比如易碎物品……" maxlength="500" show-word-limit clearable></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitDelivery('deliveryVo')" style="margin-left: 5%">提交</el-button>
-                <el-button @click="cancelDelivery">取 消</el-button>
-            </div>
-        </el-dialog>
-
-        <!-- 快递信息对话框 -->
-        <el-dialog title="快递信息" :visible.sync="openDeliveryinfo" size="40%" append-to-body :before-close="deliveryinfoClose">
-            <div class="deliveryView">
-                <div class="info">
-                    <span>快递公司：</span>
-                    <span>{{ deliveryView.name }}</span>
-                </div>
-                <div class="info">
-                    <span>收货地址：</span>
-                    <span>{{ deliveryView.address }}</span>
-                </div>
-            </div>
-
-            <el-timeline v-if="deliveryView.pathItemList.length">
-                <el-timeline-item v-for="(item, index) in deliveryView.pathItemList" :key="index" :timestamp="item.actionTime">
-                    {{ item.actionMsg }}
-                </el-timeline-item>
-            </el-timeline>
-
-            <el-empty description="暂无快递信息" v-else></el-empty>
-
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" style="margin-left: 5%" @click="openDeliveryinfo = false">关闭</el-button>
-            </div>
-        </el-dialog>
-    </div>
+                :default-time="deliTime"
+                class="date_picker"
+                :editable="false"
+              ></el-date-picker>
+            </el-form-item>
+
+            <!-- <el-form-item label="包裹数量" prop="count">
+  <el-input v-model="deliveryVo.count" type="number" placeholder="请输入包裹数量" clearable></el-input>
+</el-form-item> -->
+
+            <el-form-item label="货物高度" prop="spaceHeight">
+              <el-input v-model="deliveryVo.spaceHeight" placeholder="请输入货物高度" clearable>
+                <template slot="append">厘米(cm)</template>
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="货物长度" prop="spaceLength">
+              <el-input v-model="deliveryVo.spaceLength" placeholder="请输入货物长度" clearable>
+                <template slot="append">厘米(cm)</template>
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="货物宽度" prop="spaceWidth">
+              <el-input v-model="deliveryVo.spaceWidth" placeholder="请输入货物宽度" clearable>
+                <template slot="append">厘米(cm)</template>
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="货物总重量" prop="weight">
+              <el-input v-model="deliveryVo.weight" placeholder="请输入货物总重量" clearable>
+                <template slot="append">千克 (kg)</template>
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="备注信息" prop="customRemark">
+              <el-input v-model="deliveryVo.customRemark" rows="5" type="textarea"
+                        placeholder="请输入备注信息，比如易碎物品……" maxlength="500" show-word-limit
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDelivery('deliveryVo')" style="margin-left: 5%">提交</el-button>
+        <el-button @click="cancelDelivery">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 快递信息对话框 -->
+    <el-dialog title="快递信息" :visible.sync="openDeliveryinfo" size="40%" append-to-body
+               :before-close="deliveryinfoClose">
+      <div class="deliveryView">
+        <div class="info">
+          <span>快递公司：</span>
+          <span>{{ deliveryView.name }}</span>
+        </div>
+        <div class="info">
+          <span>收货地址：</span>
+          <span>{{ deliveryView.address }}</span>
+        </div>
+      </div>
+
+      <el-timeline v-if="deliveryView.pathItemList.length">
+        <el-timeline-item v-for="(item, index) in deliveryView.pathItemList" :key="index" :timestamp="item.actionTime">
+          {{ item.actionMsg }}
+        </el-timeline-item>
+      </el-timeline>
+
+      <el-empty description="暂无快递信息" v-else></el-empty>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" style="margin-left: 5%" @click="openDeliveryinfo = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { getAppointmentClothOrderList, setDeliveryManByAppointment, cancelAppointmentOrderByAppointment, setIntracityExpress, orderClothSetThirdDelivery, setSendDelivery } from '@/api/order/cloth'
+import {
+  getAppointmentClothOrderList,
+  setDeliveryManByAppointment,
+  cancelAppointmentOrderByAppointment,
+  setIntracityExpress,
+  orderClothSetThirdDelivery,
+  setSendDelivery
+} from '@/api/order/cloth'
 import { getDeliveryManListByOrg } from '../../../api/app/delivery'
 import { intracityExpressGetOrderInfo } from '../../../api/express/intracity'
 import { formatDate } from '../../../utils'
@@ -329,451 +363,470 @@ import { getdeliveryAll, getDeliveryPath } from '../../../api/order/goods'
 import { getDeliveryPathByClothOrderNo } from '../../../api/express/delivery'
 
 export default {
-    name: 'WorkAppointmentOrder',
-    dicts: ['cloth_order_status', 'sys_normal_disable', 'sys_yes_no', 'cloth_take_type', 'cloth_send_type', 'order_cloth_delivery_way', 'express_service_type', 'intracity_express_order_status'],
-    data() {
-        var validateNumberInput = (rule, value, callback) => {
-            if (!value || isNaN(value)) {
-                callback(new Error('只能输入数字，不能为空'))
-            } else {
-                callback()
-            }
-        }
-        return {
-            orderStatus: '1',
-            appointmentStatus: '1',
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 预约订单表格数据
-            clothList: [],
-            // 弹出层标题
-            title: '',
-            // 是否显示弹出层
-            open: false,
-            intracityExpressOpen: false,
-            intracityExpressOrderInfo: {},
-            openDeliveryPage: false,
-            deliveryVo: {
-                bizId: '',
-                // count: 1,
-                customRemark: '',
-                deliveryCompany: '',
-                deliveryId: '',
-                expectTime: '',
-                orderId: null,
-                serviceName: '',
-                serviceType: null,
-                spaceHeight: null,
-                spaceLength: null,
-                spaceWidth: null,
-                weight: null
-            },
-            deliveryData: [], //快递公司数据
-            serviceData: [], //快递公司服务类型数据
-            openDeliveryinfo: false,
-            deliveryView: {
-                name: '',
-                pathItemList: []
-            },
-            startTimeRange: null,
-            deliTime: null,
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                orderNo: null,
-                contactName: null,
-                contactPhone: null,
-                orderStatus: null,
-                appointmentStatus: null
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-                service_trans_id: [
-                    {
-                        required: true,
-                        message: '配送方式不能为空',
-                        trigger: 'blur'
-                    }
-                ],
-                takeClothAppUserId: [
-                    {
-                        required: true,
-                        message: '派送员不能为空',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            deliveryRules: {
-                deliveryName: [{ required: true, message: '请选择物流公司', trigger: 'change' }],
-                serviceType: [{ required: true, message: '请选择服务类型', trigger: 'change' }],
-                expectTime: [{ required: true, message: '选择预期揽件时间', trigger: 'blur' }],
-                // count: [
-                //   { required: true, message: '请输入包裹数量', trigger: 'blur' },
-                // ],
-                spaceHeight: [
-                    { required: true, message: '请输入货物高度', trigger: 'blur' },
-                    { validator: validateNumberInput, trigger: 'blur' }
-                ],
-                spaceLength: [
-                    { required: true, message: '请输入货物长度', trigger: 'blur' },
-                    { validator: validateNumberInput, trigger: 'blur' }
-                ],
-                spaceWidth: [
-                    { required: true, message: '请输入货物宽度', trigger: 'blur' },
-                    { validator: validateNumberInput, trigger: 'blur' }
-                ],
-                weight: [
-                    { required: true, message: '请输入货物总重量', trigger: 'blur' },
-                    { validator: validateNumberInput, trigger: 'blur' }
-                ],
-                customRemark: [{ required: true, message: '请输入备注信息，比如易碎物品……', trigger: 'blur' }]
-            },
-            deliveryManList: []
-        }
+  name: 'WorkAppointmentOrder',
+  dicts: ['cloth_order_status', 'sys_normal_disable', 'sys_yes_no', 'cloth_take_type', 'cloth_send_type', 'order_cloth_delivery_way', 'express_service_type', 'intracity_express_order_status'],
+  data() {
+    var validateNumberInput = (rule, value, callback) => {
+      if (!value || isNaN(value)) {
+        callback(new Error('只能输入数字，不能为空'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      orderStatus: '1',
+      appointmentStatus: '1',
+      virtualListStatus: 1,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 预约订单表格数据
+      clothList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      intracityExpressOpen: false,
+      intracityExpressOrderInfo: {},
+      openDeliveryPage: false,
+      deliveryVo: {
+        bizId: '',
+        // count: 1,
+        customRemark: '',
+        deliveryCompany: '',
+        deliveryId: '',
+        expectTime: '',
+        orderId: null,
+        serviceName: '',
+        serviceType: null,
+        spaceHeight: null,
+        spaceLength: null,
+        spaceWidth: null,
+        weight: null
+      },
+      deliveryData: [], //快递公司数据
+      serviceData: [], //快递公司服务类型数据
+      openDeliveryinfo: false,
+      deliveryView: {
+        name: '',
+        pathItemList: []
+      },
+      startTimeRange: null,
+      deliTime: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        orderNo: null,
+        contactName: null,
+        contactPhone: null,
+        orderStatus: null,
+        virtualListStatus: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        service_trans_id: [
+          {
+            required: true,
+            message: '配送方式不能为空',
+            trigger: 'blur'
+          }
+        ],
+        takeClothAppUserId: [
+          {
+            required: true,
+            message: '派送员不能为空',
+            trigger: 'blur'
+          }
+        ]
+      },
+      deliveryRules: {
+        deliveryName: [{ required: true, message: '请选择物流公司', trigger: 'change' }],
+        serviceType: [{ required: true, message: '请选择服务类型', trigger: 'change' }],
+        expectTime: [{ required: true, message: '选择预期揽件时间', trigger: 'blur' }],
+        // count: [
+        //   { required: true, message: '请输入包裹数量', trigger: 'blur' },
+        // ],
+        spaceHeight: [
+          { required: true, message: '请输入货物高度', trigger: 'blur' },
+          { validator: validateNumberInput, trigger: 'blur' }
+        ],
+        spaceLength: [
+          { required: true, message: '请输入货物长度', trigger: 'blur' },
+          { validator: validateNumberInput, trigger: 'blur' }
+        ],
+        spaceWidth: [
+          { required: true, message: '请输入货物宽度', trigger: 'blur' },
+          { validator: validateNumberInput, trigger: 'blur' }
+        ],
+        weight: [
+          { required: true, message: '请输入货物总重量', trigger: 'blur' },
+          { validator: validateNumberInput, trigger: 'blur' }
+        ],
+        customRemark: [{ required: true, message: '请输入备注信息，比如易碎物品……', trigger: 'blur' }]
+      },
+      deliveryManList: []
+    }
+  },
+  created() {
+    var userInfoVO = this.getUserInfo()
+    if (userInfoVO.userType == '02') {
+      this.getDeliveryList()
+    } else {
+      this.getdeliveryAll()
+    }
+
+    this.getList()
+  },
+  methods: {
+    getDeliveryList() {
+      getDeliveryManListByOrg().then((response) => {
+        this.deliveryManList = response.data
+      })
     },
-    created() {
-        var userInfoVO = this.getUserInfo()
-        if (userInfoVO.userType == '02') {
-            this.getDeliveryList()
-        } else {
-            this.getdeliveryAll()
-        }
+    changeOrderStatus() {
+      this.queryParams.virtualListStatus = this.virtualListStatus
+      this.handleQuery()
+    },
+    /** 查询洗衣订单列表 */
+    getList() {
+      this.loading = true
+      this.queryParams.virtualListStatus = this.virtualListStatus
+      getAppointmentClothOrderList(this.queryParams).then((response) => {
+        this.clothList = response.rows
+        this.total = response.total
+        this.loading = false
+        this.$forceUpdate()
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.intracityExpressOpen = false
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        orderNo: null,
+        orgId: null,
+        sourceType: null,
+        factoryId: null,
+        appUserId: null,
+        province: null,
+        city: null,
+        area: null,
+        address: null,
+        addressDetail: null,
+        longitude: null,
+        latitude: null,
+        contactName: null,
+        contactPhone: null,
+        orderAmount: null,
+        payAmount: null,
+        payType: null,
+        payTime: null,
+        outTradeOrderNo: null,
+        orderSource: null,
+        refundAmount: null,
+        refundContent: null,
+        appointmentTime: null,
+        appointmentCount: null,
+        orderStatus: '0',
+        virtualListStatus: 1,
+        takeClothTime: null,
+        takeClothAppUserId: null,
+        setPriceTime: null,
+        pickUpTime: null,
+        washClothStartTime: null,
+        washClothEndTime: null,
+        sendToStoreTime: null,
+        sendToUserTime: null,
+        refundApplyTime: null,
+        refundTime: null,
+        refundStatus: '0',
+        refundReason: null,
+        sendClothAppUserId: null,
+        takeClothWay: null,
+        sendClothWay: null,
+        couponAmount: null,
+        finishTime: null,
+        employeeId: null,
+        delFlag: null,
+        createById: null,
+        createBy: null,
+        createTime: null,
+        updateById: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        isDisassemblyAndAssembly: null,
+        isLargeItem: null,
+        clothSpeedId: null,
+        clothSpeedName: null,
+        isSpecial: null,
+        deductAmount: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 派单按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      console.log('this.form.appointmentStatus', row.appointmentStatus)
+      var userInfoVO = this.getUserInfo()
+      if (userInfoVO.userType == '01') {
+        this.openDeliveryPage = true
+        this.deliveryVo.deliveryCompany = this.deliveryData[0].deliveryName
+        this.serviceData = this.deliveryData[0].serviceType
+        // 获取当前时间
+        const now = new Date()
+        // 增加一个小时
+        now.setHours(now.getHours() + 1)
+        // 提取时分秒并格式化
+        const hours = ('0' + now.getHours()).slice(-2)
+        const minutes = ('0' + now.getMinutes()).slice(-2)
+        const seconds = ('0' + now.getSeconds()).slice(-2)
+        // 结果字符串
+        this.deliTime = `${hours}:${minutes}:${seconds}`
+        this.deliveryVo.orderNo = row.orderNo
+      } else {
+        this.open = true
+        this.form.orderNo = row.orderNo
+        this.form.appointmentStatus = row.appointmentStatus
 
-        this.getList()
+      }
     },
-    methods: {
-        getDeliveryList() {
-            getDeliveryManListByOrg().then((response) => {
-                this.deliveryManList = response.data
-            })
-        },
-        changeOrderStatus() {
-            this.queryParams.appointmentStatus = this.appointmentStatus
-            this.handleQuery()
-        },
-        /** 查询洗衣订单列表 */
-        getList() {
-            this.loading = true
-            this.queryParams.appointmentStatus = this.appointmentStatus
-            getAppointmentClothOrderList(this.queryParams).then((response) => {
-                this.clothList = response.rows
-                this.total = response.total
-                this.loading = false
-                this.$forceUpdate()
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.form.service_trans_id == 0) {
+            setIntracityExpress({ orderNo: this.form.orderNo }).then((res) => {
+              this.$modal.msgSuccess('派单成功')
+              this.open = false
+              this.getList()
             })
-        },
-        // 取消按钮
-        cancel() {
-            this.intracityExpressOpen = false
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                id: null,
-                orderNo: null,
-                orgId: null,
-                sourceType: null,
-                factoryId: null,
-                appUserId: null,
-                province: null,
-                city: null,
-                area: null,
-                address: null,
-                addressDetail: null,
-                longitude: null,
-                latitude: null,
-                contactName: null,
-                contactPhone: null,
-                orderAmount: null,
-                payAmount: null,
-                payType: null,
-                payTime: null,
-                outTradeOrderNo: null,
-                orderSource: null,
-                refundAmount: null,
-                refundContent: null,
-                appointmentTime: null,
-                appointmentCount: null,
-                orderStatus: '0',
-                appointmentStatus: '1',
-                takeClothTime: null,
-                takeClothAppUserId: null,
-                setPriceTime: null,
-                pickUpTime: null,
-                washClothStartTime: null,
-                washClothEndTime: null,
-                sendToStoreTime: null,
-                sendToUserTime: null,
-                refundApplyTime: null,
-                refundTime: null,
-                refundStatus: '0',
-                refundReason: null,
-                sendClothAppUserId: null,
-                takeClothWay: null,
-                sendClothWay: null,
-                couponAmount: null,
-                finishTime: null,
-                employeeId: null,
-                delFlag: null,
-                createById: null,
-                createBy: null,
-                createTime: null,
-                updateById: null,
-                updateBy: null,
-                updateTime: null,
-                remark: null,
-                isDisassemblyAndAssembly: null,
-                isLargeItem: null,
-                clothSpeedId: null,
-                clothSpeedName: null,
-                isSpecial: null,
-                deductAmount: null
-            }
-            this.resetForm('form')
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm('queryForm')
-            this.handleQuery()
-        },
-        /** 派单按钮操作 */
-        handleUpdate(row) {
-            this.reset()
-            console.log("this.form.appointmentStatus", row.appointmentStatus)
-            var userInfoVO = this.getUserInfo()
-            if (userInfoVO.userType == '01') {
-                this.openDeliveryPage = true
-                this.deliveryVo.deliveryCompany = this.deliveryData[0].deliveryName
-                this.serviceData = this.deliveryData[0].serviceType
-                // 获取当前时间
-                const now = new Date()
-                // 增加一个小时
-                now.setHours(now.getHours() + 1)
-                // 提取时分秒并格式化
-                const hours = ('0' + now.getHours()).slice(-2)
-                const minutes = ('0' + now.getMinutes()).slice(-2)
-                const seconds = ('0' + now.getSeconds()).slice(-2)
-                // 结果字符串
-                this.deliTime = `${hours}:${minutes}:${seconds}`
-                this.deliveryVo.orderNo = row.orderNo
+          } else {
+            if (this.form.appointmentStatus == '1' || this.form.appointmentStatus == '2') {
+              setDeliveryManByAppointment({
+                deliveryId: this.form.takeClothAppUserId,
+                orderNo: this.form.orderNo
+              }).then((response) => {
+                this.$modal.msgSuccess('派单成功')
+                this.open = false
+                this.getList()
+              })
             } else {
-                this.open = true
-                this.form.orderNo = row.orderNo
-                this.form.appointmentStatus = row.appointmentStatus
-                
+              setSendDelivery({
+                deliveryManId: this.form.takeClothAppUserId,
+                orderNo: this.form.orderNo
+              }).then((response) => {
+                this.$modal.msgSuccess('派单成功')
+                this.open = false
+                this.getList()
+              })
             }
-        },
-        /** 提交按钮 */
-        submitForm() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    if (this.form.service_trans_id == 0) {
-                        setIntracityExpress({ orderNo: this.form.orderNo }).then((res) => {
-                            this.$modal.msgSuccess('派单成功')
-                            this.open = false
-                            this.getList()
-                        })
-                    } else {
-                        if (this.form.appointmentStatus == '1' || this.form.appointmentStatus == '2') {
-                            setDeliveryManByAppointment({ deliveryId: this.form.takeClothAppUserId, orderNo: this.form.orderNo }).then((response) => {
-                                this.$modal.msgSuccess('派单成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        } else {
-                            setSendDelivery({ deliveryManId: this.form.takeClothAppUserId, orderNo: this.form.orderNo }).then((response) => {
-                                this.$modal.msgSuccess('派单成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        }
-                    }
-                }
-            })
-        },
-        handleCancel(row) {
-            this.$confirm('是否确认取消该预约订单？')
-                .then(() => {
-                    cancelAppointmentOrderByAppointment({ orderNo: row.orderNo }).then((response) => {
-                        this.$modal.msgSuccess('取消完成')
-                        this.getList()
-                    })
-                })
-                .catch(() => {})
-        },
-        checkClose(done) {
-            this.$confirm('是否关闭表单，关闭后数据将丢失？')
-                .then(function () {
-                    done()
-                })
-                .then(() => {})
-                .catch(() => {})
-        },
-        handleLogistics(row, deliveryType) {
-            getDeliveryPathByClothOrderNo({ orderNo: row.orderNo, deliveryType: deliveryType }).then((res) => {
-                this.deliveryView.name = row.deliveryName
-                this.deliveryView.pathItemList = res.data.pathItemList
-                this.deliveryView.address = row.province + row.city + row.area + row.address + row.addressDetail
-
-                this.openDeliveryinfo = true
-            })
-        },
-        handleGetExpressInfo(row, deliveryType) {
-            intracityExpressGetOrderInfo({ orderNo: row.orderNo, deliveryType: deliveryType }).then((res) => {
-                this.intracityExpressOpen = true
-                this.intracityExpressOrderInfo = res.data
-            })
-        },
-        transDate(pay_time) {
-            return formatDate(pay_time * 1000, 1)
-        },
-        //获取快递公司
-        getdeliveryAll() {
-            getdeliveryAll().then((res) => {
-                this.deliveryData = res.data
-            })
-        },
-        //切换快递获取其他数据
-        changeDeliveryId(value) {
-            this.deliveryData.forEach((item, index) => {
-                if (value == item.deliveryName) {
-                    this.deliveryVo.deliveryId = item.deliveryId
-                    this.deliveryVo.bizId = item.bizId
-
-                    this.serviceData = item.serviceType
-                }
-            })
-        },
-        checkserviceId(del) {
-            this.deliveryVo.serviceType = del.serviceType
-            this.deliveryVo.serviceName = del.serviceName
-        },
-        cancelDelivery() {
-            this.openDeliveryPage = false
-            this.deliveryreset()
-        },
-        // 表单重置
-        deliveryreset() {
-            this.deliveryVo = {
-                bizId: '',
-                // count: 1,
-                customRemark: '',
-                deliveryCompany: '',
-                deliveryId: '',
-                expectTime: '',
-                orderId: 0,
-                serviceName: '',
-                serviceType: null,
-                spaceHeight: null,
-                spaceLength: null,
-                spaceWidth: null,
-                weight: null
-            }
-        },
-        deliveryClose(done) {
-            this.$confirm('是否关闭出货信息窗口，确认关闭？')
-                .then(function () {
-                    done()
-                })
-                .then(() => {})
-                .catch(() => {})
-        },
-        deliveryinfoClose(done) {
-            this.$confirm('是否关闭快递信息窗口，确认关闭？')
-                .then(function () {
-                    done()
-                })
-                .then(() => {})
-                .catch(() => {})
-        },
-        submitDelivery(formName) {
-            this.$confirm('是否确认出货配送？')
-                .then(() => {
-                    this.$refs[formName].validate((valid) => {
-                        if (valid) {
-                            orderClothSetThirdDelivery(this.deliveryVo).then((res) => {
-                                this.$message.success('操作成功')
-                                this.getList()
-                                this.openDeliveryPage = false
-                                this.deliveryreset()
-                            })
-                        }
-                    })
-                })
-                .catch(() => {})
+          }
+        }
+      })
+    },
+    handleCancel(row) {
+      this.$confirm('是否确认取消该预约订单？')
+        .then(() => {
+          cancelAppointmentOrderByAppointment({ orderNo: row.orderNo }).then((response) => {
+            this.$modal.msgSuccess('取消完成')
+            this.getList()
+          })
+        })
+        .catch(() => {
+        })
+    },
+    checkClose(done) {
+      this.$confirm('是否关闭表单，关闭后数据将丢失？')
+        .then(function() {
+          done()
+        })
+        .then(() => {
+        })
+        .catch(() => {
+        })
+    },
+    handleLogistics(row, deliveryType) {
+      getDeliveryPathByClothOrderNo({ orderNo: row.orderNo, deliveryType: deliveryType }).then((res) => {
+        this.deliveryView.name = row.deliveryName
+        this.deliveryView.pathItemList = res.data.pathItemList
+        this.deliveryView.address = row.province + row.city + row.area + row.address + row.addressDetail
+
+        this.openDeliveryinfo = true
+      })
+    },
+    handleGetExpressInfo(row, deliveryType) {
+      intracityExpressGetOrderInfo({ orderNo: row.orderNo, deliveryType: deliveryType }).then((res) => {
+        this.intracityExpressOpen = true
+        this.intracityExpressOrderInfo = res.data
+      })
+    },
+    transDate(pay_time) {
+      return formatDate(pay_time * 1000, 1)
+    },
+    //获取快递公司
+    getdeliveryAll() {
+      getdeliveryAll().then((res) => {
+        this.deliveryData = res.data
+      })
+    },
+    //切换快递获取其他数据
+    changeDeliveryId(value) {
+      this.deliveryData.forEach((item, index) => {
+        if (value == item.deliveryName) {
+          this.deliveryVo.deliveryId = item.deliveryId
+          this.deliveryVo.bizId = item.bizId
+
+          this.serviceData = item.serviceType
         }
+      })
+    },
+    checkserviceId(del) {
+      this.deliveryVo.serviceType = del.serviceType
+      this.deliveryVo.serviceName = del.serviceName
+    },
+    cancelDelivery() {
+      this.openDeliveryPage = false
+      this.deliveryreset()
+    },
+    // 表单重置
+    deliveryreset() {
+      this.deliveryVo = {
+        bizId: '',
+        // count: 1,
+        customRemark: '',
+        deliveryCompany: '',
+        deliveryId: '',
+        expectTime: '',
+        orderId: 0,
+        serviceName: '',
+        serviceType: null,
+        spaceHeight: null,
+        spaceLength: null,
+        spaceWidth: null,
+        weight: null
+      }
+    },
+    deliveryClose(done) {
+      this.$confirm('是否关闭出货信息窗口，确认关闭？')
+        .then(function() {
+          done()
+        })
+        .then(() => {
+        })
+        .catch(() => {
+        })
+    },
+    deliveryinfoClose(done) {
+      this.$confirm('是否关闭快递信息窗口，确认关闭？')
+        .then(function() {
+          done()
+        })
+        .then(() => {
+        })
+        .catch(() => {
+        })
+    },
+    submitDelivery(formName) {
+      this.$confirm('是否确认出货配送？')
+        .then(() => {
+          this.$refs[formName].validate((valid) => {
+            if (valid) {
+              orderClothSetThirdDelivery(this.deliveryVo).then((res) => {
+                this.$message.success('操作成功')
+                this.getList()
+                this.openDeliveryPage = false
+                this.deliveryreset()
+              })
+            }
+          })
+        })
+        .catch(() => {
+        })
     }
+  }
 }
 </script>
 <style lang="scss" scoped>
 .servicecard {
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-    background-color: #fff;
-    border-radius: 5px;
-    margin: 0 10px 10px 0;
-    padding: 10px 20px;
-    display: inline-block;
-    cursor: pointer;
-    position: relative;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  background-color: #fff;
+  border-radius: 5px;
+  margin: 0 10px 10px 0;
+  padding: 10px 20px;
+  display: inline-block;
+  cursor: pointer;
+  position: relative;
+
+  &::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0px; /* 调整三角形的大小和位置 */
+    width: 0;
+    height: 0;
+    border-left: 35px solid transparent;
+    border-top: 35px solid #007bff;
+    z-index: 50;
+    opacity: 0;
+  }
+
+  .check {
+    position: absolute;
+    top: -5px;
+    right: 3px;
+    color: #fff;
+    z-index: 100;
+    opacity: 0;
+  }
+
+  &.active {
     &::after {
-        content: '';
-        position: absolute;
-        top: 0;
-        right: 0px; /* 调整三角形的大小和位置 */
-        width: 0;
-        height: 0;
-        border-left: 35px solid transparent;
-        border-top: 35px solid #007bff;
-        z-index: 50;
-        opacity: 0;
-    }
-    .check {
-        position: absolute;
-        top: -5px;
-        right: 3px;
-        color: #fff;
-        z-index: 100;
-        opacity: 0;
+      opacity: 1;
     }
 
-    &.active {
-        &::after {
-            opacity: 1;
-        }
-        .check {
-            opacity: 1;
-        }
+    .check {
+      opacity: 1;
     }
+  }
 }
 
 .deliveryView {
-    margin: 0 20px 20px 20px;
-    padding: 15px;
-    border-radius: 5px;
-    background-color: #f4f4f4;
-    color: #555;
-    .info:first-child {
-        margin-bottom: 10px;
-    }
+  margin: 0 20px 20px 20px;
+  padding: 15px;
+  border-radius: 5px;
+  background-color: #f4f4f4;
+  color: #555;
+
+  .info:first-child {
+    margin-bottom: 10px;
+  }
 }
 </style>
 s