Merge branch 'feature/finance-zs' into 'testing/finance'

下拉框改动

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

src/views/goods/create-good.vue

@@ -141,13 +141,14 @@
               </el-select>
             </el-form-item>
             <!-- 新增项目合同名称 -->
-            <el-form-item label="项目名称" prop="cooperationProjectId">
+            <el-form-item label="项目-合同名称" prop="cooperationProjectId">
               <el-select
                   v-model="formData3.cooperationProjectId"
                   placeholder="请选择"
                   size="small"
                   :disabled="isEdit && isProject"
                   @change="getContract"
+                  clearable
                   filterable>
                 <el-option
                     v-for="(item,index) in cooperationProjectList"
@@ -156,12 +157,11 @@
                     :value="item.cooperationProjectId"
                 ></el-option>
               </el-select>
-            </el-form-item>
-            <el-form-item label="合同名称" prop="contractId">
               <el-select
                   v-model="formData3.contractId"
                   placeholder="请选择"
                   size="small"
+                  clearable
                   :disabled="isEdit && isContract">
                 <el-option
                     v-for="(item,index) in contractList"
@@ -172,7 +172,6 @@
               </el-select>
             </el-form-item>
 
-
              <el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
               <el-radio-group v-model="formData3.expressLimitFlag" :disabled="!hasRepoFlag">
                 <el-radio :label="1">是</el-radio>
@@ -1083,7 +1082,6 @@
       // this.getBusinessCategory();
       this.getLever(0,1)
       this.getCooperationProjectList();
-      this.getContractList();
       dosageAll().then((res)=>{
         this.doseAll = res.data
         if (!this.doseAll) {
@@ -1472,6 +1470,13 @@
       },
       updateStock(){
         let r = /^\+?[1-9][0-9]*$/;
+        const {cooperationProjectId, contractId} = this.formData3;
+        if ((cooperationProjectId && !contractId) || (!cooperationProjectId && contractId)) {
+          return  this.$message({
+            message: '请选择项目-合同名称',
+            type: 'warning'
+          });
+        }
         //造假  接口来了删掉
         if(this.stock.num <= 0){
           return  this.$message({
@@ -1553,6 +1558,13 @@
         this.formData.specificationImages = this.fileIntrList;
         this.formData.buyLimitDtoList = this.buyLimitDtoList;
         this.isgoodsImages = this.formData.goodsImages.length == 0 ? false :true;
+        const {cooperationProjectId, contractId} = this.formData3;
+        if ((cooperationProjectId && !contractId) || (!cooperationProjectId && contractId)) {
+          return  this.$message({
+            message: '请选择项目-合同名称',
+            type: 'warning'
+          });
+        }
 
         // 如果是【药品】类型的商品
         // if(this.isMedic){