Merge branch 'release'

src/utils/education/educationApi.js

-import fetch from '../fetch';
-import { getBaseUrl } from '@/utils/index';
-
+import fetch from "../fetch";
+import { getBaseUrl } from "@/utils/index";
 
 export const uploadExcel = (data, projectId) => {
   // return utils.checkAuth(()=>{
   return fetch({
     headers: {
-            'Content-Type': 'application/json;charset=UTF-8',
+      "Content-Type": "application/json;charset=UTF-8",
       sysCode: 12,
-            token: localStorage.getItem('storageToken'),
+      token: localStorage.getItem("storageToken"),
     },
-        url: getBaseUrl('portal/v2/role/importRoleFile?projectId=' + projectId),
-        method: 'post',
+    url: getBaseUrl("portal/v2/role/importRoleFile?projectId=" + projectId),
+    method: "post",
     data: data,
-        description: '上传excel文件',
-    })
+    description: "上传excel文件",
+  });
   // })
-}
+};
 export const uploadOrgExcel = (data, projectId) => {
   // return utils.checkAuth(()=>{
   return fetch({
     headers: {
-            'Content-Type': 'application/json;charset=UTF-8',
+      "Content-Type": "application/json;charset=UTF-8",
       sysCode: 12,
-            token: localStorage.getItem('storageToken'),
+      token: localStorage.getItem("storageToken"),
     },
-        url: getBaseUrl('portal/new/scope/org/v1/' + projectId + '/import'),
-        method: 'put',
+    url: getBaseUrl("portal/new/scope/org/v1/" + projectId + "/import"),
+    method: "put",
     data: data,
-        description: '上传excel文件',
-    })
+    description: "上传excel文件",
+  });
   // })
-}
+};
 export const uploadPersonExcel = (data, projectId) => {
   // return utils.checkAuth(()=>{
   return fetch({
     headers: {
-            'Content-Type': 'application/json;charset=UTF-8',
+      "Content-Type": "application/json;charset=UTF-8",
       sysCode: 12,
-            token: localStorage.getItem('storageToken'),
+      token: localStorage.getItem("storageToken"),
     },
-        url: getBaseUrl('portal/new/scope/doctor/v1/' + projectId + '/import'),
-        method: 'put',
+    url: getBaseUrl("portal/new/scope/doctor/v1/" + projectId + "/import"),
+    method: "put",
     data: data,
-        description: '上传excel文件',
-    })
+    description: "上传excel文件",
+  });
   // })
-}
+};
 export const uploadShieldExcel = (data, projectId) => {
   return fetch({
     headers: {
-            token: localStorage.getItem('storageToken'),
+      token: localStorage.getItem("storageToken"),
+    },
+    url: getBaseUrl("aggregate/black/setPeopleBlackStatus/batch/" + projectId),
+    method: "post",
+    data: data,
+    description: "上传excel文件",
+  });
+};
+
+export const uploadMateExcel = (data) => {
+  return fetch({
+    headers: {
+      token: localStorage.getItem("storageToken"),
+    },
+    url: getBaseUrl("portal/black/transferHospitalInfo"),
+    method: "post",
+    data: data,
+    description: "转换机构信息上传文件",
+  });
+};
+export const uploadBatchExcel = (data) => {
+  return fetch({
+    headers: {
+      token: localStorage.getItem("storageToken"),
     },
-        url: getBaseUrl('aggregate/black/setPeopleBlackStatus/batch/' + projectId),
-        method: 'post',
+    url: getBaseUrl("portal/black/setHospitalBlackStatus/batch"),
+    method: "post",
     data: data,
-        description: '上传excel文件',
-    })
-}
+    description: "屏蔽机构操作上传文件",
+  });
+};
\ No newline at end of file

src/utils/goods/index.js

@@ -142,5 +142,24 @@ export const getBusinessCategory = () => {
   });
 };
 
+export const getContractList = (projectId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/contract/options/queryByProjectId/${projectId}`),
+    method: "get",
+    description: "查询合同",
+  });
+};
+
+export const getCooperationProjectList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(
+      `store/cooperation/project/options/query`
+    ),
+    method: "get",
+    description: "查询合作项目",
+  });
+};
 
 

src/utils/utils.js

@@ -808,3 +808,23 @@ export const setOptionLabel = (self,selfModel,selfEId,selfEName,list,listEId,lis
 export function deepCopy(obj) {
   return obj ? JSON.parse(JSON.stringify(obj)) : obj;
 }
+
+
+//按照有效数字位数进行四舍五入，默认6位有效数字
+export function signFigures(num, rank = 6){
+    if(!num) return(0);
+    const sign = num / Math.abs(num);
+    const number = num * sign;
+    const temp = rank - 1 - Math.floor(Math.log10(number));
+    let ans;
+    if (temp > 0) {
+        ans = parseFloat(number.toFixed(temp));
+    }
+    else if (temp < 0) {
+        ans = Math.round(number / Math.pow(10, temp)) * temp;
+    }
+    else {
+        ans = Math.round(number);
+    }
+    return (ans * sign);
+};

src/views/education/edit-manager.vue

@@ -1741,13 +1741,19 @@ export default {
       if (option == "edit" || option == "storageEdit") {
         notifyData.notifyId = this.formData.notifyId;
       }
+      // 中医项目
+      const projectType = vm.getUrlSearch(window.location.href, "projectType");
+      console.log('--projectType', projectType);
+      if(projectType == 5){
+        projectModel.projectType = 5;
+      }
       let postData = {
         projectModel: JSON.stringify(projectModel),
         attachmentModel: JSON.stringify(attachmentModel),
         attachmentPDFModel: JSON.stringify(attachmentPDFModel),
         notifyData: JSON.stringify(notifyData)
       };
-      //console.log(postData);
+      console.log('JSON.stringify(projectModel)', projectModel, attachmentModel, attachmentPDFModel, notifyData);
       openLoading(vm);
       vm.POST("portal/portalInfo/insertOrUpdate", postData).then(res => {
         closeLoading(vm);
@@ -2822,7 +2828,6 @@ export default {
         projectId: this.projectId,
         administrativeId: "",
         hospitalLevel: "",
-        hospitalLevel: "",
         scope: this.getScope("administrative"),
         pageNum: this.formOrganization.pageNum,
         pageSize: this.formOrganization.pageSize

src/views/education/item-manager.vue

@@ -213,7 +213,7 @@
       <el-dialog
         title="请选择项目类型"
         :visible.sync="centerDialogVisible"
-        width="600px"
+        width="750px"
         :close-on-click-modal="false"
         @close="handleTypeClose"
         center
@@ -224,6 +224,7 @@
           <el-radio :label="2">CME项目</el-radio>
           <el-radio :label="3">开放模板</el-radio>
           <el-radio :label="5">职称考试</el-radio>
+          <el-radio :label="6">中医项目</el-radio>
         </el-radio-group>
         <span slot="footer" class="dialog-footer">
           <el-button @click="centerDialogVisible = false">取 消</el-button>
@@ -295,7 +296,6 @@ export default {
   data() {
     return {
       changeStatusVisible: false,
-      currentRow: null,
       currentType: 4,
       changeStatusConfig: {
         title: "确认通过该项目模版审核吗？",
@@ -460,6 +460,9 @@ export default {
     toPage(isPreview = 0) {
       this.$router.push("edit-manager?projectType=1&isPreview=" + isPreview);
     },
+    toTCMPage(isPreview = 0) {
+      this.$router.push("edit-manager?projectType=5&isPreview=" + isPreview);
+    },
     toCmePage(isPreview = 0) {
       this.$router.push("edit-cme?projectType=2&isPreview=" + isPreview);
     },
@@ -490,6 +493,8 @@ export default {
         this.toTemplatePage();
       } else if (this.newProjectType == 5) {
         this.toProfessionalExamPage();
+      }else if (this.newProjectType == 6) {
+        this.toTCMPage();
       }
     },
 
@@ -505,16 +510,6 @@ export default {
       }
     },
 
-    // handleCreateProject(isPreview) {
-    //   if (this.newProjectType == 1) {  // 1 普通项目 2 CME项目
-    //     this.toPage(isPreview);
-    //   } else if (this.newProjectType == 2) {
-    //     this.toCmePage(isPreview);
-    //   } else if(this.newProjectType == 3) {
-    //     this.toTemplatePage(isPreview);
-    //   }
-    // },
-
     hanldeCmeClick(row) {
       this.currentRow = row;
       let status = row.projectStatus;
@@ -661,13 +656,10 @@ export default {
       return text;
       // return true / false;
     },
-
     changeStatusPre() {
       this.changeStatus(this.currentRow, this.currentType);
       this.changeStatusVisible = false;
     },
-
-    //
     changeStatusForSP(row, type) {
       this.currentRow = row;
       this.currentType = type;
@@ -681,17 +673,18 @@ export default {
       }
       this.changeStatusVisible = true;
     },
-
     //改变状态
     changeStatus(row, type) {
+      console.log('--row', row);
       let projectId = row.id;
       let level = row.level;
       if (type === 0) {
         this.updateItemManager(this.formInline);
         //编辑
-        if (row.projectType === 1) {
+        if (row.projectType === 1 || row.projectType === 5 ) {
+
           this.$router.push(
-            "edit-manager?projectType=1&projectId=" +
+            "edit-manager?projectType=" + row.projectType +"&projectId=" +
               projectId +
               "&level=" +
               level +
@@ -799,9 +792,6 @@ export default {
       this.deleteVisible = true;
       this.currentRow = row;
     },
-    hideDeleteFrom() {
-      this.deleteVisible = false;
-    },
     // 删除项目
     confirmDelete() {
       let req = {};

src/views/education/item-shield.vue

@@ -8,7 +8,7 @@
       </el-radio-group>
       <!-- <el-button class="complete" type="primary" size="small" @click="complete">完成</el-button> -->
       <el-row :gutter="30" class="row" type="flex" style="margin-top: 10px">
-        <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline" style=";width:1000px;">
+        <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline" style="width:1000px;">
           <el-col :span="6" v-if=" shieldType == 0">
             <el-form-item label="地区：">
               <el-cascader
@@ -47,12 +47,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="6" style="padding:0;text-align:right;padding-right:10px;">
+          <el-col :span="6" style="padding:0;text-align:right;">
             <el-button type="primary" size="small" @click="searchList()">搜索</el-button>
             <el-button type="primary" size="small" @click="importOrder()" v-if="shieldType == 1">批量导入</el-button>
           </el-col>
         </el-form>
       </el-row>
+      <el-row justify="end" class="row" type="flex" style="margin: 5px 0 10px;width:1000px;" v-if="shieldType == 0">
+        <span class="tip">（请在机构信息匹配完成后再进行批量屏蔽）</span>
+        <el-button type="primary" size="small" @click="importMate()">机构匹配</el-button>
+        <el-button type="primary" size="small" @click="importBatch()">批量导入</el-button>
+      </el-row>
       <el-table :data="tableData" style="width: 100%">
         <el-table-column v-if="shieldType == 0" prop="hospitalName" label="医院名称" align="center"></el-table-column>
         <el-table-column
@@ -123,7 +128,7 @@
             :show-file-list="true"
             :before-upload="uploadfile"
           >
-            <div class="upload-container">
+            <div class="upload-container inline-b">
               <el-input
                 class="file-name"
                 v-model="fileData.fileName"
@@ -151,13 +156,103 @@
         >
       </div>
     </el-dialog>
+    <!-- 导入匹配机构名单 -->
+    <el-dialog
+      class="exportlogistics-dialog"
+      title="匹配机构导入"
+      :visible="isShowMate"
+      @close="isShowMate = false"
+      width="600px"
+    >
+      <el-form label-width="120px">
+        <el-form-item label="导入文档：">
+          <el-upload
+            class="upload-excel"
+            action="#"
+            accept=".xlsx"
+            multiple
+            :limit="1"
+            :show-file-list="false"
+            :before-upload="uploadMateFile"
+          >
+            <div class="upload-container inline-b">
+              <el-input
+                class="file-name"
+                v-model="mateFileData.fileName"
+                size="mini"
+                readonly
+              ></el-input
+              >
+              <el-button type="primary" size="mini">选择文件</el-button>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="模板：">
+          <a class="import-url" :href="mateTmpUrl" style="color: #449284">
+            导入匹配机构模板.xlxs</a>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cancelMateImport">取消</el-button>
+        <el-button
+          size="small"
+          :loading="isLoading"
+          type="primary"
+          @click="confirmMateImport"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
+      <!-- 批量屏蔽 -->
+    <el-dialog
+      class="exportlogistics-dialog"
+      title="批量导入"
+      :visible="isShowBatch"
+      @close="isShowBatch = false"
+      width="600px"
+    >
+      <el-form label-width="120px">
+        <el-form-item label="导入文档：">
+          <el-upload
+            class="upload-excel"
+            action="#"
+            accept=".xlsx"
+            multiple
+            :limit="1"
+            :show-file-list="false"
+            :before-upload="uploadBatchFile"
+          >
+            <div class="upload-container inline-b">
+              <el-input
+                class="file-name"
+                v-model="batchFileData.fileName"
+                size="mini"
+                readonly
+              ></el-input
+              >
+              <el-button type="primary" size="mini">选择文件</el-button>
+            </div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="cancelBatchImport">取消</el-button>
+        <el-button
+          size="small"
+          :loading="isLoading"
+          type="primary"
+          @click="confirmBatchImport"
+          >确认</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
 import { mapGetters } from "vuex";
 import { openLoading, closeLoading } from "../../utils/utils";
-import { uploadShieldExcel } from "@/utils/education/educationApi";
+import { uploadShieldExcel, uploadMateExcel, uploadBatchExcel } from "@/utils/education/educationApi";
 import * as commonUtil from "../../utils/utils";
 import * as operationData from "../../utils/operation";
 let vm = null;
@@ -215,6 +310,17 @@ export default {
       shieldBlock: "",
       scopeRow: {},
       administrativeValue: "",
+      isShowMate: false,
+      isShowBatch: false,
+      mateFileData: {
+        file: "",
+        fileName: "",
+      },
+      batchFileData: {
+        file: "",
+        fileName: "",
+      },
+      mateTmpUrl: 'https://files.yunqueyi.com/template/org_template.xlsx',
       props: {
         lazy: true,
         lazyLoad(node, resolve) {
@@ -523,7 +629,102 @@ export default {
       console.log(`当前页: ${val}`);
       this.formInline.pageNo = val;
       this.search();
+    },
+    importMate() {
+      this.isShowMate = true;
+    },
+    importBatch() {
+      this.isShowBatch = true
+    },
+    //机构匹配上传exel
+    uploadMateFile(file) {
+      console.log("file",file)
+      this.mateFileData.fileName = file.name;
+      const formData = new FormData();
+      formData.append("projectId", this.projectId)
+      formData.append("file",file)
+      this.mateFileData.file = formData;
+      console.log("file",formData)
+    },
+    // 机构匹配确认导入
+    confirmMateImport() {
+      if (!this.mateFileData.file) {
+        this.$message.error('请确认您上传的文件');
+        return
+      }
+      this.isLoading = true;
+      uploadMateExcel(this.mateFileData.file).then(res => {
+        this.isLoading = false;
+        if (res.code == '000000') {
+          if (res.data) {
+            this.cancelMateImport();
+            let a = document.createElement('a');
+            let href = res.data;
+            a.setAttribute('href',href);
+            a.click();
+            this.$message({
+              message: '导入成功,您上传的机构信息已匹配完成，请确认后进行批量屏蔽',
+              type: 'success'
+              });
+          } else {
+            this.$message.error(res.message);
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch(error => {
+        this.isLoading = false;
+        this.$message.error(error.message);
+      })
+    },
+    // 机构匹配取消导入
+    cancelMateImport() {
+      this.mateFileData = {
+        file: "",
+        fileName: "",
+      };
+      this.isShowMate = false;
+    },
+    //批量屏蔽上传exel
+    uploadBatchFile(file) {
+      this.batchFileData.fileName = file.name;
+      const formData = new FormData();
+      formData.append('projectId', this.projectId)
+      formData.append("file",file)
+      this.batchFileData.file = formData;
+    },
+    // 批量屏蔽确认导入
+    confirmBatchImport() {
+      if (!this.batchFileData.file) {
+        this.$message.error('请确认您上传的文件');
+        return
+      }
+      this.isLoading = true;
+      uploadBatchExcel(this.batchFileData.file).then(res => {
+        this.isLoading = false;
+        if (res.code == '000000') {
+          this.cancelBatchImport();
+          this.$message({
+            message: `导入成功${res.data.success}条，失败${res.data.failed}`,
+            type: 'warning'
+          });
+          this.searchList();
+        } else {
+          this.$message.error(res.message);
         }
+      }).catch(error => {
+        this.isLoading = false;
+        this.$message.error(error.message);
+      })
+    },
+    //批量屏蔽取消导入
+    cancelBatchImport() {
+      this.batchFileData = {
+        file: "",
+        fileName: "",
+      };
+      this.isShowBatch = false;
+    },
   }
 };
 </script>
@@ -532,6 +733,11 @@ export default {
   .component-content {
     padding: 10px;
     background: #fff;
+    .tip {
+      color: #D51F35;
+      font-size: 14px;
+      line-height: 32px;
+    }
     .complete {
       float: right;
     }
@@ -539,5 +745,14 @@ export default {
       color: #D51F35;
     }
   }
+  .inline-b{
+      display: flex;
+      .el-button--mini{
+        margin-left: 20px;
+      }
+    }
+  .upload-container  {
+    line-height: 0;
+  }
 }
 </style>
\ No newline at end of file

src/views/goods/forms.js

@@ -66,7 +66,7 @@ const form = {
   mostCount: -1,
   incrType: 1,
   saleType: 1,
-  minWhole: 0,
+  minWhole: 1,
   expressLimitFlag: 0, //是否支持退货退款
 };
 
@@ -76,8 +76,10 @@ const form3 = {
   goodsHeaderImages: [],
   goodsVideoList: [],
   goodsType: "",
-  businessCategoryId:"",
+  // businessCategoryId: "",
   expressLimitFlag: 0, //是否支持退货退款
+  cooperationProjectId: '', // 合作项目id
+  contractId: '', // 合同id
 };
 
 

src/views/goods/rules.js

@@ -116,7 +116,7 @@ const rules = {
 const rules3 = {
   goodsName: [
     { required: true, message: "请输入商品名称", trigger: "submit" },
-    { validator: checkProjectStr, trigger: "submit" },
+    // { validator: checkProjectStr, trigger: "submit" },
   ],
   goodsDescription: [
     { required: true, message: "请输入商品介绍", trigger: "submit" },

src/views/shop/create-shop.vue

@@ -814,6 +814,7 @@
                       <el-form-item
                         label="法人姓名"
                         label-width="100px"
+                        class="hidden-conten"
                       >
                         <el-input
                           size="small"
@@ -823,6 +824,7 @@
                       </el-form-item>
                       <el-form-item
                         label="证件号码"
+                        class="hidden-conten"
                       >
                         <el-input
                           size="small"
@@ -832,6 +834,7 @@
                       </el-form-item>
                       <el-form-item
                         label="有效日期"
+                        class="hidden-conten"
                       >
                         <el-date-picker
                           v-model="formData.imgUrlC3Date"
@@ -848,7 +851,8 @@
                 </div>
               </el-form-item>
               <el-form-item label="资质信息" class="required-label" v-if="formData.storeType < 3">
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0 || formData.storeType == 2">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0 || formData.storeType == 2"> -->
+                <div v-if="imgUrlP7Show || formData.storeType == 2">
                   <p v-if="certifyValidDtoList(7)" class="red">{{certifyValidDtoList(7)}}</p>
                   <p class="tips">药品经营许可证</p>
                   <el-form-item prop="imgUrlP7">
@@ -947,7 +951,8 @@
 <!--                    </el-date-picker>-->
 <!--                  </el-form-item>-->
 <!--                </div>-->
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0"> -->
+                <div v-if="imgUrlP9Show">
                   <p v-if="certifyValidDtoList(9)" class="red">{{certifyValidDtoList(9)}}</p>
                   <p class="tips">食品经营(流通)许可证</p>
                   <el-form-item prop="imgUrlP9">
@@ -996,7 +1001,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0"> -->
+                <div v-if="imgUrlP10Show">
                   <p v-if="certifyValidDtoList(10)" class="red">{{certifyValidDtoList(10)}}</p>
                   <p class="tips">医疗器械经营许可证</p>
                   <el-form-item prop="imgUrlP10">
@@ -1045,7 +1051,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0"> -->
+                <div v-if="imgUrlP13Show">
                   <p class="tips">医疗器械网络销售备案</p>
                   <el-form-item prop="imgUrlP13">
                   <el-upload
@@ -1093,7 +1100,8 @@
                     </el-date-picker>
                   </el-form-item>
                 </div>
-                <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0">
+                <!-- <div v-if="controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0"> -->
+                <div v-if="imgUrlP11Show">
                   <p v-if="certifyValidDtoList(11)" class="red">{{certifyValidDtoList(11)}}</p>
                   <p class="tips">二类医疗器械经营备案凭证</p>
                   <el-form-item prop="imgUrlP11">
@@ -1367,10 +1375,10 @@ export default {
           label: "供货商",
           value: 1,
         },
-        {
-          label: "小药房",
-          value: 2,
-        },
+        // {
+        //   label: "小药房",
+        //   value: 2,
+        // },
         {
           label: "医生小店",
           value: 3,
@@ -1696,6 +1704,21 @@ export default {
   computed: {
     certifyStatusColor () {
       return `certifyStatusColor${this.certifyStatus}`;
+    },
+    imgUrlP7Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '1'; })).length > 0
+    },
+    imgUrlP9Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '3'; })).length > 0
+    },
+    imgUrlP10Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2'; })).length > 0
+    },
+    imgUrlP11Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '2'; })).length > 0
+    },
+    imgUrlP13Show(){
+      return this.controlLicense.filter((i => { return String(i).charAt(0) == '2' && String(i).charAt(3) == '3'; })).length > 0
     }
   },
   watch: {
@@ -1911,6 +1934,49 @@ export default {
       });
     },
     completeWholeForm() {
+      console.log(this.controlLicense,this.formData);
+      this.formData.certifyReq.certifyLicenseImgList = this.formData.certifyReq.certifyLicenseImgList || [];
+      if(!this.imgUrlP7Show){
+        this.formData.imgUrlP7 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 7) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP9Show){
+        this.formData.imgUrlP9 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 9) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP10Show){
+        this.formData.imgUrlP10 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 10) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP11Show){
+        this.formData.imgUrlP11 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 11) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      if(!this.imgUrlP13Show){
+        this.formData.imgUrlP13 = ''
+        this.formData.certifyReq.certifyLicenseImgList.forEach((v,i)=>{
+          if(v.imageType == 13) {
+            this.formData.certifyReq.certifyLicenseImgList.splice(i,1)
+          }
+        })
+      }
+      this.resetCertType();
       let flag = this.submitForm();
       if (flag && this.certifyStatus == 3) {
         this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', {
@@ -2484,6 +2550,7 @@ export default {
       this.$nextTick(() => {
         const c = that.$refs['cascaderBizScope'].getCheckedNodes();
         const m = c.filter( i => {return !i.hasChildren;}).map(k => {return {...k.data}});
+        console.log('--m----', m);
         const j = [];
         if(m) {
           m.map( i => {
@@ -2491,6 +2558,8 @@ export default {
           })
           this.controlLicense = j;
         }
+        vm.formData.certifyReq.bizScope = m;
+        that.bizScopeCasValue = v;
       });
 
       const checkedNodes = this.$refs['cascaderBizScope'].getCheckedNodes();
@@ -2818,6 +2887,22 @@ export default {
       const s = {...query, currentTab: this.activeTabName};
       vm.$router.push({ path: "create-shop", query: s});
     },
+    resetCertType() {
+      console.log('this.formData.certifyReq.certType == 1');
+      console.log(this.formData.certifyReq.certType == 1);
+      if(this.formData.certifyReq.certType == 1) {
+        console.log('papsdpapspd');
+        this.formData.imgUrlC4 = '';
+        this.formData.imgUrlC5 = '';
+        this.formData.certifyReq.assignorCertBackUrl = '';
+        this.formData.certifyReq.assignorCertFrontUrl = '';
+        this.formData.certifyReq.assignorLetterUrl = '';
+        this.formData.certifyReq.assignorName = '';
+        this.formData.certifyReq.assignorCertNo = '';
+        this.formData.imgUrlC5Date = '';
+        this.formData.imgUrlP5 = '';
+      }
+    },
     handleRegionChange(v) {
       const checkedNodes = this.$refs['regionCascader'].getCheckedNodes()[0];
       const n = [];
@@ -3201,6 +3286,11 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
+    .hidden-conten{
+      .el-form-item__label::before{
+        content: '';
+      }
+    }
     .el-range-editor{
       width: 500px;
     }