浏览代码

框/扇入库,框/扇出库-增加字段

jingbb 11 月之前
父节点
当前提交
6e755b94b4

+ 36 - 2
src/views/production/productionTotalOrder/modules/KSOutbound.vue

@@ -21,12 +21,20 @@
                     rowKey="rowNo"
                     :dataSource="form.dataSource"
                     :pagination="false"
-                    :scroll="{ x: 5500, y: 300 }"
+                    :scroll="{ x: 6500, y: 300 }"
                     :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                 >
+                
                     <span slot="boxFreightTitle" class="form-table-heard">
-                       框运费
+                        框运费
+                    </span>
+                    <span slot="executeOutFramesNowTitle" class="form-table-heard">
+                        本次执行框数量
                     </span>
+                    <span slot="executeOutLeafNowTitle" class="form-table-heard">
+                        本次执行扇数量
+                    </span>
+                    
                     <template slot="boxFreight" slot-scope="text, record, index">
                         <a-form-model-item :prop="'dataSource.'+index+'.boxFreight'" class='sonItem' :rules="rules.boxFreight">
                             <a-input placeholder="请输入" v-model="record.boxFreight" ></a-input>
@@ -40,6 +48,16 @@
                             <a-input placeholder="请输入" v-model="record.fanFreight" ></a-input>
                         </a-form-model-item>
                     </template> 
+                    <template slot="executeOutLeafNow" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.executeOutLeafNow'" class='sonItem' :rules="rules.executeOutLeafNow">
+                            <a-input placeholder="请输入" v-model="record.executeOutLeafNow" ></a-input>
+                        </a-form-model-item>
+                    </template> 
+                    <template slot="executeOutFramesNow" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.executeOutFramesNow'" class='sonItem' :rules="rules.executeOutFramesNow">
+                            <a-input placeholder="请输入" v-model="record.executeOutFramesNow" ></a-input>
+                        </a-form-model-item>
+                    </template> 
                 </a-table>
             </a-form-model>
         </div>
@@ -128,6 +146,22 @@
                     scopedSlots: { customRender: 'fanFreight' } ,
                     slots:{title:'fanFreightTitle'},
                 },
+                {
+                    // title: '本次执行扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeafNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutLeafNow' } ,
+                    slots:{title:'executeOutLeafNowTitle'},
+                },
+                {
+                    // title: '本次执行框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFramesNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
+                    slots:{title:'executeOutFramesNowTitle'},
+                },
                 {
                     title: '成品计量单位',
                     align:"center",

+ 32 - 0
src/views/production/productionTotalOrder/modules/KSWarehousing.vue

@@ -24,6 +24,22 @@
                     :scroll="{ x: 5500, y: 300 }"
                     :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                 >
+                    <span slot="executeOutFramesNowTitle" class="form-table-heard">
+                        本次执行框数量
+                    </span>
+                    <span slot="executeOutLeafNowTitle" class="form-table-heard">
+                        本次执行扇数量
+                    </span>
+                    <template slot="executeOutLeafNow" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.executeOutLeafNow'" class='sonItem' :rules="rules.executeOutLeafNow">
+                            <a-input placeholder="请输入" v-model="record.executeOutLeafNow" ></a-input>
+                        </a-form-model-item>
+                    </template> 
+                    <template slot="executeOutFramesNow" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.executeOutFramesNow'" class='sonItem' :rules="rules.executeOutFramesNow">
+                            <a-input placeholder="请输入" v-model="record.executeOutFramesNow" ></a-input>
+                        </a-form-model-item>
+                    </template> 
                 </a-table>
             </a-form-model>
         </div>
@@ -96,6 +112,22 @@
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
+                {
+                    // title: '本次执行扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeafNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutLeafNow' } ,
+                    slots:{title:'executeOutLeafNowTitle'},
+                },
+                {
+                    // title: '本次执行框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFramesNow',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutFramesNow' } ,
+                    slots:{title:'executeOutFramesNowTitle'},
+                },
                 {
                     title: '成品计量单位',
                     align:"center",