Merge remote-tracking branch 'origin/master'

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>

src/views/GARDENTRADEDATA/index.vue

@@ -117,7 +117,7 @@
           {{scope.row.gardenWaterElectric}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/GATHER/index.vue

@@ -87,7 +87,7 @@
           {{ scope.row.year }}
         </template>
       </el-table-column>
-      <el-table-column label="月份" align="center" prop="month">
+      <el-table-column label="海关部分贸易" align="center" prop="month">
         <template slot-scope="scope">
           {{ '01-' + scope.row.month }}
         </template>
@@ -98,14 +98,14 @@
           <span v-if="scope.row.collStatus == 1">已采集</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报状态" align="center" prop="reportStatus">
+      <el-table-column label="海关进出口总值导入" align="center" prop="reportStatus">
         <template slot-scope="scope">
           <span v-if="scope.row.reportStatus == 0">未上报</span>
           <span v-if="scope.row.reportStatus == 1">已上报</span>
         </template>
       </el-table-column>
       <el-table-column label="上报人" align="center" prop="reportName" width="110" />
-      <el-table-column label="上报时间" align="center" prop="createTime" width="100" />
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="100" />
 
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
@@ -127,11 +127,11 @@
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 0" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
           <template v-if="scope.row.reportStatus == 0 && scope.row.collStatus == 1">
             <el-popconfirm title="确定上报吗？" @confirm="handleReport(scope.row)">
-              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
+              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text"  v-hasPermi="['gather:GATHER:report']">上报</el-button>
             </el-popconfirm>
           </template>
           <el-popconfirm title="确定提交吗？" @confirm="handleApprove(scope.row)">
-            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" type="text" slot="reference">提交审核</el-button>
+            <el-button style="margin: 0 2px" v-if="scope.row.approveStatus == 0 && scope.row.collStatus == 1" size="mini" v-hasPermi="['gather:GATHER:approve']" type="text" slot="reference">审核</el-button>
           </el-popconfirm>
           <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text" @click="handleDetail(scope.row, 0)">查看</el-button>
 
@@ -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/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
@@ -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>

src/views/RANK/index.vue

@@ -124,7 +124,8 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,i) in nearYearList"
+              :key="i"
               :label="item"
               :value="item">
             </el-option>

src/views/TOTEXP/index.vue

@@ -139,7 +139,8 @@
         <el-form-item prop="year" label-width="100px" label="年份">
           <el-select v-model="form.year" filterable default-first-option clearable placeholder="请选择年份">
             <el-option
-              v-for="item in nearYearList"
+              v-for="(item,index) in nearYearList"
+              :key="index"
               :label="item"
               :value="item">
             </el-option>

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 => {