修改事项规则添加设备显示字段和搜索条件

src/views/rulesManagement/components/MaterialAdd.vue

@@ -7,7 +7,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
-    width="70%"
+    width="90%"
   >
     <el-card shadow="never">
       <ele-split-layout
@@ -105,6 +105,26 @@
             label: '固资编码',
             prop: 'fixCode'
           },
+          {
+            label: '使用人',
+            prop: 'usePerson'
+          },
+          {
+            label: '使用岗位',
+            prop: 'postName'
+          },
+          {
+            label: '负责人',
+            prop: 'chargePerson'
+          },
+          {
+            label: '有效开始时间',
+            prop: 'startTime'
+          },
+          {
+            label: '有效结束时间',
+            prop: 'endTime'
+          },
           {
             label: '型号',
             prop: 'modelType',
@@ -150,7 +170,11 @@
             return item.equipmentList;
           })
           .flat();
-        this.processData = list.map((item) => item.id);
+        if (list.length > 0) {
+          this.processData = list.map((item) => item.id);
+        } else {
+          this.processData = [];
+        }
         this.ruleIdListIndex = ruleIdListIndex;
         this.visible = true;
         this.getTreeData();

src/views/rulesManagement/components/product-search.vue

@@ -7,23 +7,37 @@
     @submit.native.prevent
   >
     <el-row :gutter="10">
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="设备名称">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="编号">
           <el-input clearable v-model="where.codeNumber" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <el-form-item label="固资编码">
           <el-input clearable v-model="where.fixCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+    </el-row>
+    <el-row :gutter="10">
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
+        <el-form-item label="结束时间">
+          <el-date-picker
+            style="width: 100%"
+            v-model="where.endTime"
+            value-format="yyyy-MM"
+            type="month"
+            placeholder="选择有效期结束"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { md: 8 } : { span: 8 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
@@ -54,7 +68,8 @@
       const defaultWhere = {
         name: '',
         codeNumber: '',
-        fixCode: ''
+        fixCode: '',
+        endTime: ''
       };
       return {
         defaultWhere,

src/views/rulesManagement/components/programRulesDialog.vue

@@ -69,7 +69,10 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="addForm.autoOrder">
+        <el-col
+          :span="8"
+          v-if="addForm.autoOrder && !dialogTitle.includes('量具送检')"
+        >
           <el-form-item label="部门" prop="groupId">
             <deptSelect
               v-model="addForm.groupId"
@@ -78,7 +81,10 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="addForm.autoOrder">
+        <el-col
+          :span="8"
+          v-if="addForm.autoOrder && !dialogTitle.includes('量具送检')"
+        >
           <el-form-item label="负责人" prop="executeIdList">
             <el-select
               v-model="addForm.executeIdList"
@@ -97,7 +103,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" v-if="!dialogTitle.includes('量具送检')">
           <el-form-item label="审核人" prop="approvalUserId">
             <el-select
               v-model="addForm.approvalUserId"
@@ -797,8 +803,10 @@
             };
           });
           this.tabsValue = this.ruleIdList[0].ruleId;
-          const params = { groupId: res.groupId };
-          this.getUserList(params);
+          if (res.groupId) {
+            const params = { groupId: res.groupId };
+            this.getUserList(params);
+          }
           // this._getMatterRulesDetails(res.ruleId);
           this.$set(this.addForm, 'code', res.code);
           this.$set(this.addForm, 'urgent', JSON.stringify(res.urgent));

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''