Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/api/certificate/management.js

@@ -17,4 +17,13 @@ export const queryAllRoleList = (params) => {
         method: 'get',
         params
     })
-}
+}
+
+//获取当前项目下所有合同段
+export const queryContractList = (params) => {
+  return request({
+        url: '/api/blade-manager/signPfxFile/queryContractList',
+        method: 'get',
+        params
+  })
+}

src/api/manager/wbsprivate.js

@@ -69,3 +69,11 @@ export const removePrivateTreeNode = (pKeyId) => {
     }
   })
 }
+
+export const wbsTreePrivateTableSort = (data) => {
+  return request({
+    url: '/api/blade-manager/wbsPrivate/wbsTreePrivateTableSort',
+    method: 'post',
+    data:data
+  })
+}

src/api/news/news.js

@@ -9,11 +9,11 @@ export const queryBusinessUserOpinionList = (params) => {
 }
 
 //业务人员提交环节操作
-export const manageUserOperationStatus = (data) => {
+export const manageUserOperationStatus = (params) => {
     return request({
         url: '/api/blade-business/businessUserOpinion/manageUserOperationStatus',
         method: 'post',
-        data
+      params
     })
 }
 
@@ -25,4 +25,4 @@ export const queryBusinessUserOpinionListAll = (params) => {
         method: 'get',
         params
     })
-}
+}

src/views/AssessmentArea/index.vue

@@ -4,6 +4,7 @@
       <el-select
         v-model="userId"
         placeholder="请选择"
+        @change="queryAssessUser"
       >
         <el-option
           v-for="item in options"
@@ -13,7 +14,6 @@
         >
         </el-option>
       </el-select>
-
       <el-date-picker
         class="marleft20"
         v-model="time"
@@ -21,7 +21,7 @@
         align="right"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        value-format='yyyy-MM-dd hh-mm'
+        value-format='yyyy-MM-dd hh:mm'
         :default-time="['12:00:00', '08:00:00']"
       >
       </el-date-picker>
@@ -115,6 +115,9 @@ export default {
     }
   },
   methods: {
+    queryAssessUser(){
+      this.queryUserAssessmentPage();
+    },
     //#region 分页
     handleSizeChange (val) {//
       this.pagesize = val
@@ -194,7 +197,7 @@ export default {
     //#endregion
   },
   created () {
-    // this.findMaintenanceUser()
+    this.findMaintenanceUser()
     this.queryUserAssessmentPage()
 
     // this.queryAllUserAssessmentContent()
@@ -202,4 +205,4 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

src/views/certificate/lists/addList.vue

@@ -235,7 +235,7 @@ export default {
       form: {
         certificateType: 1,
         certificateUserName: '',
-        certificateUserName: '',//所持证书者身份证ID
+        certificateId: '',//所持证书者身份证ID
         enterpriseUnifiedCode: '',//企业统一社会信用代码
         certificateNumber: '',
         certificatePassword: '',
@@ -263,7 +263,7 @@ export default {
     }
   },
   methods: {
-    //#region 
+    //#region
     cancel () {//取消按钮
       this.$router.push('/certificate/list')
     },
@@ -275,6 +275,7 @@ export default {
             certificateUserName: this.form.certificateUserName,
             certificateNumber: this.form.certificateNumber,
             certificatePassword: this.form.certificatePassword,
+            certificateId: this.form.certificateId,
           }
           if (this.form.certificateFileUrl[0].name) {
             fromData.certificateFileUrl = await this.addFileInfo(this.form.certificateFileUrl[0].raw)
@@ -363,7 +364,6 @@ export default {
     //#region //接口
     async getById () {//获取详细信息
       const { data: res } = await getById({ id: this.$route.query.id })
-      console.log(res);
       if (res.code == 200) {
         this.form = res.data
         this.form.certificateFileUrl = [{ raw: res.data.certificateFileUrl }]
@@ -372,7 +372,6 @@ export default {
     },
     async save (da) {//新增
       const { data: res } = await save(da)
-      console.log(res);
       if (res.code == 200) {
         this.$message({
           type: 'success',
@@ -383,21 +382,18 @@ export default {
     },
     async findUserByName () { //关联用户
       const { data: res } = await findUserByName()
-      console.log(res);
       if (res.code == 200) {
         this.userData = res.data
       }
     },
     async queryRole () { //获取角色方
       const { data: res } = await queryRole()
-      console.log(res);
       if (res.code == 200) {
         this.ParticipationConstruction = res.data
       }
     },
     async queryProjectAndContract () {//获取项目和合同段
       const { data: res } = await queryProjectAndContract()
-      console.log(res);
       if (res.code == 200) {
         this.projectMeiju = res.data
       }
@@ -406,14 +402,12 @@ export default {
       let fromData = new FormData();
       fromData.append('file', file);
       const { data: res } = await addFileInfo(fromData)
-      console.log(res);
       if (res.code == 200) {
         return res.data.link
       }
     },
     async update (da) {//编辑保存接口
       const { data: res } = await update(da)
-      console.log(res);
       if (res.code == 200) {
         this.$message({
           type: 'success',
@@ -436,4 +430,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/views/certificate/management.vue

@@ -73,13 +73,12 @@ export default {
     }
   },
   methods: {
-    //#region 
+    //#region
     projectChange () {//项目名称选择
       this.singPfxManagementPage()
     },
     async queryProjectList () {
-      const { data: res } = await queryProjectList()
-      console.log(res);
+      const { data: res } = await queryProjectList();
       if (res.code == 200) {
         this.options = res.data
       }
@@ -88,9 +87,8 @@ export default {
       const { data: res } = await singPfxManagementPage({
         current: this.pageindex,
         size: this.pagesize,
-        contractId: this.value,
-      })
-      console.log(res);
+        projectId: this.value,
+      });
       if (res.code == 200) {
         this.tableData = res.data.records
         this.total = res.data.total
@@ -106,7 +104,7 @@ export default {
     },
     //#endregion
 
-    //#region 
+    //#region
     see (contractId) {
       this.$router.push({
         path: '/certificate/management/see',
@@ -132,4 +130,4 @@ export default {
     }
   }
 }
-</style>
+</style>

src/views/certificate/managements/see.vue

@@ -17,13 +17,13 @@
     >
       <el-option
         v-for="item in options"
-        :key="item.roleId"
-        :label="item.roleName"
-        :value="item.roleId"
+        :key="item.id"
+        :label="item.contractName"
+        :value="item.id"
       >
       </el-option>
     </el-select>
-        <el-menu  
+        <el-menu
           default-active="2"
           class="el-menu-vertical-demo"
         >
@@ -78,7 +78,7 @@
 
 <script>
 import { remove, } from "@/api/certificate/list";
-import { queryAllRoleList, } from "@/api/certificate/management";
+import { queryAllRoleList, queryContractList } from "@/api/certificate/management";
 export default {
   data () {
     return {
@@ -94,14 +94,16 @@ export default {
       this.rightData = signPfxFileList
     },
     changePosition () {//下拉框change事件
-      if (this.value && this.options.length > 0) {
-        this.options.forEach(val => {
-          if (val.roleId == this.value) {
-            this.menuData = [val]
-            this.rightData = []
-          }
-        })
-      }
+      // if (this.value && this.options.length > 0) {
+      //   this.options.forEach(val => {
+      //     if (val.roleId == this.value) {
+      //       this.menuData = [val]
+      //       this.rightData = []
+      //     }
+      //   })
+      // }
+      this.rightData = [];
+      this.queryAllRoleList(this.value);
     },
     deleteAutograph (ids) {
       let _that = this
@@ -122,10 +124,17 @@ export default {
       const { data: res } = await queryAllRoleList({ contractId })
       console.log(res);
       if (res.code == 200) {
-        this.options = res.data
+        // this.options = res.data
         this.menuData = res.data
       }
     },
+    async queryContractList (contractId) {
+      const { data: res } = await queryContractList({contractId});
+      if(res.code == 200){
+        this.options = res.data
+      }
+      this.value = contractId;
+    },
     async remove (ids) {
       const { data: res } = await remove({ ids })
       console.log(res);
@@ -156,11 +165,12 @@ export default {
     },
   },
   created () {
-    this.queryAllRoleList(this.$route.query.contractId)
+    this.queryAllRoleList(this.$route.query.contractId);
+    this.queryContractList(this.$route.query.contractId);
   }
 }
 </script>
 <style lang="scss" scoped>
 .see {
 }
-</style>
+</style>

src/views/manager/projectinfo/detail.vue

@@ -327,7 +327,7 @@
                 class="marleft10"
                 @click="addUserToProject"
               >添加</el-button>
-              <el-button type="primary">创建新用户</el-button>
+              <el-button type="primary" @click="rputerPush()">创建新用户</el-button>
               <el-button
                 type="danger"
                 @click="handleDeletes"
@@ -537,6 +537,12 @@ export default {
       this.pageindx = val
       this.getUserByCondition();
     },
+    rputerPush () {
+      this.$router.push({
+        path: '/system/user',
+        query: { tankai: true }
+      })
+    },
     //#endregion
     init () {
       this.getHighwayGradeList();

src/views/manager/projectinfo/tree.vue

@@ -213,6 +213,12 @@
               style="color:#409EFF;cursor: pointer;"
               @click="editEditElementForm()"
             ></i>
+            <i
+              class="el-icon-sort marleft10"
+              size="26"
+              @click="privateTableSort()"
+              style="color:#409EFF;cursor: pointer;"
+            ></i>
           </p>
           <el-table
             :data="formData"
@@ -440,6 +446,30 @@
       </span>
     </el-dialog>
 
+    <!-- 元素表排序 -->
+    <el-dialog
+      title="调整排序"
+      :visible="excelSortTag"
+      width="50%"
+      append-to-body
+    >
+      <ManualSorting
+        v-if="excelSortTag2"
+        @bianhua='bianhua2()'
+        :sort='tableSortList'
+      />
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="excelSortTag=false">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="editPrivateSort()"
+        >确 定</el-button>
+      </span>
+    </el-dialog>
+
     <!-- 关联清表 -->
     <el-dialog
       title="关联清表"
@@ -506,6 +536,7 @@
       width="50%"
       append-to-body
       :close-on-click-modal="false"
+      @closed="saveNodeLoading = false"
     >
       <el-form
         ref="nodeDetail"
@@ -1359,7 +1390,7 @@ import {
   saveElement, remove as removeElement, updateBatchElements, getTemplate,
   importWbsElement
 } from "@/api/manager/wbsformelement";
-import { getLazytree, getDetail, update, findNodeTableByCondition as selectByNodeTable, removeTableByCondition as removeTableById ,removePrivateTreeNode} from "@/api/manager/wbsprivate";
+import { getLazytree, getDetail, update, findNodeTableByCondition as selectByNodeTable, removeTableByCondition as removeTableById ,removePrivateTreeNode,wbsTreePrivateTableSort} from "@/api/manager/wbsprivate";
 import { findProjectTree as getAlltree } from "@/api/manager/projectinfo";
 import { getList as getAttchFromOriginalName } from "@/api/resource/attach";
 import { getDictionary } from "@/api/system/dict";
@@ -1478,6 +1509,10 @@ export default {
       namelists: [],
 
       infoNameVisible: false,
+
+      excelSortTag:false,
+      excelSortTag2:false,
+      tableSortList:[],
       //#endregion
     };
   },
@@ -1559,9 +1594,6 @@ export default {
           type: "success",
           message: "新增成功!"
         });
-        this.$nextTick(() => {
-          this.saveNodeLoading = false;
-        })
       })
     },
     updateNode () {
@@ -1861,6 +1893,7 @@ export default {
           type: "warning",
           message: "请先选择文件再进行导入"
         });
+        return;
       }
       let forms = new FormData();
       forms.append('excelFile', this.upFile);
@@ -1968,6 +2001,43 @@ export default {
       this.$set(data, 'moreShow', value)
     },
 
+    bianhua2 () {
+      this.excelSortTag2 = false
+      this.$nextTick(() => {
+        this.excelSortTag2 = true
+      })
+    },
+    //私有树的元素表修改排序
+    privateTableSort(){
+      if(!this.curTreeData.id){
+        this.$message({
+          type: "warning",
+          message: "请先选择需要排序的节点"
+        })
+        return;
+      }
+      this.tableSortList = this.formData.map((form,index)=>{
+        return{
+          sort:index+1,
+          deptName:form.tableName,
+          pkeyId:form.pkeyId,
+        }
+      })
+      this.excelSortTag = true
+      this.excelSortTag2 = true
+    },
+    editPrivateSort(){
+      wbsTreePrivateTableSort(this.tableSortList).then(()=>{
+        this.updateNodeTable();
+        this.$message({
+          type: "success",
+          message: "排序成功!"
+        });
+        this.excelSortTag = false;
+        this.excelSortTag2 = false;
+      })
+    },
+
     getDeptCategorylist () {
       if (this.deptCategorylist.length > 1) {
         return;

src/views/manager/wbsinfo/edit.vue

@@ -504,6 +504,7 @@
       width="50%"
       append-to-body
       :close-on-click-modal="false"
+      @closed="saveNodeLoading = false"
     >
       <el-form
         ref="nodeDetail"
@@ -1674,9 +1675,6 @@ export default {
           type: "success",
           message: "新增成功!"
         });
-        this.$nextTick(()=>{
-          this.saveNodeLoading = false;
-        })
       })
     },
     updateNode () {

src/views/news/news.vue

@@ -35,6 +35,7 @@
         <el-button
           size="small"
           @click="changeProgres(scope.row)"
+          v-show="!scope.row.isCurrent && scope.row.operation"
         >提交进度</el-button>
       </template>
       <!-- 处理状态 -->
@@ -63,17 +64,17 @@
       <div class="flex jc-al-c">
         <span class="mg-r-20 titl-font">提交进度</span>
         <el-select
-          v-model="curRow.currentLinkId"
+          v-model="curRow.currentLink"
           placeholder="请选择"
         >
-          <el-option
-            label="已解决"
-            :value="3"
-          ></el-option>
           <el-option
             label="进入人工预处理环境"
             :value="2"
-          ></el-option>
+          />
+          <el-option
+            label="已解决"
+            :value="3"
+          />
         </el-select>
       </div>
       <span
@@ -196,6 +197,7 @@ export default {
     async SubmissionProgress () {//提交进度弹框保存按钮事件
       await this.manageUserOperationStatus({
         currentLinkId: this.curRow.currentLinkId,
+        currentLink: this.curRow.currentLink,
         newNumber: this.curRow.newNumber,
         userOpinionId: this.curRow.userOpinionId
       })
@@ -230,9 +232,14 @@ export default {
     },
     async manageUserOperationStatus (da) {//业务人员提交环节操作
       const { data: res } = await manageUserOperationStatus(da)
-      console.log(res);
       if (res.code == 200) {
         this.dialogVisible = false
+        this.$message({
+          type: 'success',
+          message: '提交成功!'
+        })
+        //重新刷新列表
+        await this.queryBusinessUserOpinionList();
       }
     },
     async queryBusinessUserOpinionListAll () {//所有工单处理列表