From f97381041aa8e88bc82a43b05c9015fdcc31d055 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 15 Apr 2024 15:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventorys/index.vue                |  5 ++++
 src/views/inventorys/outbounds.vue            | 10 ++++++++
 src/views/inventorys/stocks.vue               |  5 ++++
 .../outbounds/component/addoutbounds.vue      | 23 +++++++++++++++++--
 src/views/stocks/component/addRuku.vue        | 19 +++++++++++++--
 5 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/src/views/inventorys/index.vue b/src/views/inventorys/index.vue
index 284de5e..137aa15 100644
--- a/src/views/inventorys/index.vue
+++ b/src/views/inventorys/index.vue
@@ -208,6 +208,11 @@
             label: "入库批次",
             width: 120,
             prop: 'rukupici'
+          },
+          {
+            label: "生产日期",
+            width: 120,
+            prop: 'shengchanriqi'
           },
           {
             label: "固定资产编号",
diff --git a/src/views/inventorys/outbounds.vue b/src/views/inventorys/outbounds.vue
index 172df3f..4d2f103 100644
--- a/src/views/inventorys/outbounds.vue
+++ b/src/views/inventorys/outbounds.vue
@@ -155,6 +155,16 @@
             prop: 'jiliangdanwei',
             align: 'center',
 
+          },
+          {
+            label: "入库批次",
+            width: 120,
+            prop: 'rukupici',
+          },
+          {
+            label: "生产日期",
+            width: 120,
+            prop: 'shengchanriqi',
           },
           {
             label: "出库数量",
diff --git a/src/views/inventorys/stocks.vue b/src/views/inventorys/stocks.vue
index b6856a0..84189f6 100644
--- a/src/views/inventorys/stocks.vue
+++ b/src/views/inventorys/stocks.vue
@@ -202,6 +202,11 @@
               }
             }
           },
+          {
+            label: "生产日期",
+            width: 120,
+            prop: 'shengchanriqi'
+          },
           {
             label: '备注',
             prop:'stocks_beizhu',
diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index 7fe57cc..fa36bcd 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -178,6 +178,15 @@
             <el-input type="text" v-model="mingxiObj.zaikushuliang" placeholder="请选择在库数量" disabled
               style="width: 300px;"></el-input>
           </div>
+        </div>
+        <div class="xy-table-item">
+          <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.shengchanriqi" placeholder="请选择生产日期" disabled
+              style="width: 300px;"></el-input>
+          </div>
         </div>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -341,7 +350,12 @@
             label: "在库数量",
             prop: "zaikushuliang",
             width: 180
-          }, {
+          },{
+
+            label: "生产日期",
+            prop: "shengchanriqi",
+            width: 180
+          } ,{
             label: "借用数量",
             prop: "jieyongshuliang",
             width: 180
@@ -398,6 +412,10 @@
           {
             title: '入库批次',
             key: 'rukupici',
+          },
+          {
+            title: '生产日期',
+            key: 'shengchanriqi',
           },
         ],
         wuziList: []
@@ -543,7 +561,8 @@
             this.mingxiObj.zaikushuliang = e.zaikushuliang
             this.mingxiObj.jiliangdanwei = e.jiliangdanwei
             this.mingxiObj.inventorys_id = e.id
-            this.mingxiObj.guigexinghao = e.guigexinghao
+            this.mingxiObj.guigexinghao = e.guigexinghao
+            this.mingxiObj.shengchanriqi = e.shengchanriqi
           }
         });
         this.mingxiList.map(item=>{
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index fdc3abb..c0fb461 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -239,7 +239,7 @@
               style="width: 300px;"></el-input>
           </div>
         </div>
-        <div class="xy-table-item" v-if="form.rukuleixing!='回库'">
+        <div class="xy-table-item" v-if="form.rukuleixing!='回库'||form.rukuleixing!='盘点'">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资分类：
           </div>
@@ -289,6 +289,15 @@
             <el-input type="text" v-model="mingxiObj.rukushuliang" placeholder="请填写入库数量"
               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-date-picker style="width: 300px;" v-model="mingxiObj.shengchanriqi" type="date" placeholder="选择生产日期"
+              value-format="yyyy-MM-dd"></el-date-picker>
+          </div>
         </div>
 
       </div>
@@ -489,6 +498,10 @@
             label: "在库数量",
             prop: "zaikushuliang",
             width: 180
+          },{
+            label: "生产日期",
+            prop: "shengchanriqi",
+            width: 180
           },
         ],
         // 物资
@@ -1138,7 +1151,9 @@
           this.mingxiObj.jiliangdanwei = e.jiliangdanwei
           this.mingxiObj.zaikushuliang = e.zaikushuliang
           this.mingxiObj.rukupici = e.rukupici
-          this.mingxiObj.id = e.id
+          this.mingxiObj.id = e.id
+          this.mingxiObj.shengchanriqi = e.shengchanriqi
+
         } else {
           this.mingxiObj.wuzibianma = e.wuzibianma
           this.mingxiObj.zichanmingcheng = e.zichanmingcheng