完成数据报送

src/components/TopNav/index.vue

@@ -112,7 +112,6 @@ export default {
   methods: {
 
     closeMenuHandler(){
-      console.log("close");
       this.$emit("closeMenuHandler");
     },
 

src/layout/components/Navbar.vue

@@ -3,10 +3,13 @@
     <div style="display: flex; justify-content: center;">
       <div class="cursor index menu-hover" @click="handlerIndex">首页</div>
       <div class="cursor menu menu-hover" @click="handlerShowMenu">数据接口</div>
+      <!-- 伸缩按钮 -->
+      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+        @toggleClick="toggleSideBar" />
       <div style="margin: 0 20px; position: relative;">
         <!-- <ul v-show="isShowMenu" class="menu-list"> -->
-          <top-nav class="menu-list" @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
-          <!--           
+        <top-nav class="menu-list" @closeMenuHandler="handlerShowMenu" :isShowMenu="isShowMenu"></top-nav>
+        <!--           
           <div class="manu-item-container cursor" @click="handlerRouteData(item,index)" v-for="(item, index) in routeData">
             <img :src="routeImgs[index]" class="menu-item-img" alt="" srcset="">
             <li :key="item.path + index" class="menu-item ">{{ item.meta.title }}
@@ -16,9 +19,7 @@
       </div>
     </div>
 
-    <!-- 伸缩按钮 -->
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
-      @toggleClick="toggleSideBar" />
+
 
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
     <!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" /> -->
@@ -126,7 +127,6 @@ export default {
       }).catch(() => { });
     },
     handlerShowMenu() {
-      console.log(123);
       this.isShowMenu = !this.isShowMenu;
     },
     handlerRouteData(item, index) {

src/views/norm/dataSubmission.vue

@@ -7,12 +7,6 @@
             :value="item == 1 ? 1 : 0" />
         </el-select>
       </el-form-item>
-      <el-form-item label="明细类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择明细类型" clearable filterable>
-          <el-option v-for="(item, index) in 2" :key="index" :label="item == 1 ? '采集分类' : '绩效分类'"
-            :value="item == 1 ? 1 : 0" />
-        </el-select>
-      </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>
@@ -59,12 +53,12 @@
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="启用时间" align="center" prop="startTime">
+      <el-table-column label="启用时间" width="150px" align="center" prop="startTime">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '1' ? true : false">{{ scope.row.startTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="停用时间" align="center" prop="stopTime">
+      <el-table-column label="停用时间" width="150px" align="center" prop="stopTime">
         <template slot-scope="scope">
           <div v-if="scope.row.status == '0' ? true : false">{{ scope.row.stopTime }}</div>
         </template>
@@ -353,7 +347,6 @@ export default {
 
 
       this.$refs["form"].validate(valid => {
-        console.log(valid);
         if (!(parseInt(this.form.fnumber) == this.form.fnumber || parseFloat(this.form.fnumber) == this.form.fnumber)) {
           this.$message.error('权数必须为整数或小数');
           return;
@@ -413,7 +406,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('business/GIVE/export', {
+      this.download('/norm/GIVE/export', {
         ...this.queryParams
       }, `GIVE_${new Date().getTime()}.xlsx`)
     },

src/views/norm/feeindex.vue

@@ -85,9 +85,7 @@
           <el-form-item label="指标参数名称" prop='fname'>
             <el-input v-model="form.fname"></el-input>
           </el-form-item>
-          <el-form-item label="指标参数" prop='fvalue'>
-            <el-input v-model="form.fvalue"></el-input>
-          </el-form-item>
+
 
           <el-form-item label="采集公差上下公差占比" prop='dfRetio'>
             <el-input v-model="form.dfRetio"></el-input>
@@ -97,13 +95,6 @@
             <el-input v-model="form.msRetio"></el-input>
           </el-form-item>
 
-          <!-- <el-form-item label="明细类型" prop='type'>
-          <template>
-            <el-radio v-model="form.type" label="2">采集分类</el-radio>
-            <el-radio v-model="form.type" label="1">绩效分类</el-radio>
-          </template>
-        </el-form-item> -->
-
           <el-form-item label='采集参考值' prop='collValue'>
             <el-input v-model="form.collValue"></el-input>
           </el-form-item>
@@ -112,9 +103,6 @@
             <el-input v-model="form.meritsValue"></el-input>
           </el-form-item>
 
-          <!-- <el-form-item v-if="form.type == 1" key="1" label="采集参考值">
-            <el-input v-model="form.collValue"></el-input>
-          </el-form-item> -->
 
           <el-form-item label="备注">
             <el-input type="textarea" v-model="form.remark"></el-input>
@@ -222,17 +210,20 @@ export default {
         funit: [
           { required: true, message: "计量单位不能为空", trigger: "blur" }
         ],
-        fvalue: [
-          { required: true, message: "指标参数不能为空", trigger: "blur" }
-        ],
         dfRetio: [
-          { required: true, message: "公差占比", trigger: "blur" }
+          { required: true, message: "公差占比不能为空", trigger: "blur" }
         ],
         type: [
-          { required: true, message: "明细类型", trigger: "blur" }
+          { required: true, message: "明细类型不能为空", trigger: "blur" }
+        ],
+        msRetio: [
+          { required: true, message: "绩效公差上下公差占比不能为空", trigger: "blur" }
+        ],
+        collValue: [
+          { required: true, message: "采集参考值不能为空", trigger: "blur" }
         ],
-        msRetio:[
-          { required: true, message: "明细类型", trigger: "blur" }
+        meritsValue: [
+          { required: true, message: "绩效参考值不能为空", trigger: "blur" }
         ],
       },
       unitSel: null,
@@ -290,7 +281,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      // console.log(this.queryParams.status);
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -308,9 +298,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true;
-      // addNORMFEE().then(() => {
-      //   console.log("res");
-      // })
       this.reset();
       this.title = "添加指标权重明细";
     },
@@ -322,7 +309,6 @@ export default {
         this.form = response.data;
         this.open = true;
         this.form = row;
-        console.log(response);
         this.title = "修改指标权重明细";
       });
     },
@@ -330,12 +316,36 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         this.form.status = 1;
-        if (this.form.type == 2) {
-          this.form.collValue = null;
-        } else {
-          this.form.meritsValue = null;
-        }
         if (valid) {
+          if (!(parseInt(this.form.fnumber) == this.form.fnumber || parseFloat(this.form.fnumber) == this.form.fnumber)) {
+            this.$message.error('权数必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.normRatio) == this.form.normRatio || parseFloat(this.form.normRatio) == this.form.normRatio)) {
+            this.$message.error('分类占比必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.fname) == this.form.fname || parseFloat(this.form.fname) == this.form.fname)) {
+            this.$message.error('指标参数名称必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.meritsValue) == this.form.meritsValue || parseFloat(this.form.meritsValue) == this.form.meritsValue)) {
+            this.$message.error('绩效参考值必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.collValue) == this.form.collValue || parseFloat(this.form.collValue) == this.form.collValue)) {
+            this.$message.error('采集参考值必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.dfRetio) == this.form.dfRetio || parseFloat(this.form.dfRetio) == this.form.dfRetio)) {
+            this.$message.error('采集公差上下公差占比必须为整数或小数');
+            return;
+          }
+          if (!(parseInt(this.form.msRetio) == this.form.msRetio || parseFloat(this.form.msRetio) == this.form.msRetio)) {
+            this.$message.error('绩效公差上下公差占比必须为整数或小数');
+            return;
+          }
+
           this.form.normId = this.normId;
           this.form.status = 1;
           // if (this.form.id != null) {
@@ -399,10 +409,5 @@ export default {
       }
     }
   },
-  // watch:{
-  //   normId:(newV)=>{
-  //     console.log(newV,"---");
-  //   }
-  // }
 };
 </script>

src/views/system/user/index.vue

@@ -573,7 +573,6 @@ export default {
       this.reset();
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
-        console.log(response);
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;