package.json

@@ -55,7 +55,7 @@
     "mockjs": "^1.1.0",
     "nprogress": "0.2.0",
     "obj-modal": "^1.2.0",
-    "obj-table-plus": "^2.4.0",
+    "obj-table-plus": "^2.3.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "signature_pad": "^3.0.0-beta.4",

src/api/modules/mer_admin.js

@@ -1,6 +1,5 @@
 import $http from "@/utils/httpRequest.js";
 import city_data from "@/utils/country-level2-data.js";
-import qs from "qs";
 
 export const mer_admin = {
     /** 
@@ -87,12 +86,8 @@ export const mer_admin = {
     },
     //删除模板
     removeShippingTemplate: (id) => {
-        return $http.post(`/merchant-api/shippingTemplates/delete`, qs.stringify({
+        return $http.post(`/merchant-api/shippingTemplates/delete`, {
             id
-        }), {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded'
-            }
         })
     },
     //更新模板

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

@@ -8,9 +8,6 @@
       v-model="dataList"
       @query="queryList"
     >
-      <template slot="flexEmpty">
-        <el-empty description="暂无数据"></el-empty>
-      </template>
       <div slot="tableTop" class="mb-2">
         <el-form inline>
           <el-form-item label="模板名称：">
@@ -79,64 +76,8 @@ export default {
             console.log(row);
             this.$api.mer_admin.getShippingTemplateInfo(row.id).then((res) => {
               console.log(res);
-              console.log("row.tableData", row.tableData);
+              // this.$set(row,tableData,);
-
-              if (!row.tableData) {
-                if (res.data.data.shippingTemplatesRegionResultList) {
-                  this.$set(
-                    row,
-                    "tableData",
-                    res.data.data.shippingTemplatesRegionResultList.map(
-                      (item) => {
-                        item.cityCodes = item.cityCodes?.split(",");
-                        console.log("item.cityCodes", item.cityCodes);
-
-                        return item;
-                      }
-                    )
-                  );
-                } else {
-                  //包邮，假数据写死
-                  this.$set(row, "tableData", [
-                    {
-                      cityCodes: "0",
-                      first: "1",
-                      firstPrice: "0.00",
-                      renewal: "1",
-                      renewalPrice: "0.00",
-                    },
-                  ]);
-                }
-              }
             });
-            const findLabelsByCode = (tree, codes) => {
-              const labels = [];
-              // console.log("row.cityCodes",row.cityCodes);
-              //全国范围
-              if (codes == "0") {
-                return "中国";
-              }
-              function searchTree(node) {
-                // 如果当前节点的 code 在 codes 数组中，添加其 label
-                if (codes?.includes(node.code)) {
-                  labels.push(node.name);
-                }
-                // 如果有子节点，继续递归查找
-                if (node.children) {
-                  for (let child of node.children) {
-                    searchTree(child);
-                  }
-                }
-              }
-
-              // 对树的每个顶层节点调用 searchTree
-              for (let node of tree) {
-                searchTree(node);
-              }
-
-              return labels.join(",");
-            };
-
             const appointMapper = {
               0: "（全国包邮）",
               1: "（部分包邮）",
@@ -160,25 +101,10 @@ export default {
                 });
             };
             const remove = () => {
-              this.$api.mer_admin.removeShippingTemplate(row.id).then((res) => {
+              this.$api.mer_admin.removeShippingTemplate(row.id)
+              .then(res=>{
                 this.$refs.oTable.refresh();
-              });
+              })
-            };
-            const groupMapper = {
-              1: {
-                first: "首件（个）",
-                renewal: "续件（个）",
-              },
-              2: {
-                first: "首重（kg）",
-                renewal: "续重（kg）",
-              },
-            };
-            //打开弹窗预览
-            const openPreview = (str) => {
-              this.$confirm(str, "详情", {
-                showCancel: false,
-              });
             };
             return (
               <div class="mb-5">
@@ -196,11 +122,7 @@ export default {
                       <el-button type="text" onClick={edit}>
                         修改
                       </el-button>
-                      <el-popconfirm
+                      <el-popconfirm class="ml-2" title="确认删除模板？" onConfirm={remove}>
-                        class="ml-2"
-                        title="确认删除模板？"
-                        onConfirm={remove}
-                      >
                         <el-button type="text" slot="reference">
                           删除
                         </el-button>
@@ -208,59 +130,30 @@ export default {
                     </div>
                   </div>
                 </div>
-                <vxe-table
+                <vxe-table border align="center" data={row.tableData}>
-                  max-height="300"
-                  border
-                  align="center"
-                  show-overflow
-                  data={row.tableData}
-                >
                   <vxe-column
                     width="180px"
-                    field="cityCodes"
+                    field="a"
                     title="运送到"
-                    scopedSlots={{
-                      default: (scope) => {
-                        console.log("scope", scope);
-                        return (
-                          <span
-                            class="cursor-pointer"
-                            onClick={() => {
-                              openPreview(
-                                findLabelsByCode(
-                                  this.$api.mer_admin.getCityOptions(),
-                                  scope.row.cityCodes
-                                )
-                              );
-                            }}
-                          >
-                            {findLabelsByCode(
-                              this.$api.mer_admin.getCityOptions(),
-                              scope.row.cityCodes
-                            )}
-                          </span>
-                        );
-                      },
-                    }}
                   ></vxe-column>
                   <vxe-column
                     width="200px"
-                    field="first"
+                    field="b"
-                    title={groupMapper[row.groups].first}
+                    title="首件（个）"
                   ></vxe-column>
                   <vxe-column
                     width="200px"
-                    field="firstPrice"
+                    field="c"
                     title="首费（元）"
                   ></vxe-column>
                   <vxe-column
                     width="200px"
-                    field="renewal"
+                    field="d"
-                    title={groupMapper[row.groups].renewal}
+                    title="续件（个）"
                   ></vxe-column>
                   <vxe-column
                     width="200px"
-                    field="renewalPrice"
+                    field="e"
                     title="运费（元）"
                   ></vxe-column>
                 </vxe-table>

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

@@ -30,13 +30,13 @@ const BASE_DATA = {
       //默认运费，不限制城市
       cityCodes: "0",
       //首重
-      first: 1,
+      first: "",
       //首重价格
-      firstPrice: 0,
+      firstPrice: "",
       //续重
-      renewal: 1,
+      renewal: "",
       //续重价格
-      renewalPrice: 0,
+      renewalPrice: "",
     },
   ],
   //追加
@@ -121,8 +121,8 @@ export default {
 
         //默认运费回显
         _data.shippingTemplatesRegionList =
-          _data.shippingTemplatesRegionResultList?.slice(0,1)||
+          [_data.shippingTemplatesRegionResultList?.[0]] ||
-          cloneDeep(BASE_DATA.shippingTemplatesRegionList);
+          BASE_DATA.shippingTemplatesRegionList;
         //指定城市设置运费
         _data.shippingTemplatesRegionListAppend =
           _data.shippingTemplatesRegionResultList
@@ -130,7 +130,7 @@ export default {
             ?.map((item) => {
               item.cityCodes = item.cityCodes.split(",");
               return item;
-            }) || cloneDeep(BASE_DATA.shippingTemplatesRegionListAppend);
+            }) || BASE_DATA.shippingTemplatesRegionListAppend;
         //指定包邮条件
         _data.shippingTemplatesConditionList =
           _data.shippingTemplatesConditionResultList?.map((item) => {
@@ -144,7 +144,7 @@ export default {
               item.conditionType = "件数";
             }
             return item;
-          }) || cloneDeep(BASE_DATA.shippingTemplatesConditionList);
+          }) || BASE_DATA.shippingTemplatesConditionList;
 
         //计价方式
         _data.calculateMethod = {
@@ -167,7 +167,7 @@ export default {
       return {
         add: () => {
           this.$nextTick(() => {
-            this.modalData = cloneDeep(BASE_DATA);
+            this.modalData = JSON.parse(JSON.stringify(BASE_DATA));
           });
           this.isAdd = true;
           this.modalConfig.title = "添加运费模板";
@@ -181,8 +181,6 @@ export default {
           this.isAdd = true;
           refillData(e);
           this.modalConfig.title = "添加运费模板";
-          console.log("this.modalData",this.modalData);
-          
           this.modalData.templateName += "(复制)";
         },
       };
@@ -396,7 +394,6 @@ export default {
                         //默认运费，不限制城市
                         cityCodes: "",
                         //城市可选的选项
-                        cityOptions: [],
                         //首重
                         first: "",
                         //首重价格
@@ -525,9 +522,9 @@ export default {
                   >
                     <el-input-number
                       min={0}
-                      max={Number(
+                      max={
-                        this.modalData.shippingTemplatesRegionList[0].firstPrice
+                        Number(this.modalData.shippingTemplatesRegionList[0].firstPrice)
-                      )}
+                      }
                       controls={false}
                       precision={2}
                       v-model={
@@ -547,7 +544,7 @@ export default {
                         enabled: true,
                         gt: 5,
                       },
-                      "show-overflow": true,
+                      'show-overflow':true
                     }}
                     style="height:50vh;"
                     enable-auto-query={false}
@@ -785,7 +782,7 @@ export default {
                   }[this.modalData.fareConfig],
                   shippingTemplatesRegionList:
                     this.modalData.fareConfig == "全国包邮"
-                      ? nu
+                      ? null
                       : [
                           ...this.modalData.shippingTemplatesRegionList,
                           ...JSON.parse(