计划规则修改

src/api/ledgerAssets/index.js

@@ -65,4 +65,13 @@ export async function getCount (data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
+}
+
+// 类别信息列表 
+export async function getCategoryList (data) {
+  const res = await request.post(`/main/category/getList`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
 }

src/components/addPatrolConfigDialog/index.vue

@@ -274,9 +274,9 @@
 					  <span>{{ scope.$index + 1 }}</span>
 					</template>
 				  </el-table-column>
-				  <el-table-column label="备件名称" align="center" prop="name">
+				  <el-table-column label="备件类别名称" align="center" prop="categoryName">
 				  </el-table-column>
-				  <el-table-column label="规格型号" align="center" prop="model">
+				  <el-table-column label="型号" align="center" prop="model">
 				  </el-table-column>
 				  <el-table-column label="所需数量" align="center" prop="num">
 						<template slot-scope="scope">
@@ -290,11 +290,11 @@
 							></el-input>
 						</template>
 				  </el-table-column>
-				  <el-table-column label="单位" align="center" prop="measuringUnit">
+				  <el-table-column label="单位" align="center" prop="unit">
 				  </el-table-column>
 				  <el-table-column label="费用" align="center">
 					  <template slot-scope="scope">
-						 {{scope.row.num*scope.row.univalence?scope.row.num*scope.row.univalence:'0'}}{{scope.row.univalenceUnit=='wanyuan'?'万元':'元'}}
+						 {{scope.row.num*scope.row.unitPrice?scope.row.num*scope.row.unitPrice:'0'}}{{scope.row.parValue=='wanyuan'?'万元':'元'}}
 					  </template>
 				  </el-table-column>
 				  <el-table-column label="操作" align="center" width="70">
@@ -500,6 +500,7 @@ export default {
 	
 	  
     handleClose () {
+	  this.clickedTreeNode = false
       this.addPatrolConfigDialog = false
       this.$refs.addFormRef.resetFields()
       if (this.$refs.equiListTree) {
@@ -563,7 +564,7 @@ export default {
 			    for (let j = 0; j < this.addForm.deviceInfo.length; j++) {
 			      if ( this.planRuleEquiList[i].code === this.addForm.deviceInfo[j].substanceCode ) {
 			        this.planRuleEquiList[i]['sparePart'] = this.addForm.deviceInfo[j]['sparePart']
-					this.$set(this.planRuleEquiList[i],'totalCost',this.addForm.deviceInfo[j]['totalCost'])
+					// this.$set(this.planRuleEquiList[i],'totalCost',this.addForm.deviceInfo[j]['totalCost'])
 			  		// this.planRuleEquiList[i]['totalCost'] = this.addForm.deviceInfo[j]['totalCost']
 			      }
 			    }
@@ -708,12 +709,12 @@ export default {
     spareItemSelectSubmit (list) {
        this.planRuleEquiList[this.currentEquItemIndex]['sparePart'] = list.map(item => {
           return {
-              name: item.name,
-              model: item.category.modelType,
-              num: item.num,
-              univalenceUnit: item.category.univalenceUnit,
-              univalence: item.category.univalence,
-              measuringUnit:item.category.measuringUnit,
+              categoryName: item.name,
+              model: item.modelType,
+              needNum: item.num,
+              parValue: item.univalenceUnit,
+              unitPrice: item.univalence,
+              unit:item.measuringUnit,
               code:item.code,
 			  id:item.id
           }
@@ -734,8 +735,8 @@ export default {
         let applayList = this.planRuleEquiList[this.currentEquItemIndex].sparePart
         let total = 0
         applayList.map(item=>{
-           if(item.num&&item.num!=''){
-              switch (item.univalenceUnit) {
+           if(item.needNum&&item.needNum!=''){
+              switch (item.parValue) {
                 case 'wanyuan': {
                   item.chengs = 10000
                   break;
@@ -747,7 +748,7 @@ export default {
                 default:
                   break;
               }
-              total = total + item.num*item.univalence*item.chengs
+              total = total + item.needNum*item.unitPrice*item.chengs
            }
         })
         this.$set(this.planRuleEquiList[this.currentEquItemIndex],'totalCost',total)

src/components/addSpareDialog/index.vue

@@ -45,12 +45,9 @@
             width="55"
             align="center"
           />
-          <el-table-column prop="code" label="备件编码" />
-          <el-table-column prop="name" label="备件名称" />
+          <el-table-column prop="code" label="备件类别编码" />
+          <el-table-column prop="name" label="备件类别名称" />
 		  <el-table-column label="型号" prop="modelType">
-		    <template slot-scope="{ row }">
-		      <div>{{ row.category.modelType }}</div>
-		    </template>
 		  </el-table-column>
         </el-table>
       </el-col>
@@ -65,7 +62,7 @@
 
 <script>
 import AssetTree from '@/components/AssetTree'
-import {  getAssetList } from '@/api/ledgerAssets';
+import {  getCategoryList } from '@/api/ledgerAssets';
 export default {
   components: { 
 		// CommonTree,
@@ -150,10 +147,10 @@ export default {
       let params = {
         page: 1,
         size: 99999,
-        categoryLevelId: this.currentTreeData.id,
-        rootCategoryLevelId: this.rootId
+        categoryLevelId: this.currentTreeData.id
       }
-      const res = await getAssetList(params)
+      const res = await getCategoryList(params)
+	  console.log('res',res)
       this.tableLoading = false
       if (res.list.length) {
         this.tableData = res.list

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

@@ -67,19 +67,19 @@
             <div class="equipment_info">
               <div class="item_info">
                 <span class="item_label">设备编码</span>
-                <span class="item_value">{{ item.substanceCode }}</span>
+                <span class="item_value">{{ item.substance.code }}</span>
               </div>
               <div class="item_info">
                 <span class="item_label">设备名称</span>
-                <span class="item_value">{{ item.substanceName }}</span>
+                <span class="item_value">{{ item.substance.name }}</span>
               </div>
               <div class="item_info">
                 <span class="item_label">设备型号</span>
-                <span class="item_value">{{ item.mode }}</span>
+                <span class="item_value">{{ item.substance.model }}</span>
               </div>
               <div class="item_info">
                 <span class="item_label">设备位置</span>
-                <span class="item_value">{{ item.position }}</span>
+                <span class="item_value">{{ item.substance.positionNames }}</span>
               </div>
             </div>
             <p>操作事项</p>