完善需求

src/api/api.js

@@ -90,10 +90,12 @@ import vipUser from "../fxApi/vipUser"//会员列表
 import configKey from "../fxApi/configKey"//积分规则
 import merchant from "../fxApi/merchant"//合作商户
 import goodsClassification from '../fxApi/goodsClassification'//商户分类
+import goodsPoints from '../fxApi/goodsPoints'//积分商品
 
 
 // 导入对应模块------------------------
 export default {
+    ...goodsPoints,
     ...goodsClassification,
     ...merchant,
     ...configKey,

src/components/tableList.vue

@@ -755,11 +755,7 @@
             }}
           </span>
           <span v-else-if="item.scope === 'toFixedYuan'">
-            {{
-              scope.row[item.prop] || scope.row[item.prop] == 0
-                ? scope.row[item.prop].toFixed(2)
-                : scope.row[item.prop]
-            }}
+            {{ $methodsTools.decimalPoint(scope.row[item.prop]) }}
           </span>
           <span v-else-if="item.scope === 'cType'">
             <el-tag

src/fxApi/goodsPoints.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request' //引入axios请求及拦截器
+export default {
+    //新增积分商品
+    addgoodspoints(data) {
+        return request({
+            url: '/goods/points', 
+            method: 'post',
+            data
+        })
+    },
+    //编辑积分商品
+    editgoodspoints(data) {
+        return request({
+            url: '/goods/updatePoints',
+            method: 'post',
+            data
+        })
+    },
+    //查询积分商品列表
+    goodslistPoints(data) {
+        return request({
+            url: '/goods/listPoints',
+            method: 'get',
+            params: data
+        })
+    },
+}

src/utils/methodsTool.js

@@ -33,6 +33,13 @@ export default {
 		}
 
 	},
+	decimalPoint(number, n = 2) {
+		if (number || number == 0) {
+			return number.toFixed(n)
+		} else {
+			return number
+		}
+	},
 	getUrl() {
 		return baseUrls.BASE_IMG_URL + '/'
 	},

src/utils/request.js

@@ -7,9 +7,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
-export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-// export const baseURL = "http://192.168.1.24:7077/";
+export const baseURL = "http://192.168.1.24:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/components/dislogOrderDetails.vue

@@ -60,10 +60,7 @@
               <div v-if="desc.type === 'pretax'">
                 <span style="margin-right: 20px"
                   >税前佣金：{{
-                    detailInfo["pretaxBrokerage"] ||
-                    detailInfo["pretaxBrokerage"] == 0
-                      ? detailInfo["pretaxBrokerage"].toFixed(2)
-                      : detailInfo["pretaxBrokerage"]
+                    $methodsTools.decimalPoint(detailInfo["pretaxBrokerage"])
                   }}</span
                 ><span>税占比：{{ detailInfo["pretaxStr"] }}</span>
               </div>
@@ -78,11 +75,7 @@
                 </template>
               </div>
               <div v-if="desc.type === 'money'">
-                {{
-                  detailInfo[desc.key] || detailInfo[desc.key] === 0
-                    ? detailInfo[desc.key].toFixed(2)
-                    : detailInfo[desc.key]
-                }}
+                {{ $methodsTools.decimalPoint(detailInfo[desc.key]) }}
                 <span
                   v-if="desc.key === 'orderProfit'"
                   :style="{

src/views/financed/components/studentDetails.vue

@@ -66,6 +66,12 @@
             @click="orderCheck(2, '不')"
             >学员审核不通过</el-button
           >
+          <span style="float: right; color: rgb(110, 101, 198)"
+            >共：{{ tableData1.length > 0 ? tableData1[0].userCount : 0 }}人；{{
+              total
+            }}条</span
+          >
+          <div style="clear: both"></div>
         </div>
         <table-list
           ref="tableList"
@@ -193,13 +199,13 @@ export default {
         {
           label: "原价(元)",
           prop: "goodsPrice",
-          scope:"toFixedYuan",
+          scope: "toFixedYuan",
           hidden: true,
         },
         {
           label: "单价(元)",
           prop: "goodsRealPrice",
-          scope:"toFixedYuan",
+          scope: "toFixedYuan",
           hidden: true,
         },
         {

src/views/financed/orderManageList/index.vue

@@ -43,9 +43,10 @@
           </h4>
           <p>
             {{
-              item.ch === "元"
-                ? formatPrice(statisticsData[item.prop])
-                : statisticsData[item.prop]
+              formatPrice(
+                statisticsData[item.prop],
+                item.ch === "元" ? true : false
+              )
             }}{{ item.ch }}
           </p>
         </div>
@@ -70,21 +71,53 @@
         <div>订单号：{{ props.scope.row["orderSn"] }}</div>
       </template>
       <template slot="orderPrice" slot-scope="props">
-        <div>合同金额：{{ props.scope.row["orderPrice"].toFixed(2) }}</div>
-        <div>已收账款：{{ props.scope.row["orderReceived"].toFixed(2) }}</div>
-        <div>申请退款：{{ props.scope.row["orderRefund"].toFixed(2) }}</div>
-        <div>已退账款：{{ props.scope.row["orderRefunded"].toFixed(2) }}</div>
-        <div>未收账款：{{ props.scope.row["orderUncollected"].toFixed(2) }}</div>
+        <div>
+          合同金额：{{
+            $methodsTools.decimalPoint(props.scope.row["orderPrice"])
+          }}
+        </div>
+        <div>
+          已收账款：{{
+            $methodsTools.decimalPoint(props.scope.row["orderReceived"])
+          }}
+        </div>
+        <div>
+          申请退款：{{
+            $methodsTools.decimalPoint(props.scope.row["orderRefund"])
+          }}
+        </div>
+        <div>
+          已退账款：{{
+            $methodsTools.decimalPoint(props.scope.row["orderRefunded"])
+          }}
+        </div>
+        <div>
+          未收账款：{{
+            $methodsTools.decimalPoint(props.scope.row["orderUncollected"])
+          }}
+        </div>
         <div style="color: red">
           (预计收款时间){{
             $methodsTools.onlyForma(props.scope.row["predictReceiveTime"])
           }}
         </div>
-        <div>实际账款：{{ props.scope.row["orderPractical"].toFixed(2) }}</div>
+        <div>
+          实际账款：{{
+            $methodsTools.decimalPoint(props.scope.row["orderPractical"])
+          }}
+        </div>
       </template>
       <template slot="inon" slot-scope="props">
-        <div>成本（元）：{{ props.scope.row["orderCost"].toFixed(2) }}</div>
-        <div>盈亏（元）：{{ props.scope.row["orderProfit"].toFixed(2) }}</div>
+        <div>
+          成本（元）：{{
+            $methodsTools.decimalPoint(props.scope.row["orderCost"])
+          }}
+        </div>
+        <div>
+          盈亏（元）：{{
+            $methodsTools.decimalPoint(props.scope.row["orderProfit"])
+          }}
+        </div>
         <div v-if="props.scope.row['orderProfit']">
           <span
             :style="
@@ -343,6 +376,11 @@ export default {
             { label: "已撤销", value: 3 },
           ],
         },
+        {
+          prop: "tenantId",
+          placeholder: "请选择机构",
+          scope: "systemtenantlist",
+        },
         {
           prop: "refundStatus",
           placeholder: "退款状态",
@@ -394,8 +432,8 @@ export default {
           Diszing: true,
         },
         {
-          prop: "orderSn",
-          placeholder: "订单号",
+          prop: "keyword",
+          placeholder: "订单号/业务号/下单企业",
         },
         {
           prop: "userCard",
@@ -489,7 +527,7 @@ export default {
         },
         {
           label: "下单企业",
-          prop: "orderOrg",
+          prop: "purchaseOrg",
           hidden: true,
         },
         {
@@ -543,10 +581,14 @@ export default {
     this.getStatistics();
   },
   methods: {
-    formatPrice(price) {
+    formatPrice(price, status) {
       return price?.toLocaleString(
         "zh-CN",
-        (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 4 })
+        (undefined,
+        {
+          minimumFractionDigits: status ? 2 : 0,
+          maximumFractionDigits: status ? 4 : 0,
+        })
       );
     },
     //退款状态

src/views/integralManagement/giftGoods/dislog.vue

@@ -3,7 +3,7 @@
     <BaseDialog
       width="800px"
       :isShow.sync="isShow"
-      :title="activeData.id ? '修改' : '新增'"
+      :title="goodsId ? '修改' : '新增'"
       @submit="submitForm"
       @close="close"
     >
@@ -84,10 +84,7 @@
               v-for="(item, index) in formData.mainImg"
               :key="index"
             >
-              <i
-                class="el-icon-error del"
-                @click="formData.mainImg.splice(index, 1)"
-              ></i>
+              <i class="el-icon-error del" @click="delImg(index)"></i>
               <el-image
                 style="width: 90px; height: 90px"
                 :src="$methodsTools.splitImgHost(item)"
@@ -125,46 +122,31 @@
             :min="0"
             :precision="2"
           /> </el-form-item
-        ><el-form-item label="可抵扣积分：" prop="e">
+        ><el-form-item label="可抵扣积分：" prop="integral">
           <el-input-number
+            :disabled="true"
             :controls="false"
-            v-model="formData.e"
+            v-model="formData.integral"
             placeholder="输入可抵扣积分"
             :min="0"
             :precision="0" /></el-form-item
-        ><el-form-item label="状态：" prop="status">
+        ><el-form-item label="是否上架：" prop="goodsStatus">
+          <el-radio-group v-model="formData.goodsStatus">
+            <el-radio :label="1">是</el-radio><el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="状态：" prop="status">
           <el-radio-group v-model="formData.status">
             <el-radio :label="1">启用</el-radio
             ><el-radio :label="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="商品详情：">
-          <div style="margin-bottom: 14px">
-            <el-button
-              size="small"
-              @click="mobileDetailStatus = 1"
-              :type="mobileDetailStatus === 1 ? 'primary' : ''"
-              >手机端</el-button
-            >
-            <el-button
-              size="small"
-              @click="mobileDetailStatus = 2"
-              :type="mobileDetailStatus === 2 ? 'primary' : ''"
-              >电脑端</el-button
-            >
-          </div>
           <editor
-            v-show="mobileDetailStatus === 1"
             v-model="formData.mobileDetailHtml"
             :min-height="300"
             :max-height="500"
             :uploadStatus="2"
-          /><editor
-            v-show="mobileDetailStatus === 2"
-            v-model="formData.pcDetailHtml"
-            :min-height="300"
-            :max-height="500"
-            :uploadStatus="2"
           />
         </el-form-item>
       </el-form>
@@ -183,54 +165,88 @@ export default {
       type: Boolean,
       default: false,
     },
-    activeData: {
-      type: Object,
-      default: () => {
-        return {};
-      },
+    goodsId: {
+      type: Number,
+      default: 0,
+    },
+    getRules: {
+      type: Number,
+      default: 0,
     },
   },
   data() {
     return {
-      categoryIdsList: [
-        {
-          label: "技术类",
-          value: 1,
-        },
-        {
-          label: "理疗类",
-          value: 2,
-        },
-      ],
       formData: {
         useType: [],
         merId: "",
         storeId: "",
         categoryIds: "",
-        accountList: [{}],
-        invoiceBo: {},
-        storeId: null,
+        mainImg: [],
         status: 1,
+        goodsStatus: 1,
       },
-      mobileDetailStatus: 1,
       rules: {
+        goodsName: [
+          { required: true, message: "请输入商品名称", trigger: "blur" },
+        ],
+        standPrice: [
+          { required: true, message: "请输入商品原价", trigger: "blur" },
+        ],
+        specialPrice: [
+          { required: true, message: "请输入会员优惠价", trigger: "blur" },
+        ],
         useType: [
           { required: true, message: "请选择关联使用", trigger: "change" },
         ],
         merId: [
           { required: true, message: "请选择合作商户", trigger: "change" },
         ],
+        mainImg: [
+          { required: true, message: "请上传商品主图", trigger: "change" },
+        ],
         storeId: [
           { required: true, message: "请选择商户店铺", trigger: "change" },
         ],
         categoryIds: [
           { required: true, message: "请选择商品分类", trigger: "change" },
         ],
-        status: [{ required: true, message: "请选择状态", trigger: "change" }],
+        goodsStatus: [
+          { required: true, message: "请选择是否上架", trigger: "change" },
+        ],
+        status: [
+          { required: true, message: "请选择商品状态", trigger: "change" },
+        ],
       },
     };
   },
+  watch: {
+    "formData.standPrice"(newVal) {
+      if ((newVal || 0) && this.formData.specialPrice) {
+        var integral =
+          parseInt(
+            parseFloat(newVal) - parseFloat(this.formData.specialPrice)
+          ) * this.getRules;
+        this.$set(this.formData, "integral", integral);
+      } else {
+        this.$set(this.formData, "integral", 0);
+      }
+    },
+    "formData.specialPrice"(newVal) {
+      if ((newVal || newVal == 0) && this.formData.standPrice) {
+        var integral =
+          parseInt(parseFloat(this.formData.standPrice) - parseFloat(newVal)) *
+          this.getRules;
+        this.$set(this.formData, "integral", integral);
+      } else {
+        this.$set(this.formData, "integral", 0);
+      }
+    },
+  },
   methods: {
+    delImg(index) {
+      this.formData.mainImg.splice(index, 1);
+      this.$refs["formData"].validateField("mainImg");
+    },
     changeMerId(e) {
       this.$set(this.formData, "storeId", null);
     },
@@ -252,23 +268,32 @@ export default {
       this.$upload
         .upload(file, 0)
         .then((res) => {
-          self.formData.urls.push(res);
+          self.formData.mainImg.push(res);
+          this.$refs["formData"].validateField("mainImg");
         })
         .finally(() => {
           e.target.value = "";
         });
     },
     init() {
-      this.formData = {
-        useType:[],
-        merId: "",
-        storeId: "",
-        categoryIds: "",
-        accountList: [{}],
-        invoiceBo: {},
-        storeId: null,
-        status: 1,
-      };
+      if (this.goodsId) {
+        this.$api.obtainGoods(this.goodsId).then((res) => {
+          res.data.mainImg = res.data.mainImg?.split(",") || [];
+          res.data.useType = res.data.useType?.split(",").map(Number) || [];
+          res.data.categoryIds = parseInt(res.data.categoryIds);
+          this.formData = res.data;
+        });
+      } else {
+        this.formData = {
+          useType: [],
+          merId: "",
+          storeId: "",
+          categoryIds: "",
+          mainImg: [],
+          status: 1,
+          goodsStatus: 1,
+        };
+      }
     },
     close() {
       this.$refs["formData"].resetFields();
@@ -276,9 +301,16 @@ export default {
     submitForm() {
       this.$refs["formData"].validate((valid) => {
         if (valid) {
-          this.$message.success("成功");
-          this.isShow = false;
-          this.$emit("search");
+          var data = JSON.parse(JSON.stringify(this.formData));
+          data.mainImg = data.mainImg.toString();
+          data.useType = data.useType.toString();
+          this.$api[
+            this.formData.goodsId ? "editgoodspoints" : "addgoodspoints"
+          ](data).then((res) => {
+            this.$message.success("操作成功");
+            this.isShow = false;
+            this.$emit("search");
+          });
         } else {
           return false;
         }

src/views/integralManagement/giftGoods/index.vue

@@ -21,17 +21,26 @@
         <el-button> 导出excel </el-button>
       </template>
       <template slot="about" slot-scope="props">
-        <span v-for="(item, index) in props.scope.row.b" :key="index">
-          <span v-if="item === 1"> 积分商城 </span>
-          <span v-if="item === 2"> 会员卡 </span>
+        <span
+          v-for="(item, index) in arrayStr(props.scope.row.useType)"
+          :key="index"
+        >
+          <span v-if="item == 1"> 积分商城 </span>
+          <span v-if="item == 2"> 会员卡 </span>
         </span>
       </template>
       <template slot="images" slot-scope="props">
         <el-image
           style="width: 100px; height: 70px"
-          :src="$methodsTools.splitImgHost(props.scope.row.urls[0])"
+          :src="
+            $methodsTools.splitImgHost(
+              imgListComputer(props.scope.row.mainImg)[0]
+            )
+          "
           :preview-src-list="
-            props.scope.row.urls.map((i) => $methodsTools.splitImgHost(i))
+            imgListComputer(props.scope.row.mainImg).map((i) =>
+              $methodsTools.splitImgHost(i)
+            )
           "
         >
         </el-image>
@@ -47,6 +56,14 @@
         >
         </el-switch>
       </template>
+      <template slot="rule" slot-scope="props">
+        {{
+          parseInt(
+            parseFloat(props.scope.row.standPrice) -
+              parseFloat(props.scope.row.specialPrice)
+          ) * getRules
+        }}
+      </template>
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="addClick(props.scope.row)"
           >编辑</el-button
@@ -62,7 +79,8 @@
     <dislog
       :dialogVisible.sync="dialogVisible"
       @search="search"
-      :activeData="activeData"
+      :goodsId="goodsId"
+      :getRules="getRules"
     ></dislog>
   </div>
 </template>
@@ -89,18 +107,17 @@ export default {
       },
       formList: [
         {
-          prop: "a",
-          placeholder: "合作商户",
-          scope: "select",
-          options: [
-            {
-              label: "深圳桥恩心理咨询有限公司",
-              value: 1,
-            },
-          ],
+          prop: "merId",
+          placeholder: "请选择合作商户",
+          scope: "merList",
         },
         {
-          prop: "b",
+          prop: "storeId",
+          placeholder: "请选择商户店铺",
+          scope: "storeList",
+        },
+        {
+          prop: "useType",
           placeholder: "关联使用",
           scope: "select",
           options: [
@@ -115,61 +132,79 @@ export default {
           ],
         },
         {
-          prop: "c",
+          prop: "goodsName",
           placeholder: "请输入商品名称",
         },
       ],
-      formData: { a: "", b: "", c: "" },
+      formData: {},
       tableSet: [
         {
           label: "合作商户",
-          prop: "a",
+          prop: "merName",
           hidden: true,
         },
         {
           label: "关联使用",
-          prop: "b",
+          prop: "useType",
           hidden: true,
           scope: "solt",
           soltName: "about",
         },
         {
           label: "商品名称",
-          prop: "c",
+          prop: "goodsName",
           hidden: true,
         },
         {
           label: "商品主图",
-          prop: "urls",
+          prop: "mainImg",
           hidden: true,
           scope: "solt",
           soltName: "images",
         },
         {
           label: "兑换积分",
-          prop: "e",
           hidden: true,
+          scope: "solt",
+          soltName: "rule",
         },
         {
           label: "商品原价",
-          prop: "f",
+          prop: "standPrice",
           hidden: true,
         },
         {
           label: "会员优惠价",
-          prop: "g",
+          prop: "specialPrice",
           hidden: true,
         },
         {
           label: "上架状态",
-          prop: "status",
+          prop: "goodsStatus",
           hidden: true,
           scope: "solt",
           soltName: "status",
         },
+        {
+          label: "商品状态",
+          prop: "status",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "有效",
+              value: 1,
+            },
+            {
+              label: "无效",
+              value: 0,
+            },
+          ],
+        },
+
         {
           label: "录入时间",
-          prop: "i",
+          prop: "createTime",
           hidden: true,
           scope: "aTimeList",
         },
@@ -177,57 +212,62 @@ export default {
       tableData: [],
       total: 0,
       dialogVisible: false,
-      activeData: {},
+      goodsId: null,
+      getRules: 0,
     };
   },
+  computed: {
+    imgListComputer: function () {
+      return function (str) {
+        return str?.split(",") || [];
+      };
+    },
+    arrayStr: function () {
+      return function (str) {
+        return str?.split(",") || [];
+      };
+    },
+  },
   created() {
+    this.$api.mallstoreconfigKeypointsRule().then((res) => {
+      this.getRules = res.data.oneExchangeValue;
+    });
     this.search(2);
   },
   methods: {
     statusChange(e, row) {
-      if (true) {
-        row.status = 1;
-      }
+      this.$api
+        .editgoodspoints({ goodsId: row.goodsId, status: e })
+        .then((res) => {
+          this.$message.success("操作成功");
+          row.status = e;
+        })
+        .catch(() => {
+          return (row.status = e ? 0 : 1);
+        });
     },
     addClick(data) {
-      this.activeData = data || {};
+      this.goodsId = data?.goodsId || 0;
       this.dialogVisible = true;
     },
     search(v) {
-      this.tableData = [
-        {
-          id: 1,
-          a: "深圳桥恩心理咨询有限公司",
-          b: [1, 2],
-          c: "鹿卡通",
-          urls: [
-            "oss/images/avatar/20230518/1684381305489/1684381305490_1510435823",
-            "oss/images/avatar/20230518/1684381305489/1684381305490_1510435823",
-          ],
-          e: 1520,
-          f: 1520,
-          g: 1520,
-          status: 1,
-          i: 1234567891,
-        },
-      ];
-      //   this.loading = true;
-      //   if (v === 2) {
-      //     this.formData = {
-      //       pageSize: 10,
-      //       pageNum: 1,
-      //     };
-      //   }
-      //   this.$api
-      //     .xxx(this.formData)
-      //     .then((res) => {
-      //       this.tableData = res.rows;
-      //       this.total = res.total;
-      //       this.navText.index = res.total;
-      //     })
-      //     .finally(() => {
-      //       this.loading = false;
-      //     });
+      this.loading = true;
+      if (v === 2) {
+        this.formData = {
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      this.$api
+        .goodslistPoints(this.formData)
+        .then((res) => {
+          this.tableData = res.rows;
+          this.total = res.total;
+          this.navText.index = res.total;
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     init() {
       this.search(2);

src/views/integralManagement/merchantManageMent/index.vue

@@ -196,7 +196,7 @@ export default {
         })
         .catch(() => {});
     },
-    del(v) {
+    del(row) {
       this.$confirm("确定删除此内容？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/integralManagement/storeManageMent/index.vue

@@ -202,7 +202,7 @@ export default {
       })
         .then(() => {
           this.$api
-            .editmallmerchant({ storeId: row.storeId, status: -1 })
+            .editmallmerchant({ storeId: v.storeId, status: -1 })
             .then((res) => {
               this.$message.success("删除成功");
               this.$store.commit("STORELIST");

src/views/systemManagement/mechanism/dislog.vue

@@ -172,6 +172,15 @@ export default {
       formData: {
         accountList: [{}],
         invoiceBo: {},
+        tenantName: "",
+        billType: "",
+        billDay: "",
+        openingName: "",
+        openingBank: "",
+        proceedsAccount: "",
+        invoiceType: "",
+        invoice: "",
+        taxpayer: "",
       },
       rules: {
         tenantName: [
@@ -218,8 +227,24 @@ export default {
     },
     init() {
       this.formData = JSON.parse(JSON.stringify(this.activeData));
-      this.formData.accountList = this.formData.accountList || [{}];
-      this.formData.invoiceBo = this.formData.invoiceBo || {};
+      if (this.formData.tenantId) {
+        this.formData.accountList = this.formData.accountList || [{}];
+        this.formData.invoiceBo = this.formData.invoiceBo || {};
+      } else {
+        this.formData = {
+          tenantName: "",
+          billType: "",
+          billDay: "",
+          openingName: "",
+          openingBank: "",
+          proceedsAccount: "",
+          invoiceType: "",
+          invoice: "",
+          taxpayer: "",
+          accountList: [{}],
+          invoiceBo: {},
+        };
+      }
     },
     close() {
       this.$refs["formData"].resetFields();