diff --git a/.env.development b/.env.development
index 0ff4a59..53f407a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,11 +2,16 @@
 ENV='development'
 
 # base api
-#VUE_APP_BASE_API = http://192.168.60.100:9002/
-#VUE_APP_UPLOAD_API = http://192.168.60.100:9002/api/admin/upload-file
+#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_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_OUT_URL = http://192.168.60.18:2021
 
-VUE_APP_OUT_URL_test= http://suzhouhedaooa.langye.net
diff --git a/.env.production b/.env.production
index 3a2183c..c66d5c7 100644
--- a/.env.production
+++ b/.env.production
@@ -2,8 +2,15 @@
 ENV = 'production'
 
 # base api
-#VUE_APP_BASE_API = http://192.168.60.100:9002/
-#VUE_APP_UPLOAD_API = http://192.168.60.100:9002/api/admin/upload-file
-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_OUT_URL = http://192.168.60.18:2021
+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"}'
+
+
+
diff --git a/public/code1.png b/public/code1.png
new file mode 100644
index 0000000..ad0e86d
Binary files /dev/null and b/public/code1.png differ
diff --git a/public/code2.png b/public/code2.png
new file mode 100644
index 0000000..beb7adf
Binary files /dev/null and b/public/code2.png differ
diff --git a/public/code3.png b/public/code3.png
new file mode 100644
index 0000000..0ac62d8
Binary files /dev/null and b/public/code3.png differ
diff --git a/public/print.html b/public/print.html
index 7e18682..1bf11ef 100644
--- a/public/print.html
+++ b/public/print.html
@@ -16,13 +16,12 @@
       //canvas宽高
       var canvaswidth = 302;
       var canvasheight = 188;
-      var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host
+      var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host;
       // var VUE_APP_BASE_API="http://hd-wuziguanli-test.ali251.langye.net"
       //文字描述位置
       var textleft = qrcodewidth / 2;
       var texttop = qrcodeheight + 70;
-      $(function() {
-        console.log(VUE_APP_BASE_API)
+      $(function() {
         $(".wrap").html("")
         var ids = getIds('ids').split(",")
         for (var i = 0; i < ids.length; i++) {
@@ -43,11 +42,20 @@
           url: VUE_APP_BASE_API+'/api/admin/base-form/show',
           dataType: "json",
           success: function(result) {
-            var printObj = result
-            $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;'>" +
-              "<img src='' style='display: block;width:8cm; height:5cm;'>" +
-              "</li>")
-            createCode("#page" + index, printObj)
+            var printObj = result
+            $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;font-size: 18px;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'>"+
+                "<div style='display:inline-block;vertical-align: top;width:170px'>"+
+                  "<p style='margin:0'>编码:"+printObj['wuzibianma']+"</p>"+
+                 "<p style='margin:0'>类型:"+printObj['wuzileixing']+"</p>"+
+                  "<p style='margin:0'>名称:"+printObj['zichanmingcheng']+"</p>"+
+                "</div>"+
+              "</div>"+
+              "</li>")
+
+            // createCode("#page" + index, printObj)
             $(".load").remove()
           },
           complete: function(xhr, textStatus) {
@@ -55,75 +63,6 @@
           }
         });
       }
-      // 生成二维码
-      function utf16to8(str) {
-        var out, i, len, c;
-        out = "";
-        len = str.length;
-        for (i = 0; i < len; i++) {
-          c = str.charCodeAt(i);
-          if ((c >= 0x0001) && (c <= 0x007F)) {
-            out += str.charAt(i);
-          } else if (c > 0x07FF) {
-            out += String.fromCharCode(0xE0 | ((c >> 12) & 0x0F));
-            out += String.fromCharCode(0x80 | ((c >> 6) & 0x3F));
-            out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-          } else {
-            out += String.fromCharCode(0xC0 | ((c >> 6) & 0x1F));
-            out += String.fromCharCode(0x80 | ((c >> 0) & 0x3F));
-          }
-        }
-        return out;
-      }
-
-      function createCode(id, printObji) {
-        // alert(id)
-        var qrcode = $(id).qrcode({
-          render: 'canvas',
-          text:VUE_APP_BASE_API+'/admin/printShow.html',
-          width: qrcodewidth,
-          height: qrcodeheight,
-          background: '#ffffff',
-          foreground: '#000000',
-        });
-        var canvas = qrcode.find('canvas').get(0);
-        var img = new Image();
-        var str = decodeURI(decodeURI(printObji['zichanmingcheng'])).replace(/\s+/g,'')
-        var wzlx = decodeURI(decodeURI(printObji['wuzileixing']))
-        var zcbm = decodeURI(decodeURI(printObji['wuzibianma']))
-        img.src = canvas.toDataURL('image/png');
-        img.onload = function() {
-          canvas.width = canvaswidth;
-          canvas.height = canvasheight;
-          var ctx = canvas.getContext('2d');
-          ctx.fillStyle = '#ffffff';
-          ctx.fillRect(0, 0, canvas.width, canvas.height);
-          //设置文字样式
-          ctx.fillStyle = '#000000';
-          ctx.font = 'bold ' + 18 + 'px Arial';
-          ctx.textAlign = 'left';
-          //文字描述
-          ctx.fillText("苏州河道管理处", 100, 30);
-          ctx.fillText("编码:" + zcbm, qrcodeleft + 110, 65);
-          if(str.length<=6){
-            ctx.fillText("类型:" + wzlx, qrcodeleft + 110, 95);
-            ctx.fillText("名称:"+str, qrcodeleft + 110, 125);
-          }else{
-            ctx.fillText("类型:" + wzlx, qrcodeleft + 110, 95);
-            ctx.fillText("名称:"+str.substring(0,6), qrcodeleft + 110, 125);
-            ctx.fillText(str.substring(6,str.length), qrcodeleft + 110, 155);
-          }
-          ctx.drawImage(img, qrcodeleft, qrcodetop);
-          var data = canvas.toDataURL('image/png', 1);
-          var imgOk = new Image();
-          imgOk.src = data;
-          $(id).children('img').attr('src', imgOk.src)
-          $(id).children('canvas').remove()
-        }
-      }
-
-
-
       function doPrint(obj) {
         if ($(obj).hasClass("disabled")) {
           alert("已经打印过了，如要重新打印请刷新本页");
@@ -258,15 +197,38 @@
       }
 
       .lists li {
-        // float: left;
+        /* float: left; */
         margin-left: 20px;
-        margin-bottom: 10px;
-      }
+        margin-bottom: 10px;
+        /* color:#fff; */
+        font-size: 18px;
+        background-color: #fff;
+      }
+      .lists li>p{
+        text-align:center;
+        margin-bottom:0;
+        padding-top:10px;
+      }
+      .lists li>div{
+        padding:15px;
+      }
+      .lists li>div img{
+        display: inline-block
+      }
+      .lists li>div div{
+        display:inline-block;
+        vertical-align: top;
+        width:180px
+      }
+      .lists li>div div p{
+        margin:0
+      }
+
     </style>
   </head>
   <body>
     <div class="lists">
-      <div class="load">加载中...</div>
+      <!-- <div class="load">加载中...</div> -->
       <ul class="wrap">
 
         <div class="clear"></div>
diff --git a/public/printShow.html b/public/printShow.html
deleted file mode 100644
index d38ce39..0000000
--- a/public/printShow.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title></title>
-	</head>
-	<body>
-    123
-	</body>
-</html>
\ No newline at end of file
diff --git a/public/ps.html b/public/ps.html
new file mode 100644
index 0000000..d83b6ec
--- /dev/null
+++ b/public/ps.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>物资详情</title>
+    <script language="javascript" src="/admin/jquery.js"></script>
+	</head>
+	<body>
+    <div class="wuzibianma">
+
+    </div>
+	</body>
+  <script>
+    var id = getIds("id")
+    // var wuzibianma = getIds('bm')
+    $(function(){
+      $(".wuzibianma").html("")
+       $(".wuzibianma").html(id)
+    })
+    function getIds(name) {
+      var reg = new RegExp("(^|&)" + name.toLowerCase() + "=([^&]*)(&|$)");
+      var r = window.location.search.substr(1).toLowerCase().match(reg);
+      if (r != null) {
+        return unescape(r[2].replace(new RegExp(/(%25)/g), '%').replace(new RegExp(/(%25)/g), '%'));
+      }
+      return null
+    }
+  </script>
+</html>
diff --git a/src/views/outbounds/component/printoutbounds.vue b/src/views/outbounds/component/printoutbounds.vue
index 17cc1bf..f7a8219 100644
--- a/src/views/outbounds/component/printoutbounds.vue
+++ b/src/views/outbounds/component/printoutbounds.vue
@@ -12,7 +12,7 @@
             <td>物资名称</td>
             <td>领用时间</td>
             <td>数量</td>
-            <td>型号规格</td>
+            <td>规格型号</td>
             <td>业务科室</td>
             <td>备注</td>
           </tr>
@@ -20,7 +20,7 @@
             <td>{{item.zichanmingcheng}}</td>
             <td>{{form.chukushijian}}</td>
             <td>{{item.jieyongshuliang}}</td>
-            <td>{{item.xinghaoguige}}</td>
+            <td>{{item.guigexinghao}}</td>
             <td>{{form.jieyongbumen}}</td>
             <td>{{form.beizhu}}</td>
           </tr>
diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue
index c6fbd1c..712452a 100644
--- a/src/views/outbounds/index.vue
+++ b/src/views/outbounds/index.vue
@@ -199,6 +199,7 @@
 
         let default_json = {
           'yewukeshi':row.jieyongbumen,
+          'bianhao':row.chukushijian+'-'+row.id,
           'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng,
           'lingyongshijian':row.chukushijian,
           'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang,
@@ -209,10 +210,17 @@
           'baofeiyuanyin':row.baofeiyuanyin,
           'link_id':row.id
         }
-        let typeid = this.chukuType=='领用'?31:(this.chukuType=='处置'?32:33)
+        let typeid = ''
+        let typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
+        for(var k in typeObj){
+          if(k==this.chukuType){
+            typeid =  parseInt(typeObj[k])
+          }
+        }
+         // = this.chukuType=='领用'?31:(this.chukuType=='处置'?32:33)
         // http://suzhouhedaooa.langye.net/admin/flow/create/31?username=admin&default_json={%22bianhao%22:%22100%22}
         let url =
-          `${process.env.VUE_APP_OUT_URL_test}/admin/flow/create/${typeid}?username=${this.userName}&default_json=${JSON.stringify(default_json)}`
+          `${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?username=${this.userName}&default_json=${JSON.stringify(default_json)}`
         let seeBuy = window.open(url, 'follow',
           `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
           )