Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/api/business/purchase/catalogue.js

@@ -50,7 +50,7 @@ export function EXIST(data) {
 
 export function EXPORT(data) {
   return request({
-    url: "/pu/price/catalogue/export",
+    url: "/pu/price/catalogue/exportByIds",
     method: "POST",
     data: data,
   });

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

@@ -37,7 +37,7 @@ export default {
       default: () => ({}),
     },
     // 多选
-    multiple: {
+    checkbox: {
       type: Boolean,
       default: false,
     },
@@ -160,9 +160,9 @@ export default {
     useConfirm(prop) {
       this.hide();
       const {
-        $props: { source, multiple, valueKey, dataMapping },
+        $props: { source, checkbox, valueKey, dataMapping },
       } = this;
-      if (multiple) {
+      if (checkbox) {
         this.$emit(
           "change",
           this.selectData.map((item) => {
@@ -276,8 +276,8 @@ export default {
           :size="size"
           :page="page"
           :columns="TableColumns"
-          :radio="!multiple"
-          :checkbox="multiple"
+          :radio="!checkbox"
+          :checkbox="checkbox"
           pagination
           highlight-current-row
           @pagination="useQuery"

src/components/super-table/once/filters.vue

@@ -3,7 +3,7 @@
     v-if="innerValue !== false || filterData.length"
     :visible-arrow="false"
     width="auto"
-    trigger="hover"
+    trigger="click"
     placement="bottom"
     popper-class="p-0"
     class="icon-filter"

src/utils/request.js

@@ -117,7 +117,7 @@ service.interceptors.response.use(
             url: res.config.url,
             data: res.config.data,
             method: res.config.method,
-            params: { ...res.config.params},
+            params: { ...res.config.params },
           });
         }
       } catch (err) {

src/views/purchase/apply/add/columns.js

@@ -118,7 +118,7 @@ export default function useColumns() {
           item: { key: "materialName", title: "物料名称", require: true },
           attr: {
             is: "el-popover-select-v2",
-            multiple: true,
+            checkbox: true,
             valueKey: "name",
             referName: "MATERIAL_PARAM",
             dataMapping: {

src/views/purchase/apply/copy/columns.js

@@ -118,7 +118,7 @@ export default function useColumns() {
           item: { key: "materialName", title: "物料名称", require: true },
           attr: {
             is: "el-popover-select-v2",
-            multiple: true,
+            checkbox: true,
             valueKey: "name",
             referName: "MATERIAL_PARAM",
             dataMapping: {

src/views/purchase/apply/edit/columns.js

@@ -118,7 +118,7 @@ export default function useColumns() {
           item: { key: "materialName", title: "物料名称", require: true },
           attr: {
             is: "el-popover-select-v2",
-            multiple: true,
+            checkbox: true,
             valueKey: "name",
             referName: "MATERIAL_PARAM",
             dataMapping: {

src/views/purchase/catalogue/columns.js

@@ -3,67 +3,79 @@ import CONFIG from "@/config";
 export default function useColumns() {
   const TableColumns = [
     {
-      item: { width:100,key: "puOrgName", title: "采购组织" },
+      item: { width: 100, key: "puOrgName", title: "采购组织" },
       attr: {},
     },
-    { item: { width:150,key: "materialName", title: "物料" }, attr: {} },
-    { item: { width:150,key: "materialCode", title: "物料编码" }, attr: {} },
-    { item: { width:100,key: "materialClassifyName", title: "物料一级分类" }, attr: {} },
-    { item: { width:100,key: "manufacturerName", title: "生产厂家名称" }, attr: {} },
-    { item: { width:100,key: "model", title: "物料型号" }, attr: {} },
-    { item: { width:100,key: "specification", title: "物料规格" }, attr: {} },
+    { item: { width: 150, key: "materialName", title: "物料" }, attr: {} },
+    { item: { width: 150, key: "materialCode", title: "物料编码" }, attr: {} },
     {
-      item: { width:100,key: "supplierName", title: "供应商名称" },
+      item: { width: 100, key: "materialClassifyName", title: "物料一级分类" },
       attr: {},
     },
-    { item: { width:100,key: "customerName", title: "客户" }, attr: {} },
     {
-      item: { width:100,key: "taxPrice", title: "主含税单价" },
+      item: { width: 100, key: "manufacturerName", title: "生产厂家名称" },
+      attr: {},
+    },
+    { item: { width: 100, key: "model", title: "物料型号" }, attr: {} },
+    { item: { width: 100, key: "specification", title: "物料规格" }, attr: {} },
+    {
+      item: { width: 100, key: "supplierName", title: "供应商名称" },
+      attr: {},
+    },
+    { item: { width: 100, key: "customerName", title: "客户" }, attr: {} },
+    {
+      item: { width: 100, key: "taxPrice", title: "主含税单价" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { taxPrice = 0 } = prop;
+          return (taxPrice * 1).toFixed(CONFIG.precision);
         },
       },
     },
-    { item: { width:100,key: "unitName", title: "主单位" }, attr: {} },
-    { item: { width:100,key: "effectiveDate", title: "价格生效日期" }, attr: {} },
-    { item: { width:100,key: "endDate", title: "价格失效日期" }, attr: {} },
-    { item: { width:100,key: "buyerName", title: "采购员" }, attr: {} },
-    { item: { width:100,key: "applyCode", title: "来源单据" }, attr: {} },
+    { item: { width: 100, key: "unitName", title: "主单位" }, attr: {} },
+    {
+      item: { width: 100, key: "effectiveDate", title: "价格生效日期" },
+      attr: {},
+    },
+    { item: { width: 100, key: "endDate", title: "价格失效日期" }, attr: {} },
+    { item: { width: 100, key: "buyerName", title: "采购员" }, attr: {} },
+    { item: { width: 100, key: "applyCode", title: "来源单据" }, attr: {} },
     {
-      item: { width:100,key: "convertRate", title: "换算率" },
+      item: { width: 100, key: "convertRate", title: "换算率" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { convertRate = 0 } = prop;
+          return (convertRate * 1).toFixed(CONFIG.precision);
         },
       },
     },
     {
-      item: { width:100,key: "status", title: "有效状态" },
+      item: { width: 100, key: "status", title: "有效状态" },
       attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
-      item: { width:100,key: "enableStatus", title: "启用状态" },
+      item: { width: 100, key: "enableStatus", title: "启用状态" },
       attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
-      item: { width:100,key: "materialStatus", title: "物料启用状态" },
+      item: { width: 100, key: "materialStatus", title: "物料启用状态" },
       attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
-      item: { width:100,key: "isDistribution", title: "配送价" },
+      item: { width: 100, key: "isDistribution", title: "配送价" },
       attr: { is: "el-dict-tag", dictName: "is_effective" },
     },
     {
-      item: { width:100,key: "priceType", title: "价格类型" },
+      item: { width: 100, key: "priceType", title: "价格类型" },
       attr: { is: "el-dict-tag", dictName: "sys_price_type" },
     },
-    { item: { width:100,key: "expiryEarly", title: "效期预警" }, attr: {} },
-    { item: { width:100,key: "priority", title: "含税/无税优先" }, attr: {} },
-    { item: { width:100,key: "createByName", title: "创建人" }, attr: {} },
-    { item: { width:100,key: "updateByName", title: "更新人名称" }, attr: {} },
+    { item: { width: 100, key: "expiryEarly", title: "效期预警" }, attr: {} },
+    { item: { width: 100, key: "priority", title: "含税/无税优先" }, attr: {} },
+    { item: { width: 100, key: "createByName", title: "创建人" }, attr: {} },
+    {
+      item: { width: 100, key: "updateByName", title: "更新人名称" },
+      attr: {},
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: {
@@ -77,11 +89,11 @@ export default function useColumns() {
 
   const SearchColumns = [
     {
-      item: { width:100,key: "puOrgName", title: "采购组织" },
+      item: { width: 100, key: "puOrgName", title: "采购组织" },
       attr: {
         is: "el-popover-select-v2",
         referName: "ORG_PARAM",
-        valuewidth:100,key: "name",
+        valueKey: "name",
         dataMapping: {
           puOrg: "id",
           puOrgName: "name",
@@ -89,15 +101,23 @@ export default function useColumns() {
       },
     },
     {
-      item: { width:100,key: "manufacturer", title: "生产厂家" },
-      attr: { is: "el-input" },
+      item: { width: 100, key: "manufacturerName", title: "生成厂家" },
+      attr: {
+        is: "el-popover-select-v2",
+        referName: "MANUFACTURER_PARAM",
+        valueKey: "name",
+        dataMapping: {
+          manufacturer: "id",
+          manufacturerName: "name",
+        },
+      },
     },
     {
-      item: { width:100,key: "supplierName", title: "供应商" },
+      item: { width: 100, key: "supplierName", title: "供应商" },
       attr: {
         is: "el-popover-select-v2",
         referName: "SUPPLIER_PARAM",
-        valuewidth:100,key: "name",
+        valueKey: "name",
         dataMapping: {
           supplier: "id",
           supplierName: "name",
@@ -105,15 +125,15 @@ export default function useColumns() {
       },
     },
     {
-      item: { width:100,key: "applyCode", title: "来源单据" },
+      item: { width: 100, key: "applyCode", title: "来源单据" },
       attr: { is: "el-input" },
     },
     {
-      item: { width:100,key: "materialCode", title: "物料编码" },
+      item: { width: 100, key: "materialCode", title: "物料编码" },
       attr: {
         is: "el-popover-select-v2",
         referName: "MATERIAL_PARAM",
-        valuewidth:100,key: "code",
+        valueKey: "code",
         dataMapping: {
           material: "id",
           materialCode: "code",
@@ -121,11 +141,11 @@ export default function useColumns() {
       },
     },
     {
-      item: { width:100,key: "status", title: "有效状态" },
+      item: { width: 100, key: "status", title: "有效状态" },
       attr: { is: "el-select", dictName: "is_effective" },
     },
     {
-      item: { width:100,key: "enableStatus", title: "启用状态" },
+      item: { width: 100, key: "enableStatus", title: "启用状态" },
       attr: { is: "el-select", dictName: "is_effective" },
     },
   ];

src/views/purchase/catalogue/export/index.vue

@@ -2,12 +2,8 @@
 export default {
   name: "ExportDialog",
   props: {
-    data: {
-      type: Object,
-      require: true,
-    },
-    page: {
-      type: Object,
+    selectData: {
+      type: Array,
       require: true,
     },
   },
@@ -29,13 +25,11 @@ export default {
             instance.confirmButtonText = "下载中...";
             try {
               // try
-              const {
-                data,
-                page: { pageNum, pageSize },
-              } = this.$props;
+              const { selectData } = this.$props;
+              const ids = selectData.map((item) => item.id);
               await this.download(
-                "pu/price/catalogue/export",
-                { ...data, pageNum, pageSize },
+                "/pu/price/catalogue/exportByIds",
+                { ids: ids },
                 `catalogue_${new Date().getTime()}.xlsx`
               );
               await done();

src/views/purchase/catalogue/index.vue

@@ -132,8 +132,7 @@ export default {
       <el-button-group>
         <exp-button
           :size="size"
-          :page="page"
-          :data="params"
+          :select-data="selectData"
           @success="useQuery(params, page)"
         ></exp-button>
       </el-button-group>

src/views/purchase/contract/columns.js

@@ -2,240 +2,266 @@ import CONFIG from "@/config";
 
 export default function useColumns() {
   const TableColumns = [
-    { item: { width:100,key: "puOrgName", title: "采购组织" }, attr: {} },
-    { item: { width:100,key: "code", title: "合同编码" }, attr: {} },
+    { item: { width: 100, key: "puOrgName", title: "采购组织" }, attr: {} },
+    { item: { width: 100, key: "code", title: "合同编码" }, attr: {} },
     {
-      item: { width:100,key: "status", title: "状态" },
+      item: { width: 100, key: "status", title: "状态" },
       attr: { is: "el-dict-tag", dictName: "documents_status" },
     },
     {
-      item: { width:100,key: "lastPuMoney", title: "上年度采购额" },
+      item: { width: 100, key: "lastPuMoney", title: "上年度采购额" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { lastPuMoney = 0 } = prop;
+          return (lastPuMoney * 1).toFixed(CONFIG.precision);
         },
       },
     },
-    { item: { width:100,key: "buyerName", title: "采购员" }, attr: {} },
-    { item: { width:100,key: "supplierName", title: "供应商" }, attr: {} },
+    { item: { width: 100, key: "buyerName", title: "采购员" }, attr: {} },
+    { item: { width: 100, key: "supplierName", title: "供应商" }, attr: {} },
     {
-      item: { width:100,key: "contractType", title: "合同类型" },
+      item: { width: 100, key: "contractType", title: "合同类型" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_contract_type",
       },
     },
     {
-      item: { width:100,key: "puMoneyYear", title: "本年度采购额" },
+      item: { width: 100, key: "puMoneyYear", title: "本年度采购额" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { puMoneyYear = 0 } = prop;
+          return (puMoneyYear * 1).toFixed(CONFIG.precision);
         },
       },
     },
-    { item: { width:100,key: "puDeptName", title: "采购部门" }, attr: {} },
+    { item: { width: 100, key: "puDeptName", title: "采购部门" }, attr: {} },
     {
-      item: { width:100,key: "supplierTier", title: "供应商层级" },
+      item: { width: 100, key: "supplierTier", title: "供应商层级" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_supplier_tier",
       },
     },
     {
-      item: { width:100,key: "contractName", title: "合同名称" },
+      item: { width: 100, key: "contractName", title: "合同名称" },
       attr: {},
     },
     {
-      item: { width:100,key: "grossRateAverage", title: "平均毛利率 (%)" },
+      item: { width: 100, key: "grossRateAverage", title: "平均毛利率 (%)" },
       attr: {
         is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { grossRateAverage = 0 } = prop;
+          return (grossRateAverage * 1).toFixed(2);
         },
       },
     },
     {
-      item: { width:100,key: "approveFlow", title: "审批流程" },
+      item: { width: 100, key: "approveFlow", title: "审批流程" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_approve_flow",
       },
     },
     {
-      item: { width:100,key: "consumableClass", title: "耗材类别" },
+      item: { width: 100, key: "consumableClass", title: "耗材类别" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_consumable_class",
       },
     },
     {
-      item: { width:100,key: "effectiveDate", title: "合同生效日期" },
+      item: { width: 100, key: "effectiveDate", title: "合同生效日期" },
       attr: {},
     },
     {
-      item: { width:100,key: "brandGrossRate", title: "同类品牌及毛利率 (%)" },
+      item: {
+        width: 100,
+        key: "brandGrossRate",
+        title: "同类品牌及毛利率 (%)",
+      },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { brandGrossRate = 2 } = prop;
+          return (brandGrossRate * 1).toFixed(2);
         },
       },
     },
     {
-      item: { width:100,key: "contractFormat", title: "合同格式" },
+      item: { width: 100, key: "contractFormat", title: "合同格式" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_contract_format",
       },
     },
     {
-      item: { width:100,key: "productName", title: "产品类别&名称" },
+      item: { width: 100, key: "productName", title: "产品类别&名称" },
       attr: {},
     },
-    { item: { width:100,key: "endDate", title: "合同终止日期" }, attr: {} },
+    { item: { width: 100, key: "endDate", title: "合同终止日期" }, attr: {} },
     {
-      item: { width:100,key: "invoiceTax", title: "发票税率 (%)" },
+      item: { width: 100, key: "invoiceTax", title: "发票税率 (%)" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return (prop * 1).toFixed(CONFIG.precision);
+          const { invoiceTax } = prop;
+          return (invoiceTax * 1).toFixed(2);
         },
       },
     },
     {
-      item: { width:100,key: "emergencyDegree", title: "紧急程度" },
+      item: { width: 100, key: "emergencyDegree", title: "紧急程度" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_emergency_degree",
       },
     },
-    { item: { width:100,key: "project", title: "项目医院" }, attr: {} },
+    { item: { width: 100, key: "project", title: "项目医院" }, attr: {} },
     {
-      item: { width:100,key: "deliveryType", title: "交货方式" },
+      item: { width: 100, key: "deliveryType", title: "交货方式" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_delivery_type",
       },
     },
-    { item: { width:100,key: "source", title: "合同来源" }, attr: {} },
+    { item: { width: 100, key: "source", title: "合同来源" }, attr: {} },
     {
-      item: { width:100,key: "contractPartycName", title: "合同丙方" },
+      item: { width: 100, key: "contractPartycName", title: "合同丙方" },
       attr: {},
     },
     {
-      item: { width:100,key: "guaranteePeriodEnd", title: "质保期限" },
+      item: { width: 100, key: "guaranteePeriodEnd", title: "质保期限" },
       attr: {},
     },
     {
-      item: { width:100,key: "freightMethods", title: "运费承担方式" },
+      item: { width: 100, key: "freightMethods", title: "运费承担方式" },
       attr: {
         is: "el-dict-tag",
         dictName: "puarchase_contract_freight_methods",
       },
     },
     {
-      item: { width:100,key: "signDate", title: "合同创建时间" },
+      item: { width: 100, key: "signDate", title: "合同创建时间" },
       attr: {},
     },
     {
-      item: { width:100,key: "isTarget", title: "是否有指标" },
+      item: { width: 100, key: "isTarget", title: "是否有指标" },
       attr: { is: "el-dict-tag", dictName: "sys_yes_no" },
     },
     {
-      item: { width:100,key: "contractTarget", title: "合同指标" },
+      item: { width: 100, key: "contractTarget", title: "合同指标" },
       attr: {},
     },
     {
-      item: { width:100,key: "exemptionPostageCondtion", title: "包邮条件" },
+      item: { width: 100, key: "exemptionPostageCondtion", title: "包邮条件" },
       attr: {},
     },
     {
-      item: { width:100,key: "isRebate", title: "是否有返利" },
+      item: { width: 100, key: "isRebate", title: "是否有返利" },
       attr: { is: "el-dict-tag", dictName: "sys_yes_no" },
     },
     {
-      item: { width:100,key: "rebatePolicy", title: "返利政策" },
+      item: { width: 100, key: "rebatePolicy", title: "返利政策" },
       attr: {},
     },
     {
-      item: { width:100,key: "externalContract", title: "外部合同号" },
+      item: { width: 100, key: "externalContract", title: "外部合同号" },
       attr: {},
     },
     {
-      item: { width:100,key: "rollbackPolicy", title: "退换货政策" },
+      item: { width: 100, key: "rollbackPolicy", title: "退换货政策" },
       attr: {},
     },
-    { item: { width:100,key: "enquiryCode", title: "询价单号" }, attr: {} },
+    { item: { width: 100, key: "enquiryCode", title: "询价单号" }, attr: {} },
     {
-      item: { width:100,key: "contractContent", title: "合同主要内容" },
+      item: { width: 100, key: "contractContent", title: "合同主要内容" },
       attr: {},
     },
     {
-      item: { width:100,key: "refusalReasons", title: "拒绝理由" },
+      item: { width: 100, key: "refusalReasons", title: "拒绝理由" },
       attr: {},
     },
     {
-      item: { width:100,key: "pigeonhole", title: "是否归档" },
+      item: { width: 100, key: "pigeonhole", title: "是否归档" },
       attr: { is: "el-dict-tag", dictName: "sys_yes_no" },
     },
     {
-      item: { width:100,key: "pigeonholeFile", title: "归档附件" },
+      item: {
+        width: 100,
+        key: "pigeonholeFile",
+        title: "归档附件",
+        filterabled: false,
+      },
       attr: { is: "el-file-preview" },
     },
     {
-      item: { width:100,key: "externalFile", title: "对外附件" },
+      item: {
+        width: 100,
+        key: "externalFile",
+        title: "对外附件",
+        filterabled: false,
+      },
       attr: { is: "el-file-preview" },
     },
     {
-      item: { width:100,key: "puFile", title: "采购商盖章合同附件" },
+      item: {
+        width: 100,
+        key: "puFile",
+        title: "采购商盖章合同附件",
+        filterabled: false,
+      },
       attr: { is: "el-file-preview" },
     },
     {
-      item: { width:100,key: "supplierFile", title: "供应商盖章合同附件" },
+      item: {
+        width: 100,
+        key: "supplierFile",
+        title: "供应商盖章合同附件",
+        filterabled: false,
+      },
       attr: { is: "el-file-preview" },
     },
-    { item: { width:100,key: "projectCode", title: "项目编号" }, attr: {} },
-    { item: { width:100,key: "projectName", title: "项目名称" }, attr: {} },
-    { item: { width:100,key: "area", title: "区域" }, attr: {} },
+    { item: { width: 100, key: "projectCode", title: "项目编号" }, attr: {} },
+    { item: { width: 100, key: "projectName", title: "项目名称" }, attr: {} },
+    { item: { width: 100, key: "area", title: "区域" }, attr: {} },
     {
-      item: { width:100,key: "consigneePhone", title: "收货人联系方式" },
+      item: { width: 100, key: "consigneePhone", title: "收货人联系方式" },
       attr: {},
     },
     {
-      item: { width:100,key: "paymentAgreement", title: "付款协议" },
+      item: { width: 100, key: "paymentAgreement", title: "付款协议" },
       attr: {},
     },
     {
-      item: { width:100,key: "taxPrice", title: "价税合计" },
+      item: { width: 100, key: "taxPrice", title: "价税合计" },
       attr: {
-        is: "el-computed-input-v2",
         formatter: (prop) => {
-          return prop ? (prop * 1).toFixed(CONFIG.precision) : "0.000000";
+          const { taxPrice = 0 } = prop;
+          return (taxPrice * 1).toFixed(CONFIG.precision);
         },
       },
     },
-    { item: { width:100,key: "currencyName", title: "币种" }, attr: {} },
+    { item: { width: 100, key: "currencyName", title: "币种" }, attr: {} },
     {
-      item: { width:100,key: "guaranteePeriod", title: "质保期" },
+      item: { width: 100, key: "guaranteePeriod", title: "质保期" },
       attr: {},
     },
   ].map(({ item, attr }) => ({
     attr,
     item: {
-      ...item,
       sortabled: true,
       fixedabled: true,
       filterabled: true,
       hiddenabled: true,
+      ...item,
     },
   }));
 
   const SearchColumns = [
     {
       item: {
-        width:100,key: "contractName",
+        width: 100,
+        key: "contractName",
         title: "合同名称",
       },
       attr: {
@@ -243,7 +269,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { width:100,key: "status", title: "状态" },
+      item: { width: 100, key: "status", title: "状态" },
       attr: {
         is: "el-select",
         dictName: "documents_status",
@@ -251,7 +277,8 @@ export default function useColumns() {
     },
     {
       item: {
-        width:100,key: "pigeonhole",
+        width: 100,
+        key: "pigeonhole",
         title: "是否归档",
       },
       attr: {