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

3 months ago · 927313b019
2 changed files with 8 additions and 13 deletions
--- a/index.html
+++ b/index.html
@ -6,14 +6,8 @@
    <link rel="icon" href="/src/assets/imgs/logo1.png" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta
-      name="keywords"
-      content="富维海拉智慧工厂管理平台 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
-    />
-    <meta
-      name="description"
-      content="富维海拉智慧工厂管理平台 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
-    />
+    <meta name="keywords" content="富维海拉智慧工厂管理平台" />
+    <meta name="description" content="富维海拉智慧工厂管理平台" />
    <title>%VITE_APP_TITLE%</title>
  </head>
  <body>
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@ -148,7 +148,8 @@
    :apiPage="SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage"
    :apiDelete="SupplierinvoiceRequestDetailApi.deleteSupplierinvoiceRequestDetail" 
    :Echo="Echo"
-    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowEdit="true"
+    :detailButtonIsShowAddStatusArray="['1','6']"
    :detailButtonIsShowDelete="false"
    :detailButtonIsShowAdd="false"
    @buttonBaseClick="detailButtonBaseClick"
@ -442,11 +443,11 @@ const handleImport = () => {
  /** 添加/修改操作 */
  const formRef = ref()
  const openForm = async (type : string, row ?: number) => {
-    if(type=='update'){
-      SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
-    }else{
+    // if(type=='update'){
+    //   SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
+    // }else{
      SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
-    }
+    // }
    if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
    // 校验是否可以开票
    SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {