Merge branch 'release' of...

Merge branch 'release' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into feature/jq

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);

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
@@ -675,14 +675,16 @@ export default {
     },
     //改变状态
     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 +

src/views/goods/create-good.vue

@@ -148,6 +148,7 @@
                   size="small"
                   :disabled="isEdit && isProject"
                   @change="getContract"
+                  @clear="projectClear"
                   clearable
                   filterable>
                 <el-option
@@ -1188,6 +1189,7 @@
         getContractList(projectId || 0).then(res => {
           if(res.code == '000000') {
             this.contractList = res.data;
+            console.log(this.contractList, 'this.contractList');
           }
         })
       },
@@ -1200,8 +1202,14 @@
         })
       },
       getContract(projectId) {
+        this.formData3.contractId = '';
+        this.contractList = [];
         this.getContractList(projectId);
       },
+      projectClear() {
+        this.formData3.contractId = '';
+        this.contractList = [];
+      },
       // 获取业务类型
       // getBusinessCategory(){
       //   getBusinessCategory().then((res) => {
@@ -1260,8 +1268,9 @@
 
           const { goodsInfo, medicalService, buyLimitDtoList, hasRepoFlag} = res.data;
           const { goodsName, goodsDescription, goodsType, expressLimitFlag,goodsHeaderImages=[], goodsVideoList=[], contractId, cooperationProjectId } = goodsInfo;
-          this.isProject = cooperationProjectId;
-          this.isContract = contractId;
+          this.isProject = Boolean(cooperationProjectId);
+          if(this.isProject) {this.getContractList(cooperationProjectId) }
+          this.isContract = Boolean(contractId);
           this.formData = {...this.formData, ...goodsInfo};
           this.formData2 = medicalService;
           this.formData = { ...this.formData, ...this.formData2 };
@@ -1320,8 +1329,9 @@
           const { goodsName, goodsDescription, goodsType,expressLimitFlag, goodsHeaderImages=[], goodsVideoList=[],contractId, cooperationProjectId } = goodsList[0];
           const goodDet = goodsList[0];
           goodDet.otc1 = goodDet.otc ? '1' : '0';
-          this.isProject = cooperationProjectId;
-          this.isContract = contractId;
+          this.isProject = Boolean(cooperationProjectId);
+          if(this.isProject) {this.getContractList(cooperationProjectId)}
+          this.isContract = Boolean(contractId);
           this.formData1 = goodDet;
           if (this.formData1.goodsType == 340) {
             this.showTcm = true;
@@ -1374,7 +1384,6 @@
           };
           this.barAndGoodsFlag = this.formData1.medicalCategoryId ? true : false;
         }
-        console.log(this.formData);
       },
       getImges(d,type){
         let a = [];

src/views/goods/forms.js

@@ -66,7 +66,7 @@ const form = {
   mostCount: -1,
   incrType: 1,
   saleType: 1,
-  minWhole: 0,
+  minWhole: 1,
   expressLimitFlag: 0, //是否支持退货退款
 };
 

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

@@ -851,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">
@@ -950,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">
@@ -999,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">
@@ -1048,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
@@ -1096,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">
@@ -1699,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: {
@@ -1914,6 +1934,47 @@ export default {
       });
     },
     completeWholeForm() {
+      console.log(this.controlLicense,this.formData);
+      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)
+          }
+        })
+      }
       let flag = this.submitForm();
       if (flag && this.certifyStatus == 3) {
         this.$confirm('您的店铺已经审核通过，重新提交后需要重新审核。', '确认重新提交店铺信息吗?', {