Merge branch 'master'

src/views/ARTICLE/edit.vue

@@ -129,60 +129,60 @@ export default {
     /** 提交按钮 */
     submitForm(type) {
       this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            if (type == 0) {
-              updateARTICLE(this.form).then((response) => {
-                this.$modal.msgSuccess("修改成功");
-                this.$layer.close(this.layerid);
-                this.$parent.getList();
-              });
-            } else if (type == 1) {
-              this.form.status = 1;
-              audit(this.form).then((response) => {
-                this.$modal.msgSuccess("提交成功");
-                this.$layer.close(this.layerid);
-                this.$parent.getList();
-              });
-            }
-          } else {
-            this.form.status = 1;
-            addARTICLE(this.form).then((response) => {
-              this.$modal.msgSuccess("提交审核成功");
-              this.$layer.close(this.layerid);
-              this.$parent.getList();
-            });
-          }
-        }
-
         // if (valid) {
         //   if (this.form.id != null) {
-        //     console.log("修改内容");
-        //     updateARTICLE(this.form).then((response) => {
-        //       this.$modal.msgSuccess("修改成功");
-        //       this.$layer.close(this.layerid);
-        //       this.$parent.getList();
-        //     });
-        //   } else {
         //     if (type == 0) {
-        //       console.log("草稿保存");
-        //       this.form.status = 0;
-        //       addARTICLE(this.form).then((response) => {
-        //         this.$modal.msgSuccess("保存成功");
+        //       updateARTICLE(this.form).then((response) => {
+        //         this.$modal.msgSuccess("修改成功");
         //         this.$layer.close(this.layerid);
         //         this.$parent.getList();
         //       });
         //     } else if (type == 1) {
-        //       console.log("草稿提交审核");
         //       this.form.status = 1;
-        //       addARTICLE(this.form).then((response) => {
-        //         this.$modal.msgSuccess("提交审核成功");
+        //       audit(this.form).then((response) => {
+        //         this.$modal.msgSuccess("提交成功");
         //         this.$layer.close(this.layerid);
         //         this.$parent.getList();
         //       });
         //     }
+        //   } else {
+        //     this.form.status = 1;
+        //     addARTICLE(this.form).then((response) => {
+        //       this.$modal.msgSuccess("提交审核成功");
+        //       this.$layer.close(this.layerid);
+        //       this.$parent.getList();
+        //     });
         //   }
         // }
+
+        if (valid) {
+          this.form.status = type;
+          if (this.form.id != null) {
+            // console.log("修改内容");
+            updateARTICLE(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          } else {
+            if (type == 0) {
+              // console.log("草稿保存");
+              addARTICLE(this.form).then((response) => {
+                this.$modal.msgSuccess("保存成功");
+                this.$layer.close(this.layerid);
+                this.$parent.getList();
+              });
+            } 
+            if (type == 1) {
+              // console.log("提交审核");
+              addARTICLE(this.form).then((response) => {
+                this.$modal.msgSuccess("提交审核成功");
+                this.$layer.close(this.layerid);
+                this.$parent.getList();
+              });
+            }
+          }
+        }
       });
     },
   },

src/views/ARTICLE/index.vue

@@ -15,7 +15,7 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="项目名称">
+      <el-form-item label="建设规模">
         <el-select v-model="queryParams.scale" placeholder="请选择建设规模">
           <el-option
             v-for="item in scaleList"
@@ -326,8 +326,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.least = null
-      this.queryParams.most = null
+      this.queryParams.atvName = null;
+      this.queryParams.scale = null;
+      this.queryParams.least = null;
+      this.queryParams.most = null;
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/AttendMeeting/index.vue

@@ -125,22 +125,22 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >单位指派</el-button
           >
           <el-button
             size="mini"
             type="text"
-            @click="handleReply(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
-            >回复会议</el-button
+            @click="handleUnit(scope.row)"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
+            >会议回复</el-button
           >
         </template>
       </el-table-column>
@@ -350,10 +350,18 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getJOINTCONFERENCE(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改联席会议";
+      // getJOINTCONFERENCE(id).then((response) => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改联席会议";
+      // });
+
+      this.iframe({
+        obj: add,
+        param: {id:id},
+        title: "修改会议",
+        width: "750px",
+        height: "60%",
       });
     },
     /** 提交按钮 */

src/views/GARDENTRADEDATA/index.vue

@@ -1,11 +1,17 @@
 <template>
   <div class="app-container">
-    <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="园区名称">
+        <el-input
+          v-model="queryParams.gardenName"
+          placeholder="请输入园区名称"
+        ></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
-    </el-form> -->
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -194,7 +200,9 @@ export default {
         gardenInnovative: null,
         companyWaterElectric: null,
         gardenWaterElectric: null,
-        createTime: null
+        createTime: null,
+
+        gardenName: '', // 园区名称
       },
       // 表单参数
       form: {},
@@ -281,6 +289,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.gardenName = '';
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/GATHER/index.vue

@@ -370,9 +370,11 @@ export default {
         callback(new Error('请输入数字和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }
+      // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      //   callback(new Error('最多只能输入两位小数')); //小数点后两位
+      // }
+      else {
         callback();
       }
     },
@@ -382,9 +384,11 @@ export default {
         callback(new Error('请输入正数和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
-        callback(new Error('最多只能输入两位小数')); //小数点后两位
-      } else {
+      }
+      // else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      //   callback(new Error('最多只能输入两位小数')); //小数点后两位
+      // }
+      else {
         callback();
       }
     },

src/views/GATHERWARNING/index.vue

@@ -193,7 +193,7 @@ export default {
   data() {
     return {
       typeList: [
-        { label: "要闻咨量化指标数据询", value: "0" },
+        { label: "量化指标数据", value: "0" },
         { label: "月报表数据", value: "1" },
       ],
       //状态（0=预警,1=已解除,2已取消）

src/views/JOINTCONFERENCE/index.vue

@@ -125,14 +125,14 @@
             size="mini"
             type="text"
             @click="goDetail(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >会议详情</el-button
           >
           <el-button
             size="mini"
             type="text"
             @click="handleUnit(scope.row)"
-            v-hasPermi="['business:JOINTCONFERENCE:edit']"
+            v-hasPermi="['business:JOINTCONFERENCE:query']"
             >单位指派</el-button
           >
         </template>
@@ -331,10 +331,18 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getJOINTCONFERENCE(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改联席会议";
+      // getJOINTCONFERENCE(id).then((response) => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改联席会议";
+      // });
+
+      this.iframe({
+        obj: add,
+        param: {id:id},
+        title: "修改会议",
+        width: "750px",
+        height: "60%",
       });
     },
     /** 提交按钮 */

src/views/RANK/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table :data="RANKList" @selection-change="handleSelectionChange">
+    <el-table  :data="RANKList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="保税区" align="center" prop="deptName">
         <template slot-scope="scope">
@@ -131,8 +131,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="ranking" label-width="100px" label="出入口总值">
-          <el-input  v-model="form.ranking" placeholder="请输入出入口总值" ></el-input>
+        <el-form-item prop="ranking" label-width="100px" label="排名">
+          <el-input  v-model="form.ranking" placeholder="请输入排名" ></el-input>
         </el-form-item>
 
       </el-form>
@@ -195,11 +195,11 @@ export default {
           { required: true, message: "保税区ID不能为空", trigger: "blur" }
         ],
         year: [
-          { required: true, message: "年份不能为空", trigger: "blur" },
-          { trigger: 'blur', validator: this.validatorFloatNum }
+          { required: true, message: "年份不能为空", trigger: "blur" }
         ],
         ranking: [
-          { required: true, message: "排名不能为空", trigger: "blur" }
+          { required: true, message: "排名不能为空", trigger: "blur" },
+          { trigger: 'blur', validator: this.validatorFloatNum }
         ],
       }
     };
@@ -235,6 +235,7 @@ export default {
 
       // 获取近三年
       let nearYearArr = [];
+      nearYearArr.push(curYear)
       for (let i = 1; i <= 4; i++) {
         nearYearArr.push(curYear - i + '');
       }
@@ -285,6 +286,7 @@ export default {
       const id = row.id || this.ids
       getRANK(id).then(response => {
         this.form = response.data;
+        this.form.deptId = Number(this.form.deptId)
         this.open = true;
         this.title = "修改广西保税区排名";
       });
@@ -292,6 +294,7 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
+        debugger
         if (valid) {
           if (this.form.id != null) {
             updateRANK(this.form).then(response => {
@@ -330,14 +333,14 @@ export default {
       let reg = /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g;
       if (!reg.test(value)) {
         callback(new Error('请输入数字和正确格式的数字'));
-      } else if (value.split('.').length > 2) {
+      } else if (value.split('.').length >= 1) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
         callback(new Error('最多只能输入两位小数')); //小数点后两位
       } else {
         callback();
       }
-    },
+    }
   }
 };
 </script>

src/views/REGISTERTASK/index.vue

@@ -17,12 +17,11 @@
           </el-descriptions-item>
           <el-descriptions-item label="审核意见">{{ taskList.comments ? taskList.comments : '无' }}</el-descriptions-item>
         </el-descriptions>
-
         <el-form ref="form" :model="taskList" label-width="auto" style="margin-top: 20px">
           <el-row>
             <el-col :span="12">
               <el-col :span="12">
-                <el-form-item label="姓名：">{{ taskList.formobj.nickName }}</el-form-item>
+                <el-form-item label="姓名：">{{ getFormobjAttribute('nickName') }}</el-form-item>
               </el-col>
             </el-col>
             <el-col :span="12">
@@ -35,7 +34,7 @@
                   border-radius: 5px;
                   margin-bottom: -15px;"
                   :z-index="50000"
-                  :src="baseUrl + taskList.formobj.userAvatar"
+                  :src="baseUrl + getFormobjAttribute('userAvatar')"
                   @click="showImagePreview(taskList.formobj.userAvatar)"
                 ></el-image>
               </el-form-item>
@@ -45,36 +44,36 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="类型：">
-                <span v-if="taskList.formobj.type == 2">专家</span>
+                <span v-if="getFormobjAttribute('type') == 2">专家</span>
                 <span v-else>其它</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="民族：">{{ taskList.formobj.nation }}</el-form-item>
+              <el-form-item label="民族：">{{ getFormobjAttribute('nation') }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="用户名：">{{ taskList.formobj.userName }}</el-form-item>
+              <el-form-item label="用户名：">{{ getFormobjAttribute('userName') }}</el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="学历：">{{ taskList.formobj.education }}</el-form-item>
+              <el-form-item label="学历：">{{ getFormobjAttribute('education') }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="服务方向：">{{ taskList.formobj.servicesAvailable }}</el-form-item>
+              <el-form-item label="服务方向：">{{ getFormobjAttribute('servicesAvailable') }}</el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工作经验：">{{ taskList.formobj.experience }}</el-form-item>
+              <el-form-item label="工作经验：">{{ getFormobjAttribute('experience') }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="专业领域：">{{ taskList.formobj.field }}</el-form-item>
+              <el-form-item label="专业领域：">{{ getFormobjAttribute('field') }}</el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="研究方向：">{{ taskList.formobj.research }}</el-form-item>
+              <el-form-item label="研究方向：">{{ getFormobjAttribute('research') }}</el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -88,7 +87,7 @@
                   border-radius: 5px;
                   margin-bottom: -15px;"
                   :z-index="50000"
-                  :src="baseUrl + taskList.formobj.diploma"
+                  :src="baseUrl + getFormobjAttribute('diploma')"
                   @click="showImagePreview(taskList.formobj.diploma)"
                 ></el-image>
               </el-form-item>
@@ -104,7 +103,7 @@
                 margin-bottom: -15px;
               "
                   :z-index="50000"
-                  :src="baseUrl + taskList.formobj.credentials"
+                  :src="baseUrl + getFormobjAttribute('credentials')"
                   @click="showImagePreview(taskList.formobj.credentials)"
                 ></el-image>
                </el-form-item>
@@ -112,7 +111,7 @@
           </el-row>
         </el-form>
         <el-dialog :visible="BigImgVisible" fullscreen append-to-body @close="BigImgVisible = false">
-          <img width="100%" :src="taskList.formobj.fileUrl" alt="" />
+          <img width="100%" :src="getFormobjAttribute('fileUrl')" alt="" />
         </el-dialog>
       </el-tab-pane>
       <el-tab-pane label="审批记录" name="审批记录">
@@ -155,7 +154,7 @@ export default {
   },
   props: ['taskList'],
   created() {
-    if (this.taskList.formobj.fileUrl) {
+    if (this.taskList.formobj && this.taskList.formobj.fileUrl) {
       this.fileList.push({
         url: this.baseURL + this.taskList.formobj.fileUrl,
         name: "xxx",
@@ -180,6 +179,13 @@ export default {
       this.previewImageUrl = this.baseURL + url;
       this.imagePreviewVisible = true;
     },
+    getFormobjAttribute(key) {
+      if(this.taskList.formobj) {
+        return this.taskList.formobj[key];
+      } else {
+        return "";
+      }
+    },
   }
 };
 </script>

src/views/TOTEXP/index.vue

@@ -63,7 +63,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table  :data="TOTEXPList" @selection-change="handleSelectionChange">
+    <el-table :data="TOTEXPList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="主键" align="center" prop="id">-->
 <!--        <template slot-scope="scope">-->
@@ -146,8 +146,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="imExport" label-width="100px" label="出入口总值">
-          <el-input  v-model="form.imExport" placeholder="请输入出入口总值" ></el-input>
+        <el-form-item prop="imExport" label-width="100px" label="进出口总值">
+          <el-input  v-model="form.imExport" placeholder="请输入进出口总值" ></el-input>
         </el-form-item>
 
       </el-form>
@@ -249,6 +249,7 @@ export default {
 
       // 获取近三年
       let nearYearArr = [];
+      nearYearArr.push(curYear)
       for (let i = 1; i <= 4; i++) {
         nearYearArr.push(curYear - i + '');
       }
@@ -298,6 +299,7 @@ export default {
       const id = row.id || this.ids
       getTOTEXP(id).then(response => {
         this.form = response.data;
+        this.form.deptId = Number(this.form.deptId)
         this.open = true;
         this.title = "修改保税区进出口总值数据";
       });
@@ -346,7 +348,7 @@ export default {
         callback(new Error('请输入数字和正确格式的数字'));
       } else if (value.split('.').length > 2) {
         callback(new Error('请输入正确格式的数字')); //防止输入多个小数点
-      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 2) {
+      } else if (value.indexOf('.') != -1 && value.split('.')[1].length > 6) {
         callback(new Error('最多只能输入两位小数')); //小数点后两位
       } else {
         callback();

src/views/norm/dataSubmission.vue

@@ -352,7 +352,8 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除报送数据项配置编号为"' + ids + '"的数据项？')
+        // .confirm('是否确认删除报送数据项配置编号为"' + ids + '"的数据项？')
+        .confirm(`是否确认删除报送数据项配置编号为【${ids}】;报送参数名称为【${row.fname}】的数据项？`)
         .then(function () {
           return delGIVE(ids);
         })

src/views/norm/index.vue

@@ -43,7 +43,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['business:NORM:edit']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:NORM:remove']">删除</el-button>
+          <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['business:NORM:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,7 +152,8 @@ export default {
         deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
         name: [{ required: true, message: '指标分类名称不能为空', trigger: 'blur' }],
         code: [{ required: true, message: '指标分类编号不能为空', trigger: 'blur' },
-               { pattern: /^[1-9a-zA-Z]{1,}$/, message: '指标分类编号只能输入数字和字母', trigger: 'blur' }
+               // { pattern: /^[1-9a-zA-Z]{1,}$/, message: '指标分类编号只能输入数字和字母', trigger: 'blur' }
+               { pattern: /^[A-Za-z0-9]+$/, message: '指标分类编号只能输入数字和字母', trigger: 'blur' }
               ],
         status: [
           {

src/views/norm/quotaBonded.vue

@@ -45,11 +45,13 @@
 
     <el-table :data="QUOTABONDEDList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="保税区名称" align="center" prop="bondedName"></el-table-column>
-      <el-table-column label="指标名称" align="center" prop="quotaName"></el-table-column>
-      <el-table-column label="得分" align="center" prop="score" width="120"></el-table-column>
-      <el-table-column label="说明" align="center" prop="remark" width="300"></el-table-column>
-      <el-table-column label="附件" align="center" prop="fileNames" width="300"></el-table-column>
+      <el-table-column label="保税区名称" align="center" prop="bondedName" width="140"></el-table-column>
+      <el-table-column label="指标名称" align="center" prop="quotaName" width="180"></el-table-column>
+      <el-table-column label="得分" align="center" prop="score"></el-table-column>
+      <el-table-column label="录入方式" align="center" prop="enterType"></el-table-column>
+      <el-table-column label="数值" align="center" prop="numValue"></el-table-column>
+      <el-table-column label="文字说明" align="center" prop="remark" width="280"></el-table-column>
+      <el-table-column label="附件" align="center" prop="fileNames" width="280"></el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button
@@ -92,7 +94,15 @@
             <el-option v-for="dict in QUOTAFEEList" :key="dict.id" :label="dict.quotaName" :value="dict" />
           </el-select>
         </el-form-item>
-        <el-form-item label-width="100px" label="上传附件" prop="linkUrls">
+
+        <el-form-item label-width="100px" label="录入方式" prop="enterType">
+          <el-select v-model="form.enterType" placeholder="请选择录入方式" clearable filterable style="width:100%">
+            <el-option value="附件">附件</el-option>
+            <el-option value="文字说明">文字说明</el-option>
+            <el-option value="数值">数值</el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="form.enterType == '附件'" label-width="100px" prop="linkUrls" label="上传附件">
           <el-upload
             class="upload-demo"
             ref="upload"
@@ -104,9 +114,13 @@
             <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item label-width="100px" prop="remark" label="说明">
+        <el-form-item v-if="form.enterType == '文字说明'" label-width="100px" prop="remark" label="说明">
           <el-input type="textarea" v-model="form.remark" rows="5"></el-input>
         </el-form-item>
+        <el-form-item v-if="form.enterType == '数值'" label-width="100px" prop="numValue" label="数值">
+          <el-input v-model="form.numValue"></el-input>
+        </el-form-item>
+
         <el-form-item label-width="100px" prop="score" label="分值">
           <el-input v-model="form.score"></el-input>
         </el-form-item>
@@ -185,9 +199,6 @@ export default {
         quotaName: [
           { required: true, message: "指标名称不能为空", trigger: "blur" }
         ],
-        score: [
-          { required: true, message: "得分不能为空", trigger: "blur" }
-        ],
       }
     };
   },
@@ -242,7 +253,9 @@ export default {
         stopTime: null,
         linkUrls: null,
         remark: null,
-        fileNames: null
+        fileNames: null,
+        enterType: null,
+        numValue: null
       };
       this.fileList = [];
       this.resetForm("form");
@@ -267,7 +280,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加辅助指标-综保区";
+      this.title = "辅助指标录入新增";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -276,7 +289,7 @@ export default {
       getQUOTABONDED(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改辅助指标-综保区";
+        this.title = "辅助指标录入修改";
       });
     },
     /** 提交按钮 */
@@ -287,7 +300,22 @@ export default {
             this.$message.error("得分必须为整数");
             return;
           }
-
+          if (this.form.enterType == '附件' && this.form.linkUrls == null) {
+            this.$message.error("请上传附件");
+            return;
+          }
+          if (this.form.enterType == '文字说明' && this.form.remark == null) {
+            this.$message.error("请录入文字说明");
+            return;
+          }
+          if (this.form.enterType == '数值' && this.form.numValue == null) {
+            this.$message.error("请录入数值");
+            return;
+          }
+          if (this.form.numValue != null && !(parseInt(this.form.numValue) == this.form.numValue || parseFloat(this.form.numValue) == this.form.numValue)) {
+            this.$message.error("数值必须为整数或小数");
+            return;
+          }
           if (this.form.id != null) {
             updateQUOTABONDED(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

src/views/norm/quotafee.vue

@@ -1,16 +1,15 @@
 <template>
-  <el-dialog
-    title="辅助指标明细"
-    :visible.sync="isShowQuotaDialog"
-    :width="'80%'"
-    :close-on-click-modal="false"
-    :before-close="closeHandler"
-  >
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
         <el-form-item label="指标名称" prop="quotaName">
           <el-input v-model="queryParams.quotaName"></el-input>
         </el-form-item>
+        <el-form-item label="指标分类" prop="normName">
+          <el-select v-model="queryParams.normName" clearable filterable>
+            <el-option value="加分项">加分项</el-option>
+            <el-option value="减分项">减分项</el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -47,7 +46,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
-      <el-table :data="quotaData" @selection-change="handleSelectionChange">
+      <el-table :data="QUOTAFEEList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
 
         <el-table-column label="指标分类" width="85" align="center" prop="normName">
@@ -125,7 +124,6 @@
         </div>
       </el-dialog>
     </div>
-  </el-dialog>
 </template>
 
 <script>
@@ -133,30 +131,6 @@ import { listQUOTAFEE, getQUOTAFEE, delQUOTAFEE, addQUOTAFEE, updateQUOTAFEE } f
 
 export default {
   name: "QUOTAFEE",
-  props: {
-    isShowQuotaDialog: {
-      type: Boolean,
-      default: () => {
-        return false;
-      },
-    },
-    normId: {
-      type: String,
-      default: () => {
-        return null;
-      },
-    },
-    quotaData: {
-      type: Array,
-      defaultL: () => {
-        return [];
-      },
-    },
-    totalNum:{
-      type:Number,
-      default:0
-    }
-  },
   data() {
     return {
       // 根路径
@@ -173,6 +147,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 辅助指标表格数据
+      QUOTAFEEList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -181,7 +157,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        quotaName: null
+        quotaName: null,
+        normName: null
       },
       // 表单参数
       form: {},
@@ -219,14 +196,13 @@ export default {
     /** 查询辅助指标明细列表 */
     getList() {
       this.loading = true;
-      this.queryParams.normId = this.normId;
       listQUOTAFEE(this.queryParams).then(response => {
         response.rows.forEach((item, index) => {
           response.rows[index].status = item.status == 0 ? false : true;
         });
+        this.QUOTAFEEList = response.rows;
         this.total = response.total;
         this.loading = false;
-        this.$emit("dataHandler", response.rows);
       });
     },
     // 取消按钮
@@ -298,7 +274,6 @@ export default {
             return;
           }
 
-          this.form.normId = this.normId;
           this.form.status = 1;
           if (this.form.id != null) {
             updateQUOTAFEE(this.form).then(response => {

src/views/task/index.vue

@@ -406,7 +406,7 @@ export default {
       });
     },
 
-    //点击审核
+    //点击详情
     handleExamine(row) {
       // this.taskList = []
       getINSTACTIONTASK(row.id).then((res) => {