Browse Source

getRequestParams 增加参数

dusenyao 1 week ago
parent
commit
c2e83aeb25

+ 44 - 0
package-lock.json

@@ -28,6 +28,7 @@
         "vue": "^2.6.14",
         "vue-esign": "^1.1.4",
         "vue-router": "^3.6.5",
+        "vue-signature-pad": "^2.0.5",
         "vuedraggable": "^2.24.3",
         "vuex": "^3.6.2"
       },
@@ -12964,6 +12965,11 @@
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
       "dev": true
     },
+    "node_modules/merge-images": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/merge-images/-/merge-images-1.2.0.tgz",
+      "integrity": "sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw=="
+    },
     "node_modules/merge-options": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz",
@@ -17212,6 +17218,11 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
+    "node_modules/signature_pad": {
+      "version": "3.0.0-beta.4",
+      "resolved": "https://registry.npmmirror.com/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
+      "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
+    },
     "node_modules/simple-mind-map": {
       "version": "0.14.0-fix.1",
       "resolved": "https://registry.npmmirror.com/simple-mind-map/-/simple-mind-map-0.14.0-fix.1.tgz",
@@ -20250,6 +20261,19 @@
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz",
       "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
+    "node_modules/vue-signature-pad": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/vue-signature-pad/-/vue-signature-pad-2.0.5.tgz",
+      "integrity": "sha512-FLvJRmhSP/DVkg0W/tGcPZ4D0ZQlFxHgN1mjph6jt/59yLeTSv0zGGU133lfq9CkYMQ5DqN6rWujjL7Gnx7UPA==",
+      "dependencies": {
+        "merge-images": "^1.1.0",
+        "signature_pad": "^3.0.0-beta.3",
+        "vue": "^2.6.14"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
@@ -30758,6 +30782,11 @@
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
       "dev": true
     },
+    "merge-images": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/merge-images/-/merge-images-1.2.0.tgz",
+      "integrity": "sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw=="
+    },
     "merge-options": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz",
@@ -33762,6 +33791,11 @@
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
+    "signature_pad": {
+      "version": "3.0.0-beta.4",
+      "resolved": "https://registry.npmmirror.com/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
+      "integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
+    },
     "simple-mind-map": {
       "version": "0.14.0-fix.1",
       "resolved": "https://registry.npmmirror.com/simple-mind-map/-/simple-mind-map-0.14.0-fix.1.tgz",
@@ -36040,6 +36074,16 @@
       "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.6.5.tgz",
       "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
+    "vue-signature-pad": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/vue-signature-pad/-/vue-signature-pad-2.0.5.tgz",
+      "integrity": "sha512-FLvJRmhSP/DVkg0W/tGcPZ4D0ZQlFxHgN1mjph6jt/59yLeTSv0zGGU133lfq9CkYMQ5DqN6rWujjL7Gnx7UPA==",
+      "requires": {
+        "merge-images": "^1.1.0",
+        "signature_pad": "^3.0.0-beta.3",
+        "vue": "^2.6.14"
+      }
+    },
     "vue-style-loader": {
       "version": "4.1.3",
       "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",

+ 11 - 7
src/utils/http.js

@@ -78,16 +78,20 @@ service.interceptors.response.use(
 
 /**
  * 得到必需的请求参数
+ * @param {boolean} noTransmit 不传递旧的请求参数
  * @returns {object} 返回必需的请求参数
  * */
-function getRequestParams() {
+function getRequestParams(noTransmit = false) {
   const token = getToken();
-  return {
-    AccessToken: token?.access_token ?? '',
+  const params = {
     UserCode: token?.gcls_sys_session_info?.user_id ?? '',
     UserType: token?.gcls_sys_session_info?.user_type ?? '',
     SessionID: token?.gcls_sys_session_info?.session_id ?? '',
   };
+  return {
+    AccessToken: token?.access_token ?? '',
+    ...(!noTransmit && params),
+  };
 }
 
 /**
@@ -104,17 +108,17 @@ export const http = {
    * @param {object} data 请求数据
    * @param {object} config 请求配置
    */
-  post: (url, data = {}, config = {}) => {
+  post: (url, data = {}, config = {}, noTransmit = false) => {
     config.params = {
       ...config.params,
-      ...getRequestParams(),
+      ...getRequestParams(noTransmit),
     };
     return service.post(url, data, config);
   },
-  postForm: (url, data = {}, config = {}) => {
+  postForm: (url, data = {}, config = {}, noTransmit = false) => {
     config.params = {
       ...config.params,
-      ...getRequestParams(),
+      ...getRequestParams(noTransmit),
     };
     return service.postForm(url, data, config);
   },

+ 4 - 2
src/views/personal_workbench/project/ProductionEditorialManage.vue

@@ -39,6 +39,7 @@
             is_leaf_chapter,
             is_root,
             is_inherited_producer,
+            is_inherited_auditor,
             auditor_desc,
             status_name,
           } in node_list"
@@ -62,7 +63,7 @@
           </div>
           <div
             class="audit nowrap-ellipsis"
-            :style="{ color: isEnable(is_inherited_producer) ? '#ff4757' : 'default' }"
+            :style="{ color: isEnable(is_inherited_auditor) ? '#ff4757' : 'default' }"
             :title="auditor_desc"
           >
             {{ auditor_desc }}
@@ -73,8 +74,9 @@
               v-if="is_root !== 'true'"
               class="link"
               @click="openUpdateNameDialog(id, name, is_leaf_chapter === 'true')"
-              >修改</span
             >
+              修改
+            </span>
             <span class="link" @click="openSetProducer(id)">设置制作人</span>
             <span class="link" @click="openSetAuditor(id)">设置审校人</span>
             <span