suk调整

src/views/pms/sku/index.vue

@@ -3,7 +3,6 @@
     <el-card shadow="hover" class="mb-[10px]">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="default" class="ry_form">
         <el-form-item label="商品名称" prop="productId">
-          <!--        <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />-->
           <el-select
             v-model="queryParams.productId"
             placeholder="请选择商品"
@@ -24,9 +23,6 @@
         <el-form-item label="价格" prop="price">
           <el-input v-model="queryParams.price" placeholder="请输入价格" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <!--      <el-form-item label="展示图片" prop="pic">
-        <el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable @keyup.enter="handleQuery" />
-      </el-form-item>-->
         <el-form-item class="flex_one tr">
           <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -61,7 +57,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getList" />
     </el-card>
     <!-- 添加或修改sku信息对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body>
@@ -136,8 +132,8 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        pageNum: 1,
+        current: 1,
-        pageSize: 10,
+        size: 10,
         productId: null,
         outSkuId: null,
         price: null,
@@ -197,10 +193,7 @@ export default {
     /** 查询sku信息列表 */
     getList() {
       this.loading = true;
-      const { pageNum, pageSize } = this.queryParams;
+      listPmsSku(this.queryParams).then((response) => {
-      const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { page: pageNum - 1, size: pageSize };
-      listPmsSku(query, pageReq).then((response) => {
         const { records, total } = response.data || {};
         this.pmsSkuList = records;
         this.total = total;
@@ -230,7 +223,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      // this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */

src/views/system/tenant/index.vue

@@ -233,7 +233,13 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="营业执照有效期:" prop="expireTime">
-                <el-date-picker v-model="form.expireTime" clearable type="date" value-format="YYYY-MM-DD" placeholder="请选择营业执照有效期">
+                <el-date-picker
+                  v-model="form.expireTime"
+                  clearable
+                  type="datetime"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请选择营业执照有效期"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -368,7 +374,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="签约日期" prop="signDate">
-                <el-date-picker v-model="form.signDate" type="date" clearable value-format="YYYY-MM-DD" placeholder="请选择签约日期" />
+                <el-date-picker v-model="form.signDate" type="datetime" clearable value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择签约日期" />
               </el-form-item>
             </el-col>
             <el-col :span="8">

src/views/ums/feedback/index.vue

@@ -56,8 +56,8 @@
         </el-table-column>
         <el-table-column label="处理状态/时间" align="center">
           <template v-slot="scope">
-            <div v-if="scope.row.handleStatus === 1">已处理</div>
+            <div v-if="scope.row.handleStatus == 1">已处理</div>
-            <el-button v-else type="button" @click="handleStatusChange(scope.row)">点击处理</el-button>
+            <!-- <el-button v-else type="button" @click="handleStatusChange(scope.row)">点击处理</el-button> -->
             <div>{{ scope.row.handleTime ? parseTime(scope.row.handleTime) : '' }}</div>
           </template>
         </el-table-column>
@@ -69,7 +69,7 @@
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="处理" placement="top">
-              <el-button link type="primary" @click="handleAdd(scope.row)">处理</el-button>
+              <el-button link type="primary" @click="handleStatusChange(scope.row)">处理</el-button>
             </el-tooltip>
             <el-tooltip content="修改备注" placement="top">
               <el-button link type="primary" @click="showUpdateMark(scope.row)">修改备注</el-button>
@@ -94,7 +94,7 @@
       <template v-slot:footer>
         <span class="dialog-footer">
           <el-button @click="showRefuteDialog = false">取 消</el-button>
-          <el-button type="primary" @click="updateRemark">确 定</el-button>
+          <el-button type="primary" @click="changeStatus">确 定</el-button>
         </span>
       </template>
     </el-dialog>
@@ -151,10 +151,7 @@ export default {
       showRefuteDialog: false,
       handObj: {},
       param: {
-        id: '',
+        remark: null
-        resultType: '',
-        remark: '',
-        status: 1
       }
     };
   },
@@ -169,15 +166,14 @@ export default {
     }
   },
   methods: {
-    handleAdd(row) {
+    updateHandleStatus(row) {
-      this.param = {
+      updateMark({ id: this.remarkModal.id, remark: this.remarkModal.remark }).then((res) => {
-        id: row.id,
+        if (res > 0) {
-        resultType: '',
+          this.$modal.msgSuccess('修改成功');
-        remark: '',
+        } else {
-        status: 1
+          this.$modal.msgError('修改失败');
-      };
+        }
-      this.handObj = row;
+      });
-      this.showRefuteDialog = true;
     },
     showUpdateMark(record) {
       this.remarkModal = {
@@ -242,17 +238,15 @@ export default {
     handleStatusChange(row) {
       // 使用nextTick确保是用户主动操作触发的变更
       this.$nextTick(() => {
-        this.changeStatus(row);
+        this.showRefuteDialog = true;
+        // this.changeStatus(row);
+        this.param = { ...this.param, id: row.id, handleStatus: row.handleStatus };
       });
     },
 
     // 更改账户状态
     changeStatus(row) {
-      const data = {
+      changeHandleStatus(this.param).then((response) => {
-        id: row.id,
-        handleStatus: row.handleStatus
-      };
-      changeHandleStatus(data).then((response) => {
         if (response) {
           this.$modal.msgSuccess('操作成功');
           this.getList();