Procházet zdrojové kódy

Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into test

yusheng před 9 měsíci
rodič
revize
69845d42c3

+ 23 - 3
src/views/contractManage/contractBook/index.vue

@@ -57,6 +57,14 @@
                     >
                       批量删除
                     </el-button>
+                    <!-- <el-button
+                      type="primary"
+                      size="small"
+                      icon="el-icon-upload2"
+                      @click="uploadFile"
+                      >导入</el-button
+                    > -->
+                    <!-- v-if="$hasPermission('eom:contract:import')" -->
                   </div>
                   <div class="title">
                     合同总金额:{{ extInfo.contractTotalPrice }}元
@@ -215,6 +223,14 @@
       v-if="addOrEditDialogFlag"
       @reload="reload"
     ></addInvoiceManage>
+    <importDialog
+      ref="importDialogRef"
+      @success="reload"
+      :fileUrl="'/eom/contract/importTemplate'"
+      :isWeb="false"
+      fileName="合同台账导入模板"
+      apiUrl="/eom/contract/importFile"
+    />
   </div>
 </template>
 
@@ -243,7 +259,7 @@
   import addInvoiceManage from '@/views/financialManage/invoiceManage/components/addOrEditDialog.vue';
 
   import { parameterGetByCode } from '@/api/main/index.js';
-
+  import importDialog from '@/components/upload/import-dialog.vue';
   export default {
     mixins: [dictMixins, tabMixins],
     components: {
@@ -257,7 +273,8 @@
       saleOrderAddDialog,
       supplierAddDialog,
       addInvoiceManage,
-      jimureport
+      jimureport,
+      importDialog
     },
     //客户管理数据
     props: {
@@ -647,7 +664,10 @@
       //查看详情
       openDetail(row) {
         this.$refs.contactDetailDialogRef.open(row);
-      }
+      },
+      uploadFile() {
+        this.$refs.importDialogRef.open();
+      },
     }
   };
 </script>

+ 1 - 1
src/views/purchasingManage/purchaseNeedManage/index.vue

@@ -97,7 +97,7 @@
             <el-link
               type="primary"
               icon="el-icon-plus"
-              v-if="[2].includes(row.status)"
+              v-if="[2].includes(row.status) && row.isCreatePlanOrder === 0"
               @click="openPurchasePlanManage(row)"
             >
               生成采购计划