Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

ruoyi-ui/src/views/project/projectStandard/index.vue

@@ -66,7 +66,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-if="1==2" v-hasPermi="['project:projectStandard:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)" v-hasPermi="['project:projectStandard:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
             v-hasPermi="['project:projectStandard:remove']">删除</el-button>
         </template>
@@ -104,18 +104,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <standardDlg ref="dlg" @success="loadData"></standardDlg>
   </div>
 </template>
 
 <script>
 import { listProjectStandard, getProjectStandard, delProjectStandard, addProjectStandard, updateProjectStandard } from "@/api/project/projectStandard";
 import standardTypes from './standardType'
+import standardDlg from './projectStandardDlg.vue'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "ProjectStandard",
   components: {
-    Treeselect
+    Treeselect,standardDlg
     },
   data() {
     return {
@@ -214,7 +216,7 @@ export default {
           row.standardType=row.oldStandardType;
         }else{
           updateProjectStandard(row).then(d=>{
-            debugger;
+            this.$modal.msgSuccess("更新成功");
           })
         }
       },400);
@@ -269,6 +271,10 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    handleEdit(row) {
+            let tmps = this.depts.filter(d => d.deptId == this.activeName);
+            this.$refs.dlg.showDialog(this.prj, tmps.length > 0 ? tmps[0] : {}, row);
+      },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)

ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue

@@ -12,15 +12,16 @@
                 <el-tab-pane :label="'' + it.deptName" :name="'' + it.deptId" :key="idx" v-for="(it, idx) in depts">
                     <div>
                         <el-button type="primary" @click="doAdd">增加</el-button>
-                        <el-button style="margin-right:12px;"   type="danger" :disabled="multiple"  @click="handleDelete">删除</el-button>
+                        <el-button style="margin-right:12px;" type="danger" :disabled="multiple"
+                            @click="handleDelete">删除</el-button>
                         <div style="display: inline-block;width:200px;position: relative;top: 12px;">
                             <treeselect v-model="standType" :options="options" :show-count="true" placeholder="请选择类型" />
                         </div>
                         <el-button type="success" style="margin-left:12px;" @click="doQuery">搜索</el-button>
                     </div>
                     <div class="div-data">
-                        <el-table v-loading="loading" :data="projectStandardList" @selection-change="handleSelectionChange"
+                        <el-table v-loading="loading" :data="projectStandardList"
-                            stripe>
+                            @selection-change="handleSelectionChange" stripe>
                             <el-table-column type="selection" width="55" align="center" />
                             <el-table-column label="图片路径" align="center" prop="imageFile">
                                 <template slot-scope="{row}">
@@ -38,12 +39,15 @@
                             </el-table-column>
                             <el-table-column label="排序" align="center" prop="ord">
                                 <template slot-scope="{row}">
-                                    <el-input-number v-model="row.ord" controls-position="right" @change="doSave(row, false)"
+                                    <el-input-number v-model="row.ord" controls-position="right"
-                                        :min="1" :max="10000"></el-input-number>
+                                        @change="doSave(row, false)" :min="1" :max="10000"></el-input-number>
                                 </template>
                             </el-table-column>
-                            <el-table-column label="类型" align="center" prop="standardType">
+                            <el-table-column label="类型" align="center" prop="standardType" class-name="td-tree-select">
-                                <template slot-scope="{row}">{{ getType(row) }}</template>
+                                <template slot-scope="{row}">
+                                    <treeselect v-model="row.standardType" :options="options" :show-count="true"
+                                        placeholder="请选择类型" @select="a => doRowSelect(row, a)" />
+                                </template>
                             </el-table-column>
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                                 <template slot-scope="scope">
@@ -128,6 +132,17 @@ export default {
     },
 
     methods: {
+        doRowSelect(row, a) {
+            setTimeout(() => {
+                if (a.children && a.children.length > 0) {
+                    row.standardType = row.oldStandardType;
+                } else {
+                    updateProjectStandard(row).then(d => {
+                        this.$modal.msgSuccess("更新成功");
+                    })
+                }
+            }, 400);
+        },
         doTabClick() {
             setTimeout(() => {
                 this.doQuery();
@@ -235,6 +250,7 @@ export default {
             listProjectStandard(this.queryParams).then(response => {
                 this.projectStandardList = (response.rows || []).map(it => {
                     it.editDesc = false;
+                    it.oldStandardType=it.standardType;
                     return it;
                 });
                 this.total = response.total;
@@ -275,16 +291,24 @@ export default {
 
         }
     }
-}</style>
+}
+</style>
 <style lang="scss">
 .project-standar-drawer {
     .el-tab-pane {
         min-height: 800px;
     }
+
     .vue-treeselect__menu-container {
         .vue-treeselect__menu {
             max-height: 600px !important;
         }
     }
+
+    .td-tree-select {
+        .cell {
+            overflow: visible;
+        }
+    }
 }
 </style>