Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

5 天以前 84076d95a74a44876e4ce29a3df52479f18a0c47

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/api/financialManagement/salesRefund.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
import request from "@/utils/request";

// æŸ¥è¯¢åˆ—表
// /salesRefundAmountOrder/page
export const listPage = (params) => {
  return request({
    url: "/salesRefundAmountOrder/page",
    method: "get",
    params,
  });
};

// æ–°å¢ž 
// /salesRefundAmountOrder/add
export function add(data) {
  return request({
    url: "/salesRefundAmountOrder/add",
    method: "post",
    data: data,
  });
}

// ä¿®æ”¹
// /salesRefundAmountOrder/update
export function update(data) {
  return request({
    url: "/salesRefundAmountOrder/update",
    method: "put",
    data: data,
  });
}

// åˆ é™¤
// /salesRefundAmountOrder/deleteByIds
export function del(data) {
  return request({
    url: "/salesRefundAmountOrder/deleteByIds",
    method: "delete",
    data: data,
  });
}

 src/api/salesManagement/returnOrder.js

@@ -33,11 +33,11 @@

// é”€å”®é€€è´§-删除
// /returnManagement/del
export function returnManagementDel(query) {
export function returnManagementDel(data) {
  return request({
    url: "/returnManagement/del",
    method: "get",
    params: query,
    method: "delete",
    data,
  });
}


 src/views/customerService/afterSalesHandling/components/formDia.vue

@@ -10,7 +10,7 @@
                :model="form"
                label-width="140px"
                label-position="top"
                :rules="rules"
                :rules="operationType === 'view' ? {} : rules"
                ref="formRef"
            >
                <el-row :gutter="30">
@@ -63,7 +63,7 @@
                                v-model="form.proDesc"
                                placeholder="请输入"
                                clearable
                                disabled
                                :disabled="operationType === 'view'"
                                type="textarea"
                            />
                        </el-form-item>
@@ -118,8 +118,9 @@
            </el-row>
            <template #footer>
                <div class="dialog-footer">
                    <el-button type="primary" @click="submitForm">确认</el-button>
                    <el-button @click="closeDia">取消</el-button>
                    <el-button v-if="operationType === 'approve'" type="primary" @click="submitForm">确认</el-button>
                    <el-button v-if="operationType === 'approve'" @click="closeDia">取消</el-button>
                    <el-button v-else type="primary" @click="closeDia">关闭</el-button>
                </div>
            </template>
    </el-dialog>
@@ -186,13 +187,16 @@
//     }
// }
const submitForm = () => {
    if (operationType.value === 'view') {
        closeDia();
        return;
    }
    proxy.$refs["formRef"].validate(valid => {
        if (valid) {
            afterSalesServiceDispose(form.value).then(response => {
                proxy.$modal.msgSuccess("新增成功")
        if (!valid) return;
        afterSalesServiceDispose(form.value).then(() => {
            proxy.$modal.msgSuccess("处理成功")
                closeDia()
            })
        }
    })
}
// å…³é—­å¼¹æ¡†

 src/views/customerService/feedbackRegistration/index.vue

@@ -198,13 +198,12 @@
    dataType: "tag",
    
    formatData: (params) => {
      if (params === 1) {
        return "待处理";
      } else if (params === 2) {
        return "已处理";
      } else {
        return null;
      if (params) {
        let part = String(params)
        const item = workOrderStatusOptions.value.find(item => item.value === part);
        return item?.label || params; 
      }
      return null;
    },
    formatType: (params) => {
      if (params === 1) {

 src/views/salesManagement/returnOrder/index.vue

@@ -95,7 +95,7 @@
    cancelButtonText: "取消",
    type: "warning",
  }).then(() => {
    returnManagementDel({ ids: String(row.id) }).then(() => {
    returnManagementDel([row.id]).then(() => {
      proxy.$modal.msgSuccess("删除成功");
      getList();
    });
@@ -252,12 +252,13 @@
    return;
  }
  ids = selectedRows.value.map(i => i.id);
  console.log(ids);
  ElMessageBox.confirm("选中的内容将被删除，是否确认删除？", "删除提示", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning",
  }).then(() => {
    returnManagementDel({ ids: ids.join(",") }).then(() => {
    returnManagementDel( ids ).then(() => {
      proxy.$modal.msgSuccess("删除成功");
      getList();
    });