Merge branch 'testing/3.31.0' into 'release'

Testing/3.31.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!452

src/views/goods/create-good.vue

@@ -141,7 +141,7 @@
               </el-select>
             </el-form-item>
             <!-- 新增项目合同名称 -->
-            <el-form-item label="项目-合同名称" prop="cooperationProjectId">
+            <el-form-item label="项目-合同名称" prop="cooperationProjectId" class="project-req">
               <el-select
                   v-model="formData3.cooperationProjectId"
                   placeholder="请选择"
@@ -171,6 +171,7 @@
                     :value="item.contractId"
                 ></el-option>
               </el-select>
+              <div class="project-tip">未找到项目名称请联系产品经理添加</div>
             </el-form-item>
 
              <el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
@@ -1653,6 +1654,12 @@
         this.formData.buyLimitDtoList = this.buyLimitDtoList;
         this.isgoodsImages = this.formData.goodsImages.length == 0 ? false :true;
         const {cooperationProjectId, contractId} = this.formData3;
+        if (!cooperationProjectId) {
+          return  this.$message({
+            message: '请关联项目名称',
+            type: 'error'
+          });
+        }
         if ((cooperationProjectId && !contractId) || (!cooperationProjectId && contractId)) {
           return  this.$message({
             message: '请选择项目-合同名称',
@@ -2204,6 +2211,16 @@
       }
     }
   }
+  .project-req {
+    .el-form-item__label::before {
+    content: "*";
+    color: #f56c6c;
+    margin-right: 4px;
+  }
+  .project-tip {
+    color: #aaaaaa;
+  }
+  }
   .required-label .el-form-item__label::before {
     content: "*";
     color: #f56c6c;