cq

master/src/main/java/com/ruoyi/project/plant/controller/TTargetyardstickController.java

@@ -36,7 +36,6 @@ public class TTargetyardstickController extends BaseController
     /**
      * 查询目标完成判定标准列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:targetyardstick:list')")
     @GetMapping("/list")
     public TableDataInfo list(TTargetyardstick tTargetyardstick)
     {

master/src/main/java/com/ruoyi/project/plant/domain/TTargetyardstick.java

@@ -29,8 +29,8 @@ public class TTargetyardstick extends BaseEntity
     private String target;
 
     /** 完成时间 */
-    @JsonFormat(pattern = "yyyy-MM" , timezone = "GMT+8")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM")
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date achieveDate;
 
     /** 判定标准 */

master/src/main/resources/mybatis/plant/TTargetyardstickMapper.xml

@@ -31,8 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="agreementId != null "> and agreement_id = #{agreementId}</if>
             and d.del_flag = 0
         </where>
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
     
     <select id="selectTTargetyardstickById" parameterType="Long" resultMap="TTargetyardstickResult">

ui/src/views/plant/targetagreement/index.vue

@@ -70,7 +70,7 @@
             <el-table-column :label="$t('目标')" align="center" prop="target" :show-overflow-tooltip="true" />
             <el-table-column :label="$t('完成时间')" align="center" prop="achieveDate" width="100">
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.achieveDate, '{y}-{m}') }}</span>
+                <span>{{ parseTime(scope.row.achieveDate, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('判定标准')" align="left" header-align="center" prop="yardstick">
@@ -246,11 +246,11 @@
             <el-date-picker
               v-if="scope.row.isEdit"
               v-model="scope.row.achieveDate"
-              type="month"
-              value-format="yyyy-MM"
+              type="date"
+              value-format="yyyy-MM-dd"
               :placeholder="$t('请选择')+$t('完成时间')">
             </el-date-picker>
-            <span v-else>{{ parseTime(scope.row.achieveDate, '{y}-{m}') }}</span>
+            <span v-else>{{ parseTime(scope.row.achieveDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('判定标准')" align="left" header-align="center" prop="yardstick">

ui/src/views/plant/targetmeasures/index.vue

@@ -54,8 +54,8 @@
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column :label="$t('年份')" align="center" prop="year" width="50" />
       <el-table-column :label="$t('序号')" align="center" prop="item" width="50" />
-      <el-table-column :label="$t('内容')" align="center" prop="description" width="200"/>
-      <el-table-column :label="$t('目标')" align="center" prop="targets" width="150"/>
+      <el-table-column :label="$t('内容')" align="center" prop="description" width="270"/>
+      <el-table-column :label="$t('目标')" align="center" prop="targets" />
       <el-table-column :label="$t('方案/行动计划/措施')" align="center" prop="measures" width="600" />
       <el-table-column :label="$t('负责人')" align="center" prop="responsible" width="200"/>
       <el-table-column :label="$t('计划完成日期')" align="center" prop="expectedDate" width="100">