Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!369

src/api/business/purchase/purchase-order.js

@@ -152,6 +152,15 @@ const toOA =(userName, fdId) => {
   })
 }
 
+// 采购订单修订导出
+const orderExport =(data) => {
+  return request({
+    url: `/pu/order/export`,
+    method: "POST",
+    data: data,
+  })
+}
+
 export default {
   list,
   details,
@@ -170,5 +179,6 @@ export default {
   putInStorage,
   returnedGoods,
   toOA,
+  orderExport,
 
 }

src/components/FileUpload/index.vue

@@ -13,9 +13,10 @@
       :headers="headers"
       class="upload-file-uploader"
       ref="fileUpload"
+      :disabled="disabled"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button size="mini" type="primary" :disabled="disabled">选取文件</el-button>
       <!-- <i class="el-icon-upload"></i>
       <div class="el-upload__text">
         将文件拖到此处，或
@@ -54,8 +55,12 @@
           <span class="el-icon-document"> {{ file.name }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger"
-            >删除</el-link
+          <el-link 
+            :underline="false" 
+            @click="handleDelete(index)" 
+            type="danger"
+            :disabled="disabled"
+          >删除</el-link
           >
         </div>
       </li>
@@ -91,6 +96,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    disabled:{
+      type:Boolean,
+      default:false,
+    }
   },
   data() {
     return {

src/views/material/basicFile/index.vue

@@ -320,6 +320,9 @@
       },
       //查询
       handleQuery() {
+        // 重新查询后需要清空列表选中的数据
+        this.checkedList = [];
+        this.$refs.materialTable.clearSelection();
         this.getMaterialList('material');
       },
       // 重置查询条件

src/views/purchase/PurchaseDemandList/add.vue

@@ -999,6 +999,22 @@ export default {
                 Object.values(data).forEach(errList => {
                     console.log('data',data)
                     console.log(errList)
+                    // 将子表下标加入进入标识字段
+                    this.basicForm.puDemandItemList.forEach((item,index) => {
+                      item.rightIndex = index
+                    })
+                    console.log('所有列表', this.basicForm.puDemandItemList)
+                    // 将校验未通过的项与整个表格数据进行过滤对比，得出校验通过的数据
+                    let rightList = this.basicForm.puDemandItemList.filter((item, index) => {
+                      return errList.find(item2 => {
+                        return item2.rowIndex !== item.rightIndex
+                      })
+                    })
+                    console.log('xxx',rightList)
+                    rightList.forEach(items => {
+                      this.$refs.table.$el.querySelector(`.elx-body--row:nth-of-type(${items.rightIndex+1})`).style.background = ''
+                    })
+
                     errList.forEach(params => {
                         let { rowIndex, column, rules } = params
                         rules.forEach(rule => {
@@ -1033,6 +1049,7 @@ export default {
           this.back()
         }
       }).catch(err => {
+        console.log(err)
         this.$modal.closeLoading();
       })
     },

src/views/purchase/apply/edit/index.vue

@@ -97,6 +97,7 @@ export default {
   methods: {
     //
     async changeMaterialName(prop) {
+      console.log('prop',prop);
       const { selectData } = prop;
       const {
         puOrg,
@@ -106,11 +107,13 @@ export default {
         currencyCode,
         currencyName,
       } = this.params;
+      console.log('selectData', selectData)
       const { nickName: createByName } = this.$store.state.user;
       if (selectData.length) {
         this.params[this.tabName].splice(-1);
       }
       for (const item of selectData) {
+        console.log('item', item)
         this.loading = true;
         const { tax: taxName, unitName, code: materialCode } = item;
         // task 1

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

@@ -20,16 +20,7 @@ export default function useColumns() {
       attr: { is: "el-input" },
     },
     {
-      item: { key: "status", title: "状态" },
-      attr: {
-        is: "el-select",
-        dictName: "documents_status",
-        disabled: true,
-        value: "0",
-      },
-    },
-    {
-      item: { key: "lastPuMoney", title: "上年度采购额", width: 100 },
+      item: { key: "lastPuMoney", title: "年度采购额", width: 100 },
       attr: {
         is: "el-input-number",
       },
@@ -48,21 +39,17 @@ export default function useColumns() {
         },
       },
     },
+
     {
       item: {
-        key: "supplierName",
-        title: "供应商",
+        key: "isPartya",
+        title: "采购是否甲方",
         required: true,
         width: 100,
       },
       attr: {
-        is: "el-popover-select-v2",
-        valueKey: "name",
-        referName: "SUPPLIER_PARAM",
-        dataMapping: {
-          supplier: "code",
-          supplierName: "name",
-        },
+        is: "el-select",
+        dictName: "sys_yes_no",
       },
     },
     {
@@ -75,7 +62,7 @@ export default function useColumns() {
       attr: { is: "el-select", dictName: "puarchase_contract_contract_type" },
     },
     {
-      item: { key: "puMoneyYear", title: "本年度采购额", width: 100 },
+      item: { key: "puMoneyYear", title: "合同总金额", width: 100 },
       attr: {
         is: "el-input-number",
       },
@@ -99,12 +86,20 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "supplierTier",
-        title: "供应商层级",
+        key: "supplierName",
+        title: "供应商",
         required: true,
         width: 100,
       },
-      attr: { is: "el-select", dictName: "puarchase_contract_supplier_tier" },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "SUPPLIER_PARAM",
+        dataMapping: {
+          supplier: "code",
+          supplierName: "name",
+        },
+      },
     },
     {
       item: {
@@ -138,15 +133,12 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "consumableClass",
-        title: "耗材类别",
+        key: "supplierTier",
+        title: "供应商层级",
         required: true,
         width: 100,
       },
-      attr: {
-        is: "el-select",
-        dictName: "puarchase_contract_consumable_class",
-      },
+      attr: { is: "el-select", dictName: "puarchase_contract_supplier_tier" },
     },
     {
       item: {
@@ -166,10 +158,11 @@ export default function useColumns() {
         title: "同类品牌及毛利率 (%)",
         required: true,
       },
-      attr: {
-        is: "el-input-number",
-        precision: 2,
-      },
+      // attr: {
+      //   is: "el-input-number",
+      //   precision: 2,
+      // },
+      attr: { is: "el-input", },
     },
     {
       item: {
@@ -185,12 +178,15 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "productName",
-        title: "产品类别&名称",
+        key: "consumableClass",
+        title: "耗材类别",
         required: true,
         width: 100,
       },
-      attr: { is: "el-input" },
+      attr: {
+        is: "el-select",
+        dictName: "puarchase_contract_consumable_class",
+      },
     },
     {
       item: {
@@ -234,10 +230,19 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "project", title: "项目医院", required: true, width: 100 },
+      item: {
+        key: "productName",
+        title: "产品类别&名称",
+        required: true,
+        width: 100,
+      },
       attr: { is: "el-input" },
     },
     {
+      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
+    },
+    {
       item: {
         key: "deliveryType",
         title: "交货方式",
@@ -251,16 +256,8 @@ export default function useColumns() {
       attr: { is: "el-input", value: "自制", disabled: true },
     },
     {
-      item: { key: "contractPartycName", title: "合同丙方", width: 100 },
-      attr: {
-        is: "el-popover-select-v2",
-        valueKey: "name",
-        referName: "SUPPLIER_PARAM",
-        dataMapping: {
-          contractPartyc: "code",
-          contractPartycName: "name",
-        },
-      },
+      item: { key: "principalManufacturers", title: "主要厂家", width: 100 },
+      attr: { is: "el-input", },
     },
     {
       item: {
@@ -269,7 +266,8 @@ export default function useColumns() {
         required: true,
         width: 100,
       },
-      attr: { is: "el-input-number", precision: 2 },
+      // attr: { is: "el-input-number", precision: 2 },
+      attr: { is: "el-input", },
     },
     {
       item: { key: "freightMethods", title: "运费承担方式", width: 100 },
@@ -279,10 +277,40 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      item: { key: "create_time", title: "合同创建时间", width: 100 },
       attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
     },
     {
+      item: { key: "project", title: "项目医院", required: true, width: 100 },
+      attr: { is: "el-input" },
+    },
+    {
+      item: { key: "contractPartycName", title: "合同丙方", width: 100 },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "SUPPLIER_PARAM",
+        dataMapping: {
+          contractPartyc: "code",
+          contractPartycName: "name",
+        },
+      },
+    },
+
+    {
+      item: {
+        key: "exemptionPostageCondtion",
+        title: "包邮条件",
+        span: 12,
+        width: 100,
+      },
+      attr: {
+        is: "el-input",
+        placeholder:
+          "当运费承担方式为供应商有条件承担时，该字段必填，填写要求，写明什么条件下供应商承担全部，什么条件下我方承担，什么条件下分别承担",
+      },
+    },
+    {
       item: {
         key: "isTarget",
         title: "是否有指标",
@@ -300,18 +328,18 @@ export default function useColumns() {
       },
       attr: { is: "el-input", placeholder: '当【是否有指标】="有"时，必填' },
     },
+    // {
+    //   item: { key: "", title: "交易类型", required: true, span: 12,},
+    //   attr: { is: "el-input" },
+    // },
     {
       item: {
-        key: "exemptionPostageCondtion",
-        title: "包邮条件",
+        key: "rollbackPolicy",
+        title: "退换货政策",
+        required: true,
         span: 12,
-        width: 100,
-      },
-      attr: {
-        is: "el-input",
-        placeholder:
-          "当运费承担方式为供应商有条件承担时，该字段必填，填写要求，写明什么条件下供应商承担全部，什么条件下我方承担，什么条件下分别承担",
       },
+      attr: { is: "el-input" },
     },
     {
       item: {
@@ -322,6 +350,7 @@ export default function useColumns() {
       },
       attr: { is: "el-select", dictName: "sys_yes_no" },
     },
+
     {
       item: {
         key: "rebatePolicy",
@@ -335,72 +364,74 @@ export default function useColumns() {
         placeholder: '当【是否有返利】="有"时，必填',
       },
     },
-    {
-      item: { key: "externalContract", title: "外部合同号", width: 100 },
-      attr: { is: "el-input" },
-    },
+   
     {
       item: {
-        key: "rollbackPolicy",
-        title: "退换货政策",
+        key: "contractContent",
+        title: "合同主要内容",
         required: true,
+        span: 24,
         width: 100,
       },
-      attr: { is: "el-input" },
+      attr: { is: "el-input", type: "textarea",rows:3, },
     },
+
     {
       item: { key: "enquiryCode", title: "询价单号", width: 100 },
       attr: { is: "el-input" },
     },
+   
+
     {
-      item: {
-        key: "contractContent",
-        title: "合同主要内容",
-        required: true,
-        span: 24,
-        width: 100,
-      },
-      attr: { is: "el-input", type: "textarea" },
+      item: { key: "electronicContract", title: "电子合同", span: 6, width: 100 },
+      attr: { is: "el-input" },
     },
+    
     {
-      item: { key: "refusalReasons", title: "拒绝理由", span: 24, width: 100 },
+      item: { key: "refusalReasons", title: "拒绝理由", span: 6, width: 100 },
       attr: { is: "el-input" },
     },
     {
-      item: { key: "externalFile", title: "对外附件", span: 24, width: 100 },
-      attr: { is: "el-file-upload", fileType: ["pdf"] },
+      item: { key: "status", title: "状态" },
+      attr: {
+        is: "el-select",
+        dictName: "documents_status",
+        disabled: true,
+        value: "0",
+      },
     },
+    
     {
-      item: {
-        key: "puFile",
-        title: "采购商盖章合同附件",
-        span: 24,
-        width: 100,
-      },
-      attr: { is: "el-file-upload", fileType: ["pdf"] },
+      item: { key: "externalFile", title: "附件", span: 12, width: 100 },
+      attr: { is: "el-file-upload", fileType: ["pdf","doc","docx","png","jpg","xls","xlsx"] },
     },
     {
       item: {
-        key: "supplierFile",
-        title: "供应商盖章合同附件",
-        span: 24,
+        key: "puFile",
+        title: "盖章合同附件",
+        span: 12,
         width: 100,
       },
       attr: { is: "el-file-upload", fileType: ["pdf"] },
     },
-    {
-      item: { key: "projectCode", title: "项目编号", width: 100 },
-      attr: { is: "el-input" },
-    },
-    {
-      item: { key: "projectName", title: "项目名称", width: 100 },
-      attr: { is: "el-input" },
-    },
-    { item: { key: "area", title: "区域" }, attr: { is: "el-input" } },
-    {
-      item: { key: "consigneePhone", title: "收货人联系方式", width: 100 },
-      attr: { is: "el-input" },
-    },
+    // {
+    //   item: {
+    //     key: "supplierFile",
+    //     title: "供应商盖章合同附件",
+    //     span:12,
+    //     width: 100,
+    //   },
+    //   attr: { is: "el-file-upload", fileType: ["pdf"] },
+    // },
+    // {
+    //   item: {
+    //     key: "",
+    //     title: "电子合同供应商附件",
+    //     span: 12,
+    //     width: 100,
+    //   },
+    //   attr: { is: "el-file-upload", fileType: ["pdf"] },
+    // },
     {
       item: {
         key: "paymentAgreement",
@@ -442,11 +473,45 @@ export default function useColumns() {
         is: "el-input-number",
       },
     },
+    
+
+
+
+
+
+
+
+
+    
+    
+    // {
+    //   item: { key: "externalContract", title: "外部合同号", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    
+    // {
+    //   item: { key: "projectCode", title: "项目编号", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    // {
+    //   item: { key: "projectName", title: "项目名称", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    // { item: { key: "area", title: "区域" }, attr: { is: "el-input" } },
+    // {
+    //   item: { key: "consigneePhone", title: "收货人联系方式", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },
   }));
 
+
+
+
+
   const TabColumns = [
     {
       item: { title: "物料基本信息", key: "contractItemList" },

src/views/purchase/contract/columns.js

@@ -9,7 +9,7 @@ export default function useColumns() {
       attr: { is: "el-dict-tag", dictName: "documents_status" },
     },
     {
-      item: { width: 100, key: "lastPuMoney", title: "上年度采购额" },
+      item: { width: 100, key: "lastPuMoney", title: "年度采购额" },
       attr: {
         formatter: (prop) => {
           const { lastPuMoney = 0 } = prop;
@@ -27,7 +27,7 @@ export default function useColumns() {
       },
     },
     {
-      item: { width: 100, key: "puMoneyYear", title: "本年度采购额" },
+      item: { width: 100, key: "puMoneyYear", title: "合同总金额" },
       attr: {
         formatter: (prop) => {
           const { puMoneyYear = 0 } = prop;
@@ -207,7 +207,7 @@ export default function useColumns() {
       item: {
         width: 100,
         key: "puFile",
-        title: "采购商盖章合同附件",
+        title: "盖章合同附件",
         filterabled: false,
       },
       attr: { is: "el-file-preview" },

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

@@ -20,16 +20,7 @@ export default function useColumns() {
       attr: { is: "el-input" },
     },
     {
-      item: { key: "status", title: "状态" },
-      attr: {
-        is: "el-select",
-        dictName: "documents_status",
-        disabled: true,
-        value: "0",
-      },
-    },
-    {
-      item: { key: "lastPuMoney", title: "上年度采购额", width: 100 },
+      item: { key: "lastPuMoney", title: "年度采购额", width: 100 },
       attr: {
         is: "el-input-number",
       },
@@ -50,19 +41,14 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "supplierName",
-        title: "供应商",
+        key: "isPartya",
+        title: "采购是否甲方",
         required: true,
         width: 100,
       },
       attr: {
-        is: "el-popover-select-v2",
-        valueKey: "name",
-        referName: "SUPPLIER_PARAM",
-        dataMapping: {
-          supplier: "code",
-          supplierName: "name",
-        },
+        is: "el-select",
+        dictName: "sys_yes_no",
       },
     },
     {
@@ -75,7 +61,7 @@ export default function useColumns() {
       attr: { is: "el-select", dictName: "puarchase_contract_contract_type" },
     },
     {
-      item: { key: "puMoneyYear", title: "本年度采购额", width: 100 },
+      item: { key: "puMoneyYear", title: "合同总金额", width: 100 },
       attr: {
         is: "el-input-number",
       },
@@ -99,12 +85,20 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "supplierTier",
-        title: "供应商层级",
+        key: "supplierName",
+        title: "供应商",
         required: true,
         width: 100,
       },
-      attr: { is: "el-select", dictName: "puarchase_contract_supplier_tier" },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "SUPPLIER_PARAM",
+        dataMapping: {
+          supplier: "code",
+          supplierName: "name",
+        },
+      },
     },
     {
       item: {
@@ -138,15 +132,12 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "consumableClass",
-        title: "耗材类别",
+        key: "supplierTier",
+        title: "供应商层级",
         required: true,
         width: 100,
       },
-      attr: {
-        is: "el-select",
-        dictName: "puarchase_contract_consumable_class",
-      },
+      attr: { is: "el-select", dictName: "puarchase_contract_supplier_tier" },
     },
     {
       item: {
@@ -167,8 +158,9 @@ export default function useColumns() {
         required: true,
       },
       attr: {
-        is: "el-input-number",
-        precision: 2,
+        is: "el-input",
+        // is: "el-input-number",
+        // precision: 2,
       },
     },
     {
@@ -185,12 +177,15 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "productName",
-        title: "产品类别&名称",
+        key: "consumableClass",
+        title: "耗材类别",
         required: true,
         width: 100,
       },
-      attr: { is: "el-input" },
+      attr: {
+        is: "el-select",
+        dictName: "puarchase_contract_consumable_class",
+      },
     },
     {
       item: {
@@ -241,10 +236,20 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "project", title: "项目医院", required: true, width: 100 },
+      item: {
+        key: "productName",
+        title: "产品类别&名称",
+        required: true,
+        width: 100,
+      },
       attr: { is: "el-input" },
     },
     {
+      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
+    },
+   
+    {
       item: {
         key: "deliveryType",
         title: "交货方式",
@@ -258,16 +263,8 @@ export default function useColumns() {
       attr: { is: "el-input", value: "自制", disabled: true },
     },
     {
-      item: { key: "contractPartycName", title: "合同丙方", width: 100 },
-      attr: {
-        is: "el-popover-select-v2",
-        valueKey: "name",
-        referName: "SUPPLIER_PARAM",
-        dataMapping: {
-          contractPartyc: "code",
-          contractPartycName: "name",
-        },
-      },
+      item: { key: "principalManufacturers", title: "主要厂家", width: 100 },
+      attr: { is: "el-input", },
     },
     {
       item: {
@@ -276,7 +273,7 @@ export default function useColumns() {
         required: true,
         width: 100,
       },
-      attr: { is: "el-input-number", precision: 2 },
+      attr: { is: "el-input", },
     },
     {
       item: { key: "freightMethods", title: "运费承担方式", width: 100 },
@@ -286,10 +283,39 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "signDate", title: "合同签订日期", width: 100 },
+      item: { key: "create_time", title: "合同创建时间", width: 100 },
       attr: { is: "el-date-picker", valueFormat: "yyyy-MM-dd" },
     },
     {
+      item: { key: "project", title: "项目医院", required: true, width: 100 },
+      attr: { is: "el-input" },
+    },
+    {
+      item: { key: "contractPartycName", title: "合同丙方", width: 100 },
+      attr: {
+        is: "el-popover-select-v2",
+        valueKey: "name",
+        referName: "SUPPLIER_PARAM",
+        dataMapping: {
+          contractPartyc: "code",
+          contractPartycName: "name",
+        },
+      },
+    },
+    {
+      item: {
+        key: "exemptionPostageCondtion",
+        title: "包邮条件",
+        span: 12,
+        width: 100,
+      },
+      attr: {
+        is: "el-input",
+        placeholder:
+          "当运费承担方式为供应商有条件承担时，该字段必填，填写要求，写明什么条件下供应商承担全部，什么条件下我方承担，什么条件下分别承担",
+      },
+    },
+    {
       item: {
         key: "isTarget",
         title: "是否有指标",
@@ -309,16 +335,13 @@ export default function useColumns() {
     },
     {
       item: {
-        key: "exemptionPostageCondtion",
-        title: "包邮条件",
-        span: 12,
+        key: "rollbackPolicy",
+        title: "退换货政策",
+        required: true,
         width: 100,
+        span:12,
       },
-      attr: {
-        is: "el-input",
-        placeholder:
-          "当运费承担方式为供应商有条件承担时，该字段必填，填写要求，写明什么条件下供应商承担全部，什么条件下我方承担，什么条件下分别承担",
-      },
+      attr: { is: "el-input" },
     },
     {
       item: {
@@ -343,71 +366,58 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "externalContract", title: "外部合同号", width: 100 },
-      attr: { is: "el-input" },
-    },
-    {
       item: {
-        key: "rollbackPolicy",
-        title: "退换货政策",
+        key: "contractContent",
+        title: "合同主要内容",
         required: true,
+        span: 24,
         width: 100,
       },
-      attr: { is: "el-input" },
+      attr: { is: "el-input", type: "textarea", rows:3,},
     },
     {
       item: { key: "enquiryCode", title: "询价单号", width: 100 },
       attr: { is: "el-input" },
     },
     {
-      item: {
-        key: "contractContent",
-        title: "合同主要内容",
-        required: true,
-        span: 24,
-        width: 100,
-      },
-      attr: { is: "el-input", type: "textarea" },
+      item: { key: "electronicContract", title: "电子合同", span: 6, width: 100 },
+      attr: { is: "el-input" },
     },
     {
-      item: { key: "refusalReasons", title: "拒绝理由", span: 24, width: 100 },
+      item: { key: "refusalReasons", title: "拒绝理由", span: 6, width: 100 },
       attr: { is: "el-input" },
     },
     {
-      item: { key: "externalFile", title: "对外附件", span: 24, width: 100 },
-      attr: { is: "el-file-upload", fileType: ["pdf"] },
+      item: { key: "status", title: "状态" },
+      attr: {
+        is: "el-select",
+        dictName: "documents_status",
+        disabled: true,
+        value: "0",
+      },
     },
     {
-      item: {
-        key: "puFile",
-        title: "采购商盖章合同附件",
-        span: 24,
-        width: 100,
-      },
-      attr: { is: "el-file-upload", fileType: ["pdf"] },
+      item: { key: "externalFile", title: "附件", span: 12, width: 100 },
+      attr: { is: "el-file-upload", fileType: ["pdf","doc","docx","png","jpg","xls","xlsx"] },
     },
     {
       item: {
-        key: "supplierFile",
-        title: "供应商盖章合同附件",
-        span: 24,
+        key: "puFile",
+        title: "盖章合同附件",
+        span: 12,
         width: 100,
       },
       attr: { is: "el-file-upload", fileType: ["pdf"] },
     },
-    {
-      item: { key: "projectCode", title: "项目编号", width: 100 },
-      attr: { is: "el-input" },
-    },
-    {
-      item: { key: "projectName", title: "项目名称", width: 100 },
-      attr: { is: "el-input" },
-    },
-    { item: { key: "area", title: "区域" }, attr: { is: "el-input" } },
-    {
-      item: { key: "consigneePhone", title: "收货人联系方式", width: 100 },
-      attr: { is: "el-input" },
-    },
+    // {
+    //   item: {
+    //     key: "supplierFile",
+    //     title: "供应商盖章合同附件",
+    //     span: 24,
+    //     width: 100,
+    //   },
+    //   attr: { is: "el-file-upload", fileType: ["pdf"] },
+    // },
     {
       item: {
         key: "paymentAgreement",
@@ -449,6 +459,44 @@ export default function useColumns() {
         is: "el-input-number",
       },
     },
+    
+   
+   
+   
+   
+   
+    
+   
+   
+   
+   
+    
+   
+   
+   
+  
+   
+    
+    // {
+    //   item: { key: "externalContract", title: "外部合同号", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    
+    
+    // {
+    //   item: { key: "projectCode", title: "项目编号", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    // {
+    //   item: { key: "projectName", title: "项目名称", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+    // { item: { key: "area", title: "区域" }, attr: { is: "el-input" } },
+    // {
+    //   item: { key: "consigneePhone", title: "收货人联系方式", width: 100 },
+    //   attr: { is: "el-input" },
+    // },
+   
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

src/views/purchase/contract/see/index.vue

@@ -20,6 +20,7 @@ export default {
     ElSuperDescriptions: () =>
       import("@/components/super-descriptions/index.vue"),
     ElSuperTable: () => import("@/components/super-table/index.vue"),
+    ElSuperForm: () => import("@/components/super-form/index.vue"),
   },
   data() {
     const {
@@ -105,19 +106,32 @@ export default {
       <h4 class="m-0" style="font-weight: 500; flex: 1">
         {{ title.split("-")[0] }}
       </h4>
-      <el-button
+      <!-- <el-button
         type="primary"
         :size="$attrs.size"
         :loading="loading"
         @click="useSubmit('superForm')"
         >确 认</el-button
-      >
+      > -->
       <el-button :size="$attrs.size" :loading="loading" @click="hide"
         >取 消</el-button
       >
     </div>
     <div v-if="params.code" style="flex: 1; overflow-y: auto">
-      <el-super-descriptions
+      <el-super-form
+        v-if="params.code"
+        v-model="params"
+        :dict="dict"
+        :size="$attrs.size"
+        :columns="TableColumns"
+        ref="superForm"
+        label-width="auto"
+        label-position="right"
+        style="padding: 18px"
+      >
+       
+    </el-super-form>
+      <!-- <el-super-descriptions
         v-if="params.code"
         v-model="params"
         :dict="dict"
@@ -126,7 +140,7 @@ export default {
         :columns="TableColumns"
         style="padding: 18px"
       >
-      </el-super-descriptions>
+      </el-super-descriptions> -->
     </div>
     <el-tabs
       v-if="params.code"

src/views/purchase/purchase-order/index.vue

@@ -96,6 +96,10 @@ export default {
         }
       }
     },
+
+    handleDownload(){
+
+    },
     async jumpFlow(row){
       const {name} = this.$store.state.user;
 
@@ -642,8 +646,13 @@ export default {
             @click="handlePurchaseReturn"
           >采购退货</el-button> -->
           <el-button type="primary" size="mini" @click="handlePaymentRequest">付款申请</el-button>
-
+          <!-- <el-button 
+            type="primary" 
+            size="mini" 
+            @click="handleDownload" 
+          >批量导出</el-button> -->
         </el-button-group>
+        
 
 
       </el-col>