update: 驳回审核补充字段资料改造及联调

src/views/start/check.vue

@@ -4,9 +4,9 @@
     <div class="steps-container">
       <div class="tit">
         <el-result
-        :icon="auditInfo.approval_status==1 ? 'success' : [3,5].includes(auditInfo.approval_status) ? 'primary' : 'error' "
+        :icon="auditInfo.approval_status==1 ? 'success' : [3,5].includes(auditInfo.approval_status) ? 'warning' : 'error' "
         :title="auditInfo?.approval_remark"
-        :sub-title="auditInfo.approval_status==1 ? '现在去商家端看看吧~' : [3,5].includes(auditInfo.approval_status) ? '请耐心等一些时间' : '请填写以下资料重新提交审核' "
+        :sub-title="auditInfo.approval_status==1 ? '现在去商家端看看吧~' : [3,5].includes(auditInfo.approval_status) ? '预计3-5个工作日哦~' : '请填写以下资料重新提交审核' "
       >
       </el-result>
       </div>
@@ -17,7 +17,6 @@
       :model="applyFormData"
       ref="formRef"
       label-width="160px"
-      style="max-width: 600px"
       v-loading.fullscreen.lock="loading"
       element-loading-text="数据加载中..."
       element-loading-background="rgba(0,0,0,.75)"
@@ -34,6 +33,21 @@
             v-model="applyFormData[item.key]"
             :placeholder="item.placeholder"
           />
+          
+          <el-input
+          :rows="5"
+           type="textarea"
+            v-if="item.type == 'textarea'"
+            v-model="applyFormData[item.key]"
+            :placeholder="item.placeholder"
+          />
+
+          <el-date-picker
+          v-if="item.type == 'datepicker'"
+          v-model="applyFormData[item.key]"
+                type="date"
+                :placeholder="item.placeholder"
+              />
 
         <template v-if="item.type == 'select' && item.key=='mapAddress'">
           <el-cascader
@@ -262,6 +276,7 @@ const applyFormData = reactive({
   biz_license_image: "",
   biz_license_number: "",
   biz_second_category: null,
+  biz_license_content: "",
   city_id: null,
   contact_name: "",
   county_id: null,
@@ -271,11 +286,17 @@ const applyFormData = reactive({
   individual_id_images: "",
   individual_id_images2: "",
   individual_id_number: "",
+  individual_id_addr: "",
+  individual_id_period_begin: "",
+  individual_id_period_end: "",
   legal_person_id_images: "",
   legal_person_id_images2: "",
   legal_person_id_number: "",
   legal_person_mobile: "",
   legal_person_name: "",
+  legal_person_id_addr: "",
+  legal_person_id_period_begin: "",
+  legal_person_id_period_end: "",
   license_image: [],
   license_number: "",
   license_type: "",
@@ -292,6 +313,7 @@ const applyFormData = reactive({
   store_area: "",
   user_status: "",
   bank_image: "",
+  email: "",
 });
 const license_type = ref('1')
 const optionsPermitType = [
@@ -379,7 +401,7 @@ const rules = reactive({
 });
 const formItemData = ref([]);
 let auditInfo = ref({
-  approval_status: 3,
+  approval_status: 0,
   created_at: "2099-02-17 09:25:53",
   approval_remark: "",
   approval_invalid_col: [],
@@ -392,11 +414,19 @@ const handleGetAuditInfo = async () => {
   })) as any;
 
   let arr = JSON.parse(res.data.approval_invalid_col);
+  let legal_person_card = ['legal_person_id_addr','legal_person_id_period_begin','legal_person_id_period_end']
+  let individual_id_card = ['individual_id_addr','individual_id_period_begin','individual_id_period_end']
+ 
+  // arr = arr.concat(legal_person_card).concat(individual_id_card).concat(['biz_license_content'])
+
+  if(res.data.entity_type==1){
+    arr = arr.filter(item=>(!individual_id_card.includes(item)))
+  } else if(res.data.entity_type==2){
+    arr = arr.filter(item=>(!legal_person_card.includes(item)))
+  }
+
   const arr2 = formConfig.reduce((acc, item) => {
     if (arr.includes(item.key)) {
-      // if(item.key=='storefrontImg' || item.key=='surroundingsImg' ){
-      //     applyFormData[item.key] = "";
-      // }
       acc.push(item);
     }
     return acc;
@@ -404,9 +434,6 @@ const handleGetAuditInfo = async () => {
   
   auditInfo.value = { ...res.data, approval_invalid_col: arr };
   formItemData.value = arr2.sort((a,b)=>(a.sort-b.sort));
-  console.log("formItemData", formItemData.value);
-  console.log("auditInfo", auditInfo);
-  
 };
 
 const handleMerchApply = async () => {
@@ -447,8 +474,16 @@ const handleMerchApply = async () => {
     store_longitude,
     store_name,
     store_area,
+    biz_license_content,
+    legal_person_id_addr,
+    legal_person_id_period_begin,
+    legal_person_id_period_end,
+    individual_id_addr,
+    individual_id_period_begin,
+    individual_id_period_end,
   } = applyFormData;
   const res = await re_apply({
+    id: auditInfo.value.id,
     bank_name,
     bank_district,
     bank_area,
@@ -485,7 +520,18 @@ const handleMerchApply = async () => {
     store_longitude,
     store_name,
     store_area,
+    biz_license_content,
+    legal_person_id_addr,
+    legal_person_id_period_begin,
+    legal_person_id_period_end,
+    individual_id_addr,
+    individual_id_period_begin,
+    individual_id_period_end,
   });
+  if(res.status==200&&res.code==0){
+    ElMessage.success("资料已提交~")
+    handleGetAuditInfo();
+  }
 };
 
 const checkForm = async () => {
@@ -780,12 +826,57 @@ const handleOcrText = async (batchNo, imgType) => {
       applyFormData.legal_person_name = res.bizLicenseOwnerName;
       applyFormData.biz_license_number = res.bizLicenseCreditCode;
       applyFormData.account_holder_name = res.bizLicenseCompanyName;
+      applyFormData.biz_license_content = res.bizLicenseScope;
       break;
     case "legal_person_id_images":
       var res = (await getOcrText(batchNo, orcImgTypeConf.ID_CARD_FRONT)) as any;
 
       console.log("legal_person_id_images", res);
       applyFormData.legal_person_id_number = res.idNumber;
+      applyFormData.legal_person_id_addr = res.address;
+      break;
+      case "legal_person_id_images2":
+      var res = (await getOcrText(
+        batchNo,
+        orcImgTypeConf.ID_CARD_BEHIND
+      )) as any;
+      var validity = res.validity.split('-')
+
+      console.log("legal_person_id_images2", res);
+      applyFormData.legal_person_id_period_begin = validity[0];
+
+      if(validity[1]!='长期'){
+        applyFormData.legal_person_id_period_end = validity[1];
+      } else {
+        applyFormData.legal_person_id_period_end = "9999-12-31"
+      }
+      break;
+    case "individual_id_images":
+      var res = (await getOcrText(
+        batchNo,
+        orcImgTypeConf.FR_ID_CARD_FRONT
+      )) as any;
+
+      console.log("individual_id_images", res);
+      applyFormData.individual_id_number = res.idNumber;
+      applyFormData.individual_id_addr = res.address;
+      break;
+    case "individual_id_images2":
+      var res = (await getOcrText(
+        batchNo,
+        orcImgTypeConf.ID_CARD_BEHIND
+      )) as any;
+
+      var validity = res.validity.split('-')
+
+      console.log("individual_id_images2", res);
+      applyFormData.individual_id_period_begin = validity[0];
+
+      if(validity[1]!='长期'){
+        applyFormData.individual_id_period_end = validity[1];
+      } else {
+        applyFormData.individual_id_period_end = "9999-12-31"
+      }
       break;
     case "bank_image":
       var res = (await getOcrText(batchNo, orcImgTypeConf.BANK_CARD)) as any;
@@ -822,6 +913,21 @@ const handleUploadSuccess = async (response, file, fileList, field) => {
           currentBbatchNo.value = res.batchNo
           handleOcrText(res.batchNo, field)
           break;
+        case "legal_person_id_images2":
+          var res = await getBatchNo(file.raw, orcImgTypeConf.ID_CARD_BEHIND);
+          currentBbatchNo.value = res.batchNo;
+          handleOcrText(res.batchNo, field);
+          break;
+        case "individual_id_images":
+          var res = await getBatchNo(file.raw, orcImgTypeConf.FR_ID_CARD_FRONT);
+          currentBbatchNo.value = res.batchNo;
+          handleOcrText(res.batchNo, field);
+          break;
+        case "individual_id_images2":
+          var res = await getBatchNo(file.raw, orcImgTypeConf.ID_CARD_BEHIND);
+          currentBbatchNo.value = res.batchNo;
+          handleOcrText(res.batchNo, field);
+          break;
         case "bank_image":
           var res = await getBatchNo(file.raw, orcImgTypeConf.BANK_CARD);
           currentBbatchNo.value = res.batchNo
@@ -925,7 +1031,7 @@ onMounted(() => {
   }
 
   .steps-container {
-    width: 50%;
+    width: 1000px;
     padding: 15px;
     border-radius: 5px;
     background: #fff;
@@ -937,18 +1043,18 @@ onMounted(() => {
   }
 
   .form-submit {
-    width: 50%;
+    width: 1000px;
     padding: 15px;
     border-radius: 5px;
     background: #fff;
     margin-bottom: 12px;
 
-    :deep(.el-form) {
+    // :deep(.el-form) {
-      max-width: 100% !important;
+    //   max-width: 100% !important;
-    }
+    // }
 
     .from_box {
-      width: 100%;
+      // width: 100%;
       padding: 15px;
       margin: 0 0 12px;
       border-radius: 5px;

src/views/start/formConfig.js

@@ -1,201 +1,257 @@
-const formConfig = [
-  {
-    type: "input",
-    key: "contact_name",
-    label: "联系人",
-    placeholder: "请输入联系人",
-    sort: 1,
-  },
-  {
-    type: "select",
-    key: "biz_category",
-    label: "经营品类",
-    isReadonly: true,
-    style: "pointer-events: none",
-    placeholder: "请选择经营品类",
-    sort: 2,
-  },
-  {
-    type: "input",
-    key: "store_name",
-    label: "门店名称",
-    placeholder: "请输入门店名称",
-    sort: 3,
-  },
-  {
-    type: "select",
-    key: "mapAddress",
-    label: "所在地区",
-    isReadonly: true,
-    style: "pointer-events: none",
-    placeholder: "请在地图上选择门店地址",
-    sort: 4,
-  },
-  {
-    type: "input",
-    key: "store_address",
-    label: "详细地址",
-    placeholder: "请输入店铺详细地址",
-    sort: 5,
-  },
-  {
-    type: "upload",
-    key: "front_facade_image",
-    label: "门脸图片",
-    placeholder: "请上传门脸图片",
-    sort: 6,
-  },
-  {
-    type: "upload",
-    key: "environment_image",
-    label: "环境图片",
-    placeholder: "请上传门脸图片",
-    sort: 7,
-  },
-  {
-    type: "upload",
-    key: "biz_license_image",
-    label: "营业执照",
-    placeholder: "",
-    sort: 8,
-  },
-  {
-    type: "input",
-    key: "biz_license_company",
-    label: "公司名称",
-    placeholder: "请输入公司名称",
-    sort: 9,
-  },
-  {
-    type: "input",
-    key: "legal_person_name",
-    label: "法人姓名",
-    placeholder: "请输入法人姓名",
-    sort: 10,
-  },
-  {
-    type: "input",
-    key: "legal_person_mobile",
-    label: "法人手机号",
-    placeholder: "请输入法人手机号",
-    sort: 10,
-  },
-  {
-    type: "input",
-    key: "biz_license_number",
-    label: "注册号",
-    placeholder: "请输入注册号",
-    sort: 11,
-  },
-  {
-    type: "select",
-    key: "license_type",
-    label: "许可证类型",
-    isReadonly: true,
-    style: "pointer-events: none",
-    placeholder: "请选择许可证类型",
-    sort: 12,
-  },
-  {
-    type: "upload",
-    key: "license_image",
-    label: "许可证图片",
-    class: "upload-4",
-    placeholder: "",
-    imgUrlArr: [],
-    imgWidth: 125,
-    imgHeight: 88,
-    imgUpMaxCount: 5,
-    sort: 13,
-  },
-  {
-    type: "input",
-    key: "license_number",
-    label: "许可证编号",
-    placeholder: "请输入许可证编号",
-    sort: 14,
-  },
-  {
-    type: "upload",
-    key: "individual_id_images",
-    label: "个人身份证正面图片",
-    class: "upload-5",
-    placeholder: "",
-    imgUrlArr: [],
-    sort: 15,
-  },
-  {
-    type: "upload",
-    key: "individual_id_images2",
-    label: "个人身份证反面图片",
-    class: "upload-5",
-    placeholder: "",
-    imgUrlArr: [],
-    sort: 15,
-  },
-  {
-    type: "input",
-    key: "individual_id_number",
-    label: "个人身份证号码",
-    placeholder: "请输入个人身份证号码",
-    sort: 16,
-  },
-  {
-    type: "upload",
-    key: "legal_person_id_images",
-    label: "法人身份证正面图片",
-    class: "upload-5",
-    placeholder: "",
-    imgUrlArr: [],
-    imgWidth: 180,
-    imgHeight: 110,
-    sort: 15,
-  },
-  {
-    type: "upload",
-    key: "legal_person_id_images2",
-    label: "法人身份证反面图片",
-    class: "upload-6",
-    placeholder: "",
-    imgUrlArr: [],
-    imgWidth: 180,
-    imgHeight: 110,
-    sort: 15,
-  },
-  {
-    type: "input",
-    key: "legal_person_id_number",
-    label: "法人身份证号码",
-    placeholder: "请输入法人身份证号",
-    sort: 16,
-  },
-  {
-    type: "input",
-    key: "account_holder_name",
-    label: "开户名称",
-    placeholder: "请输入开户名称",
-    sort: 17,
-  },
-  {
-    type: "input",
-    key: "account_number",
-    label: "银行卡号",
-    placeholder: "请输入银行卡号",
-    sort: 18,
-  },
-  {
-    type: "select",
-    key: "bank_name",
-    label: "开户银行",
-    isReadonly: true,
-    style: "pointer-events: none",
-    placeholder: "请选择开户银行",
-    sort: 19,
-  },
-];
-
 export default {
-  formConfig,
+  formConfig:  [
+    {
+      type: "input",
+      key: "contact_name",
+      label: "联系人",
+      placeholder: "请输入联系人",
+      sort: 1,
+    },
+    {
+      type: "select",
+      key: "biz_category",
+      label: "经营品类",
+      isReadonly: true,
+      style: "pointer-events: none",
+      placeholder: "请选择经营品类",
+      sort: 2,
+    },
+    {
+      type: "input",
+      key: "store_name",
+      label: "门店名称",
+      placeholder: "请输入门店名称",
+      sort: 3,
+    },
+    {
+      type: "select",
+      key: "mapAddress",
+      label: "所在地区",
+      isReadonly: true,
+      style: "pointer-events: none",
+      placeholder: "请在地图上选择门店地址",
+      sort: 4,
+    },
+    {
+      type: "input",
+      key: "store_address",
+      label: "详细地址",
+      placeholder: "请输入店铺详细地址",
+      sort: 5,
+    },
+    {
+      type: "upload",
+      key: "front_facade_image",
+      label: "门脸图片",
+      placeholder: "请上传门脸图片",
+      sort: 6,
+    },
+    {
+      type: "upload",
+      key: "environment_image",
+      label: "环境图片",
+      placeholder: "请上传门脸图片",
+      sort: 7,
+    },
+    {
+      type: "upload",
+      key: "biz_license_image",
+      label: "营业执照",
+      placeholder: "",
+      sort: 8,
+    },
+    {
+      type: "input",
+      key: "biz_license_company",
+      label: "公司名称",
+      placeholder: "请输入公司名称",
+      sort: 9,
+    },
+    {
+      type: "input",
+      key: "legal_person_name",
+      label: "法人姓名",
+      placeholder: "请输入法人姓名",
+      sort: 10,
+    },
+    {
+      type: "input",
+      key: "legal_person_mobile",
+      label: "法人手机号",
+      placeholder: "请输入法人手机号",
+      sort: 10,
+    },
+    {
+      type: "input",
+      key: "biz_license_number",
+      label: "注册号",
+      placeholder: "请输入注册号",
+      sort: 11,
+    },
+     {
+      type: "textarea",
+      key: "biz_license_content",
+      label: "经营范围",
+      placeholder: "请输入经营范围",
+      sort: 11,
+    },
+    {
+      type: "select",
+      key: "license_type",
+      label: "许可证类型",
+      isReadonly: true,
+      style: "pointer-events: none",
+      placeholder: "请选择许可证类型",
+      sort: 12,
+    },
+    {
+      type: "upload",
+      key: "license_image",
+      label: "许可证图片",
+      class: "upload-4",
+      placeholder: "",
+      imgUrlArr: [],
+      imgWidth: 125,
+      imgHeight: 88,
+      imgUpMaxCount: 5,
+      sort: 13,
+    },
+    {
+      type: "input",
+      key: "license_number",
+      label: "许可证编号",
+      placeholder: "请输入许可证编号",
+      sort: 14,
+    },
+    {
+      type: "upload",
+      key: "individual_id_images",
+      label: "个人身份证正面图片",
+      class: "upload-5",
+      placeholder: "",
+      imgUrlArr: [],
+      sort: 15,
+    },
+    {
+      type: "upload",
+      key: "individual_id_images2",
+      label: "个人身份证反面图片",
+      class: "upload-5",
+      placeholder: "",
+      imgUrlArr: [],
+      sort: 15,
+    },
+    {
+      type: "input",
+      key: "individual_id_number",
+      hide: true,
+      label: "个人身份证号码",
+      placeholder: "请输入个人身份证号码",
+      sort: 16,
+    },
+    {
+      type: "input",
+      key: "individual_id_addr",
+      hide: true,
+      label: "个人身份证地址",
+      placeholder: "请输入个人身份证地址",
+      sort: 16,
+    },
+    {
+      type: "datepicker",
+      key: "individual_id_period_begin",
+      hide: true,
+      label: "个人身份证生效日期",
+      placeholder: "请输入个人身份证生效日期",
+      sort: 16,
+    },
+    {
+      type: "datepicker",
+      key: "individual_id_period_end",
+      hide: true,
+      label: "个人身份证截止日期",
+      placeholder: "请输入个人身份证截止日期",
+      sort: 16,
+    },
+    {
+      type: "upload",
+      key: "legal_person_id_images",
+      hide: true,
+      label: "法人身份证正面图片",
+      class: "upload-5",
+      placeholder: "",
+      imgUrlArr: [],
+      imgWidth: 180,
+      imgHeight: 110,
+      sort: 15,
+    },
+    {
+      type: "upload",
+      key: "legal_person_id_images2",
+      label: "法人身份证反面图片",
+      class: "upload-6",
+      placeholder: "",
+      imgUrlArr: [],
+      imgWidth: 180,
+      imgHeight: 110,
+      sort: 15,
+    },
+    {
+      type: "input",
+      key: "legal_person_id_number",
+      hide: true,
+      label: "法人身份证号码",
+      placeholder: "请输入法人身份证号码",
+      sort: 16,
+    },
+    {
+      type: "input",
+      key: "legal_person_id_addr",
+      hide: true,
+      label: "法人身份证地址",
+      placeholder: "请输入法人身份证地址",
+      sort: 16,
+    },
+    {
+      type: "datepicker",
+      key: "legal_person_id_period_begin",
+      hide: true,
+      label: "法人身份证生效日期",
+      placeholder: "请输入法人身份证生效日期",
+      sort: 16,
+    },
+    {
+      type: "datepicker",
+      key: "legal_person_id_period_end",
+      hide: true,
+      label: "法人身份证截止日期",
+      placeholder: "请输入法人身份证截止日期",
+      sort: 16,
+    },
+    {
+      type: "input",
+      key: "account_holder_name",
+      label: "开户名称",
+      placeholder: "请输入开户名称",
+      sort: 17,
+    },
+    {
+      type: "input",
+      key: "account_number",
+      label: "银行卡号",
+      placeholder: "请输入银行卡号",
+      sort: 18,
+    },
+    {
+      type: "select",
+      key: "bank_name",
+      label: "开户银行",
+      isReadonly: true,
+      style: "pointer-events: none",
+      placeholder: "请选择开户银行",
+      sort: 19,
+    },
+  ],
 };