Merge branch 'dev_ren' into 'master'

1.11 源文件

See merge request !40

src/views/webSiteManagement/imageLibrary/edit.vue

@@ -35,7 +35,7 @@
             @input="(val, info) => getSrc('coverImg', val)"
           ></my-upload>
         </el-form-item>
-        <el-form-item label="上传源文件">
+        <el-form-item label="上传源文件" prop="imageInfoRelationList" required>
           <!-- :prop="'imageInfoRelationList.url' && 'imageInfoRelationList.price'" -->
 
           <!-- 上传 -->
@@ -282,6 +282,13 @@ export default {
         }
       }
     };
+    let validateListLength = function (rule, value, callback) {
+      if (value.length < 1) {
+        callback(new Error("请上传源文件"));
+      } else {
+        callback();
+      }
+    };
     return {
       BASE_API: process.env.BASE_API,
       //1--影像美图 2--专题图 3--遥感成果图
@@ -316,6 +323,9 @@ export default {
         type: [
           { required: true, message: "请选择影像类型", trigger: "change" },
         ],
+        imageInfoRelationList: [
+          { validator: validateListLength, trigger: "blur" },
+        ],
         "paramJson.productType": [
           { required: true, message: "请输入产品类型", trigger: "blur" },
         ],

src/views/webSiteManagement/industryApplication/applicationList/addUpApp/index.vue

@@ -134,12 +134,12 @@
                 <el-radio-button label="否"></el-radio-button>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="是否提供定制" prop="isCustomized">
+            <!-- <el-form-item label="是否提供定制" prop="isCustomized">
               <el-radio-group v-model="form.isCustomized">
                 <el-radio-button label="是"></el-radio-button>
                 <el-radio-button label="否"></el-radio-button>
               </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="上传样例" prop="fileList">
               <el-upload
                 class="upload-demo"
@@ -268,9 +268,9 @@ export default {
         isSample: [
           { required: true, message: "是否提供样例", trigger: "blur" },
         ],
-        isCustomized: [
-          { required: true, message: "是否提供定制", trigger: "blur" },
-        ],
+        // isCustomized: [
+        //   { required: true, message: "是否提供定制", trigger: "blur" },
+        // ],
         fileList: [{ required: true, message: "请上传样例", trigger: "blur" }],
         sourceFile: [
           { required: true, message: "请上传源文件", trigger: "blur" },
@@ -291,7 +291,7 @@ export default {
         achievement: "", // 成果形式
         resolvpower: "", // 分辨率
         isSample: "是", // 是否提供样例
-        isCustomized: "是", // 是否定制
+        // isCustomized: "是", // 是否定制
         fileList: [], // 样例图片路径集合
         introduction: "", // 简介
         sourceFile: "", //源文件路径
@@ -342,7 +342,7 @@ export default {
       this.form.fileList =
         info.examples != 0 ? eval("(" + info.examplesJson + ")") : [];
       this.form.introduction = info.introduction;
-      this.form.isCustomized = info.customized == 1 ? "是" : "否";
+      // this.form.isCustomized = info.customized == 1 ? "是" : "否";
       // this.form = {
       //   title: info.title,// 应用名称
       //   coverImg: info.coverImg,// 封面图
@@ -498,6 +498,8 @@ export default {
         this.$message.error("请输入分辨率!!!");
       } else if (this.form.isSample == "是" && this.form.fileList.length == 0) {
         this.$message.error("请上传样例!!!");
+      } else if (this.form.sourceFile == "") {
+        this.$message.error("请上传源文件!!!");
       } else {
         let data, message;
         if (this.$parent.info) {
@@ -528,7 +530,7 @@ export default {
             secondTitle: this.$parent.info.secondTitle,
             indexShow: this.$parent.info.indexShow,
             isDel: this.$parent.info.isDel,
-            customized: this.form.isCustomized == "是" ? 1 : 2,
+            // customized: this.form.isCustomized == "是" ? 1 : 2,
           };
           message = "修改成功!!!";
         } else {
@@ -566,7 +568,7 @@ export default {
             ).label,
             secondTypeId: this.currentSecondType,
             secondTitle: secondtitle,
-            customized: this.form.isCustomized == "是" ? 1 : 2,
+            // customized: this.form.isCustomized == "是" ? 1 : 2,
           };
           message = "添加成功!!!";
         }