back/src/views/modules/hasToDoTasks/deviceApproval.vue

@@ -38,9 +38,6 @@
                     </template>
                 </el-table-column>
 
-                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center"></el-table-column>
-
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"

back/src/views/modules/myAgent/approval.vue

@@ -12,23 +12,15 @@
             <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%">
                 <el-table-column prop="title" label="申请标题" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="name" label="申请人信息" header-align="center" align="center"></el-table-column>
-                <el-table-column label="设备名称" header-align="center" align="center">
-                    <template slot-scope="scope">
-                        <span class="demand-text">{{
-                        (scope.row && scope.row.tbDeviceDTO && scope.row.tbDeviceDTO.name)
-                        }}</span>
-                    </template>
-                </el-table-column>
                 <el-table-column prop="state" label="审批状态" header-align="center" align="center">
                     <template slot-scope="scope">
                         <span>{{wrjStateObj[scope.row.state]}}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-                <!-- <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="phone" label="电话" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="dept" label="单位" header-align="center" align="center"></el-table-column>
                 <el-table-column prop="applicationSystem" label="应用系统" header-align="center" align="center">
-                </el-table-column> -->
+                </el-table-column>
                 <el-table-column label="应用领域" header-align="center" align="center">
                     <template slot-scope="scope" v-if="scope.row.applicationArea">
                         <span class="area-text" v-for="(x,i) in JSON.parse(scope.row.applicationArea)"

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -13,32 +13,40 @@
       <h3>申请人信息</h3>
       <div class="big-BOX">
         <p>
-          <span class="text">申请人：<span> {{ dataForm.content.user || '--' }}</span></span>
-          <span class="text">电话：<span>{{ dataForm.content.phone || '--' }}</span></span>
-          <span class="text">单位：<span>{{ dataForm.content.unit || '--' }}</span></span>
+          <span class="text"
+            >申请人：<span> {{ dataForm.content.user || '--' }}</span></span
+          >
+          <span class="text"
+            >电话：<span>{{ dataForm.content.phone || '--' }}</span></span
+          >
+          <span class="text"
+            >单位：<span>{{ dataForm.content.unit || '--' }}</span></span
+          >
         </p>
         <p>
           <span class="text">
             能力申请标题：<span>
-              {{ dataForm.content.title || '--' }}</span></span>
-          <span class="text" v-if="dataForm.content.applicationSystem">应用系统：<span>{{
-          dataForm.content.applicationSystem || '--'
-          }}</span></span>
-          <span class="text"></span>
+              {{ dataForm.content.title || '--' }}</span
+            ></span
+          >
+          <span class="text" v-if="dataForm.content.applicationSystem"
+            >应用系统：<span>{{
+              dataForm.content.applicationSystem || '--'
+            }}</span></span
+          >
+          <span class="text" ></span>
         </p>
         <p>
-          <span v-if="dataForm.content.applicationSceneStr">应用场景：<span>
-              {{ dataForm.content.applicationSceneStr || '--' }}</span></span>
+          <span v-if="dataForm.content.applicationSceneStr"
+            >应用场景：<span>
+              {{ dataForm.content.applicationSceneStr || '--' }}</span
+            ></span>
         </p>
         <p>
           <span>
             需求依据：<span>
-              {{ dataForm.content.applicationBackground || '--' }}</span></span>
-        </p>
-        <p>
-          <div>
-            <el-button type="primary" v-if="dataForm.content.attachment" size="small" @click="download(dataForm.content)">附件下载</el-button>
-          </div>
+              {{ dataForm.content.applicationBackground || '--' }}</span
+            ></span>
         </p>
         <!-- <p>
           <span>
@@ -94,7 +102,9 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
+        <el-button type="danger" plain @click="showDialog('驳回')"
+          >驳回</el-button
+        >
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
          <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
@@ -103,12 +113,21 @@
 
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
-    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
-      :before-close="handleClose">
+    <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
-        <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </el-card>
@@ -125,7 +144,7 @@ import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
-  data() {
+  data () {
     return {
       dialogVisible: false,
       dialogType: '',
@@ -154,7 +173,7 @@ export default {
       agreeOrList: '同意'
     }
   },
-  created() {
+  created () {
     // 将业务KEY赋值给表单
     console.log('params=================>', this.$route, this.$route.params)
     this.dataForm.taskId = this.$route.params.taskId
@@ -188,7 +207,7 @@ export default {
     RenProcessDetail
   },
   methods: {
-    init() {
+    init () {
       // this.visible = true
       this.$nextTick(() => {
         // this.$refs.dataForm.resetFields()
@@ -200,32 +219,32 @@ export default {
         }
       })
     },
-    showDialog(title) {
+    showDialog (title) {
       this.dialogVisible = true
       this.dialogType = title
     },
-    handleClose(done) {
+    handleClose (done) {
       this.$confirm('确认关闭？')
         .then((_) => {
           this.input = ''
           done()
         })
-        .catch((_) => { })
+        .catch((_) => {})
     },
-    handleClose2() {
+    handleClose2 () {
       this.dialogVisible = false
       this.input = ''
     },
-    downloadFile2(url) {
+    downloadFile2 (url) {
       console.log(window.SITE_CONFIG.previewUrl)
       window.open(
         window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(url))
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(url))
       )
     },
     // 获取信息
-    getInfo() {
+    getInfo () {
       let params = ''
       if (this.dataForm.taskId) {
         params = `taskId=${this.dataForm.taskId}`
@@ -253,7 +272,7 @@ export default {
                     index <
                     res.data.tAbilityApplicationDTOList[0].applicationScene
                       .length -
-                    1
+                      1
                   ) {
                     res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
                       '、'
@@ -288,7 +307,7 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => { })
+          .catch(() => {})
       } else {
         params = `instanceId=${this.dataForm.instanceId}`
         this.$http
@@ -340,11 +359,11 @@ export default {
               this.dataList.push(obj)
             }
           })
-          .catch(() => { })
+          .catch(() => {})
       }
     },
     // 申请能力
-    applyData() {
+    applyData () {
       this.$http
         .get(`/resource/select/${this.dataForm.instanceId}`)
         .then(({ data: res }) => {
@@ -356,7 +375,7 @@ export default {
           // this.dataForm.content = res.data
           // console.log(this.dataForm, 'ela')
         })
-        .catch(() => { })
+        .catch(() => {})
     },
     // 同意与退回
     agreeOrNot: debounce(
@@ -393,7 +412,7 @@ export default {
                   }
                 })
               })
-              .catch(() => { })
+              .catch(() => {})
             this.tabRemoveHandle(data)
           } else {
             this.$message.error('请输入审批意见！')
@@ -436,7 +455,7 @@ export default {
       1000,
       { leading: true, trailing: false }
     ),
-    tabRemoveHandle(tabName) {
+    tabRemoveHandle (tabName) {
       console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
         return false
@@ -453,7 +472,7 @@ export default {
       if (tabName === this.$store.state.contentTabsActiveName) {
         const tab =
           this.$store.state.contentTabs[
-          this.$store.state.contentTabs.length - 1
+            this.$store.state.contentTabs.length - 1
           ]
         this.$router.push({
           name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
@@ -463,19 +482,13 @@ export default {
       }
     },
     // 启动流程出错回调
-    startProcessErrorCallback(data) {
+    startProcessErrorCallback (data) {
       console.log(data)
     },
     // 任务处理出错回调
-    taskHandleErrorCallback(data) { },
-    download(data) {
-      const alink = document.createElement('a')
-      alink.download = '附件' // 文件名,大部分浏览器兼容,IE10及以下不兼容
-      alink.href = data.attachment // 创建 url地址
-      alink.click() // 自动点击
-    },
+    taskHandleErrorCallback (data) {}
   },
-  mounted() {
+  mounted () {
     // this.applyData()
   }
 }
@@ -484,47 +497,38 @@ export default {
 ::v-deep .big-BOX {
   background: rgba(244, 245, 248, 0.8);
   padding: 24px;
-
   h3 {
     font-size: 16px;
     color: #212121;
   }
-
   p {
     width: 100%;
     display: flex;
     justify-content: space-between;
     color: #212121;
     font-size: 14px;
-
     span {
       display: inline-block;
       margin-left: 8px;
       line-height: 32px;
-
       span {
         font-weight: bold;
       }
     }
-
     .text {
       width: 500px;
     }
   }
-
   .lastP {
     margin-top: 16px;
     width: 100%;
-
     span {
       display: flex;
-
       span {
         padding: 0 12px;
         height: 32px;
         background: rgba(232, 234, 239, 1);
         border-radius: 2px;
-
         button {
           background: unset;
           border: 0;
@@ -535,7 +539,6 @@ export default {
     }
   }
 }
-
 ::v-deep .AbilityApply {
   margin-top: 32px;
 
@@ -545,33 +548,27 @@ export default {
     border-bottom: 1px solid #dddee1;
     padding-bottom: 10px;
   }
-
   ul {
     padding-left: 0px;
-
     li {
       list-style: none;
       padding: 30px 0;
       border-bottom: 1px solid #dddee1;
       display: flex;
-
       img {
         width: 100px;
         height: 100px;
       }
-
       div {
         margin-left: 16px;
         display: flex;
         flex-direction: column;
         justify-content: center;
-
         h2 {
           margin-bottom: 20px;
           font-size: 20px;
           color: #000;
           display: flex;
-
           span {
             display: block;
             font-size: 14px;
@@ -584,26 +581,22 @@ export default {
             border-radius: 4px;
           }
         }
-
         p {
           margin-bottom: 0;
         }
       }
     }
-
     .clearfix:after {
       display: block;
       content: "";
       clear: both;
     }
-
     .title {
       color: #0558e1;
       font-size: 18px;
       padding-bottom: 0;
       border-bottom: 0;
     }
-
     .title:before {
       content: "";
       width: 6px;
@@ -617,21 +610,17 @@ export default {
     }
   }
 }
-
-::v-deep .agreeOr>div {
+::v-deep .agreeOr > div {
   display: flex;
   align-items: center;
-
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
   }
 }
-
-::v-deep .agreeOr>div:last-of-type {
+::v-deep .agreeOr > div:last-of-type {
   margin-top: 15px;
 }
-
 .blueAll {
   ::v-deep .el-radio-button__inner {
     width: 80px;
@@ -643,14 +632,12 @@ export default {
     color: #0558e1;
     border: 1px solid #0558e1;
   }
-
-  ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     box-shadow: unset !important;
     background: #0558e1;
     color: #ffffff;
   }
 }
-
 .inputBule {
   width: 55px;
   height: 32px;
@@ -661,10 +648,8 @@ export default {
   color: #ffffff;
   border: 1px solid #0558e1;
 }
-
 .redAll {
   margin-left: 10px;
-
   ::v-deep .el-radio-button__inner {
     width: 80px;
     height: 32px;
@@ -676,14 +661,12 @@ export default {
     color: #e83a48;
     margin-left: 10px;
   }
-
-  ::v-deep .el-radio-button__orig-radio:checked+.el-radio-button__inner {
+  ::v-deep .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     box-shadow: unset !important;
     color: #ffffff;
     background: #e83a48;
   }
 }
-
 .blueInput {
   width: 55px;
 }