Merge branch 'hezhihong_bug修复'

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

@@ -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/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

@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="会议日期" prop="status"> </el-form-item>
+      <!-- <el-form-item label="会议日期" prop="status"></el-form-item> -->
 
       <el-form-item label="会议状态" prop="status">
         <el-select
@@ -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/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: [
           {