add

package.json

@@ -54,7 +54,7 @@
     "jsencrypt": "3.0.0-rc.1",
     "mockjs": "^1.1.0",
     "nprogress": "0.2.0",
-    "obj-modal": "^1.2.0",
+    "obj-modal": "^1.2.2",
     "obj-table-plus": "^2.4.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

src/config/obj-table.config.js

@@ -16,6 +16,7 @@ module.exports = {
         "checkbox-config": { labelField: "", checkRowKeys: [10053, 23666] },
         "highlight-current-row": true,
         "show-overflow": true,
+        "scroll-y":{enabled:true},
         "tree-config": { childrenField: "children" },
         "header-cell-class-name":"obj-table-header-cell"
     },

src/views/modules/logistics-fare/logistics-template/index.vue

@@ -177,7 +177,8 @@ export default {
             //打开弹窗预览
             const openPreview = (str) => {
               this.$confirm(str, "详情", {
-                showCancel: false,
+                showCancelButton: false,
+                confirmButtonText:"好的"
               });
             };
             return (

src/views/modules/logistics-fare/logistics-template/popup/add-template.vue

@@ -9,13 +9,6 @@
       :modalData="modalData"
       :modalHandles="modalHandles"
     >
-      <template slot="dialog__before">
-        <!-- <el-tabs v-model="currentPanel">
-                    <el-tab-pane label="基础信息" name="基础信息"></el-tab-pane>
-                    <el-tab-pane label="销售信息" name="销售信息"></el-tab-pane>
-                    <el-tab-pane label="其他信息" name="其他信息"></el-tab-pane>
-                </el-tabs> -->
-      </template>
     </obj-modal>
   </div>
 </template>
@@ -70,6 +63,16 @@ export default {
       return "还有未保存的数据，确定离开此页吗？";
     };
   },
+  watch: {
+    "modalConfig.show"(newVal) {
+      if (newVal) {
+        //关闭弹窗清空校验
+        setTimeout(() => {
+          this.$refs.modal.clearValidate();
+        });
+      }
+    },
+  },
   methods: {
     computedCityOptions() {
       function filterTree(tree, filterArray) {
@@ -217,8 +220,12 @@ export default {
           render: () => {
             return (
               <el-radio-group v-model={this.modalData.calculateMethod}>
-                <el-radio label="按重量">按重量</el-radio>
+                <el-radio border label="按重量">
-                <el-radio label="按件数">按件数</el-radio>
+                  按重量
+                </el-radio>
+                <el-radio border label="按件数">
+                  按件数
+                </el-radio>
               </el-radio-group>
             );
           },
@@ -236,8 +243,12 @@ export default {
           render: () => {
             return (
               <el-radio-group v-model={this.modalData.fareConfig}>
-                <el-radio label="全国包邮">全国包邮</el-radio>
+                <el-radio border label="全国包邮">
-                <el-radio label="自定义运费">自定义运费</el-radio>
+                  全国包邮
+                </el-radio>
+                <el-radio border label="自定义运费">
+                  自定义运费
+                </el-radio>
               </el-radio-group>
             );
           },
@@ -436,6 +447,7 @@ export default {
               });
             };
             return (
+              <transition name="el-fade-in">
                 <div>
                   <div class="d-flex no-warp justify-start items-center">
                     <el-form-item
@@ -477,7 +489,8 @@ export default {
                     >
                       <el-input-number
                         v-model={
-                        this.modalData.shippingTemplatesRegionList[0].firstPrice
+                          this.modalData.shippingTemplatesRegionList[0]
+                            .firstPrice
                         }
                         min={0}
                         controls={false}
@@ -526,7 +539,8 @@ export default {
                       <el-input-number
                         min={0}
                         max={Number(
-                        this.modalData.shippingTemplatesRegionList[0].firstPrice
+                          this.modalData.shippingTemplatesRegionList[0]
+                            .firstPrice
                         )}
                         controls={false}
                         precision={2}
@@ -544,10 +558,10 @@ export default {
                     <obj-table-plus
                       tableProp={{
                         "scroll-y": {
-                        enabled: true,
+                          enabled: true
-                        gt: 5,
                         },
                         "show-overflow": true,
+                        height:"auto"
                       }}
                       style="height:50vh;"
                       enable-auto-query={false}
@@ -567,6 +581,7 @@ export default {
                     </obj-table-plus>
                   </div>
                 </div>
+              </transition>
             );
           },
         },
@@ -583,17 +598,30 @@ export default {
                 width: "300px",
                 field: "cityCodes",
                 type: "jsx",
-                render: ({ row }) => {
+                render: ({ row, $rowIndex }) => {
                   const change = (e) => {
                     console.log(e);
                   };
                   return (
+                    <el-form-item
+                      label-width="0"
+                      prop={
+                        "shippingTemplatesConditionList." +
+                        $rowIndex +
+                        ".cityCodes"
+                      }
+                      rules={{
+                        required: true,
+                        message: "请选择运送城市",
+                      }}
+                    >
                       <el-cascader
                         style="width:100%;"
                         v-model={row.cityCodes}
                         onChange={change}
                         options={this.$api.mer_admin.getCityOptions()}
                         show-all-levels={false}
+                        placeholder="点击选择运送城市"
                         collapse-tags={true}
                         props={{
                           props: {
@@ -607,6 +635,7 @@ export default {
                         clearable
                         filterable
                       ></el-cascader>
+                    </el-form-item>
                   );
                 },
               },
@@ -727,6 +756,7 @@ export default {
               });
             };
             return (
+              <transition name="el-fade-in">
                 <obj-table-plus
                   class="mt-5"
                   style="height:50vh;"
@@ -745,6 +775,7 @@ export default {
                     </el-button>
                   </template>
                 </obj-table-plus>
+              </transition>
             );
           },
         },