计划提交

src/api/ruleManagement/plan.js

@@ -39,10 +39,24 @@ export async function saveOrUpdate (data) {
   return Promise.reject(new Error(res.data.message));
 }
 
+// 获取巡点检分页数据
+export async function planConfigPage (data) {
+	let par = new URLSearchParams(data);
+  const res = await request.get(`/eam/planconfig/page?`+ par , {} );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
-
-
-
+// 获取详情  
+export async function getInfoById (id) {
+  const res = await request.get(`/eam/planconfig/getById/`+ id , {} );
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 
 // // 更新或保存

src/components/addPatrolConfigDialog/index.vue

@@ -135,13 +135,13 @@
           <el-col :span="8" v-if="addForm.autoOrder">
             <el-form-item :label="formLabel + '部门'" prop="groupId">
 				<ele-tree-select
-				    clearable
-				    :data="deptData"
-				    v-model="addForm.groupId"
-				    placeholder="请选择"
-				    default-expand-all
-				    labelKey="name"
-				    valueKey="id"
+						clearable
+						:data="deptData"
+						v-model="addForm.groupId"
+						placeholder="请选择"
+						default-expand-all
+						labelKey="name"
+						valueKey="id"
 					@change="searchDeptNodeClick"
 				/>
             </el-form-item>
@@ -163,6 +163,12 @@
               </el-select>
             </el-form-item>
           </el-col>
+		  <el-col :span="8">
+		    <el-form-item label="紧急程度" prop="urgent">
+		      <DictSelection dictName="紧急程度" clearable v-model="addForm.urgent">
+		      </DictSelection>
+		    </el-form-item>
+		  </el-col>
           <el-col :span="8">
             <el-form-item label="状态" prop="status">
               <el-switch
@@ -195,7 +201,7 @@
           <div class="equipment_list_title">设备列表</div>
           <div class="equipment_tree">
             <el-tree
-              :data="addForm.planRuleEquiList"
+              :data="planRuleEquiList"
               :props="defaultProps"
               ref="equiListTree"
               highlight-current
@@ -252,7 +258,7 @@
               >添加备品备件</el-button
             >
             <el-table
-              :data="addForm.planRuleEquiList[currentEquItemIndex]&&addForm.planRuleEquiList[currentEquItemIndex].partJson"
+              :data="planRuleEquiList[currentEquItemIndex]&&planRuleEquiList[currentEquItemIndex].partJson"
               height="300"
               :key='currentEquItemIndex'
               border
@@ -297,7 +303,7 @@
               </el-table-column>
             </el-table>
             <div style="text-align: center">备件总费用：
-              {{addForm.planRuleEquiList[currentEquItemIndex]&&addForm.planRuleEquiList[currentEquItemIndex].totalCost?addForm.planRuleEquiList[currentEquItemIndex].totalCost:'-'}}
+              {{planRuleEquiList[currentEquItemIndex]&&planRuleEquiList[currentEquItemIndex].totalCost?planRuleEquiList[currentEquItemIndex].totalCost:'-'}}
               元
             </div>
           </div>
@@ -380,6 +386,7 @@ export default {
       },
 	  treeData:[],
       addForm: {
+		code:'',  // 计划配置单号
         name: '', // 计划配置名称
         autoOrder: 1, // 自动派单
         ruleId: '', // 规则id
@@ -392,23 +399,25 @@ export default {
         executorPhone: '',
         status: 1, // 状态
         remark: '', // 备注
-        planRuleType: 'PATROL', // 计划规则类型 巡点检: 'PATROL', 保养: 'MAINTAIN', 盘点: 'INVENTORY'
-        // 计划规则设备列表
-        planRuleEquiList: [
-          {
-            equiTypeId: '', // 设备分类Id
-            equiTypeName: '', // 设备分类名字
-            equiCode: '', // 设备编码 equCode
-            equiName: '', // 设备名称 name
-            equiModel: '', // 设备型号 specifications
-            equiLocation: '', // 设备位置
-            equiLocationCode: '', // 设备位置code
-            // 设备备品备件 - 巡点检不需要备品备件，保养需要
-            partJson: [ ],
-            totalCost:0,
-          }
-        ]
+		urgent:'',
+		bizType:0
+        // planRuleType: 'PATROL', // 计划规则类型 巡点检: 'PATROL', 保养: 'MAINTAIN', 盘点: 'INVENTORY'
       },
+	  // 计划规则设备列表
+	  planRuleEquiList: [
+	    {
+	      equiTypeId: '', // 设备分类Id
+	      equiTypeName: '', // 设备分类名字
+	      equiCode: '', // 设备编码 equCode
+	      equiName: '', // 设备名称 name
+	      equiModel: '', // 设备型号 specifications
+	      equiLocation: '', // 设备位置
+	      equiLocationCode: '', // 设备位置code
+	      // 设备备品备件 - 巡点检不需要备品备件，保养需要
+	      partJson: [ ],
+	      totalCost:0,
+	    }
+	  ],
       addFormRules: {
         name: [
           { required: true, message: '请输入计划配置名称', trigger: 'blur' }
@@ -429,11 +438,14 @@ export default {
           { required: true, message: '请选择设备类别', trigger: 'change' }
         ],
         groupId: [
-          { required: true, message: '请选择选择巡点检部门', trigger: 'change' }
+          { required: true, message: '请选择巡点检部门', trigger: 'change' }
         ],
         executeId: [
-          { required: true, message: '请选择选择巡点检人员', trigger: 'change' }
-        ]
+          { required: true, message: '请选择巡点检人员', trigger: 'change' }
+        ],
+		urgent: [
+          { required: true, message: '请选择紧急程度', trigger: 'change' }
+        ],
       },
       ruleNameList:[],
 	  addDialogLoading:false,	  
@@ -494,7 +506,7 @@ export default {
       this.getUserList(params)
       // 回显设备事项
       await this._getEquipmentList(val.categoryId)
-      const item = this.addForm.planRuleEquiList[0]
+      const item = this.planRuleEquiList[0]
       console.log('item',item)
       // 默认选中列表第一条树节点
       this.$nextTick(() => {
@@ -504,23 +516,23 @@ export default {
       this.equipmentInfo = {
         equiCode: item.code,
         equiName: item.name,
-        equiModel: item.modelType,
+        equiModel: item.category.modelType,
         equiLocation: equiLocation,
         equiLocationCode: equiLocationCode
       }
       this.currentEquItemIndex = 0
-      this.addForm.planRuleEquiList[0]['equiLocation'] = equiLocation
-      this.addForm.planRuleEquiList[0]['equiLocationCode'] = equiLocationCode
+      this.planRuleEquiList[0]['equiLocation'] = equiLocation
+      this.planRuleEquiList[0]['equiLocationCode'] = equiLocationCode
       // 对比详情返回的数据和设备分类下面所有的设备列表，将itemJson同步过去
-      // for (let i = 0; i < this.addForm.planRuleEquiList.length; i++) {
+      // for (let i = 0; i < this.planRuleEquiList.length; i++) {
       //   for (let j = 0; j < tempPlanRuleEquiList.length; j++) {
       //     if (
-      //       this.addForm.planRuleEquiList[i].code ===
+      //       this.planRuleEquiList[i].code ===
       //       tempPlanRuleEquiList[j].equiCode
       //     ) {
-      //       this.addForm.planRuleEquiList[i]['itemJson'] =
+      //       this.planRuleEquiList[i]['itemJson'] =
       //         tempPlanRuleEquiList[j]['itemJson']
-      //       this.addForm.planRuleEquiList[i]['partJson'] =
+      //       this.planRuleEquiList[i]['partJson'] =
       //         tempPlanRuleEquiList[j]['partJson']
       //       break
       //     }
@@ -540,7 +552,7 @@ export default {
       this.currentEquItemIndex = 0
       this.equipmentInfo = {}
       this.addForm = {
-        // planRuleCode: getRuleNo('PL'), // 计划配置单号
+        code:'',  // 计划配置单号
         name: '', // 计划配置名称
         autoOrder: 1, // 自动派单
         ruleId: '', // 规则id
@@ -552,23 +564,26 @@ export default {
         executorPhone: '',
         status: 1, // 状态
         remark: '', // 备注
-        planRuleType: 'PATROL', // 计划规则类型 巡点检: 'PATROL', 保养: 'MAINTAIN', 盘点: 'INVENTORY'
-        // 计划规则设备列表
-        planRuleEquiList: [
-          {
-            equiTypeId: '', // 设备分类Id
-            equiTypeName: '', // 设备分类名字
-            equiCode: '', // 设备编码 equCode
-            equiName: '', // 设备名称 name
-            equiModel: '', // 设备型号 specifications
-            equiLocation: '', // 设备位置
-            equiLocationCode: '', // 设备位置 code
-            // 设备备品备件 - 巡点检不需要备品备件，保养需要
-            partJson: [],
-            totalCost:0
-          }
-        ]
+		urgent:'',
+		bizType:0,
+        // planRuleType: 'PATROL', // 计划规则类型 巡点检: 'PATROL', 保养: 'MAINTAIN', 盘点: 'INVENTORY'
       }
+	  // // 计划规则设备列表
+	  // planRuleEquiList: [
+	  //   {
+	  //     equiTypeId: '', // 设备分类Id
+	  //     equiTypeName: '', // 设备分类名字
+	  //     equiCode: '', // 设备编码 equCode
+	  //     equiName: '', // 设备名称 name
+	  //     equiModel: '', // 设备型号 specifications
+	  //     equiLocation: '', // 设备位置
+	  //     equiLocationCode: '', // 设备位置 code
+	  //     // 设备备品备件 - 巡点检不需要备品备件，保养需要
+	  //     partJson: [],
+	  //     totalCost:0
+	  //   }
+	  // ]
+	  
     },
     // 设备分类选择
     async handleEquipmentClassChange (item) {
@@ -581,12 +596,12 @@ export default {
       const params = { pageNum: 1,size: -1, categoryId: val, rootCategoryLevelId: this.rootId }
       try {
         const res = await getAssetList(params)
-        this.addForm.planRuleEquiList = res.list
-        this.addForm.planRuleEquiList.map(item=>{
+        this.planRuleEquiList = res.list
+        this.planRuleEquiList.map(item=>{
             item.showName = item.name+'('+item.code+')'
         })
         this.currentEquItemIndex = 0
-        const item = this.addForm.planRuleEquiList[0]
+        const item = this.planRuleEquiList[0]
         const { equiLocation, equiLocationCode } = this.getEquiLocation(item)
         this.$nextTick(() => {
           this.$refs.equiListTree.setCurrentKey(item.id)
@@ -594,13 +609,13 @@ export default {
             equiTypeId: this.addForm.categoryId,
             equiCode: item.code,
             equiName: item.name,
-            equiModel: item.specifications,
+            equiModel: item.category.modelType,
             equiLocation: equiLocation,
             equiLocationCode: equiLocationCode
           }
           this.currentEquItemIndex = 0
-          this.addForm.planRuleEquiList[0]['equiLocation'] = equiLocation
-          this.addForm.planRuleEquiList[0]['equiLocationCode'] = equiLocationCode
+          this.planRuleEquiList[0]['equiLocation'] = equiLocation
+          this.planRuleEquiList[0]['equiLocationCode'] = equiLocationCode
           // if(this.addForm.planRuleEquiList[this.currentEquItemIndex].partJson){
           //    this.tableList = this.addForm.planRuleEquiList[this.currentEquItemIndex].partJson
           // }else{
@@ -608,7 +623,7 @@ export default {
           // }
         })
       } catch (error) {
-        this.addForm.planRuleEquiList = []
+        this.planRuleEquiList = []
       }
     },
 
@@ -672,7 +687,7 @@ export default {
 	// 获取计划配置单号
 	async getOrderCode () {
 	  const data = await getCode('patrolconfig_code');
-	  this.$set(this.formData, 'code', data);
+	  this.$set(this.addForm, 'code', data);
 	}, 
 	
     // 封装 - 获取设备位置名称和code方法
@@ -700,12 +715,12 @@ export default {
         equiLocationCode: equiLocationCode
       }
       // 保存当前点击的设备列表某节点的index，在添加操作事项的时候，可以将事项list放到对应的节点对象中，以及切换节点的时候回显事项list
-      this.currentEquItemIndex = this.addForm.planRuleEquiList.findIndex(
+      this.currentEquItemIndex = this.planRuleEquiList.findIndex(
          item => item.code ===  data.code
       )
       this.clickedTreeNode = true
-      this.addForm.planRuleEquiList[this.currentEquItemIndex]['equiLocation'] = equiLocation
-      this.addForm.planRuleEquiList[this.currentEquItemIndex]['equiLocationCode'] = equiLocationCode
+      this.planRuleEquiList[this.currentEquItemIndex]['equiLocation'] = equiLocation
+      this.planRuleEquiList[this.currentEquItemIndex]['equiLocationCode'] = equiLocationCode
     },
     // 获取规则名列表
     async _getRuleNameList () {
@@ -737,11 +752,11 @@ export default {
     // 从事项弹窗将数据丢到事项配置
     // ruleItemSelectionSubmit (list) {
     //   if (
-    //     !this.addForm.planRuleEquiList[this.currentEquItemIndex]['itemJson']
+    //     !this.planRuleEquiList[this.currentEquItemIndex]['itemJson']
     //   ) {
-    //     this.addForm.planRuleEquiList[this.currentEquItemIndex]['itemJson'] = []
+    //     this.planRuleEquiList[this.currentEquItemIndex]['itemJson'] = []
     //   }
-    //   this.addForm.planRuleEquiList[this.currentEquItemIndex]['itemJson'] =
+    //   this.planRuleEquiList[this.currentEquItemIndex]['itemJson'] =
     //     list.map(item => {
     //       return {
     //         id: item.id,
@@ -764,9 +779,9 @@ export default {
         return this.$message.warning('请选择规则名称！')
       }
       this.$refs.addSpareDialogRef.open()
-      if (this.addForm.planRuleEquiList[this.currentEquItemIndex]['partJson']) {
+      if (this.planRuleEquiList[this.currentEquItemIndex]['partJson']) {
         this.selectedSpare =
-          this.addForm.planRuleEquiList[this.currentEquItemIndex]['partJson']
+          this.planRuleEquiList[this.currentEquItemIndex]['partJson']
       } else {
         this.selectedSpare = []
       }
@@ -775,7 +790,7 @@ export default {
     // 从备品备件弹窗将数据丢到备品备件配置
     spareItemSelectSubmit (list) {
       console.log('list',list)
-       this.addForm.planRuleEquiList[this.currentEquItemIndex]['partJson'] = list.map(item => {
+       this.planRuleEquiList[this.currentEquItemIndex]['partJson'] = list.map(item => {
           return {
               name: item.informationName,
               model: item.modelType,
@@ -795,7 +810,7 @@ export default {
 
     // 删除备品备件
     handleDeleteSpareItem (index) {
-      this.addForm.planRuleEquiList[this.currentEquItemIndex][
+      this.planRuleEquiList[this.currentEquItemIndex][
         'partJson'
       ].splice(index, 1)
       this.changeNum()
@@ -803,7 +818,7 @@ export default {
 
     // 改变input数据重新计算总费用
     changeNum(){
-        let applayList = this.addForm.planRuleEquiList[this.currentEquItemIndex].partJson
+        let applayList = this.planRuleEquiList[this.currentEquItemIndex].partJson
         let total = 0
         applayList.map(item=>{
            if(item.hasOwnProperty('num')&&item.num!=''){
@@ -822,7 +837,7 @@ export default {
               total = total + item.num*item.amount*item.chengs
            }
         })
-        this.$set(this.addForm.planRuleEquiList[this.currentEquItemIndex],'totalCost',total)
+        this.$set(this.planRuleEquiList[this.currentEquItemIndex],'totalCost',total)
     },
 
     // 提交
@@ -841,7 +856,7 @@ export default {
 			    }
 			  }
 			)
-            // this.addForm.planRuleEquiList = this.addForm.planRuleEquiList.map(
+            // this.planRuleEquiList = this.planRuleEquiList.map(
             //   item => {
             //     return {
             //       substanceName: item.name,
@@ -855,25 +870,25 @@ export default {
       //             this.planRuleTypeObj[this.addForm.planRuleType.code]
       //         }
       //         let arr = []
-      //         this.addForm.planRuleEquiList.map((item)=>{
+      //         this.planRuleEquiList.map((item)=>{
 				  // if(item.partJson.length){
 				  //   arr.push(item)
 				  // }
       //         })
-      //         this.addForm.planRuleEquiList = arr
-      //         let newArr = JSON.parse(JSON.stringify(this.addForm.planRuleEquiList))
+      //         this.planRuleEquiList = arr
+      //         let newArr = JSON.parse(JSON.stringify(this.planRuleEquiList))
       //         for (let i = 0; i < newArr.length; i++) {
       //             for (let j = 0; j < newArr[i].partJson.length; j++) {
       //                 newArr[i].partJson[j].equipmentCode = newArr[i].equiCode
       //             }
       //         }
-      //         this.addForm.planRuleEquiList = newArr
+      //         this.planRuleEquiList = newArr
               const res = await saveOrUpdate(this.addForm)
-              if (res.success) {
+              if (res) {
                 const type = this.dialogTitle.includes('新增') ? '新增' : '编辑'
                 this.handleClose()
                 this.$message.success(type + '成功！')
-                this.$emit('refreshList')
+                this.$emit('done')
               }
 
           } catch (error) {}

src/enum/dict.js

@@ -11,5 +11,6 @@ export default {
   时间单位: 'time_unit',
   规则类型: 'rule_type',
   规则状态: 'rule_status',
-  规则周期: 'rule_cycle'
+  规则周期: 'rule_cycle',
+  紧急程度: 'urgent_type'
 };

src/views/rulesManagement/matterRules/index.vue

@@ -80,8 +80,8 @@
   export default {
 	mixins: [dictMixins],
     components: {
-      MatterSearch,
-	  MatterAdd
+        MatterSearch,
+	    MatterAdd
     },
     data () {
       return {

src/views/rulesManagement/planRules/PatrolConfig/components/patrol-search.vue

@@ -11,39 +11,47 @@
         <el-form-item label="计划配置单号:">
           <el-input clearable v-model="where.code" placeholder="请输入" />
         </el-form-item>
-		<el-form-item label="规则名称:">
-			<el-input clearable v-model="where.name" placeholder="请输入" />
-		</el-form-item>
+				<el-form-item label="规则名称:">
+					<el-input clearable v-model="where.ruleName" placeholder="请输入" />
+				</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="where.name" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="状态:">
-          <DictSelection dictName="规则状态" clearable v-model="where.staus">
+          <DictSelection dictName="规则状态" clearable v-model="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="where.dep" placeholder="请输入" />
+          <ele-tree-select
+				clearable
+				:data="deptData"
+				v-model="where.groupId"
+				placeholder="请选择"
+				default-expand-all
+				labelKey="name"
+				valueKey="id"
+          	/>         
         </el-form-item>
 		<el-form-item label="创建时间:">
 			<el-date-picker
-				v-model="where.time"
+				v-model="time"
 				type="daterange"
 				range-separator="至"
 				start-placeholder="开始日期"
 				end-placeholder="结束日期"
 				value-format="yyyy-MM-dd HH:mm:ss"
 				:default-time="['00:00:00', '23:59:59']"
-			  >
+				>
 			</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="where.texture" placeholder="请输入" />
+          <el-input clearable v-model="where.type" placeholder="请输入" />
         </el-form-item>
 		<div class="ele-form-actions">
 			<el-button
@@ -68,19 +76,24 @@
 
 <script>
   import { login } from '@/api/login';
+  import {  listOrganizations , getUserPage } from '@/api/system/organization';
   export default {
     data() {
       // 默认表单数据
       const defaultWhere = {
         name: '',
         code: '',
-        fixCode:'',
-        ownershipGroupId:''
+        groupId:'',
+		status:'',
+		ruleName:'',
+		startTime:'',
+		endTime:''
       };
       return {
         // 表单数据
         where: { ...defaultWhere },
-        treeData:[]
+        deptData:[],   //部门树
+		time:[]
       };
     },
     computed: {
@@ -90,18 +103,35 @@
       }
     },
     created(){
+		this.getDeptList()
     },
     methods: {
       /* 搜索 */
       search() {
-        console.log(this.where);
+        if(this.time.length){
+        	this.where.startTime = this.time[0]
+        	this.where.endTime = this.time[1]
+        }
         this.$emit('search', this.where);
       },
       /*  重置 */
       reset() {
+		this.time = []
         this.where = { ...this.defaultWhere };
         this.search();
-      }
+      },
+	  
+	  // 获取部门列表数据
+	  async getDeptList () {
+	    try {
+	      let list = await listOrganizations()
+	      this.deptData = this.$util.toTreeData({
+	  		  data: list,
+	  		  idField: 'id',
+	  		  parentIdField: 'parentId'
+	      });
+	    } catch (error) {}
+	  },
     }
   };
 </script>

src/views/rulesManagement/planRules/PatrolConfig/index.vue

@@ -21,26 +21,12 @@
 	       >
 	         新建
 	       </el-button>
-		   <el-button
-		     size="small"
-		     type="primary"
-		     class="ele-btn-icon"
-		     @click="goDetail()"
-		   >
-		     详情
-		   </el-button>
 	     </template>
-<!-- 	     <template v-slot:enable="{ row }">
-	       <el-switch
-	         v-model="row.enable"
-	         active-color="#13ce66"
-	         inactive-color="#ff4949"
-	         :active-value="1"
-	         :inactive-value="0"
-	         @change="changeEnable(row)"
-	       >
-	       </el-switch>
-	     </template> -->
+		 <template v-slot:code="{ row }">
+		   <el-link type="primary" :underline="false" @click="goDetail(row)">
+		     {{ row.code }}
+		   </el-link>
+		 </template>
 	     <!-- 操作列 -->
 	     <template v-slot:action="{ row }">
 	       <el-link
@@ -71,6 +57,7 @@
       ref="addPatrolConfigDialogRef"
       :dialogTitle="dialogTitle"
       :isBindPlan="isBindPlan"
+	    @done="reload"
     />
   </div>
 </template>
@@ -78,8 +65,10 @@
 <script>
   import AddPatrolConfigDialog from '@/components/addPatrolConfigDialog'
   import PatrolSearch from './components/patrol-search.vue';
-  import { pageRoles } from '@/api/system/role'; 
+  import { planConfigPage } from '@/api/ruleManagement/plan'; 
+  import dictMixins from '@/mixins/dictMixins';
   export default {
+	mixins: [dictMixins],
     components: {
       PatrolSearch,
 	  AddPatrolConfigDialog
@@ -102,53 +91,60 @@
 		    label: '计划配置单号',
 		    align: 'center',	
 		    showOverflowTooltip: true,
-		    minWidth: 110
+		    minWidth: 110,
+			slot:'code'
 		  },
 		  {
-		    prop: 'groupId',
+		    prop: 'name',
 		    label: '计划配置名称',
 		    align: 'center',
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'enable',
+		    prop: 'groupName',
 		    label: '巡点检部门',
 		    align: 'center',	
 		    showOverflowTooltip: true,
-		    slot: 'enable',
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'name',
+		    prop: 'categoryName',
 		    label: '设备分类',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 		  {
-		    prop: 'cycle',
+		    prop: 'ruleName',
 		    label: '规则名称',
 		    align: 'center',	
 		    showOverflowTooltip: true,
 		    minWidth: 110
 		  },
 			{
-			  prop: 'auto',
+			  prop: 'autoOrder',
 			  label: '自动派单',
 			  align: 'center',	
 			  showOverflowTooltip: true,
-			  minWidth: 110
+			  minWidth: 110,
+			  formatter: (_row, _column, cellValue) => {
+				let autoOrder = _row.autoOrder==1?'是':(_row.autoOrder==0?'否':'-')
+			    return autoOrder
+			  }
 			},
 			{
 			  prop: 'status',
 			  label: '状态',
 			  align: 'center',	
 			  showOverflowTooltip: true,
-			  minWidth: 110
+			  minWidth: 110,
+			  formatter: (_row, _column, cellValue) => {
+			    return this.getDictValue('规则状态',  _row.status)
+			  }
 			},
 		  {
-		    prop: 'creater',
+		    prop: 'createUserName',
 		    label: '创建人',
 		    align: 'center',	
 		    showOverflowTooltip: true,
@@ -184,10 +180,13 @@
     computed: {
 
     },
+	created () {
+	  this.requestDict('规则状态');
+	},
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return pageRoles({ pageNum: page, size: limit, ...where });
+        return planConfigPage({ pageNum: page, size: limit, ...where , ruleType:1 });
       },
       async changeEnable(row) {
         const res = await putRoles(row);
@@ -202,7 +201,7 @@
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where });
+        this.$refs.table.reload({ page: 1, where , ruleType:1 });
       },
 	  
 	  openEdit(row){