出库物资规格

src/views/component/inventorysSelect.vue

@@ -298,7 +298,7 @@ export default {
             zaikushuliang: parseFloat(item.zaikushuliang) - parseFloat(item.wait_num) || 0, // 初始化为当前记录的在库数量
             wuzileixing: item.wuzileixing,
             guigexinghao: item.guigexinghao,
-            wuziguige: item.wuziguige,
+            wuziguige: item.wuzibianma_material_infos_wuzibianma_relation.wuziguige||item.wuziguige,
             jiliangdanwei: item.jiliangdanwei,
             shengchanriqi:item.shengchanriqi,
             wuzibianma_material_infos_wuzibianma_relation: item.wuzibianma_material_infos_wuzibianma_relation,

src/views/outbounds/component/addoutbounds.vue

@@ -261,6 +261,20 @@
             />
           </div>
         </div>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;" />物资规格：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input
+              v-model="mingxiObj.wuziguige"
+              type="text"
+              placeholder="请选择物资规格"
+              disabled
+              style="width: 300px;"
+            />
+          </div>
+        </div>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;" />物资类型：
@@ -504,6 +518,10 @@ export default {
         label: '物资型号',
         prop: 'guigexinghao',
         width: 180
+      },{
+        label: '物资规格',
+        prop: 'wuziguige',
+        width: 180
       }, {
         label: '物资类型',
         prop: 'wuzileixing',
@@ -766,6 +784,7 @@ export default {
               jiliangdanwei : this.mingxiObj.jiliangdanwei,
               inventorys_id : item,
               guigexinghao : this.mingxiObj.guigexinghao,
+              wuziguige:this.mingxiObj.wuziguige,
               shengchanriqi : this.mingxiObj.shengchanriqi,
               jieyongshuliang: 1,
               shifouhuiku: this.mingxiObj.shifouhuiku,
@@ -936,8 +955,10 @@ export default {
       console.log("- zaikushuliang (在库数量):", e.zaikushuliang)
       console.log("- jiliangdanwei (计量单位):", e.jiliangdanwei)
       console.log("- guigexinghao (规格型号):", e.guigexinghao)
+      console.log("- wuziguige (物资规格):", e.wuziguige)
+
       console.log("- shengchanriqi (生产日期):", e.shengchanriqi)
-      console.log("- 其他字段:", Object.keys(e).filter(key => !['wuzibianma', 'zichanmingcheng', 'wuzileixing', 'rukupici', 'zaikushuliang', 'jiliangdanwei', 'guigexinghao', 'shengchanriqi', 'id'].includes(key)))
+      console.log("- 其他字段:", Object.keys(e).filter(key => !['wuzibianma', 'zichanmingcheng', 'wuzileixing', 'rukupici', 'zaikushuliang', 'jiliangdanwei', 'guigexinghao','wuziguige','shengchanriqi', 'id'].includes(key)))
 
       // 一物一码去除已经选择了的 序号
       if(e.wuzileixing==='一物一码'){
@@ -956,6 +977,7 @@ export default {
       this.mingxiObj.jiliangdanwei = e.jiliangdanwei
       this.mingxiObj.inventorys_id = e.id
       this.mingxiObj.guigexinghao = e.guigexinghao
+      this.mingxiObj.wuziguige = e.wuziguige
       this.mingxiObj.shengchanriqi = e.shengchanriqi
 
       console.log("this.mingxiObj",this.mingxiObj)

src/views/outbounds/component/printoutbounds.vue

@@ -17,8 +17,9 @@
             <!-- <td>批次</td> -->
             <td>批内序号</td>
             <td>数量</td>
-            <td>规格</td>
-            <td>型号</td>
+
+            <td>物资型号</td>
+            <td>物资规格</td>
             <td v-if="isChange">操作</td>
           </tr>
           <tr v-for="item in mingxiList">
@@ -33,8 +34,9 @@
             </td>
 
             <td>{{ item.wuzileixing==='一物一码'?item.inventorys.length:item.jieyongshuliang }}</td>
-            <td>{{ item.wuziguige }}</td>
             <td>{{ item.guigexinghao }}</td>
+            <td>{{ item.wuziguige }}</td>
+
             <td v-if="isChange">
               <el-button  @click="changeWz(item)"  size="small" type="primary">更改出库序号</el-button>
             </td>

src/views/outbounds/component/showChuku.vue

@@ -97,6 +97,10 @@
             label: '物资型号',
             prop: 'guigexinghao',
             width: 180
+          },{
+            label: '物资规格',
+            prop: 'wuziguige',
+            width: 180
           }, {
             label: '物资类型',
             prop: 'wuzileixing',