feat

.env.development

@@ -1,4 +1,3 @@
-# 项目本地运行端口号
 VITE_PORT = 8848
 
 # 开发环境读取配置文件路径

src/views/InvoiceSales/redInk/config/content.config.ts

@@ -108,7 +108,8 @@ const contentConfig: ContentConfig = {
   columns,
   inv: true,
   superUserNoAction: true,
-  showPreview: ({ status }) => status === "2",
+  notPreview: true,
+  // showPreview: ({ status }) => status === "2",
   apis: {
     httpList
   }

src/views/InvoiceSales/redInk/index.vue

@@ -1,15 +1,15 @@
 <script setup lang="ts">
-import { ref } from "vue";
+// import { ref } from "vue";
 import { PageSearch, usePageSearch } from "/@/components/PageSearch";
 import { PageContent } from "/@/components/PageContent";
 import searchFormConfig from "./config/search.config";
 import contentConfig from "./config/content.config";
-import OpenDialog from "./components/open-dialog.vue";
+// import OpenDialog from "./components/open-dialog.vue";
 import { usePermission } from "/@/hooks/core/usePermission";
 
 const { pageContentRef, handleResetClick, handleSearchClick } = usePageSearch();
 
-const openDialogRef = ref<InstanceType<typeof OpenDialog>>(null);
+// const openDialogRef = ref<InstanceType<typeof OpenDialog>>(null);
 
 const { hasPermissionWithCode, permissions } = usePermission("redInk");
 </script>
@@ -27,11 +27,10 @@ const { hasPermissionWithCode, permissions } = usePermission("redInk");
           ref="pageContentRef"
           :content-config="contentConfig"
           :powers="permissions"
-          @preview-btn-click="({ invRed }) => openDialogRef.onDisplay(invRed)"
         />
       </div>
     </PagePower>
-    <OpenDialog ref="openDialogRef" />
+    <!-- <OpenDialog ref="openDialogRef" /> -->
   </div>
 </template>
 

src/views/netOrderEnter/netOrderEntry/qrd-modal.vue

@@ -148,21 +148,22 @@ function handleConfirm() {
 
 function onDisplay(_modalType: ModalTypes, id?: string) {
   const isUpdateOrPriview = _modalType === ModalTypes.update || _modalType === ModalTypes.preview;
+  modalType.value = _modalType;
+  visible.value = true;
 
   if (!isUpdateOrPriview && !currentCompany.value.companyNo) { 
     ElMessage.warning('请在右上角选择一家公司');
     return
   }
 
-  visible.value = true;
-  modalType.value = _modalType;
-  isUpdateOrPriview && requsetQrdDetail({ id });
-
-  if (!isUpdateOrPriview) { 
-    requsetRatelist();
-    formData.value.companyNo = currentCompany.value.companyNo;
-    nextTick(() => companyRef.value.initalData({ companyNo:currentCompany.value.companyNo }))
+  if (isUpdateOrPriview) { 
+    requsetQrdDetail({ id });
+    return 
   }
+
+  requsetRatelist();
+  formData.value.companyNo = currentCompany.value.companyNo;
+  nextTick(() => companyRef.value.initalData({ companyNo: currentCompany.value.companyNo }))
  }
 
 defineExpose({ onDisplay })
@@ -172,13 +173,13 @@ defineExpose({ onDisplay })
   <ElDialog 
    v-model="visible" 
    :title="title" 
+   destroy-on-close
    width="1040px" 
-   center 
    top="10vh" 
+   center 
    v-loading="dialogloading" 
    @close="() => formData = {...defaultData}"
    :close-on-click-modal="false"
-   destroy-on-close
  >
      <ElForm
         ref="formRef"
@@ -191,11 +192,13 @@ defineExpose({ onDisplay })
           <ElCol :span="24" style="padding: 0 0 10px 0; margin-top: -5px">
             <ElDivider><ElTag>确认单信息</ElTag></ElDivider>
           </ElCol>
+          
           <ElCol :span="8">
             <ElFormItem label="销售员" prop="sale_id">
               <SaleUser ref="saleUserRef" v-model="formData.sale_id" @item-change="handleUserChange($event,'sale_name')" />
             </ElFormItem>
           </ElCol>
+
           <ElCol :span="8">
             <ElFormItem label="销售员部门" prop="sale_depart">
               <ElSelect style="width:100%" v-model="formData.sale_depart">
@@ -225,11 +228,13 @@ defineExpose({ onDisplay })
               ></ElInputNumber>
             </ElFormItem>
           </ElCol>
+         
           <ElCol :span="8">
             <ElFormItem label="采购员" prop="buyerid">
                <User ref="buyerUserRef" v-model="formData.buyerid"  @item-change="handleUserChange($event,'buyer')" />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="8">
             <ElFormItem label="采购员部门" prop="cgd_depart">
               <ElSelect style="width:100%" v-model="formData.cgd_depart">
@@ -243,6 +248,7 @@ defineExpose({ onDisplay })
               </ElSelect>
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="单据号" prop="workCode">
               <ElInput
@@ -250,9 +256,10 @@ defineExpose({ onDisplay })
                 placeholder="单据号"
                 maxlength="200"
               />
-            </ElFormItem> </ElCol> 
+            </ElFormItem> 
+          </ElCol> 
             
-            <ElCol :span="12">
+          <ElCol :span="12">
             <ElFormItem label="PO编号" prop="poCode">
               <ElInput
                 v-model="formData.poCode"
@@ -261,19 +268,23 @@ defineExpose({ onDisplay })
               />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="购买方公司" prop="khNo">
               <Customer ref="customerRef" v-model="formData.khNo"  />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="销售方公司" prop="companyNo">
               <Company ref="companyRef" v-model="formData.companyNo" />
             </ElFormItem>
           </ElCol>
+         
           <ElCol :span="24" style="padding: 0 0 10px 0; margin-top: -5px">
             <ElDivider><ElTag>收货信息</ElTag></ElDivider>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="收货人" prop="contactor">
               <ElInput
@@ -283,6 +294,7 @@ defineExpose({ onDisplay })
               />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="联系电话" prop="mobile">
               <ElInput
@@ -292,6 +304,7 @@ defineExpose({ onDisplay })
               />
             </ElFormItem>
           </ElCol>
+         
           <ElCol :span="12">
             <ElFormItem label="联系地址" prop="addr">
               <ElInput
@@ -301,6 +314,7 @@ defineExpose({ onDisplay })
               />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="发货时间" prop="sendtime">
               <ElDatePicker
@@ -326,11 +340,13 @@ defineExpose({ onDisplay })
               <Supplier ref="supplierRef" v-model="formData.supplierNo" />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="商品分类" prop="cat">
               <Category v-model="formData.cat"  @change="categorys => categoryData = categorys" />
             </ElFormItem>
           </ElCol>
+          
           <ElCol :span="12">
             <ElFormItem label="商品名称" prop="goodName">
               <ElInput
@@ -340,6 +356,7 @@ defineExpose({ onDisplay })
               /> 
             </ElFormItem>
           </ElCol>
+         
           <ElCol :span="6">
             <ElFormItem label="数量" prop="goodNum">
               <ElInputNumber
@@ -352,8 +369,10 @@ defineExpose({ onDisplay })
                 step-strictly
                 :step="1"
                 :max="9999999"
-              ></ElInputNumber> </ElFormItem
-          ></ElCol>
+              ></ElInputNumber> 
+            </ElFormItem>
+          </ElCol>
+          
           <ElCol :span="6">
             <ElFormItem label="单价" label-width="55px" prop="goodPrice">
               <ElInputNumber