zhangh 3 жил өмнө
parent
commit
2e50200406

+ 14 - 1
src/views/authority/role.vue

@@ -80,6 +80,19 @@
           >
           </el-tree>
         </el-tab-pane>
+
+        <el-tab-pane label="表单权限">
+          <el-tree
+            :data="ExcelRole"
+            show-checkbox
+            node-key="id"
+            ref="treeApiScope"
+            :props="props"
+          >
+
+            <!-- :default-checked-keys="apiScopeTreeObj" -->
+          </el-tree>
+        </el-tab-pane>
       </el-tabs>
 
       <span
@@ -105,6 +118,7 @@ import website from '@/config/website';
 export default {
   data () {
     return {
+      ExcelRole: [],//表单权限
       form: {},
       box: false,
       props: {
@@ -332,7 +346,6 @@ export default {
           });
         });
     },
-
     searchReset () {
       this.query = {};
       this.onLoad(this.page);

+ 29 - 12
src/views/news/news.vue

@@ -62,7 +62,10 @@
       :close-on-click-modal="false"
     >
       <div class="flex jc-al-c">
-        <span class="mg-r-20 titl-font">提交进度</span>
+        <span
+          class="mg-r-20 titl-font"
+          style="width:180px;text-align:right;"
+        >提交进度</span>
         <el-select
           v-model="curRow.currentLink"
           placeholder="请选择"
@@ -79,13 +82,11 @@
         </el-select>
       </div>
       <div
+        style="margin-top:40px;"
         class="flex jc-al-c"
         v-show="operation.show"
       >
-        <span
-          class="mg-r-20"
-          style="font-size: 25px"
-        >预计处理截止时间</span>
+        <span style="font-size: 16px;margin-right:20px;width:180px;text-align:right;font-weight: 900;">*预计处理截止时间</span>
         <el-date-picker
           v-model="operation.manageTime"
           type="date"
@@ -233,13 +234,29 @@ export default {
       this.activeIndex = key
     },
     async SubmissionProgress () {//提交进度弹框保存按钮事件
-      await this.manageUserOperationStatus({
-        currentLinkId: this.curRow.currentLinkId,
-        currentLink: this.curRow.currentLink,
-        newNumber: this.curRow.newNumber,
-        userOpinionId: this.curRow.userOpinionId,
-        manageTime: this.operation.manageTime
-      })
+      if (this.curRow.currentLink == 2) {
+        if (this.operation.manageTime) {
+          await this.manageUserOperationStatus({
+            currentLinkId: this.curRow.currentLinkId,
+            currentLink: this.curRow.currentLink,
+            newNumber: this.curRow.newNumber,
+            userOpinionId: this.curRow.userOpinionId,
+            manageTime: this.operation.manageTime
+          })
+        } else {
+          this.$message({
+            type: 'error',
+            message: '请设置预计处理截止时间'
+          })
+        }
+      } else {
+        await this.manageUserOperationStatus({
+          currentLinkId: this.curRow.currentLinkId,
+          currentLink: this.curRow.currentLink,
+          newNumber: this.curRow.newNumber,
+          userOpinionId: this.curRow.userOpinionId
+        })
+      }
     },
     //#region 分页
     currentChange (val) {