natasha 1 anno fa
parent
commit
990cca378f

+ 1 - 4
src/components/NavMenu.vue

@@ -179,10 +179,7 @@ export default {
           title: "系统配置",
           icon: "setting",
           index: "system_config",
-          showFlag:
-            getToken() && JSON.parse(getToken()).is_inner === "true"
-              ? true
-              : false,
+          code: 50001,
           node: [
             {
               title: "邮箱配置",

+ 17 - 1
src/components/Setting.vue

@@ -382,7 +382,7 @@
               <td>
                 <el-checkbox
                   v-model="manageAuth"
-                  :label="30002"
+                  :label="30003"
                   :disabled="page === 'personal' ? true : false"
                   ><br
                 /></el-checkbox>
@@ -429,6 +429,22 @@
               </td>
             </tr>
           </table>
+          <table class="step-table">
+            <tr>
+              <td rowspan="2" class="step-table-header">系统配置</td>
+              <td>系统配置</td>
+            </tr>
+            <tr>
+              <td>
+                <el-checkbox
+                  v-model="manageAuth"
+                  :label="50001"
+                  :disabled="page === 'personal' ? true : false"
+                  ><br
+                /></el-checkbox>
+              </td>
+            </tr>
+          </table>
           <template v-if="page === 'editPerson'">
             <el-button
               type="primary"

+ 50 - 2
src/views/cdkey_manage/CheckGoods.vue

@@ -246,7 +246,7 @@
                 <el-button
                   type="primary"
                   size="small"
-                  @click="handleEdit()"
+                  @click="handleExport()"
                   :disabled="true"
                   >导出报表</el-button
                 >
@@ -614,7 +614,7 @@ export default {
       type: this.$route.query.type ? this.$route.query.type * 1 : 0,
       showFinance:
         getToken() && JSON.parse(getToken())
-          ? JSON.parse(getToken()).popedom_code_list.indexOf(30002) > -1
+          ? JSON.parse(getToken()).popedom_code_list.indexOf(30003) > -1
           : false,
       quickList: [], // 快速查询
       validity: "",
@@ -798,6 +798,54 @@ export default {
         }
       });
     },
+    // 导出
+    handleExport() {
+      let MethodName =
+        "/ShopServer/Manager/FinanceManager/StartCreateOrderExportFile";
+      getLogin(MethodName, {
+        pay_status: 1,
+        content: this.searchInput.trim(),
+        pay_date_begin: this.validity ? this.validity[0] : "",
+        pay_date_end: this.validity ? this.validity[1] : "",
+        goods_study_phase: -1,
+        discount_code_use_status: -1,
+        order_status: -1,
+        person_org_id_list: [],
+        person_province_city_id_list: [],
+        pay_type: -1,
+        page_capacity: this.pageSizess,
+        cur_page: this.pageNumberss,
+        order_column_list: [],
+        goods_type: -1,
+        is_query_discount_code_user_order: "true",
+        discount_code_id: this.$route.query.id ? this.$route.query.id : "",
+      })
+        .then((res) => {
+          // let MethodName2 = "/FileServer/FilePackManager/GetFileCompressTaskProgress";
+          // let timer = setTimeout(() => {
+          //     getLogin(MethodName2, {
+          //         file_compress_task_id: res.file_compress_task_id,
+          //     })
+          //     .then((res) => {
+          //         if (res.is_finish == "true") {
+          //             data.FileID = res.compress_pack_file_id;
+          //             clearTimeout(timer);
+          //             timer = null;
+          //             _this.loading = false;
+          //             location.href =
+          //                 process.env.VUE_APP_BASE_API +
+          //                 `/FileServer/WebFileDownload?AccessToken=${data.access_token}&FileID=${data.FileID}`;
+          //             }
+          //     })
+          //     .catch((res) => {
+          //         this.loading = false;
+          //     });
+          // }, 1000);
+        })
+        .catch((res) => {
+          this.loading = false;
+        });
+    },
   },
   //生命周期 - 创建完成(可以访问当前this实例)
   created() {

+ 14 - 1
src/views/people_manage/CreatePerson.vue

@@ -288,7 +288,7 @@
                   </el-radio-group>
                 </td>
                 <td>
-                  <el-checkbox v-model="manageAuth" :label="30002"
+                  <el-checkbox v-model="manageAuth" :label="30003"
                     ><br
                   /></el-checkbox>
                 </td>
@@ -326,6 +326,19 @@
                 </td>
               </tr>
             </table>
+            <table class="step-table">
+              <tr>
+                <td rowspan="2" class="step-table-header">系统配置</td>
+                <td>系统配置</td>
+              </tr>
+              <tr>
+                <td>
+                  <el-checkbox v-model="manageAuth" :label="50001"
+                    ><br
+                  /></el-checkbox>
+                </td>
+              </tr>
+            </table>
           </div>
           <div v-if="stepIndex === 2">
             <el-result