后管试验功能

src/api/tentative/testclassify.js

@@ -0,0 +1,28 @@
+import request from '@/router/axios';
+
+export default {
+  //加载外委、第三方树
+  async getTreeAll(form) {
+    return request({
+      url: '/api/blade-manager/trial/tree-all',
+      method: 'get',
+      params: form
+    });
+  },
+  //新增或修改
+  async setTreeSubmit(form) {
+    return request({
+      url: '/api/blade-manager/trial/submit',
+      method: 'post',
+      data: form
+    });
+  },
+  //删除节点
+  async setTreeRemove(form) {
+    return request({
+      url: '/api/blade-manager/trial/remove',
+      method: 'get',
+      params: form
+    });
+  },
+}

src/api/tentative/testcollect.js

@@ -0,0 +1,49 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-manager/trial/summary/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-manager/trial/summary/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (id) => {
+  return request({
+    url: '/api/blade-manager/trial/summary/remove',
+    method: 'get',
+    params: {
+      id,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-manager/trial/summary/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-manager/trial/summary/submit',
+    method: 'post',
+    data: row
+  })
+}

src/router/views/index.js

@@ -171,7 +171,16 @@ export default [{
             },
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
-        }]
+        },
+          {
+            path: '/wbs/edit',
+            name: '编辑WBS树',
+            meta: {
+              i18n: 'edit',
+            },
+            component: () =>
+              import ( /* webpackChunkName: "views" */ '@/views/manager/wbsinfo/edit')
+          }]
     }, {
         path: '/contract',
         component: Layout,
@@ -260,4 +269,27 @@ export default [{
         // }
     ]
     },
+  {
+    path: '/tentative',
+    component: Layout,
+    redirect: '/tentative/testclassify',
+    children: [{
+      path: '/tentative/testclassify',
+      name: '试验外委/第三方试验分类配置',
+      meta: {
+        i18n: 'testclassify'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/tentative/testclassify')
+    }, {
+      path: '/tentative/testcollect',
+      name: '试验台账分类配置',
+      meta: {
+        i18n: 'testcollect'
+      },
+      component: () =>
+        import ( /* webpackChunkName: "views" */ '@/views/tentative/testcollect')
+    }
+    ]
+  }
 ]

src/views/manager/projectinfo/list.vue

@@ -54,13 +54,18 @@
     <el-dialog
       title="项目信息"
       :visible.sync="projectVisible"
-      width="800px"
+      width="900px"
       append-to-body
     >
       <div class="mg-b-10"><span class="flex1 mg-r-20">{{curProjiect.projectName}}</span></div>
       <div class="flex jc-sb pd-b-10">
         <span></span>
         <div>
+          <el-button
+            size="small"
+            @click="testTree"
+            type="success"
+          >试验划分</el-button>
           <el-button
             size="small"
             @click="editTree"
@@ -248,6 +253,15 @@ export default {
         }
       })
     },
+    testTree () {
+      this.$router.push({
+        path: '/project/tree',
+        query: {
+          pid: this.curProjiect.id,
+          wbsid: this.curProjiect.referenceWbsTemplateId
+        }
+      });
+    },
     editTree () {
       this.$router.push({
         path: '/project/tree',

src/views/manager/wbsinfo.vue

@@ -262,8 +262,15 @@ export default {
     },
 
     toEdit (row) {
-      //console.log(row,index);
-      this.$router.push('/wbs/edit/' + row.id);
+      console.log(row);
+      this.$router.push({
+        path: '/wbs/edit',
+        query: {
+          id: row.id,
+          type: row.wbsType
+        }
+      })
+      //this.$router.push('/wbs/edit/' + row.id);
     }
   }
 };

src/views/manager/wbsinfo/edit.vue

@@ -563,7 +563,7 @@
         ref="nodeDetail"
         :model="nodeDetail"
         :rules="rules"
-        label-width="110px"
+        label-width="140px"
       >
         <el-form-item
           label="节点名称"
@@ -588,6 +588,7 @@
             v-model="nodeDetail.nodeType"
             placeholder="请选择"
             class="w-100p"
+            @change="nodeTypeChange"
           >
             <el-option
               v-for="item in nodeTypelist"
@@ -597,7 +598,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="划分编号">
+        <el-form-item label="划分编号" v-if="wbsType !== 2">
           <el-input v-model="nodeDetail.partitionCode"></el-input>
         </el-form-item>
         <el-form-item label="唯一编码">
@@ -635,7 +636,7 @@
             </el-radio-group>
           </el-form-item>
         </template>
-        <el-form-item label="内业资料类型" prop="majorDataType">
+        <el-form-item label="内业资料类型" prop="majorDataType" v-if="wbsType !== 2">
           <el-select
             v-model="nodeDetail.majorDataType"
             placeholder="请选择"
@@ -649,6 +650,25 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="勾选相关联试验" prop="mixRatioTestIds" v-if="wbsType === 2 && nodeDetail.nodeType === 53">
+          <div style="position: relative; height: 300px; border: 1px solid #dddfe6;">
+            <el-scrollbar class="h-100p">
+              <div v-loading="testTreeLoad">
+                <el-tree class="filter-tree"
+                         :data="testTreeData"
+                         :props="defaultProps"
+                         :expand-on-click-node="false"
+                         highlight-current
+                         node-key="id"
+                         ref="treeall"
+                         show-checkbox
+                         :default-checked-keys="mixRatioTestIds"
+                         @check="TestTreeCheckChange"
+                />
+              </div>
+            </el-scrollbar>
+          </div>
+        </el-form-item>
       </el-form>
       <span
         slot="footer"
@@ -1771,6 +1791,9 @@ export default {
 
       formulaCompVisible:false,//公式弹框
       formulaCurRow:{},//当前元素
+      testTreeLoad: false,
+      testTreeData: [],
+      mixRatioTestIds: []
     };
   },
   computed: {
@@ -1870,12 +1893,14 @@ export default {
 
     //#region 甘云杰
     init () {
-      this.id = this.$route.params.id;
+      //this.id = this.$route.params.id;
+      const {id, type} = this.$route.query;
+      this.id = id
+      this.wbsType = Number(type)
       this.getNodeTypelist();
       this.getTableTypelist();
       this.getDataTypelist();
       this.getOwnerTypelist();
-
       this.defaultExpandedKeys = getStore({name:this.expandName});
     },
     loadNode (node, resolve) {
@@ -1912,12 +1937,30 @@ export default {
     },
 
     saveNode () {
+      const type = this.wbsType
       this.$refs['nodeDetail'].validate((valid) => {
         if (valid) {
-          if (this.editType == 1) {
-            this.addNode();
-          } else if (this.editType == 2) {
-            this.updateNode();
+          const { mixRatioTestIds, nodeType } = this.nodeDetail
+          if (type === 2 && nodeType === 53) {
+            if (mixRatioTestIds) {
+              if (this.editType == 1) {
+                this.addNode();
+              } else if (this.editType == 2) {
+                this.updateNode();
+              }
+            } else {
+              this.$message({
+                type: "error",
+                message: '请先选择节点'
+              });
+              return false;
+            }
+          } else {
+            if (this.editType == 1) {
+              this.addNode();
+            } else if (this.editType == 2) {
+              this.updateNode();
+            }
           }
         } else {
           //console.log('error submit!!');
@@ -1949,7 +1992,9 @@ export default {
         });
       })
     },
-
+    toSplit(val) {
+      return val ? String(val).split(',') : '';
+    },
     setLeftType (type, data, node) {
       //console.log(type)
       this.jiedianId = data.id
@@ -1959,13 +2004,12 @@ export default {
       this.curTreeData = data;
       this.curTreeNode = node;
       this.$refs.tree.setCurrentKey(data.id);
-
+      this.mixRatioTestIds = []
       if (type == 1 || type == 2) {
         this.getMajorDataTypeList();
         this.dialogVisible = true;
         this.editType = type;
       }
-
       getDetail(data.id).then((res) => {
         let parentName = '';
         if (node.parent.data) {
@@ -1980,6 +2024,7 @@ export default {
           };
         } else {
           this.nodeDetail = Object.assign({}, res.data.data);
+          this.mixRatioTestIds = this.toSplit(res.data.data.mixRatioTestIds)
         }
         this.nodeDetail.type = 1;//	'1'节点 '2'表单
         this.nodeDetail.wbsId = this.id;
@@ -2290,7 +2335,26 @@ export default {
         });
       }
     },
-
+    nodeTypeChange(val) {
+      if (val === 53) {
+        if (this.testTreeData.length > 0) {
+          return;
+        }
+        this.testTreeLoad = true;
+        getAlltree(this.userInfo.tenant_id, 1, this.id).then((res) => {
+          this.testTreeLoad = false;
+          this.testTreeData = res.data.data;
+        })
+      }
+    },
+    //根据逗号联合
+    toJoin(arr) {
+      return arr ? arr.join() : '';
+    },
+    TestTreeCheckChange(_, {checkedKeys, halfCheckedKeys}) {
+      const newarr = [...checkedKeys, ...halfCheckedKeys]
+      this.nodeDetail.mixRatioTestIds = this.toJoin(newarr)
+    },
     filterChange () {
       //console.log(this.$refs)
       //debugger
@@ -2447,11 +2511,12 @@ export default {
     },
 
     getNodeTypelist () {
+      const type = this.wbsType
       if (this.nodeTypelist.length > 1) {
         return;
       }
       getDictionary({
-        code: 'wbs_node_type'
+        code: type === 2 ? 'trial_node_type':'wbs_node_type'
       }).then((res) => {
         res.data.data.forEach(element => {
           element.dictKey = Number(element.dictKey)
@@ -2513,6 +2578,7 @@ export default {
       })
     },
 
+
     formatCat (row, column, cellValue) {
       for (let i = 0; i < this.nodeTypelist.length; i++) {
         if (this.nodeTypelist[i].dictKey == cellValue) {
@@ -2920,7 +2986,7 @@ export default {
         })
         return;
       }
-
+      this.mixRatioTestIds = []
       this.setLeftType(1,this.curTreeData,this.curTreeNode)
     },
 
@@ -2932,6 +2998,7 @@ export default {
         })
         return;
       }
+      this.nodeTypeChange(53)
       this.setLeftType(2,this.curTreeData,this.curTreeNode)
     },
     copyNodeHandle(){

src/views/tentative/testclassify.vue

@@ -0,0 +1,255 @@
+<template>
+  <basic-container ref="container" style="height:100%;">
+    <el-row :gutter="20" class="h-h">
+      <el-col :span="12">
+        <div class="title blue">外委检测模板目录</div>
+        <div class="tree-box blue">
+          <el-scrollbar class="h-100p">
+            <el-tree :props="props" :data="leftTreeData" node-key="id" ref="trees2" :default-expand-all="true" :filter-node-method="filterNode">
+              <span class="flexStar" slot-scope="{ node, data }" @mouseover="mouseOver(data)" @mouseleave="mouseLeave(data)" style="box-sizing: border-box;width:100%;">
+                <span>{{ data.nodeName }}</span>
+                <span class="marleft10" v-show="data.moreShow">
+                  <i @click.stop='addtree(data)' class="el-icon-circle-plus-outline" style="fontSize:18px;" v-if="data.isStorageNode!=1"></i>
+                  <i @click.stop='edittree(data)' class="el-icon-edit-outline marleft5" style="fontSize:18px;" v-if="node.level!=1"></i>
+                  <i @click.stop='deletetree(data)' class="el-icon-delete marleft5" style="fontSize:18px;" v-if="node.level!=1"></i>
+                </span>
+              </span>
+            </el-tree>
+          </el-scrollbar>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="title green">第三方检测模板目录</div>
+        <div class="tree-box green">
+          <el-scrollbar class="h-100p">
+            <el-tree :props="props" :data="rightTreeData" node-key="id" ref="trees2" :default-expand-all="true" :filter-node-method="filterNode">
+              <span class="flexStar" slot-scope="{ node, data }" @mouseover="mouseOver(data)" @mouseleave="mouseLeave(data)" style="box-sizing: border-box;width:100%;">
+                <span>{{ data.nodeName }}</span>
+                <span class="marleft10" v-show="data.moreShow">
+                  <i @click.stop='addtree(data,node)' class="el-icon-circle-plus-outline" style="fontSize:18px;" v-if="data.isStorageNode!=1"></i>
+                  <i @click.stop='edittree(data,node)' class="el-icon-edit-outline marleft5" style="fontSize:18px;" v-if="node.level!=1"></i>
+                  <i @click.stop='deletetree(data)' class="el-icon-delete marleft5" style="fontSize:18px;" v-if="node.level!=1"></i>
+                </span>
+              </span>
+            </el-tree>
+          </el-scrollbar>
+        </div>
+      </el-col>
+    </el-row>
+
+    <!-- 新增编辑 -->
+    <el-dialog :title="form.id?'编辑':'新增'" :visible.sync="treeTap" width="650px" :modal-append-to-body="false" @close="treeClose">
+      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+        <el-form-item label="节点名称" prop="nodeName">
+          <el-input v-model="form.nodeName" style="width:400px;"/>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="treeTap = false">取 消</el-button>
+        <el-button type="primary" @click="saveTree">保 存</el-button>
+      </span>
+    </el-dialog>
+
+  </basic-container>
+</template>
+
+<script>
+import ManualSorting from '@/components/WbsTree/ManualSorting'
+import trialApi from "@/api/tentative/testclassify";
+
+export default {
+  components: {
+    ManualSorting,
+  },
+  data () {
+    return {
+      props: {
+        label: 'nodeName',
+        children: 'children',
+        isLeaf: 'hasChildren'
+      },
+      leftTreeData: [],
+      rightTreeData: [],
+      treeTap: false,
+      form: {
+        id: '', //新增还是编辑
+        nodeName: "",  //节点名称
+      },
+      rules: {
+        nodeName: [{ required: true, message: '请输入节点名称', trigger: 'blur' }],
+      },
+    }
+  },
+  methods: {
+    async getTreeAll() {
+      const { data } = await trialApi.getTreeAll()
+      if (data.code === 200) {
+        let {leftTree, rightTree} = data.data
+
+        //左边树
+        if (leftTree.length > 0) {
+          leftTree.forEach(val => {
+            val.hasChildren = !val.hasChildren
+          });
+        }
+        this.leftTreeData = leftTree
+
+        //右边树
+        if (rightTree.length > 0) {
+          rightTree.forEach(val => {
+            val.hasChildren = !val.hasChildren
+          });
+        }
+        this.rightTreeData = rightTree
+      } else {
+        this.leftTreeData = []
+        this.rightTreeData = []
+      }
+    },
+    filterNode (value,data,node) {//筛选条件
+      // 如果什么都没填就直接返回
+      if(!value){
+        return true;
+      }
+
+      let _array = [];//这里使用数组存储 只是为了存储值。
+      this.getReturnNode(node,_array,value);
+      let result = false;
+
+      _array.forEach((item)=>{
+        result = result || item;
+      });
+      return result;
+    },
+    //判断节点是否匹配
+    getReturnNode(node,_array,value){
+      let isPass = node.data &&  node.data.nodeName && node.data.nodeName.indexOf(value) !== -1;
+      isPass?_array.push(isPass):'';
+
+      //判断节点是否是父节点
+      if(!isPass && node.level !== 1 && node.parent){
+        this.getReturnNode(node.parent,_array,value);
+      }
+    },
+    mouseLeave (data) {
+      if (data.moreShow) {
+        this.$set(data, 'moreShow', false)
+      }
+    },
+    mouseOver (data) {
+      if (!data.moreShow) {
+        this.$set(data, 'moreShow', true)
+      }
+    },
+    //添加树
+    addtree (data) {
+      this.form = {
+        id: '',
+        nodeName: '',
+        parentId: data.id,
+        nodeType: data.nodeType
+      }
+      this.treeTap = true
+    },
+    //编辑树
+    async edittree (data) {
+      this.form = {
+        id: data.id,
+        parentId: data.parentId,
+        nodeName: data.nodeName,
+        nodeType: data.nodeType
+      }
+      this.treeTap = true
+    },
+    //保存按钮
+    saveTree () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.setTreeSubmit()
+        } else {
+          return false
+        }
+      })
+    },
+    treeClose () {
+      this.treeTap = false
+    },
+    //提交保存
+    async setTreeSubmit() {
+      const { data } = await trialApi.setTreeSubmit(this.form)
+      if (data.code === 200) {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        this.getTreeAll()
+      }
+    },
+    //删除树
+    deletetree (data) {
+      let _that = this
+      this.$confirm('是否删除此数据', '提示', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '确认',
+        cancelButtonText: '取消'
+      }).then(() => {
+        _that.setTreeRemove(data.id)
+      });
+    },
+    //删除接口
+    async setTreeRemove (id) {
+      const { data } = await trialApi.setTreeRemove({ id })
+      if (data.code === 200) {
+        this.$message({
+          type: 'success',
+          message: '删除成功'
+        })
+        this.getTreeAll()
+      }
+    },
+  },
+  created () {
+    this.getTreeAll()
+  },
+  mounted () {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.title {
+  padding: 12px;
+  font-size: 18px;
+  font-weight: bold;
+  text-align: center;
+  &.blue {
+    background: #4095E5;
+    color: white;
+  }
+  &.green {
+    background: #17A854;
+    color: white;
+  }
+}
+.tree-box {
+  position: relative;
+  height: calc(100% - 50px);
+  overflow: hidden;
+  &.blue {
+    border: 1px solid #4095e5;
+    border-top: 0;
+  }
+  &.green {
+    border: 1px solid #17A854;
+    border-top: 0;
+  }
+}
+</style>
+
+<style lang="scss">
+.h-h.el-row,
+.h-h.el-row .el-col {
+  height: 100%;
+}
+</style>

src/views/tentative/testcollect.vue

@@ -0,0 +1,184 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot-scope="{type,size,row}" slot="menu">
+        <el-button icon="el-icon-setting" :size="size" :type="type">配置划分</el-button>
+        <el-button icon="el-icon-close" :size="size" :type="type">取消关联</el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+import {getList, getDetail, add, update, remove} from "@/api/tentative/testcollect";
+import {mapGetters} from "vuex";
+
+export default {
+  data() {
+    return {
+      form: {},
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 20,
+        currentPage: 1,
+        total: 0
+      },
+      search:{},
+      selectionList: [],
+      option: {
+        menuWidth:330,
+        height:'auto',
+        calcHeight: 30,
+        tip: false,
+        searchShow: false,
+        searchMenuSpan: 0,
+        border: true,
+        index: true,
+        viewBtn: true,
+        selection: false,
+        dialogClickModal: false,
+        labelWidth:150,
+        column: [
+          {
+            label: "分类名称",
+            prop: "className",
+            rules: [{
+              required: true,
+              message: "请输入分类名称",
+              trigger: "blur"
+            }]
+          }
+        ]
+      },
+      data: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        viewBtn: false,
+        //addBtn: this.vaildData(this.permission.imageclassificationconfig_add, false),
+        //viewBtn: this.vaildData(this.permission.imageclassificationconfig_view, false),
+        //delBtn: this.vaildData(this.permission.imageclassificationconfig_delete, false),
+       // editBtn: this.vaildData(this.permission.imageclassificationconfig_edit, false)
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    rowSave(row, done, loading) {
+      add(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage){
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize){
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  }
+};
+</script>
+
+<style>
+</style>