whj 1 tahun lalu
induk
melakukan
ad51be5f33

+ 1 - 0
src/views/store/outstoreform/modules/BaseFormYY2.vue

@@ -663,6 +663,7 @@ export default {
           selectData.storeNum = selectData.num
           selectData.spareNo = selectData.no
           selectData.num = 1
+          selectData.addBom = this.type2 === 2
           data.push(selectData)
         }
       }

+ 5 - 2
src/views/store/outstoreform/modules/TicketForm.vue

@@ -23,7 +23,7 @@
             <td colspan="1" style="text-align:left;">
               {{ type? '领库':'退库' }}单位或个人:{{ model.createdUserName }}
             </td>
-            <td colspan="3" style="text-align:left;">
+            <td colspan="4" style="text-align:left;">
               项目:{{ model.projectName }}
             </td>
             <td colspan="3" style="text-align:left;">
@@ -31,7 +31,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="7" style="text-align:left;">
+            <td colspan="8" style="text-align:left;">
               用途:{{ model.remark }}
             </td>
           </tr>
@@ -42,6 +42,7 @@
             <td colspan="1" style="min-width:65px;">货架号</td>
             <td colspan="1" style="min-width:50px;">单位</td>
             <td colspan="1" style="min-width:50px;">数量</td>
+            <td colspan="1" style="min-width:50px;">仓库名称</td>
             <td colspan="1" style="min-width:50px;">备注</td>
           </tr>
           <tr v-for="item in model.detailList" :key="item.id">
@@ -51,6 +52,7 @@
             <td colspan="1">{{ item.storePosition }}</td>
             <td colspan="1">{{ item.unit }}</td>
             <td colspan="1">{{ item.num }}</td>
+            <td colspan="1">{{ item.storeName }}</td>
             <td colspan="1">{{ item.remark }}</td>
           </tr>
           <tr v-show="model.detailList.length<6" v-for="i in ((6-model.detailList.length)>0?(6-model.detailList.length):0)" :key="i">
@@ -68,6 +70,7 @@
             <td colspan="1"></td>
             <td colspan="1">{{ model.detailList.reduce((num,item)=>num+=item.num,0) }}</td>
             <td colspan="1"></td>
+            <td colspan="1"></td>
           </tr>
         </table>
       </div>