暂存

src/fxApi/goodsPoints.js

@@ -24,4 +24,12 @@ export default {
             params: data
         })
     },
+    //商品批量删除
+    editgoodsbatchRemove(data) {
+        return request({
+            url: '/goods/batchRemove',
+            method: 'post',
+            data
+        })
+    },
 }

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.7:7077/";
+export const baseURL = "http://192.168.1.7:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/financed/arap/index.vue

@@ -124,7 +124,7 @@
             type="text"
             :disabled="
               props.scope.row.checkStatus !== 0 ||
-              !$store.state.user.rolesId.includes(props.scope.row.roleId)
+              getRoles(props.scope.row.roleId)
             "
             @click="openDialog([props.scope.row], 1)"
           >
@@ -310,7 +310,8 @@ export default {
         selectableFunc: (row, rowIndex) => {
           if (
             row.roleId &&
-            this.$store.state.user.rolesId.includes(row.roleId) &&
+            (this.$store.state.user.rolesId.includes(row.roleId) ||
+              this.$store.state.user.rolesId.includes(1)) &&
             row.checkStatus === 0
           ) {
             return true;
@@ -695,6 +696,16 @@ export default {
     this.init();
   },
   methods: {
+    getRoles(roleId) {
+      if (this.$store.state.user.rolesId?.length > 0 &&
+        this.$store.state.user.rolesId.includes(roleId) ||
+        this.$store.state.user.rolesId.includes(1)
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
     divideCheckStatus(type, e1, e2) {
       var a = "";
       if (type) {

src/views/financed/components/audit/dislogSet.vue

@@ -10,20 +10,22 @@
       :confirmName="info.length > 0 && info[0].orderSn ? '确定' : '确定支付'"
     >
       <template v-if="info.length > 0 && info[0].orderSn">
-        <div v-for="(item, index) in info" style="margin-bottom: 10px">
-          <p style="margin-top: 0">
-            下单时间：{{ $methodsTools.onlyForma(item.orderTime) }}
-          </p>
-          <p style="margin-top: 0">订单单号：{{ item.orderSn }}</p>
-          <p>
-            <span class="color_1890ff">{{ item.applyName }}</span>
-          </p>
-          <div class="bgc_pink">
+        <div style="overflow-y: auto; max-height: 600px">
+          <div v-for="(item, index) in info" style="margin-bottom: 10px">
+            <p style="margin-top: 0">
+              下单时间：{{ $methodsTools.onlyForma(item.orderTime) }}
+            </p>
+            <p style="margin-top: 0">订单单号：{{ item.orderSn }}</p>
             <p>
-              待付账款：<span class="color_red"
-                >￥{{ item.divideCompanyMoney }}</span
-              >
+              <span class="color_1890ff">{{ item.applyName }}</span>
             </p>
+            <div class="bgc_pink">
+              <p>
+                待付账款：<span class="color_red"
+                  >￥{{ item.divideCompanyMoney }}</span
+                >
+              </p>
+            </div>
           </div>
         </div>
         <el-form

src/views/financed/components/refund/dislogSet.vue

@@ -9,6 +9,39 @@
       @submit="submitForm"
       :confirmName="form.checkType === 3 ? '确定支付' : '确定'"
     >
+      <div>
+        <em>收款信息：</em>
+        <el-form
+          :model="formPay"
+          :rules="rulesPay"
+          ref="rulesPay"
+          label-width="100px"
+          class="demo-ruleForm"
+        >
+          <el-form-item label="银行账号：" prop="toBankAcount">
+            <el-input
+              readonly
+              clearable
+              v-model="formPay.toBankAcount"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="账号名称：" prop="toBankName">
+            <el-input
+              readonly
+              clearable
+              v-model="formPay.toBankName"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="银行名称：" prop="toBankTypeName">
+            <el-input
+              readonly
+              clearable
+              v-model="formPay.toBankTypeName"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <el-divider></el-divider>
+      </div>
       <template v-if="form.checkType === 2">
         <p style="margin-top: 0">
           申请时间：{{ $methodsTools.onlyForma(form.applyTime) }}
@@ -51,67 +84,32 @@
         ></audit-progress>
       </template>
       <template v-if="form.checkType === 3">
-        <div v-if="form.payType === 2">
-          <em>收款信息：</em>
-          <el-form
-            :model="formPay"
-            :rules="rulesPay"
-            ref="rulesPay"
-            label-width="100px"
-            class="demo-ruleForm"
+        <em>订单信息：</em>
+        <p>
+          支付金额：<span
+            class="color_red"
+            style="font-size: 28px; font-weight: 400"
+            >¥ {{ form.refundMoney.toFixed(2) }}</span
           >
-            <el-form-item label="银行账号：" prop="toBankAcount">
-              <el-input
-                readonly
-                clearable
-                v-model="formPay.toBankAcount"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="账号名称：" prop="toBankName">
-              <el-input
-                readonly
-                clearable
-                v-model="formPay.toBankName"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="银行名称：" prop="toBankTypeName">
-              <el-input
-                readonly
-                clearable
-                v-model="formPay.toBankTypeName"
-              ></el-input>
-            </el-form-item>
-          </el-form>
-          <el-divider></el-divider>
-        </div>
-        <template>
-          <em>订单信息：</em>
-          <p>
-            支付金额：<span
-              class="color_red"
-              style="font-size: 28px; font-weight: 400"
-              >¥ {{ form.refundMoney.toFixed(2) }}</span
-            >
-          </p>
-          <p>
-            下单时间：<em>{{ $methodsTools.onlyForma(form.applyTime) }}</em>
-          </p>
-          <p>
-            订单单号：<em>{{ form.orderSn }}</em>
-          </p>
-          <p>
-            支付方式：<el-radio disabled v-model="form.payType" :label="1"
-              >微信支付</el-radio
-            >
-            <el-radio disabled v-model="form.payType" :label="2"
-              >网银支付、对公转账</el-radio
-            >
-          </p>
-          <el-divider></el-divider>
-          <em>支付方式：</em>
-          <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
-          <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
-        </template>
+        </p>
+        <p>
+          下单时间：<em>{{ $methodsTools.onlyForma(form.applyTime) }}</em>
+        </p>
+        <p>
+          订单单号：<em>{{ form.orderSn }}</em>
+        </p>
+        <p>
+          支付方式：<el-radio disabled v-model="form.payType" :label="1"
+            >微信支付</el-radio
+          >
+          <el-radio disabled v-model="form.payType" :label="2"
+            >网银支付、对公转账</el-radio
+          >
+        </p>
+        <el-divider></el-divider>
+        <em>支付方式：</em>
+        <el-tag type="success" v-if="form.payType === 1">原路返回</el-tag>
+        <el-tag type="danger" v-if="form.payType === 2">网银支付</el-tag>
       </template>
     </BaseDialog>
   </div>

src/views/financed/orderManageList/index.vue

@@ -168,7 +168,8 @@
           :disabled="
             (props.scope.row.refundStatus !== 0 &&
               props.scope.row.refundStatus !== 2) ||
-            disabledStatus(props.scope.row.commercialTenant)
+            disabledStatus(props.scope.row.commercialTenant) ||
+            getRoles(props.scope.row.refundRoleId)
           "
           >退款审核</el-button
         >
@@ -187,8 +188,10 @@
         <el-button
           type="text"
           :disabled="
-            props.scope.row.finishSign === 0 ||
-            disabledStatus(props.scope.row.commercialTenant)
+            !(
+              props.scope.row.finishSign === 1 &&
+              props.scope.row.finishStatus === 0
+            ) || disabledStatus(props.scope.row.commercialTenant)
           "
           @click="completeOrder(props.scope.row.orderSn)"
           >完单确认</el-button
@@ -603,6 +606,17 @@ export default {
     this.getStatistics();
   },
   methods: {
+    getRoles(roleId) {
+      if (
+        (this.$store.state.user.rolesId?.length > 0 &&
+          this.$store.state.user.rolesId.includes(roleId)) ||
+        this.$store.state.user.rolesId.includes(1)
+      ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
     disabledStatus(c) {
       if (c === 1) {
         return true;
@@ -697,7 +711,11 @@ export default {
         this.$message.error("请勾选数据");
         return;
       }
-      if (this.$refs.tableList.allCheckData.some((i) => i.finishSign === 0)) {
+      if (
+        !this.$refs.tableList.allCheckData.every(
+          (i) => i.finishSign === 1 && i.finishStatus === 0
+        )
+      ) {
         this.$message.error("批量数据存在不允许操作数据，请联系管理员修复");
         return;
       }

src/views/integralManagement/giftGoods/dislog.vue

@@ -135,12 +135,6 @@
             <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="商品详情：">
           <editor
             v-model="formData.mobileDetailHtml"

src/views/integralManagement/giftGoods/index.vue

@@ -8,7 +8,7 @@
       @init="init"
     />
     <table-list
-      rowKey="id"
+      rowKey="goodsId"
       ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
@@ -17,7 +17,7 @@
       @addClick="addClick"
     >
       <template slot="customize">
-        <el-button> 批量删除 </el-button>
+        <el-button @click="remove"> 批量删除 </el-button>
         <el-button> 导出excel </el-button>
       </template>
       <template slot="about" slot-scope="props">
@@ -47,7 +47,7 @@
       </template>
       <template slot="status" slot-scope="props">
         <el-switch
-          v-model="props.scope.row.status"
+          v-model="props.scope.row.goodsStatus"
           active-color="#13ce66"
           inactive-color="#ff4949"
           :active-value="1"
@@ -101,9 +101,10 @@ export default {
         index: 0,
         ch: "条",
         num: true,
-        choice: false,
+        choice: true,
         addHide: false,
         custom: false,
+        openCheckMore: true,
       },
       formList: [
         {
@@ -185,23 +186,6 @@ export default {
           scope: "solt",
           soltName: "status",
         },
-        {
-          label: "商品状态",
-          prop: "status",
-          hidden: true,
-          scope: "isOptions",
-          options: [
-            {
-              label: "有效",
-              value: 1,
-            },
-            {
-              label: "无效",
-              value: 0,
-            },
-          ],
-        },
-
         {
           label: "录入时间",
           prop: "createTime",
@@ -237,13 +221,18 @@ export default {
   methods: {
     statusChange(e, row) {
       this.$api
-        .editgoodspoints({ goodsId: row.goodsId, status: e })
+        .editgoodspoints({
+          goodsId: row.goodsId,
+          goodsStatus: e,
+          status: row.status,
+          goodsType: row.goodsType,
+        })
         .then((res) => {
           this.$message.success("操作成功");
-          row.status = e;
+          row.goodsStatus = e;
         })
         .catch(() => {
-          return (row.status = e ? 0 : 1);
+          return (row.goodsStatus = e ? 0 : 1);
         });
     },
     addClick(data) {
@@ -257,6 +246,14 @@ export default {
           pageSize: 10,
           pageNum: 1,
         };
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
+      }
+      if (v === 3) {
+        this.$nextTick(() => {
+          this.$refs.tableList.clearMoreActive();
+        });
       }
       this.$api
         .goodslistPoints(this.formData)
@@ -272,21 +269,45 @@ export default {
     init() {
       this.search(2);
     },
+    remove() {
+      if (this.$refs.tableList.allCheckData.length === 0) {
+        this.$message.error("请勾选数据");
+        return;
+      }
+      this.$confirm("确定批量删除选中的数据吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .editgoodsbatchRemove({
+              goodsIds: this.$refs.tableList.allCheckData.map((i) => i.goodsId),
+            })
+            .then(() => {
+              this.$message.success("批量删除成功");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
+    },
     del(v) {
-      this.$alert(
-        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
-        "提示",
-        {
-          dangerouslyUseHTMLString: true,
-        }
-      )
-        .then(() => {})
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
+      this.$confirm("确定删除此内容？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$api
+            .editgoodsbatchRemove({
+              goodsIds: [v.goodsId],
+            })
+            .then(() => {
+              this.$message.success("删除成功");
+              this.search(3);
+            });
+        })
+        .catch(() => {});
     },
   },
 };