lucw 8 miesięcy temu
rodzic
commit
6a2498a7cb

+ 2 - 2
src/components/selectReleaseRules/select-release-rules.vue

@@ -117,7 +117,7 @@
             formatter: (row) => {
               return (
                 row.frequencyValue +
-                this.getDictValue('记录规则频率', row.frequencyUnit + '')
+                this.getDictValue('规则周期', row.frequencyUnit + '')
               );
             }
           },
@@ -176,7 +176,7 @@
     },
     created() {
       this.requestDict('记录规则类型');
-      this.requestDict('记录规则频率');
+      this.requestDict('规则周期');
     },
     methods: {
       open() {

+ 1 - 2
src/enum/dict.js

@@ -75,12 +75,11 @@ export default {
   物品机型: 'product_model_key',
   物品颜色: 'product_color_key',
   记录规则类型: 'record_sheet',
-  记录规则频率: 'record_rules_frequency',
   记录规则报工类型: 'record_rules_report_work_type',
   记录规则执行方式: 'record_rules_execute_method',
   记录规则事项类型: 'record_rules_item_type',
   班次出勤名称: 'attendance_name',
-  班次时间类型: 'workShift_tiemType',
+  班次时间类型: 'workShift_tiemType'
 };
 
 export const numberList = [

+ 5 - 4
src/views/rulesManagement/releaseRules/index.vue

@@ -30,7 +30,8 @@
           >
             变更
           </el-link>
-          <el-popconfirm
+
+          <!-- <el-popconfirm
             v-if="row.publishStatus == 1"
             class="ele-action"
             title="确定要撤销此条数据吗?"
@@ -41,7 +42,7 @@
                 撤销
               </el-link>
             </template>
-          </el-popconfirm>
+          </el-popconfirm> -->
 
           <el-link
             v-if="row.publishStatus != 1"
@@ -196,7 +197,7 @@
             formatter: (row) => {
               return (
                 row.frequencyValue +
-                this.getDictValue('记录规则频率', row.frequencyUnit)
+                this.getDictValue('规则周期', row.frequencyUnit)
               );
             }
           },
@@ -263,7 +264,7 @@
     },
     created() {
       this.requestDict('记录规则类型');
-      this.requestDict('记录规则频率');
+      this.requestDict('规则周期');
     },
     methods: {
       addPermit(row, type, title) {