修改bug

src/views/admin/IssueInfo/components/IssueInfoDetailForm.vue

@@ -4,22 +4,30 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
           name="NuIssueInfoForm">
-          <a-row style="padding:14px;">
+          <a-row style="padding:14px;" class="card-class">
-            <a-col :span="24" style="text-align: center;">
+            <a-col :span="24">
-              <p>
+              <a-form-item label="机构名称" v-bind="validateInfos.orgName" id="NuIssueInfoForm-orgName"
-                <span>机构名称：</span>
+                name="orgName">
-                <span>{{ formData.orgName_dictText }}</span>
+                <a-input v-model:value="formData.orgName_dictText" placeholder="请输入机构名称" disabled></a-input>
-              </p>
+              </a-form-item>
-              <p>
-                <span>发版类型：</span>
-                <span>{{ formData.issueType_dictText }}</span>
-                <span style="margin-left: 40px;">发版日期：</span>
-                <span>{{ formData.createTime }}</span>
-              </p>
             </a-col>
-            <a-col :span="24" style="margin-top: 20px;">
+            <a-col :span="24">
-              <!-- <p>发版内容：</p> -->
+              <a-form-item label="发版类型" v-bind="validateInfos.issueType_dictText"
-              <div v-html="formData.content"></div>
+                id="NuEmployeesAdvisoryInfoForm-issueType_dictText" name="issueType_dictText">
+                <a-input v-model:value="formData.issueType_dictText" placeholder="请输入发版类型" disabled></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="发版日期" v-bind="validateInfos.createTime" id="NuEmployeesAdvisoryInfoForm-createTime"
+                name="createTime">
+                <a-input v-model:value="formData.createTime" placeholder="请输入发版日期" disabled></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-item label="发版内容：" v-bind="validateInfos.content" id="NuEmployeesAdvisoryInfoForm-content"
+                name="content">
+                <div v-html="formData.content" style="background:#f9f9fa;padding:8px;"></div>
+              </a-form-item>
             </a-col>
           </a-row>
         </a-form>

src/views/admin/bizSuppliers/NuBizSuppliersApplyList.vue

@@ -5,11 +5,23 @@
       <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
         <a-row :gutter="24">
         <a-col :lg="6">
-        <a-form-item name="suppliersName">
+          <a-form-item name="paramTitle">
-        <template #label><span title="供应商名称">供应商名</span></template>
+            <template #label><span title="供应商信息">供应商信息</span></template>
-            <JInput v-model:value="queryParam.suppliersName" placeholder="请输入供应商名称" />
+            <JInput v-model:value="queryParam.paramTitle" placeholder="请输入供应商名称/负责人/联系电话" />
-        </a-form-item>
+          </a-form-item>
         </a-col>
+        <a-col :lg="6">
+            <a-form-item name="applyStatus">
+              <template #label><span title="审核状态">审核状态</span></template>
+              <a-select v-model:value="queryParam.applyStatus" placeholder="请选择审核状态" style="width: 200px"
+                :disabled="false">
+                <a-select-option value="1,2,3,4,5">全部</a-select-option>
+                <a-select-option value="1,4">待审核</a-select-option>
+                <a-select-option value="2">审核通过</a-select-option>
+                <a-select-option value="3,5">审核驳回</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -86,13 +98,13 @@
   const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
   const labelCol = reactive({
     xs:24,
-    sm:8,
+    sm:4,
-    xl:8,
+    xl:4,
-    xxl:8
+    xxl:4
   });
   const wrapperCol = reactive({
     xs: 24,
-    sm: 16,
+    sm: 20,
   });
 
   
@@ -132,8 +144,6 @@
  * @param record 
  */
 function handleUpEdit(record: Recordable) {
-  record.status = null;
-  record.applyContent = null;
   registerModal.value.disableSubmit = false;
   registerModal.value.upInfoEdit(record);
 }

src/views/admin/bizSuppliers/NuBizSuppliersInfoList.vue

@@ -124,7 +124,7 @@
    * 物料事件
    */
   function handleWlEdit(record: Recordable) {
-    wlRegisterModal.value.disableSubmit = false;
+    wlRegisterModal.value.disableSubmit = true;
     wlRegisterModal.value.edit(record);
   }
    

src/views/admin/bizSuppliers/components/NuBizSuppliersApplyBgForm.vue

@@ -49,6 +49,7 @@
         <a-col :span="12">
           <a-form-item label="审核状态" name="status" v-bind="validateInfos.status">
             <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
+              <a-select-option value="">请选择审核状态</a-select-option>
               <a-select-option value="modifyPass">审核通过</a-select-option>
               <a-select-option value="modifyFail">审核驳回</a-select-option>
             </a-select>
@@ -90,7 +91,7 @@ const isImg = (v_) => {
 }
 const provinceOptions = ref({})
 const formData = reactive<Record<string, any>>({
-  status: undefined,
+  status: '',
   applyContent: '',
   id: '',
   pkId: '',
@@ -166,10 +167,14 @@ const fieldMap = {
 };
 
 async function show(record) {
+  console.log("🚀 ~ show ~ record:", record)
   let data = await getModifyInfo({ id: record.id })
 
+  resetFields();
   formData.id = record.id
   formData.suppliersId = record.suppliersId
+  formData.status = '';
+  formData.applyContent = ''
   
   // 存储id和pkId到formData
   Object.keys(fieldMap).forEach(fieldName => {

src/views/admin/bizSuppliers/components/NuBizSuppliersApplyDetailForm.vue

@@ -54,7 +54,7 @@
               <a-form-item label="营业执照" v-bind="validateInfos.imgPath" id="NuConfigSuppliersApplyForm-imgPath"
                 name="imgPath">
                 <!-- <a-input v-model:value="formData.imgPath" placeholder="请输入营业执照" disabled ></a-input> -->
-                <j-image-upload v-if="formData.imgPath" :fileMax="1" :value="opeMediaAddress + formData.imgPath"
+                <j-image-upload v-if="formData.imgPath" :fileMax="1" :value="formData.imgPath"
                   disabled></j-image-upload>
               </a-form-item>
             </a-col>

src/views/admin/bizSuppliers/components/NuBizSuppliersApplyForm.vue

@@ -59,8 +59,8 @@
               <SectionDivider :title="'审核信息'" />
             </a-col>
             <a-col :span="24" v-if="!disabled">
-              <a-form-item label="审核状态" v-bind="validateInfos.applyStatus" id="NuConfigSuppliersApplyForm-applyStatus"
+              <a-form-item label="审核状态" v-bind="validateInfos.status" id="NuConfigSuppliersApplyForm-status"
-                name="applyStatus">
+                name="status">
                 <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审核状态">
                   <a-select-option value="modifyPass">审核通过</a-select-option>
                   <a-select-option value="modifyFail">审核驳回</a-select-option>

src/views/admin/bizSuppliers/components/NuBizSuppliersApplyModal.vue

@@ -9,10 +9,10 @@
   </a-drawer>
   <a-drawer :title="title" :width="width"  v-model:visible="bgvisible" :closable="true"
   :footer-style="{ textAlign: 'right' }" :bodyStyle="{padding:'0px'}" @close="handleBgCancel">
-  <NuBizSuppliersApplyBgForm ref="registerForm" @ok="submitBgCallback" :formDisabled="disableSubmit" :formBpm="false"></NuBizSuppliersApplyBgForm>
+  <NuBizSuppliersApplyBgForm ref="bgregisterForm" @ok="submitBgCallback" :formDisabled="disableSubmit" :formBpm="false"></NuBizSuppliersApplyBgForm>
     <template #footer>
       <a-button type="primary" style="margin-right: 8px" @click="handleBgCancel">关闭</a-button>
-      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+      <a-button type="primary" @click="handleBgOk" v-if="!disableSubmit">确认</a-button>
     </template>
   </a-drawer>
 </template>
@@ -29,6 +29,7 @@
   const bgvisible = ref<boolean>(false);
   const disableSubmit = ref<boolean>(false);
   const registerForm = ref();
+  const bgregisterForm = ref();
   const emit = defineEmits(['register', 'success']);
 
   /**
@@ -50,6 +51,8 @@
     title.value = disableSubmit.value ? '详情' : '新供应商审核';
     visible.value = true;
     nextTick(() => {
+      record.status = null;
+      record.applyContent = null;
       registerForm.value.edit(record);
     });
   }
@@ -57,7 +60,9 @@
     title.value = '信息变更审核';
     bgvisible.value = true;
     nextTick(() => {
-      registerForm.value.show(record);
+      record.status = null;
+      record.applyContent = null;
+      bgregisterForm.value.show(record);
     });
   }
   
@@ -67,6 +72,12 @@
   function handleOk() {
     registerForm.value.submitForm();
   }
+  /**
+   * 确定按钮点击事件
+   */
+  function handleBgOk() {
+    bgregisterForm.value.submitForm();
+  }
 
   /**
    * form保存回调事件