From d6af1754eb94c01b4a3f6f1550856d36dff63354 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 2 Aug 2023 17:01:28 +0800
Subject: [PATCH] up

---
 .env.development              | 16 ++++++++--------
 public/print.html             |  2 +-
 src/views/outbounds/index.vue |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.development b/.env.development
index 3d31e78..1d25804 100644
--- a/.env.development
+++ b/.env.development
@@ -2,15 +2,15 @@
 ENV='development'
 
 # base api
-VUE_APP_BASE_API = http://192.168.60.99:9004/
-VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
-VUE_APP_OA_URL = http://192.168.60.18:2021
-VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
+#VUE_APP_BASE_API = http://192.168.60.99:9004/
+#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+#VUE_APP_OA_URL = http://192.168.60.18:2021
+#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}'
 
-#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
-#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
-#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
-#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
+VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
+VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
+VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
+VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'
 
 
 
diff --git a/public/print.html b/public/print.html
index af59582..4ab990f 100644
--- a/public/print.html
+++ b/public/print.html
@@ -43,7 +43,7 @@
           dataType: "json",
           success: function(result) {
             var printObj = result
-            $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;font-size: 18px;font-weight:bold;background-color: #fff;'>" +
+            $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;font-size: 16px;font-weight:bold;background-color: #fff;'>" +
               "<p style='text-align:center;margin-bottom:0;padding-top:5px;'>苏州河道处</p>"+
               "<div style='padding:15px;padding-top:5px'>"+
                 "<img src='"+printObj['path']+"' style='width:3cm; height:3cm;display: inline-block'>"+
diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue
index 1e81dd0..298eb29 100644
--- a/src/views/outbounds/index.vue
+++ b/src/views/outbounds/index.vue
@@ -26,7 +26,7 @@
           <template slot-scope="scope">
             <div v-if="scope.row.jilurenyuan==authName||roleName=='系统管理员'">
             <Button type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'editor')">编辑</Button>
-            <Button v-if='scope.row.zhuangtai==="已办结"' type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'outbounds')">出库</Button>
+            <Button type="primary" size="small" style="margin-left: 10px;" @click="editorChuku(scope.row.id,'outbounds')">出库</Button>
             <Button v-if='scope.row.zhuangtai==="待处理"' type="primary" size="small" style="margin-left: 10px;" @click="tofollow(scope.row.id,scope.row)">请示流程</Button>
             <!-- v-if='scope.row.zhuangtai==="待处理"' -->
             <Button v-if='scope.row.zhuangtai==="待处理"' type="primary" size="small" style="margin-left: 10px;" @click="printChuku(scope.row.id,'print')">打印</Button>