From ff85c3f68fd9b8085ae7d3cf13482837ec8f6f4e Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Tue, 25 May 2021 18:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/shop/ship/shipTemplate.vue | 317 ++++++++++----------
 1 file changed, 158 insertions(+), 159 deletions(-)

diff --git a/seller/src/views/shop/ship/shipTemplate.vue b/seller/src/views/shop/ship/shipTemplate.vue
index 9e002f58..a1f22716 100644
--- a/seller/src/views/shop/ship/shipTemplate.vue
+++ b/seller/src/views/shop/ship/shipTemplate.vue
@@ -1,45 +1,43 @@
 <template>
   <div class="search">
-    <Row>
-      <Col>
-      <Card>
-        <Row>
-          <Button @click="refresh">刷新</Button>
-          <Button @click="add" type="primary">添加</Button>
-        </Row>
-        <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
-          <TabPane label="运费模板" name="INFO">
-            <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
-              <tbody>
-                <tr>
-                  <td class="sep-row" colspan="20"></td>
-                </tr>
-                <tr>
-                  <th colspan="20">
-                    <h3>{{item.name}}</h3>
-                    <span class="fr m-r-5">
-                      <time style="margin-right: 20px" title="最后编辑时间">
-                        <i class="icon-time"></i>{{item.updateTime}}
-                      </time>
-                      <Button @click="edit(item)" type="info">修改</Button>
-                      <Button @click="remove(item.id)" type="error">删除</Button>
-                    </span>
-                  </th>
-                </tr>
-                <tr>
-                  <td class="w10 bdl"></td>
-                  <td class="cell-area tl">运送到</td>
-                  <td class="w150">首件(重)
+    <Card>
+      <Row>
+        <Button @click="refresh">刷新</Button>
+        <Button @click="add" type="primary">添加</Button>
+      </Row>
+      <Tabs @on-click="handleClickType" v-model="currentTab" style="margin-top: 10px">
+        <TabPane label="运费模板" name="INFO">
+          <table class="ncsc-default-table order m-b-30" :key="index" v-for="(item,index) in shipInfo">
+            <tbody>
+              <tr>
+                <td class="sep-row" colspan="20"></td>
+              </tr>
+              <tr>
+                <th colspan="20">
+                  <h3>{{item.name}}</h3>
+                  <span class="fr m-r-5">
+                    <time style="margin-right: 20px" title="最后编辑时间">
+                      <i class="icon-time"></i>{{item.updateTime}}
+                    </time>
+                    <Button @click="edit(item)" type="info">修改</Button>
+                    <Button @click="remove(item.id)" type="error">删除</Button>
+                  </span>
+                </th>
+              </tr>
+              <tr v-if="item.pricingMethod!=='FREE'">
+                <td class="w10 bdl"></td>
+                <td class="cell-area tl">运送到</td>
+                <td class="w150">首件(重)
 
-                  </td>
-                  <td class="w150">运费</td>
-                  <td class="w150">续件(重)
+                </td>
+                <td class="w150">运费</td>
+                <td class="w150">续件(重)
 
-                  </td>
-                  <td class="w150 bdr">运费</td>
-                </tr>
-
-                <tr v-for="(children,index) in item.freightTemplateChildList">
+                </td>
+                <td class="w150 bdr">运费</td>
+              </tr>
+              <template v-if="item.pricingMethod!=='FREE'">
+                <tr v-for="(children,index) in item.freightTemplateChildList" :key="index">
                   <td class="bdl"></td>
                   <td class="cell-area tl" style="width: 60%">{{children.area}}</td>
                   <td>
@@ -55,104 +53,104 @@
                     <span class="yuan">￥</span><span class="integer">{{children.continuedPrice | unitPrice}}</span>
                   </td>
                 </tr>
-              </tbody>
+              </template>
+              
+            </tbody>
 
-            </table>
+          </table>
 
-          </TabPane>
-          <TabPane v-if="csTab" :label=title :name=operation>
-            <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-              <FormItem label="模板名称" prop="name">
-                <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
-              </FormItem>
-              <FormItem label="计价方式" prop="pricingMethod">
-                <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
-                  <Radio label="WEIGHT">按重量</Radio>
-                  <Radio label="NUM">按件数</Radio>
-                  <Radio label="FREE">包邮</Radio>
-                </RadioGroup>
-              </FormItem>
-              <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
-                <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
-                  <div class="entity">
-                    <div class="tbl-except">
-                      <table cellspacing="0" class="ncsc-default-table">
-                        <thead>
-                          <tr style="border-bottom: 1px solid #ddd;">
-                            <th class="w10"></th>
-                            <th class="tl">运送到</th>
-                            <th class="w10"></th>
-                            <th class="w50">首件(重)</th>
-                            <th class="w110">首费</th>
-                            <th class="w50">续件(重)</th>
-                            <th class="w110">续费</th>
-                            <th class="w150">操作</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
-                            <td></td>
-                            <td class="tl cell-area">
-                              <span class="area-group">
-                                <p style="display:inline-block;white-space:pre;">{{item.area}}</p>
-                              </span>
-                            </td>
-                            <td></td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable >
-                                <span slot="append">元</span>
-                              </Input>
-                            </td>
-                            <td>
-                              <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
-                            </td>
-                            <td>
-                              <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable>
-                                <span slot="append">元</span>
-                              </Input>
-                            </td>
-                            <td class="nscs-table-handle">
-                              <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
-                              </Button>
-                              <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
-                              </Button>
-                            </td>
-                          </tr>
-                        </tbody>
-                      </table>
+        </TabPane>
+        <TabPane v-if="csTab" :label=title :name=operation>
+          <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+            <FormItem label="模板名称" prop="name">
+              <Input v-model="form.name" maxlength="10" clearable style="width: 20%" />
+            </FormItem>
+            <FormItem label="计价方式" prop="pricingMethod">
+              <RadioGroup type="button" button-style="solid" v-model="form.pricingMethod">
+                <Radio label="WEIGHT">按重量</Radio>
+                <Radio label="NUM">按件数</Radio>
+                <Radio label="FREE">包邮</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="详细设置" v-if="form.pricingMethod !== 'FREE'">
+              <div class="ncsu-trans-type" data-delivery="TRANSTYPE">
+                <div class="entity">
+                  <div class="tbl-except">
+                    <table cellspacing="0" class="ncsc-default-table">
+                      <thead>
+                        <tr style="border-bottom: 1px solid #ddd;">
+                          <th class="w10"></th>
+                          <th class="tl">运送到</th>
+                          <th class="w10"></th>
+                          <th class="w50">首件(重)</th>
+                          <th class="w110">首费</th>
+                          <th class="w50">续件(重)</th>
+                          <th class="w110">续费</th>
+                          <th class="w150">操作</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr class="bd-line" data-group="n1" v-for="(item,index) in form.freightTemplateChildList">
+                          <td></td>
+                          <td class="tl cell-area">
+                            <span class="area-group">
+                              <p style="display:inline-block;white-space:pre;">{{item.area}}</p>
+                            </span>
+                          </td>
+                          <td></td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.firstCompany" maxlength="3" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.firstPrice" maxlength="6" clearable >
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td>
+                            <Input class="text w40" type="text" v-model="item.continuedCompany" maxlength="6" clearable />
+                          </td>
+                          <td>
+                            <Input class="text w60" type="text" v-model="item.continuedPrice" maxlength="6" clearable>
+                              <span slot="append">元</span>
+                            </Input>
+                          </td>
+                          <td class="nscs-table-handle">
+                            <Button @click="editRegion(item,index)" type="info" size="small" style="margin-bottom: 5px">修改
+                            </Button>
+                            <Button @click="removeTemplateChildren(index)" :loading="submitLoading" type="error" size="small" style="margin-bottom: 5px">删除
+                            </Button>
+                          </td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+                  <div class="tbl-attach p-5">
+                    <div class="div-error" v-if="saveError">
+                      <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+                      <Icon type="ios-information-circle-outline" />
+                      指定地区城市为空或指定错误
+                      <Icon type="ios-information-circle-outline" />
+                      首费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      续费应输入正确的金额
+                      <Icon type="ios-information-circle-outline" />
+                      首(续)件(重)费应输入大于0的整数
                     </div>
-                    <div class="tbl-attach p-5">
-                      <div class="div-error" v-if="saveError">
-                        <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-                        <Icon type="ios-information-circle-outline" />
-                        指定地区城市为空或指定错误
-                        <Icon type="ios-information-circle-outline" />
-                        首费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        续费应输入正确的金额
-                        <Icon type="ios-information-circle-outline" />
-                        首(续)件(重)费应输入大于0的整数
-                      </div>
 
-                    </div>
                   </div>
                 </div>
-              </FormItem>
-              <Form-item>
-                <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'" icon="ios-create-outline" >为指定城市设置运费模板
-                </Button>
-                <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
-                </Button>
-              </Form-item>
-            </Form>
-          </TabPane>
-        </Tabs>
-      </Card>
-      </Col>
-    </Row>
+              </div>
+            </FormItem>
+            <Form-item>
+              <Button @click="addShipTemplateChildren(index)" v-if="form.pricingMethod !== 'FREE'" icon="ios-create-outline" >为指定城市设置运费模板
+              </Button>
+              <Button @click="handleSubmit" :loading="submitLoading" type="primary" style="margin-right:5px">保存
+              </Button>
+            </Form-item>
+          </Form>
+        </TabPane>
+      </Tabs>
+    </Card>
     <multiple-region ref="region" @selected="handleSelect" @closed="handleClose">
 
     </multiple-region>
@@ -313,37 +311,38 @@ export default {
         const regNumber = /^\+?[1-9][0-9]*$/;
         const regMoney = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
         if (valid) {
-          debugger;
-          //校验运费模板详细信息
-          for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
-            if (
-              this.form.freightTemplateChildList[i].area == "" ||
-              this.form.freightTemplateChildList[i].firstCompany == "" ||
-              this.form.freightTemplateChildList[i].firstPrice == "" ||
-              this.form.freightTemplateChildList[i].continuedCompany == "" ||
-              this.form.freightTemplateChildList[i].continuedPrice == ""
-            ) {
-              this.saveError = true;
-              return;
-            }
-            if (
-              regNumber.test(
-                this.form.freightTemplateChildList[i].firstCompany
-              ) == false ||
-              regNumber.test(
-                this.form.freightTemplateChildList[i].continuedCompany
-              ) == false ||
-              regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
-                false ||
-              regMoney.test(
-                this.form.freightTemplateChildList[i].continuedPrice
-              ) == false
-            ) {
-              this.saveError = true;
-              return;
+          if (this.form.pricingMethod != 'FREE') {
+            //校验运费模板详细信息
+            for (let i = 0; i < this.form.freightTemplateChildList.length; i++) {
+              if (
+                this.form.freightTemplateChildList[i].area == "" ||
+                this.form.freightTemplateChildList[i].firstCompany == "" ||
+                this.form.freightTemplateChildList[i].firstPrice == "" ||
+                this.form.freightTemplateChildList[i].continuedCompany == "" ||
+                this.form.freightTemplateChildList[i].continuedPrice == ""
+              ) {
+                this.saveError = true;
+                return;
+              }
+              if (
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].firstCompany
+                ) == false ||
+                regNumber.test(
+                  this.form.freightTemplateChildList[i].continuedCompany
+                ) == false ||
+                regMoney.test(this.form.freightTemplateChildList[i].firstPrice) ==
+                  false ||
+                regMoney.test(
+                  this.form.freightTemplateChildList[i].continuedPrice
+                ) == false
+              ) {
+                this.saveError = true;
+                return;
+              }
             }
           }
-          console.log(1111);
+          
 
           if (this.operation == "ADD") {
             API_Shop.addShipTemplate(this.form, headers).then((res) => {