8-18

src/stores/user.js

@@ -50,6 +50,61 @@ localStorage.setItem(
         "hh_ids_full": []
       }
     }
+
+    // {
+    //   "user_id": "319774",
+    //   "user_name": "zby011111",
+    //   "user_realname": "张八一",
+    //   "lastlogintime": "",
+    //   "user_role_id": 75,
+    //   "user_level": "1",
+    //   "user_role_name": "平台用户",
+    //   "user_avatar": {
+    //     "big": "http://minio.zjjy.xyz/",
+    //     "middle": "http://minio.zjjy.xyz/",
+    //     "small": "http://minio.zjjy.xyz/"
+    //   },
+    //   "token": "8c1fMEvRcIspG04P4tbOhYRd_buCgdwmYYKHEKLOyDtEiyFGaRQh_b0mBnTujWAov4blm1YGA5Kfwe7jdD1l1PkzozJEyuwxMEEXzyXA",
+    //   "user_phone": "13333333335",
+    //   "power": {
+    //     "announce": 0,
+    //     "readonly": 0,
+    //     "activity": 0,
+    //     "dept_master": 1
+    //   },
+    //   "idcard": "333333199001011111",
+    //   "org_info": {
+    //     "dept_id": "823",
+    //     "dept_name": "测试用中心学校",
+    //     "oauth_orgType": "1",
+    //     "dept_type": "department",
+    //     "dept_name_full": "测试用中心学校",
+    //     "dept_pid": "1",
+    //     "is_matser": "1",
+    //     "dept_role": {
+    //       "role_id": "2",
+    //       "role_name": "教育和体育局管理员"
+    //     },
+    //     "dept_full": [
+    //       {
+    //         "dept_id": "1",
+    //         "dept_name": "教育和体育局",
+    //         "oauth_orgType": "0",
+    //         "dept_type": "department"
+    //       },
+    //       {
+    //         "dept_id": "823",
+    //         "dept_name": "测试用中心学校",
+    //         "oauth_orgType": "1",
+    //         "dept_type": "department"
+    //       }
+    //     ]
+    //   },
+    //   "my_cates": {
+    //     "hh_ids": [],
+    //     "hh_ids_full": []
+    //   }
+    // }
   )
 )
 /**

src/views/hdlb/hdjg/xgpf/index.vue

@@ -178,11 +178,15 @@ export default defineComponent({
 
       fetchApi()
         .then(({ code }) => {
-          return code === "1" && handleQueryZjpf();
+          if (code === '1') {
+            handleQueryZjpf();
+            handleCancel();
+          }
+          // return code === "1" && handleQueryZjpf();
         })
-        .then(() => {
-          handleCancel();
-        });
+        // .then(() => {
+        //   handleCancel();
+        // });
     }
 
     return {

src/views/hdlb/sqjl/index.vue

@@ -39,7 +39,7 @@
             <el-table-column label="联系方式" width="160" prop="hb_lxfs"></el-table-column>
             <el-table-column label="论文题目" width="300" prop="hb_title"></el-table-column>
             <el-table-column label="查重率" width="160" prop="hb_ccl"></el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" width="120" align="center">
               <template slot-scope="scope">
                 <el-dropdown v-if="btnCheck.cs && scope.row.hb_shzt_option_k == 0" @command="handleCommand">
                   <span class="el-dropdown-link hand">
@@ -104,9 +104,9 @@
                 </template> -->
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="120">
+            <el-table-column label="操作" width="200">
               <template slot-scope="scope">
-                <el-dropdown v-if="btnCheck.cs && scope.row.hb_shzt_option_k == 0" @command="handleCommand">
+                <el-dropdown v-if="btnCheck.cs && scope.row.hb_shzt_option_k == 0" @command="handleCommand" style="marginRight:20px">
                   <span class="el-dropdown-link hand">
                     初审
                     <i class="el-icon-arrow-down el-icon--right"></i>
@@ -116,7 +116,7 @@
                     <el-dropdown-item :command="beforeHandleCommand('no', scope.row)">不通过</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-                <span v-else>{{ scope.row.hb_shzt }}</span>
+                <span v-else  style="marginRight:20px">{{ scope.row.hb_shzt }}</span>
                 <el-button type="text" v-if="btnCheck.pf" @click="toReview(scope.row.hb_id, 'pf')">评分</el-button>
                 <el-button type="text" v-if="btnCheck.zc" :disabled="!scope.row.is_zc"
                   @click="toReview(scope.row.hb_id, 'zc')">仲裁</el-button>
@@ -168,9 +168,9 @@
                 </el-popover>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" v-if="btnCheck.yx">
+            <el-table-column label="操作" width="200" align="center">
               <template slot-scope="scope">
-                <el-dropdown v-if="btnCheck.cs && scope.row.hb_shzt_option_k == 0" @command="handleCommand">
+                <el-dropdown v-if="btnCheck.cs && scope.row.hb_shzt_option_k == 0" @command="handleCommand"  style="marginRight:20px">
                   <span class="el-dropdown-link hand">
                     初审
                     <i class="el-icon-arrow-down el-icon--right"></i>
@@ -180,11 +180,13 @@
                     <el-dropdown-item :command="beforeHandleCommand('no', scope.row)">不通过</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
-                <span v-else>{{ scope.row.hb_shzt }}</span>
-                <el-button type="text" @click="setYxzp(scope.row.hb_id)">
-                  <span v-if="scope.row.is_yxzp == 0">设为优秀</span>
-                  <span v-else>取消优秀</span>
-                </el-button>
+                <span v-else  style="marginRight:20px">{{ scope.row.hb_shzt }}</span>
+                <template v-if="btnCheck.yx">
+                  <el-button type="text" @click="setYxzp(scope.row.hb_id)">
+                    <span v-if="scope.row.is_yxzp == 0">设为优秀</span>
+                    <span v-else>取消优秀</span>
+                  </el-button>
+                </template>
               </template>
             </el-table-column>
           </template>

src/views/xtgl/pfmb/edit/index.vue

@@ -203,10 +203,9 @@ export default defineComponent({
                         if (code === "1") {
                             Message.success("提交成功");
                             handleRightQuery();
+                            handleRightCancel();
                         }
-                    }).then(() => {
-                        handleRightCancel();
-                    });
+                    })
                 } else {
                     console.log('error submit!!');
                     return false;

src/views/xtgl/zjk/index.vue

@@ -186,14 +186,14 @@
               <el-input v-model="user_main.user_phone"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="用户角色" prop="user_role_id">
               <el-select v-model="user_main.user_role_id" placeholder="请选择">
                 <el-option v-for="role in roleList" :key="role.role_id" :label="role.role_name" :value="role.role_id">
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item>
               <el-button type="primary" @click="onSubmit('user_main')">提交</el-button>
@@ -308,11 +308,11 @@ export default {
   },
   methods: {
     loadingUserRolesData() {
-      user_role().then((res) => {
-        if (res.code === "1") {
-          this.roleList = res.data.page_data;
-        }
-      });
+      // user_role().then((res) => {
+      //   if (res.code === "1") {
+      //     this.roleList = res.data.page_data;
+      //   }
+      // });
     },
     loadingCascadeData() {
       let data = {