查询条件修改

src/components/selectMatterRules/matter-search.vue

@@ -11,19 +11,14 @@
         <el-form-item label="规则名称:">
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
-        <el-form-item label="规则状态:">
+        <!-- <el-form-item label="规则状态:">
           <DictSelection
             dictName="规则状态"
             clearable
             v-model.trim="where.status"
           >
           </DictSelection>
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="规则编码:">
-          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="创建时间:">
           <el-date-picker
             style="width: 100%"
@@ -38,6 +33,11 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="规则编码:">
+          <el-input clearable v-model.trim="where.code" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则类型:">
           <DictSelection
@@ -52,13 +52,13 @@
         </el-form-item> -->
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="创建人:">
+        <!-- <el-form-item label="创建人:">
           <el-input
             clearable
             v-model.trim="where.userName"
             placeholder="请输入"
           />
-        </el-form-item>
+        </el-form-item> -->
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -91,7 +91,7 @@
         code: '',
         userName: '',
         type: '',
-        status: '',
+        status: 1,
         startTime: '',
         endTime: ''
       };

src/components/selectMatterRules/select-matter-rules.vue

@@ -27,39 +27,6 @@
             {{ row.code }}
           </el-link>
         </template>
-        <!-- 操作列 -->
-        <template v-slot:action="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-finished"
-            @click="openEdit('clone', row)"
-            v-if="$hasPermission('main:ruleinfo:saveOrEdit')"
-          >
-            克隆
-          </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click="openEdit('edit', row)"
-            v-if="$hasPermission('main:ruleinfo:saveOrEdit')"
-          >
-            修改
-          </el-link>
-          <el-popconfirm
-            class="ele-action"
-            title="确定要删除此条数据吗？"
-            @confirm="remove(row)"
-            v-if="$hasPermission('main:ruleinfo:delete')"
-          >
-            <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
-                删除
-              </el-link>
-            </template>
-          </el-popconfirm>
-        </template>
       </ele-pro-table>
     </el-card>
     <template v-slot:footer>
@@ -163,15 +130,6 @@
             formatter: (_row, _column, cellValue) => {
               return this.$util.toDateString(cellValue);
             }
-          },
-          {
-            columnKey: 'action',
-            label: '操作',
-            width: 230,
-            align: 'center',
-            resizable: false,
-            slot: 'action',
-            showOverflowTooltip: true
           }
         ],
         // 加载状态

src/components/selectReleaseRules/search.vue

@@ -36,28 +36,29 @@
             type: 'select',
             placeholder: '记录表分类',
             planList: this.typeList
-          },
-          {
-            label: '状态:',
-            value: 'publishStatus',
-            type: 'select',
-            placeholder: '状态',
-            // 0-草稿，1-已发布，2-已撤销
-            planList: [
-              {
-                label: '草稿',
-                value: '0'
-              },
-              {
-                label: '已发布',
-                value: '1'
-              },
-              {
-                label: '已撤销',
-                value: '2'
-              }
-            ]
           }
+          //,
+          // {
+          //   label: '状态:',
+          //   value: 'publishStatus',
+          //   type: 'select',
+          //   placeholder: '状态',
+          //   // 0-草稿，1-已发布，2-已撤销
+          //   planList: [
+          //     {
+          //       label: '草稿',
+          //       value: '0'
+          //     },
+          //     {
+          //       label: '已发布',
+          //       value: '1'
+          //     },
+          //     {
+          //       label: '已撤销',
+          //       value: '2'
+          //     }
+          //   ]
+          // }
         ];
       }
     },

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

@@ -189,11 +189,25 @@
       },
       /* 表格数据源 */
       datasource({ page, limit, where }) {
-        return recordrulesPage({ pageNum: page, size: limit, ...where });
+        return recordrulesPage({
+          pageNum: page,
+          size: limit,
+          // 已发布
+          publishStatus: 1,
+          // 启用
+          enable: 1,
+          ...where
+        });
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.tableRef?.reload({ page: 1, where });
+        this.$refs.tableRef?.reload({
+          page: 1, // 已发布
+          publishStatus: 1,
+          // 启用
+          enable: 1,
+          where
+        });
       },
       confirmSelection() {
         this.$emit('chooseRules', this.selection);

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -512,8 +512,8 @@
 
           this.formData.fromId = row.id;
           this.formData.id = null;
-          this.formData.startDate = new Date(row.stopDate);
-          this.formData.stopDate = new Date('2099-12-31 00:00:00');
+          this.formData.startDate = new Date(row.startDate);
+          this.formData.stopDate = new Date(row.stopDate);
 
           this.recordrulesDetailPage(row);
           this.recordrulesCyclePage(row);

src/views/technology/production/components/user-setting-matter.vue

@@ -288,7 +288,7 @@
             addPOs: this.addPOs,
             deletedIds: this.deletedIds,
             produceTaskId: this.currentRow.id,
-            updatePOs: this.updatePos
+            updatePOs: this.updatePOs
           });
           this.$message.success('保存成功');
           this.handleClose();