Explorar el Código

消息区联调

huangjn hace 3 años
padre
commit
9172c6a585

+ 10 - 1
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
+  })
+}

+ 3 - 3
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
     })
-}
+}

+ 6 - 8
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>

+ 26 - 16
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>

+ 10 - 7
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,10 @@ export default {
     },
     async manageUserOperationStatus (da) {//业务人员提交环节操作
       const { data: res } = await manageUserOperationStatus(da)
-      console.log(res);
       if (res.code == 200) {
         this.dialogVisible = false
+        //重新刷新列表
+        await this.queryBusinessUserOpinionList();
       }
     },
     async queryBusinessUserOpinionListAll () {//所有工单处理列表