From e475c8572b163d59b5c02445c7de724594b5eb7d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 5 Jun 2023 15:42:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/print.html                             | 557 +++++++++---------
 src/views/inventorys/index.vue                |  11 +-
 .../outbounds/component/addoutbounds.vue      |  80 ++-
 src/views/stocks/component/addRuku.vue        |  56 +-
 4 files changed, 389 insertions(+), 315 deletions(-)
diff --git a/public/print.html b/public/print.html
index 0be00e5..3831ed7 100644
--- a/public/print.html
+++ b/public/print.html
@@ -1,277 +1,280 @@
-<!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="/jquery-1.11.2.min.js"></script>
-    <script language="javascript" src="/jquery.qrcode.js"></script>
-
-    <script>
-      //二维码宽高
-      var qrcodewidth = 120;
-      var qrcodeheight = 120;
-      var qrcodeleft = 30;
-      var qrcodetop = 50;
-      //canvas宽高
-      var canvaswidth = 340;
-      var canvasheight = 188;
-      //logo宽高
-      var logowidth = 100;
-      var logoheight = 100;
-      //文字描述位置
-      var textleft = qrcodewidth / 2;
-      var texttop = qrcodeheight + 70;
-      //logo位置
-      var logoleft = (qrcodewidth - logowidth) / 2;
-      var logotop = (qrcodeheight - logoheight) / 2;
-      $(function() {
-        var printObj = JSON.parse(getCookie('objs'))
-        $(".wrap").html("")
-        for (var i = 0; i < printObj.length; i++) {
-          var index = parseInt(i) + 1
-          $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;'>" +
-            // "<img src='' style='display: block;width:9cm; height:5cm;'>"+
-            "</li>")
-          createCode("#page" + index, printObj[i])
-        }
-        // createCode()
-        console.log(printObj)
-      })
-
-      // 生成二维码
-      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) {
-        var qrcode = $(id).qrcode({
-          render: 'canvas',
-          text: utf16to8(printObji['wuzibianma'] + "-" + printObji['id']),
-          width: qrcodewidth,
-          height: qrcodeheight,
-          background: '#ffffff',
-          foreground: '#000000',
-        });
-        var canvas = qrcode.find('canvas').get(0);
-        var img = new Image();
-        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 ' + 16 + 'px Arial';
-          ctx.textAlign = 'center';
-          //文字描述
-          ctx.fillText("苏州河道处", 160, 30);
-          // ctx.fillText("资产名称:"+decodeURI(decodeURI(printObji['zichanmingcheng'])), qrcodeleft+180,80);
-          // ctx.fillText("物资类型:"+"123", qrcodeleft+180,110);
-          // ctx.fillText("入库数量:"+printObji['rukushuliang'], qrcodeleft+180,140);
-          //绘制二维码
-
-          ctx.drawImage(img, qrcodeleft, qrcodetop);
-          // //设置logo
-          // var logo = new Image(logowidth, logoheight);
-          // logo.src = canvas;
-          // logo.onload = function() {
-          //   ctx.drawImage(logo, logoleft, logotop, logowidth, logoheight);
-          // }
-        }
-
-        // img.src=canvas.toDataURL("image/png");
-        // $(id).children("img").attr("src",img.src)
-      }
-
-
-
-      function doPrint(obj) {
-        if ($(obj).hasClass("disabled")) {
-          alert("已经打印过了，如要重新打印请刷新本页");
-          return false;
-        }
-        $(obj).addClass("disabled");
-        var myDoc = {
-          settings: {
-            topMargin: 0,
-            leftMargin: 0,
-            bottomMargin: 0,
-            rightMargin: 0
-          }, // 设置上下左距页边距为10毫米，注意，单位是 1/10毫米
-          documents: document,
-          marginIgnored: true,
-          copyrights: '杰创软件拥有版权  www.jatools.com'
-        };
-        document.getElementById("jatoolsPrinter").print(myDoc, false); // 直接打印，不弹出打印机设置对话框
-        var ids = "{:$_REQUEST['ids']}";
-        var url = "{:U('confirmPrinted')}";
-        $.post(url, {
-          ids: ids
-        }, function() {
-
-        });
-      }
-
-      function delCookie(name)
-
-      {
-
-        var exp = new Date();
-
-        exp.setTime(exp.getTime() - 1);
-
-        var cval = getCookie(name);
-
-        if (cval != null)
-
-          document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
-
-      }
-
-      function getCookie(cookieName) {
-        //获取所有的cookie "psw=1234we; rememberme=true; user=Annie"
-        var totalCookie = document.cookie;
-        //获取参数所在的位置
-        var cookieStartAt = totalCookie.indexOf(cookieName + "=");
-        //判断参数是否存在 不存在直接返回
-        if (cookieStartAt == -1) {
-          return;
-        }
-        //获取参数值的开始位置
-        var valueStartAt = totalCookie.indexOf("=", cookieStartAt) + 1;
-        //以;来获取参数值的结束位置
-        var valueEndAt = totalCookie.indexOf(";", cookieStartAt);
-        //如果没有;则是最后一位
-        if (valueEndAt == -1) {
-          valueEndAt = totalCookie.length;
-        }
-        //截取参数值的字符串
-        var cookieValue = unescape(totalCookie.substring(valueStartAt, valueEndAt));
-        return cookieValue;
-      }
-    </script>
-    <style>
-      body {
-        font-family: "微软雅黑";
-        font-size: 12px;
-        padding: 0;
-        margin: 0;
-        background: #000;
-      }
-
-      ul,
-      li {
-        padding: 0;
-        margin: 0;
-        list-style: none;
-      }
-
-      .clear {
-        clear: both;
-      }
-
-      .bar {
-        position: fixed;
-        top: 0;
-        left: 0;
-        height: 60px;
-        background: #333;
-        color: #fff;
-        line-height: 20px;
-        width: 100%;
-      }
-
-      .bar A {
-        color: #fff;
-        text-decoration: underline;
-      }
-
-      .bar A:hover {
-        text-decoration: none;
-        color: #ccc;
-      }
-
-      .bar .wp {
-        width: 1000px;
-        margin: auto;
-        position: relative;
-      }
-
-      .bar .wp .left {
-        float: left;
-      }
-
-      .bar .wp .right {
-        float: right;
-        padding-top: 20px;
-      }
-
-      .lists {
-        padding-top: 80px;
-        padding-bottom: 20px;
-
-      }
-
-      .lists li {
-        // float: left;
-        margin-left: 20px;
-        margin-bottom: 10px;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="lists">
-      <ul class="wrap">
-
-
-        <!-- <li id="page2" style="width: 9cm; height: 5cm;">
-          <img src="/storage/temp/755_1.jpg" style=" display: block;width:9cm; height:5cm;">
-        </li>
-        <li id="page3" style="width: 9cm; height: 5cm;">
-          <img src="/storage/temp/756_1.jpg" style=" display: block;width:9cm; height:5cm;">
-        </li>
-        <li id="page4" style="width: 9cm; height: 5cm;">
-          <img src="/storage/temp/757_1.jpg" style=" display: block;width:9cm; height:5cm;">
-        </li> -->
-
-        <div class="clear"></div>
-      </ul>
-    </div>
-    <div class="bar">
-      <div class="wp">
-        <div class="left">生成打印单4张，耗时0.40861988067627秒<br />
-          本打印功能只能在IE浏览器使用，非IE浏览器请采用兼容模式<br />
-          使用之前需要安装插件（<a href="/jatoolsPrinter_free.zip" target="_blank">点击下载</a>），并正确设置打印机
-        </div>
-        <div class="right">
-          <input type="button" value="打印" onClick='doPrint(this);'>
-        </div>
-      </div>
-    </div>
-    <OBJECT ID="jatoolsPrinter" CLASSID="CLSID:B43D3361-D075-4BE2-87FE-057188254255"
-      codebase="jatoolsPrinter.cab#version=8,6,0,0">
-    </OBJECT>
-  </body>
-</html>
\ No newline at end of file
+<!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="/jquery-1.11.2.min.js"></script>
+    <script language="javascript" src="/jquery.qrcode.js"></script>
+
+    <script>
+      //二维码宽高
+      var qrcodewidth = 120;
+      var qrcodeheight = 120;
+      var qrcodeleft = 30;
+      var qrcodetop = 50;
+      //canvas宽高
+      var canvaswidth = 340;
+      var canvasheight = 188;
+      //logo宽高
+      var logowidth = 100;
+      var logoheight = 100;
+      //文字描述位置
+      var textleft = qrcodewidth / 2;
+      var texttop = qrcodeheight + 70;
+      //logo位置
+      var logoleft = (qrcodewidth - logowidth) / 2;
+      var logotop = (qrcodeheight - logoheight) / 2;
+      $(function() {
+        var printObj = JSON.parse(getCookie('objs'))
+        $(".wrap").html("")
+        for (var i = 0; i < printObj.length; i++) {
+          var index = parseInt(i) + 1
+          $(".wrap").append("<li id='page" + index + "' style='width: 9cm; height: 5cm;'>" +
+            // "<img src='' style='display: block;width:9cm; height:5cm;'>"+
+            "</li>")
+          createCode("#page" + index, printObj[i])
+        }
+        // createCode()
+        console.log(printObj)
+      })
+
+      // 生成二维码
+      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) {
+        console.log(printObji)
+        var qrcode = $(id).qrcode({
+          render: 'canvas',
+          text: utf16to8(printObji['wuzibianma'] + "-" + printObji['id']),
+          width: qrcodewidth,
+          height: qrcodeheight,
+          background: '#ffffff',
+          foreground: '#000000',
+        });
+        var canvas = qrcode.find('canvas').get(0);
+        var img = new Image();
+        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 ' + 16 + 'px Arial';
+          ctx.textAlign = 'left';
+          //文字描述
+          ctx.fillText("苏州河道处", 130, 30);
+          ctx.fillText("物资编码:"+decodeURI(decodeURI(printObji['wuzibianma'])), qrcodeleft+140,65);
+          ctx.fillText("资产名称:"+decodeURI(decodeURI(printObji['zichanmingcheng'])), qrcodeleft+140,95);
+          ctx.fillText("物资类型:"+decodeURI(decodeURI(printObji['wuzileixing'])), qrcodeleft+140,125);
+          ctx.fillText("入库数量:"+printObji['rukushuliang'], qrcodeleft+140,155);
+          //绘制二维码
+
+          ctx.drawImage(img, qrcodeleft, qrcodetop);
+          // //设置logo
+          // var logo = new Image(logowidth, logoheight);
+          // logo.src = canvas;
+          // logo.onload = function() {
+          //   ctx.drawImage(logo, logoleft, logotop, logowidth, logoheight);
+          // }
+        }
+        console.log(img)
+        // img.src=canvas.toDataURL("image/png");
+        // $(id).children("img").attr("src",img.src)
+      }
+
+
+
+      function doPrint(obj) {
+        if ($(obj).hasClass("disabled")) {
+          alert("已经打印过了，如要重新打印请刷新本页");
+          return false;
+        }
+        $(obj).addClass("disabled");
+        var myDoc = {
+          settings: {
+            topMargin: 0,
+            leftMargin: 0,
+            bottomMargin: 0,
+            rightMargin: 0
+          }, // 设置上下左距页边距为10毫米，注意，单位是 1/10毫米
+          documents: document,
+          marginIgnored: true,
+          copyrights: '杰创软件拥有版权  www.jatools.com'
+        };
+        document.getElementById("jatoolsPrinter").print(myDoc, false); // 直接打印，不弹出打印机设置对话框
+        var ids = "{:$_REQUEST['ids']}";
+        var url = "{:U('confirmPrinted')}";
+        $.post(url, {
+          ids: ids
+        }, function() {
+
+        });
+      }
+
+      function delCookie(name)
+
+      {
+
+        var exp = new Date();
+
+        exp.setTime(exp.getTime() - 1);
+
+        var cval = getCookie(name);
+
+        if (cval != null)
+
+          document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
+
+      }
+
+      function getCookie(cookieName) {
+        //获取所有的cookie "psw=1234we; rememberme=true; user=Annie"
+
+        var totalCookie = document.cookie;
+        //获取参数所在的位置
+        var cookieStartAt = totalCookie.indexOf(cookieName + "=");
+        //判断参数是否存在 不存在直接返回
+        if (cookieStartAt == -1) {
+          return;
+        }
+        //获取参数值的开始位置
+        var valueStartAt = totalCookie.indexOf("=", cookieStartAt) + 1;
+        //以;来获取参数值的结束位置
+        var valueEndAt = totalCookie.indexOf(";", cookieStartAt);
+        //如果没有;则是最后一位
+        if (valueEndAt == -1) {
+          valueEndAt = totalCookie.length;
+        }
+        //截取参数值的字符串
+        var cookieValue = unescape(totalCookie.substring(valueStartAt, valueEndAt));
+        return cookieValue;
+      }
+    </script>
+    <style>
+      body {
+        font-family: "微软雅黑";
+        font-size: 12px;
+        padding: 0;
+        margin: 0;
+        background: #000;
+      }
+
+      ul,
+      li {
+        padding: 0;
+        margin: 0;
+        list-style: none;
+      }
+
+      .clear {
+        clear: both;
+      }
+
+      .bar {
+        position: fixed;
+        top: 0;
+        left: 0;
+        height: 60px;
+        background: #333;
+        color: #fff;
+        line-height: 20px;
+        width: 100%;
+      }
+
+      .bar A {
+        color: #fff;
+        text-decoration: underline;
+      }
+
+      .bar A:hover {
+        text-decoration: none;
+        color: #ccc;
+      }
+
+      .bar .wp {
+        width: 1000px;
+        margin: auto;
+        position: relative;
+      }
+
+      .bar .wp .left {
+        float: left;
+      }
+
+      .bar .wp .right {
+        float: right;
+        padding-top: 20px;
+      }
+
+      .lists {
+        padding-top: 80px;
+        padding-bottom: 20px;
+
+      }
+
+      .lists li {
+        // float: left;
+        margin-left: 20px;
+        margin-bottom: 10px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="lists">
+      <ul class="wrap">
+
+
+        <!-- <li id="page2" style="width: 9cm; height: 5cm;">
+          <img src="/storage/temp/755_1.jpg" style=" display: block;width:9cm; height:5cm;">
+        </li>
+        <li id="page3" style="width: 9cm; height: 5cm;">
+          <img src="/storage/temp/756_1.jpg" style=" display: block;width:9cm; height:5cm;">
+        </li>
+        <li id="page4" style="width: 9cm; height: 5cm;">
+          <img src="/storage/temp/757_1.jpg" style=" display: block;width:9cm; height:5cm;">
+        </li> -->
+
+        <div class="clear"></div>
+      </ul>
+    </div>
+    <div class="bar">
+      <div class="wp">
+        <div class="left">生成打印单<br />
+          本打印功能只能在IE浏览器使用，非IE浏览器请采用兼容模式<br />
+          使用之前需要安装插件（<a href="/jatoolsPrinter_free.zip" target="_blank">点击下载</a>），并正确设置打印机
+        </div>
+        <div class="right">
+          <input type="button" value="打印" onClick='doPrint(this);'>
+        </div>
+      </div>
+    </div>
+    <OBJECT ID="jatoolsPrinter" CLASSID="CLSID:B43D3361-D075-4BE2-87FE-057188254255"
+      codebase="jatoolsPrinter.cab#version=8,6,0,0">
+    </OBJECT>
+  </body>
+</html>
diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue
index 462a483..df5a953 100644
--- a/src/views/inventorys/index.vue
+++ b/src/views/inventorys/index.vue
@@ -165,9 +165,9 @@
       selectionChange(e){
         console.log(e)
         if(e.length>0){
-          for(var m of e){
-            m = escape(m)
-          }
+          // for(var m of e){
+          //   m = escape(m)
+          // }
           this.printObj = e
         }
 
@@ -181,6 +181,11 @@
           })
           return
         }
+        for(var m of this.printObj){
+          for(var k in m){
+            m[k] = encodeURI(encodeURI(m[k]))
+          }
+        }
         Cookies.set('objs', this.printObj)
         window.open('/admin/print.html','_blank')
       },
diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index ce3c70b..f168705 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增出库' : '编辑出库'" :form="form" :rules="rules" @submit="submit">
+    <xy-dialog ref="dialog" :width='80' :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增出库' : '编辑出库'" :form="form" :rules="rules" @submit="submit">
       <template v-slot:chukushijian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -101,7 +101,7 @@
             <Button type="primary" icon="md-add" style="margin-bottom: 10px"
               @click="isShowMingxi=true">新增出库明细</Button>
 
-            <xy-table style="width: 620px" :height="260" :is-page="false" :list="mingxiList"
+            <xy-table style="width: 75%" :height="260" :is-page="false" :list="mingxiList"
               :table-item="mingxiTable">
               <template v-slot:btns>
                 <el-table-column label="操作" width="90" header-align="center" align="center">
@@ -125,7 +125,7 @@
       <div class="mingxiwrap">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资编码：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>物资编码：
           </div>
           <div class="xy-table-item-content">
             <el-input type="text" @focus="showWuzi" v-model="mingxiObj.wuzibianma" placeholder="请选择物资编码"
@@ -170,7 +170,7 @@
         </div>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>借用/报废数量：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>借用/报废数量：
           </div>
           <div class="xy-table-item-content">
             <el-input type="text" @blur='jieyong' v-model="mingxiObj.jieyongshuliang" placeholder="请填写借用/报废数量"
@@ -179,7 +179,7 @@
         </div>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>是否回库：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否回库：
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="mingxiObj.shifouhuiku" style="width: 300px;" placeholder="请选择">
@@ -289,7 +289,10 @@ export default {
       },
       isShowMingxi:false,
       mingxiObj:{
-
+        wuzibianma:'',
+        jieyongshuliang:'',
+        shifouhuiku:'',
+        huikushijian:''
       },
       mingxiObjBefore:{},
       mingxiList: [],
@@ -366,6 +369,14 @@ export default {
           {
             title:'名称',
             key:'names',
+          },
+          {
+            title:'在库数量',
+            key:'zaikushuliang',
+          },
+          {
+            title:'物资类型',
+            key:'wuzileixing',
           }
         ],
         wuziList:[]
@@ -377,8 +388,6 @@ export default {
   },
   methods: {
     jieyong(){
-      console.log(this.mingxiObj.jieyongshuliang,this.mingxiObj.zaikushuliang)
-      console.log(parseInt(this.mingxiObj.jieyongshuliang)>parseInt(this.mingxiObj.zaikushuliang))
       if(parseInt(this.mingxiObj.jieyongshuliang)>parseInt(this.mingxiObj.zaikushuliang)){
         Message({
           type:'warning',
@@ -388,6 +397,20 @@ export default {
       }
     },
     mingxiConfirm(){
+      setTimeout(() => {
+        this.showLoading = false
+        this.$nextTick(() => {
+          this.showLoading = true
+        })
+      }, 500)
+      if(this.mingxiObj.wuzibianma==''||this.mingxiObj.jieyongshuliang==''||this.mingxiObj.shifouhuiku==''){
+        Message({
+          type:'warning',
+          message:'请填写完整数据'
+        })
+        this.showLoading = false
+        return
+      }
       if(this.mingxiIndex!=''){
 
         //  比较是否改变了 数据 改变提交到明细
@@ -399,13 +422,30 @@ export default {
       }else{
         this.mingxiList.push(this.mingxiObj)
       }
-      this.mingxiObj = {}
+      this.wuziList.forEach((items) => {
+        this.$set(items, 'isSelect', false)
+      });
+
+      this.mingxiObj = {
+        wuzibianma:'',
+        jieyongshuliang:'',
+        shifouhuiku:'',
+        huikushijian:''
+      }
       this.mingxiObjBefore = {}
       this.mingxiIndex = ''
       this.isShowMingxi = false
     },
     mingxiCancel(){
-      this.mingxiObj = {}
+      this.wuziList.forEach((items) => {
+        this.$set(items, 'isSelect', false)
+      });
+      this.mingxiObj = {
+        wuzibianma:'',
+        jieyongshuliang:'',
+        shifouhuiku:'',
+        huikushijian:''
+      }
       this.mingxiObjBefore = {}
       this.mingxiIndex = ''
       this.isShowMingxi = false
@@ -442,15 +482,21 @@ export default {
         this.$set(items, 'isSelect', false)
         if(items.id==e.id){
           this.$set(items, 'isSelect', true)
+          this.mingxiObj.wuzibianma = e.wuzibianma
+          this.mingxiObj.zichanmingcheng = e.zichanmingcheng
+          this.mingxiObj.wuzileixing = e.wuzileixing
+          this.mingxiObj.rukupici = e.rukupici
+          this.mingxiObj.zaikushuliang = e.zaikushuliang
+          this.mingxiObj.jiliangdanwei = e.jiliangdanwei
+          this.mingxiObj.inventorys_id = e.id
         }
       });
-      this.mingxiObj.wuzibianma = e.wuzibianma
-      this.mingxiObj.zichanmingcheng = e.zichanmingcheng
-      this.mingxiObj.wuzileixing = e.wuzileixing
-      this.mingxiObj.rukupici = e.rukupici
-      this.mingxiObj.zaikushuliang = e.zaikushuliang
-      this.mingxiObj.jiliangdanwei = e.jiliangdanwei
-      this.mingxiObj.inventorys_id = e.id
+
+      // this.$nextTick(function(){
+      //   this.wuziList.forEach((items) => {
+      //     this.$set(items, 'isSelect', false)
+      //   });
+      // })
 
     },
     wuziPageChange(e){
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index bc705d6..ba59877 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增入库' : '编辑入库'" :form="form"
+    <xy-dialog ref="dialog" :width='80' :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增入库' : '编辑入库'" :form="form"
       :rules="rules" @submit="submit">
       <template v-slot:rukushijian>
         <div class="xy-table-item">
@@ -93,7 +93,7 @@
               @click="isShowMingxi=true">新增入库明细</Button>
             <Button v-if="form.rukuleixing=='回库'" type="primary" icon="md-add" style="margin-bottom: 10px"
               @click="isShowMingxi=true">新增回库明细</Button>
-            <xy-table style="width: 620px" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
+            <xy-table style="width: 75%" :height="260" :is-page="false" :list="mingxiList" :table-item="mingxiTable">
               <template v-slot:btns>
                 <el-table-column label="操作" width="90" header-align="center" align="center">
                   <template v-slot:default="scope">
@@ -117,7 +117,7 @@
       <div class="mingxiwrap">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资编码：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>物资编码：
           </div>
           <div class="xy-table-item-content" style="display: flex;align-items: center;">
             <el-input v-if="form.rukuleixing!='回库'" type="text" @focus="showWuzi" v-model="mingxiObj.wuzibianma"
@@ -145,6 +145,15 @@
             <el-input type="text" v-model="mingxiObj.wuzileixing" placeholder="请选择物资类型" disabled
               style="width: 300px;"></el-input>
           </div>
+        </div>
+        <div class="xy-table-item" v-if="form.rukuleixing!='回库'">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资分类：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input type="text" v-model="mingxiObj.fenlei" placeholder="请选择物资分类" disabled
+              style="width: 300px;"></el-input>
+          </div>
         </div>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -200,7 +209,7 @@
 
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>入库数量：
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库数量：
           </div>
           <div class="xy-table-item-content">
             <el-input type="text" v-model="mingxiObj.rukushuliang" placeholder="请填写入库数量"
@@ -288,7 +297,8 @@
         isShowMingxi: false,
         showLoading: true,
         mingxiObj: {
-
+          wuzibianma:'',
+          rukushuliang:''
         },
         mingxiObjBefore: {},
         mingxiList: [],
@@ -307,7 +317,8 @@
             label: "物资类型",
             prop: "wuzileixing",
             width: 200
-          },
+          },
+
           {
             label: "入库数量",
             prop: "rukushuliang",
@@ -357,7 +368,10 @@
         }, {
           title: '名称',
           key: 'names',
-        }]
+        },{
+            title:'物资类型',
+            key:'wuzileixing',
+          }]
       }
     },
     created() {
@@ -374,15 +388,14 @@
           })
         }, 500)
 
-        // if (this.mingxiObj.rukushuliang > this.mingxiObj.zaikushuliang) {
-        //   Message({
-        //     type: 'warning',
-        //     message: '请填写正确的入库数量'
-        //   })
-        //   this.showLoading = false
-        //   return
-        // }
-        console.log("123")
+        if(this.mingxiObj.wuzibianma==''||this.mingxiObj.rukushuliang==''){
+          Message({
+            type:'warning',
+            message:'请填写完整数据'
+          })
+          this.showLoading = false
+          return
+        }
         if (this.mingxiIndex != '') {
 
           //  比较是否改变了 数据 改变提交到明细
@@ -394,7 +407,10 @@
         } else {
           this.mingxiList.push(this.mingxiObj)
         }
-        this.mingxiObj = {}
+        this.mingxiObj = {
+          wuzibianma:'',
+          rukushuliang:''
+        }
         this.mingxiObjBefore = {}
         this.mingxiIndex = ''
         this.isShowMingxi = false
@@ -404,7 +420,10 @@
         this.wuziPageIndex = 1
       },
       mingxiCancel() {
-        this.mingxiObj = {}
+        this.mingxiObj = {
+          wuzibianma:'',
+          rukushuliang:''
+        }
         this.mingxiObjBefore = {}
         this.mingxiIndex = ''
         this.isShowMingxi = false
@@ -566,6 +585,7 @@
           this.mingxiObj.zichanmingcheng = e.zichanmingcheng
           this.mingxiObj.wuzileixing = e.wuzileixing
           this.mingxiObj.jiliangdanwei = e.jiliangdanwei
+          this.mingxiObj.fenlei = e.fenlei
           if(this.mingxiObj.wuzileixing=='一类一码'){
 
             this.getPici()
