客户消耗单-详情、编辑接口联调

src/api/expend/customerExpend.js

@@ -1,10 +1,26 @@
 import request from '@/utils/request'
 
-// 消耗单明细列表
+// 列表
 export function queryList(data) {
   return request({
     url: `/pu/ccd/list`,
     method: 'post',
     data: data
   })
+}
+// 详情
+export function ccdItem(id) {
+  return request({
+    url: `/pu/ccd/${id}`,
+    method: 'get',
+  })
+}
+
+// 编辑
+export function editItem(data) {
+  return request({
+    url: `/pu/ccd`,
+    method: 'put',
+    data: data,
+  })
 }

src/components/popover-select-v2/index.vue

@@ -227,6 +227,8 @@ export default {
           source[key] = prop[0][dataMapping[key]];
         }
         this.innerValue = prop[0][valueKey];
+        console.log(source, "source");
+        console.log(prop[0], this.$props, "prop[0], this.$props");
         this.$emit("update:source", source);
         this.$emit("change", prop[0], this.$props);
       }

src/views/expend/customerExpend/columns.js

@@ -1,48 +1,50 @@
 export default function useColumns() {
   const SearchColumns = [
     {
-      item: { key: "ccdProjectName", title: "项目名称" },
+      item: { key: "projectName", title: "项目名称" },
       attr: {
         is: "el-input",
         clearable: true,
       }
     },
     {
-      item: { key: "ccdSupplier", title: "供应商" },
+      item: { key: "supplier", title: "供应商" },
       attr: {
         is: "el-input",
         clearable: true,
       }
     },
     {
-      item: { key: "ccdSpdProject", title: "SPD项目" },
+      item: { key: "spdProject", title: "SPD项目" },
       attr: {
         is: "el-input",
         clearable: true,
       }
     },
     {
-      item: { key: "ccdSaleOrg_name", title: "销售组织" },
+      item: { key: "saleOrg_name", title: "销售组织" },
       attr: {
         is: "el-popover-select-v2",
         referName: "ORG_PARAM",
         valueKey: "name",
         dataMapping: {
-          ccdSaleOrg: "id",
-          ccdSaleOrg_name: "name",
+          saleOrg: "code",
+          saleOrg_name: "name",
         },
         clearable: true,
       }
     },
     {
-      item: { key: "ccdMaterialCode", title: "物料编码" },
+      item: { key: "materialCode", title: "物料编码" },
       attr: {
-        is: "el-input",
         clearable: true,
+        is: "el-popover-select-v2",
+        valueKey: "code",
+        referName: "MATERIAL_PARAM",
       }
     },
     {
-      item: { key: "ccdIsTicket", title: "是否开票" },
+      item: { key: "isTicket", title: "是否开票" },
       attr: {
         is: "el-select",
         dictName: "sys_yes_no",
@@ -50,7 +52,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdSaleOrderNo", title: "销售订单号" },
+      item: { key: "saleOrderNo", title: "销售订单号" },
       attr: {
         is: "el-input",
         clearable: true,
@@ -78,84 +80,84 @@ export default function useColumns() {
       attr: {}
     },
     {
-      item: { key: "ccdProjectName", title: "项目名称" },
+      item: { key: "projectName", title: "项目名称" },
       attr: {}
     },
     {
-      item: { key: "ccdSupplier", title: "供应商" },
+      item: { key: "supplier", title: "供应商" },
       attr: {}
     },
     {
-      item: { key: "ccdCalculateSupplier", title: "结算供应商" },
+      item: { key: "calculateSupplier", title: "结算供应商" },
       attr: {}
     },
     {
-      item: { key: "ccdStartDate", title: "结算开始日期" },
+      item: { key: "startDate", title: "结算开始日期" },
       attr: {}
     },
     {
-      item: { key: "ccdEndDate", title: "结算截止日期" },
+      item: { key: "endDate", title: "结算截止日期" },
       attr: {}
     },
     {
-      item: { key: "ccdSpdProject", title: "SPD项目" },
+      item: { key: "spdProject", title: "SPD项目" },
       attr: {}
     },
     {
-      item: { key: "ccdProfileCenter", title: "利润中心" },
+      item: { key: "profileCenter", title: "利润中心" },
       attr: {}
     },
     {
-      item: { key: "ccdSaleOrg_name", title: "销售组织" },
+      item: { key: "saleOrg_name", title: "销售组织" },
       attr: {}
     },
     {
-      item: { key: "ccdSaleMonth", title: "销售月份" },
+      item: { key: "saleMonth", title: "销售月份" },
       attr: {}
     },
     {
-      item: { key: "ccdPriceSum", title: "价税合计" },
+      item: { key: "priceSum", title: "价税合计" },
       attr: {}
     },
     {
-      item: { key: "ccdServiceFee", title: "服务费" },
+      item: { key: "serviceFee", title: "服务费" },
       attr: {}
     },
     {
-      item: { key: "ccdMaterialCode", title: "物料编码" },
+      item: { key: "materialCode", title: "物料编码" },
       attr: {}
     },
     {
-      item: { key: "ccdNum", title: "数量" },
+      item: { key: "num", title: "数量" },
       attr: {}
     },
     {
-      item: { key: "ccdIsToSaleOrder", title: "是否转销售订单" },
+      item: { key: "isSaleOrder", title: "是否转销售订单" },
       attr: {
         is: "el-dict-tag",
         dictName: "sys_yes_no",
       }
     },
     {
-      item: { key: "ccdSaleOrderNo", title: "销售订单号" },
+      item: { key: "saleOrderNo", title: "销售订单号" },
       attr: {}
     },
     {
-      item: { key: "ccdIsReturnMoney", title: "是否回款" },
+      item: { key: "isReturnMoney", title: "是否回款" },
       attr: {
         is: "el-dict-tag",
         dictName: "sys_return_money",
       }
     },
     {
-      item: { key: "ccdIsTicket", title: "是否开票" },
+      item: { key: "isTicket", title: "是否开票" },
       attr: {
         is: "el-dict-tag",
         dictName: "sys_yes_no",
       }
     },
     {
-      item: { key: "verifyState", title: "单据状态" },
+      item: { key: "status", title: "单据状态" },
       attr: {
         is: "el-dict-tag",
         dictName: "sys_status",
@@ -163,7 +165,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdIsOpenStatus", title: "单据打开状态" },
+      item: { key: "isOpen", title: "单据打开状态" },
       attr: {
         is: "el-dict-tag",
         dictName: "sys_open_status",

src/views/expend/customerExpend/edit/columns.js

@@ -8,14 +8,14 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdProjectName", title: "项目名称" },
+      item: { key: "projectName", title: "项目名称" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdStartDate", title: "结算开始日期" },
+      item: { key: "startDate", title: "结算开始日期" },
       attr: {
         is: "el-date-picker",
         type: "date",
@@ -24,7 +24,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdEndDate", title: "结算截止日期" },
+      item: { key: "endDate", title: "结算截止日期" },
       attr: {
         is: "el-date-picker",
         type: "date",
@@ -33,74 +33,74 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdSpdProject", title: "SPD项目" },
+      item: { key: "spdProject", title: "SPD项目" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdProfileCenter", title: "利润中心" },
+      item: { key: "profileCenter", title: "利润中心" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdCalculateSupplier", title: "结算供应商" },
+      item: { key: "calculateSupplier", title: "结算供应商" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdSupplier", title: "供应商" },
+      item: { key: "supplier", title: "供应商" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdSaleOrg_name", title: "销售组织" },
+      item: { key: "saleOrg", title: "销售组织" },
       attr: {
         is: "el-popover-select-v2",
         referName: "ORG_PARAM",
-        valueKey: "name",
+        valueKey: "code",
         dataMapping: {
-          ccdSaleOrg: "id",
-          ccdSaleOrg_name: "name",
+          saleOrg: "code",
+          saleOrg_name: "name",
         },
-        // ccdSaleOrg_name
+        clearable: true,
       }
     },
     {
-      item: { key: "ccdSaleMonth", title: "销售月份" },
+      item: { key: "saleMonth", title: "销售月份" },
       attr: {
         is: "el-input",
       }
     },
     {
-      item: { key: "ccdSaleOrderNo", title: "销售订单号" },
+      item: { key: "saleOrderNo", title: "销售订单号" },
       attr: {
         is: "el-input",
       }
     },
     {
-      item: { key: "ccdPriceSum", title: "价税合计" },
+      item: { key: "priceSum", title: "价税合计" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdServiceFee", title: "服务费" },
+      item: { key: "serviceFee", title: "服务费" },
       attr: {
         is: "el-input",
         disabled: true,
       }
     },
     {
-      item: { key: "ccdIsToSaleOrder", title: "是否转销售订单" },
+      item: { key: "isToSaleOrder", title: "是否转销售订单" },
       attr: {
         is: "el-select",
         dictName: "sys_yes_no",
@@ -108,7 +108,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdIsReturnMoney", title: "是否回款" },
+      item: { key: "isReturnMoney", title: "是否回款" },
       attr: {
         is: "el-select",
         dictName: "sys_return_money",
@@ -116,7 +116,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdIsTicket", title: "是否开票" },
+      item: { key: "isTicket", title: "是否开票" },
       attr: {
         is: "el-select",
         dictName: "sys_yes_no",
@@ -124,7 +124,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "ccdIsOpenStatus", title: "单据打开状态" },
+      item: { key: "isOpen", title: "单据打开状态" },
       attr: {
         is: "el-select",
         dictName: "sys_open_status",
@@ -132,7 +132,7 @@ export default function useColumns() {
       }
     },
     {
-      item: { key: "verifyState", title: "单据状态" },
+      item: { key: "status", title: "单据状态" },
       attr: {
         is: "el-select",
         dictName: "sys_status",

src/views/expend/customerExpend/edit/index.vue

@@ -1,5 +1,7 @@
 <script>
 import useColumns from "./columns";
+import { ccdItem, editItem } from "@/api/expend/customerExpend";
+
 export default {
   name: "customerExpendAdd",
   props: {
@@ -25,6 +27,7 @@ export default {
       visible: false,
       loading: false,
       opType: "edit",
+      count: 0,
     };
   },
   computed: {
@@ -46,8 +49,20 @@ export default {
       this.opType = type;
     },
     // 查询
-    fetchItem(prop) {
+    async fetchItem(prop) {
       console.log(prop, "prop");
+      try {
+        this.loading = true;
+        let { code, data } = await ccdItem(prop.id);
+        if (code == 200) {
+          this.params = data;
+          this.count++;
+          console.log(this.params, "params");
+        }
+      } catch (error) {
+      } finally {
+        this.loading = false;
+      }
     },
     //
     onHide() {
@@ -56,7 +71,22 @@ export default {
       this.params = this.$init.params(FearchColumns);
       this.$emit("success");
     },
-    useSubmit() {},
+    async useSubmit() {
+      try {
+        this.loading = true;
+        let { code, msg } = await editItem({ ...this.params });
+        if (code == 200) {
+          this.$notify.success(msg);
+          this.onHide();
+        }
+      } catch (error) {
+      } finally {
+        this.loading = false;
+      }
+    },
+    ccdSaleOrgChange(prop) {
+      console.log(prop, "prop");
+    },
   },
   created() {},
 };
@@ -64,10 +94,13 @@ export default {
 
 <template>
   <el-drawer
+    v-bind="$attrs"
+    v-on="$listeners"
     :show-close="false"
     :size="width"
     :title="title"
     :visible.sync="visible"
+    v-loading="loading"
     append-to-body
     destroy-on-close
     @close="onHide"

src/views/expend/customerExpend/index.vue

@@ -125,7 +125,7 @@ export default {
       ref="customerEdit"
       :dict="dict"
       :size="size"
-      @submit="useQuery(params, page)"
+      @success="useQuery(params, page)"
     ></edit-drawer>
     <el-super-ux-table
       v-model="tableData"