bug修复

src/views/rulesManagement/inspectionReportTemplate/index.vue

@@ -0,0 +1,134 @@
+<template>
+  <div class="ele-body">
+    <el-card shadow="never">
+      <seek-page :seekList="seekList" @search="search"></seek-page>
+      <ele-pro-table
+        ref="table"
+        row-key="id"
+        :columns="columns"
+        :datasource="datasource"
+        :cache-key="cacheKeyUrl"
+        autoAmendPage
+      >
+        <template v-slot:toolbar>
+          <el-button type="primary" size="mini" icon="el-icon-plus"
+            >新建</el-button
+          >
+        </template>
+        <template v-slot:action="{ row }">
+          <el-link type="primary" :underline="false" icon="el-icon-edit">
+            编辑
+          </el-link>
+          <el-popconfirm
+            class="ele-action"
+            title="确定要删除此条数据吗？"
+            @confirm=""
+          >
+            <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>
+  </div>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import tableColumnsMixin from '@/mixins/tableColumnsMixin';
+
+  export default {
+    mixins: [dictMixins, tableColumnsMixin],
+    data() {
+      return {
+        columns: [
+          {
+            width: 50,
+            type: 'index',
+            columnKey: 'index',
+            align: 'center',
+            label: '序号'
+          },
+          {
+            prop: 'code',
+            label: '领料单编号',
+            align: 'center',
+            minWidth: 110,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'status',
+            label: '状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 150,
+            formatter: (row) => {
+              switch (row.status) {
+                case 0:
+                  return '未领料';
+                case 1:
+                  return '已领料';
+                case 2:
+                  return '已出库';
+                case 3:
+                  return '部分出库';
+                default:
+                  return '';
+              }
+            }
+          },
+          {
+            columnKey: 'action',
+            label: '操作',
+            width: 220,
+            align: 'center',
+            resizable: false,
+            fixed: 'right',
+            slot: 'action',
+            showOverflowTooltip: true
+          }
+        ],
+        cacheKeyUrl: 'mes-259231040-material-table'
+      };
+    },
+    computed: {
+      seekList() {
+        return [
+          {
+            label: '模板名称：',
+            value: 'name',
+            type: 'input',
+            placeholder: '请输入'
+          }
+        ];
+      }
+    },
+    methods: {
+      // 刷新表格
+      reload(where = {}) {
+        this.$refs.table.reload({
+          where
+        });
+      },
+      /* 表格数据源 */
+      datasource({ page, limit, where, order }) {
+        // 参数
+        const body = {
+          ...where,
+          ...order,
+          pageNum: page,
+          size: limit
+        };
+        return [];
+      },
+      search(where) {
+        this.reload(where);
+      }
+    }
+  };
+</script>
+
+<style></style>

src/views/rulesManagement/recordPlan/components/patrol-search.vue

@@ -36,6 +36,8 @@
         <el-form-item :label="ruleType == 1 ? '巡点检部门' : '部门'">
           <deptSelect v-model.trim="where.groupId" />
         </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="创建时间:">
           <el-date-picker
             style="width: 100%"
@@ -50,14 +52,6 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="设备分类:">
-          <equipmentSelect v-model.trim="where.categoryLevelId" />
-        </el-form-item>
-        <!-- <el-form-item label="组织机构:">
-          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
-        </el-form-item> -->
-      </el-col>
     </el-row>
     <el-row>
       <el-col

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

@@ -30,13 +30,21 @@
       </el-form-item>
 
       <el-form-item label="执行方式" required prop="executeMethod">
-        <DictSelection
+        <!-- <DictSelection
           dictName="记录规则执行方式"
           clearable
           v-model="formData.executeMethod"
-          isProhibit
         >
-        </DictSelection>
+        </DictSelection> -->
+        <el-select v-model="formData.executeMethod" style="width: 100%">
+          <el-option
+            v-for="item in executeMethodDict"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            :disabled="item.disabled"
+          ></el-option>
+        </el-select>
       </el-form-item>
 
       <el-form-item
@@ -105,6 +113,21 @@
           </el-input>
         </div>
       </el-form-item>
+
+      <el-form-item
+        v-if="formData.executeMethod == '1'"
+        label="查询范围"
+        required
+        prop="dayRange"
+      >
+        <el-select v-model="formData.dayRange" style="width: 100%">
+          <el-option label="当日" :value="1"></el-option>
+          <el-option label="3日内" :value="3"></el-option>
+          <el-option label="7日内" :value="7"></el-option>
+          <el-option label="15日内" :value="15"></el-option>
+          <el-option label="30日内" :value="30"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
 
     <template v-slot:footer>
@@ -159,6 +182,32 @@
       selectReleaseRules,
       selectPlanRules
     },
+    computed: {
+      executeMethodDict() {
+        const list = this.getDictListByName('记录规则执行方式') || [];
+
+        if (this.formData.itemType == '1' || this.formData.itemType == '2') {
+          // 过程控制 只能选择按事项执行
+          return list.map((item) => {
+            if (item.label == '任务驱动') {
+              item.disabled = true;
+            } else {
+              item.disabled = false;
+            }
+            return item;
+          });
+        }
+
+        return list.map((item) => {
+          if (item.label != '任务驱动') {
+            item.disabled = true;
+          } else {
+            item.disabled = false;
+          }
+          return item;
+        });
+      }
+    },
     data() {
       const formBaseData = {
         id: null,
@@ -185,7 +234,8 @@
         isUsing: 0,
         recordRulesClassify: '', // 记录规则分类
         planConfigId: null, // 计划配置id
-        planConfigName: '' // 计划配置名称
+        planConfigName: '', // 计划配置名称
+        dayRange: 1 // 查询范围
       };
 
       return {
@@ -238,6 +288,14 @@
               trigger: 'change'
             },
             { required: true, message: '请选择关联规则', trigger: 'blur' }
+          ],
+          dayRange: [
+            {
+              required: true,
+              message: '请选择查询范围',
+              trigger: 'change'
+            },
+            { required: true, message: '请选择查询范围', trigger: 'blur' }
           ]
         },
         dialogLoading: false,
@@ -288,6 +346,7 @@
         this.formData.executeMethod = row.executeMethod + '';
         this.formData.itemType = row.itemType + '';
         this.formData.reportWorkType = row.reportWorkType + '';
+        this.formData.dayRange = row.dayRange;
         console.log('this.formData', this.formData);
       },
       // 去选择设备

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
@@ -45,7 +45,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.11:18086', // 开发
-        // target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.116:18086', // 赵沙金
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {