生产总订单-生单

src/views/production/productionTotalOrder/modules/KSOutbound.vue

@@ -0,0 +1,458 @@
+<template>
+    <a-modal
+      title="框/扇出库"
+       width="95%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @cancel="handleCancel"
+      @ok='handleOk'
+      >
+      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
+        <div >
+            <a-form-model ref="formRef" :model="form">
+                <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    id='sonList'
+                    :columns="columns"
+                    rowKey="rowNo"
+                    :dataSource="form.dataSource"
+                    :pagination="false"
+                    :scroll="{ x: 5500, y: 300 }"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                >
+                    <span slot="boxFreightTitle" 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>
+                        </a-form-model-item>
+                    </template> 
+                    <span slot="fanFreightTitle" class="form-table-heard">
+                       扇运费
+                    </span>
+                    <template slot="fanFreight" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.fanFreight'" class='sonItem' :rules="rules.fanFreight">
+                            <a-input placeholder="请输入" v-model="record.fanFreight" ></a-input>
+                        </a-form-model-item>
+                    </template> 
+                </a-table>
+            </a-form-model>
+        </div>
+    </a-card>
+    </a-modal>
+  </template>
+  
+  <script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+  import moment from 'moment'
+  export default {
+    name: 'KSOutbound', //  Tabs 详情
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      moment,
+    },
+    data() {
+      return {
+        form:{
+            dataSource:[],
+        },
+        loading:false,
+        columns: [
+                {
+                    title: '#',
+                    dataIndex: '',
+                    key: 'rowIndex',
+                    width: 60,
+                    align: "center",
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
+                {
+                    title: '开票类型',
+                    align:"center",
+                    dataIndex: 'billingType',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目编码',
+                    align:"center",
+                    dataIndex: 'projectCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目名称',
+                    align:"center",
+                    dataIndex: 'projectName',
+                    ellipsis: true,
+                },
+                {
+                    title: '批次',
+                    align:"center",
+                    dataIndex: 'batch',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品编码',
+                    align:"center",
+                    dataIndex: 'inventoryCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品名称',
+                    align:"center",
+                    dataIndex: 'inventoryName',
+                    ellipsis: true,
+                },
+                {
+                    // title: '成品入库数量',
+                    align:"center",
+                    dataIndex: 'boxFreight',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'boxFreight' } ,
+                    slots:{title:'boxFreightTitle'},
+                },
+                {
+                    // title: '成品入库数量',
+                    align:"center",
+                    dataIndex: 'fanFreight',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'fanFreight' } ,
+                    slots:{title:'fanFreightTitle'},
+                },
+                {
+                    title: '成品计量单位',
+                    align:"center",
+                    dataIndex: 'unit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅数量',
+                    align:"center",
+                    dataIndex: 'unQuantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库成品数量',
+                    align:"center",
+                    dataIndex: 'quantityExecuteIn',
+                    ellipsis: true,
+                },
+                {
+                    title: '框数量',
+                    align:"center",
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                 },
+                {
+                    title: '扇数量',
+                    align:"center",
+                    dataIndex: 'leafCount',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库扇数量',
+                    align:"center",
+                    dataIndex: 'executeInLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库框数量',
+                    align:"center",
+                    dataIndex: 'executeInFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '规格',
+                    align:"center",
+                    dataIndex: 'specs',
+                    ellipsis: true,
+                },
+                {
+                    title: '型号',
+                    align:"center",
+                    dataIndex: 'model',
+                    ellipsis: true,
+                },
+                {
+                    title: '颜色',
+                    align:"center",
+                    dataIndex: 'color',
+                    ellipsis: true,
+
+                },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
+                {   
+                    title: '定尺',
+                    align:"center",
+                    dataIndex: 'fixedLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽/高',
+                    align:"center",
+                    dataIndex: 'widthHeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
+                    align:"center",
+                    dataIndex: 'remarks',
+                    ellipsis: true,
+                },
+                {
+                    title: '米重',
+                    align:"center",
+                    dataIndex: 'meterWeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '装饰面周长',
+                    align:"center",
+                    dataIndex: 'decorationLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {
+                    title: '专用区',
+                    align:"center",
+                    dataIndex: 'exclusiveZone',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽度/长度',
+                    align:"center",
+                    dataIndex: 'widthLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '高度',
+                    align:"center",
+                    dataIndex: 'height',
+                    ellipsis: true,
+                },
+                {
+                    title: '楼层楼号',
+                    align:"center",
+                    dataIndex: 'buildingNumber',
+                    ellipsis: true,
+                },
+                {
+                    title: '樘数(数量)',
+                    align:"center",
+                    dataIndex: 'framesTang',
+                    ellipsis: true,
+                },
+                
+                
+                {
+                    title: '半成品分类',
+                    align:"center",
+                    dataIndex: 'semiClass',
+                    ellipsis: true,
+                },
+                {
+                    title: '面积',
+                    align:"center",
+                    dataIndex: 'area',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割长度',
+                    align:"center",
+                    dataIndex: 'cuttingLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
+          ],
+          visible:false,
+          selectedRowKeys:[],
+          selectedRows:[],
+          rules:{
+            // boxFreight:{required:true,message:"不可为空"},
+            // fanFreight:{required:true,message:"不可为空"},
+        },
+      }
+    },
+     props: {
+      
+    },
+  
+    created() {},
+    methods: {
+        onSelectChange(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectedRows = selectionRows;
+        },
+        handleOk(){
+            // this.$refs.formRef.validate(success => {
+            //     if (success) {
+            //     }
+            // })
+            if(this.selectedRows.length==0){
+                this.$message.warning('请勾选数据')
+            }else{
+                this.loading =true
+                postAction('/productionOrder/madeProductionOrders/outMadeProductionOrdersOutList', {madeProductionOrdersInList:this.selectedRows}).then((res) => {
+                    if (res.success) {
+                        this.$emit('ok')
+                        this.handleCancel()
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                }).finally(() => {
+                    this.loading = false
+                })
+            }
+        },
+        handleCancel(){
+            this.visible = false
+        }
+    },
+  
+    computed: {
+      // 合计数据
+      // sumInfoSource() {}
+    }
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  /* @import '~@assets/less/common.less' */
+    /deep/.ant-input{
+        height:29px;
+    }
+    /deep/.ant-select-selection--single {
+        height: 29px;
+    }
+    /deep/.ant-select{
+        font-size: 12px;
+    }
+    /deep/.ant-form label{
+        font-size: 12px;
+    }
+    /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item{
+        margin-bottom:9px
+    }
+    /deep/.moddle>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.top>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.ant-btn{
+        height:28px
+    }
+    /deep/.ant-modal-body{
+        padding-bottom: 0px;
+        padding-top: 0px;
+    }
+    // /deep/.ant-modal-body{
+    //     background: #f0f2f5;
+    // }
+    /deep/.ant-modal-content{
+        background: #f0f2f5;
+    }
+    /deep/.ant-card-body .table-operator {
+        margin-bottom: 0px;
+    }
+    /deep/.three>.ant-card-body{
+        padding-bottom:12px;
+        padding-top: 12px;
+    }
+    /deep/.bottom>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+
+    /deep/.ant-calendar-picker{
+        min-width: 0px !important;  
+    }
+    /deep/.sonItem {
+        margin-bottom:0px !important
+    }
+    /deep/#sonList>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
+        padding: 0px 8px !important;
+    }
+    .form-table-heard:before {
+    content:'*';
+    color:red
+   }
+   /deep/.ant-form-explain, .ant-form-split {
+        display: none;
+   }
+  </style>
+  

src/views/production/productionTotalOrder/modules/KSWarehousing.vue

@@ -0,0 +1,418 @@
+<template>
+    <a-modal
+      title="框/扇入库"
+       width="95%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @cancel="handleCancel"
+      @ok='handleOk'
+      >
+      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
+        <div >
+            <a-form-model ref="formRef" :model="form">
+                <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    id='KS'
+                    :columns="columns"
+                    rowKey="rowNo"
+                    :dataSource="form.dataSource"
+                    :pagination="false"
+                    :scroll="{ x: 5500, y: 300 }"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                >
+                </a-table>
+            </a-form-model>
+        </div>
+    </a-card>
+    </a-modal>
+  </template>
+  
+  <script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+  import moment from 'moment'
+  export default {
+    name: 'KSWarehousing', //  Tabs 详情
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      moment,
+    },
+    data() {
+      return {
+        form:{
+            dataSource:[],
+        },
+        loading:false,
+        columns: [
+                {
+                    title: '#',
+                    dataIndex: '',
+                    key: 'rowIndex',
+                    width: 60,
+                    align: "center",
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
+                {
+                    title: '开票类型',
+                    align:"center",
+                    dataIndex: 'billingType',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目编码',
+                    align:"center",
+                    dataIndex: 'projectCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目名称',
+                    align:"center",
+                    dataIndex: 'projectName',
+                    ellipsis: true,
+                },
+                {
+                    title: '批次',
+                    align:"center",
+                    dataIndex: 'batch',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品编码',
+                    align:"center",
+                    dataIndex: 'inventoryCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品名称',
+                    align:"center",
+                    dataIndex: 'inventoryName',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品计量单位',
+                    align:"center",
+                    dataIndex: 'unit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅数量',
+                    align:"center",
+                    dataIndex: 'unQuantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库成品数量',
+                    align:"center",
+                    dataIndex: 'quantityExecuteIn',
+                    ellipsis: true,
+                },
+                {
+                    title: '框数量',
+                    align:"center",
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                 },
+                {
+                    title: '扇数量',
+                    align:"center",
+                    dataIndex: 'leafCount',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库扇数量',
+                    align:"center",
+                    dataIndex: 'executeInLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库框数量',
+                    align:"center",
+                    dataIndex: 'executeInFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '规格',
+                    align:"center",
+                    dataIndex: 'specs',
+                    ellipsis: true,
+                },
+                {
+                    title: '型号',
+                    align:"center",
+                    dataIndex: 'model',
+                    ellipsis: true,
+                },
+                {
+                    title: '颜色',
+                    align:"center",
+                    dataIndex: 'color',
+                    ellipsis: true,
+
+                },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
+                {   
+                    title: '定尺',
+                    align:"center",
+                    dataIndex: 'fixedLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽/高',
+                    align:"center",
+                    dataIndex: 'widthHeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
+                    align:"center",
+                    dataIndex: 'remarks',
+                    ellipsis: true,
+                },
+                {
+                    title: '米重',
+                    align:"center",
+                    dataIndex: 'meterWeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '装饰面周长',
+                    align:"center",
+                    dataIndex: 'decorationLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {
+                    title: '专用区',
+                    align:"center",
+                    dataIndex: 'exclusiveZone',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽度/长度',
+                    align:"center",
+                    dataIndex: 'widthLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '高度',
+                    align:"center",
+                    dataIndex: 'height',
+                    ellipsis: true,
+                },
+                {
+                    title: '楼层楼号',
+                    align:"center",
+                    dataIndex: 'buildingNumber',
+                    ellipsis: true,
+                },
+                {
+                    title: '樘数(数量)',
+                    align:"center",
+                    dataIndex: 'framesTang',
+                    ellipsis: true,
+                },
+                
+                
+                {
+                    title: '半成品分类',
+                    align:"center",
+                    dataIndex: 'semiClass',
+                    ellipsis: true,
+                },
+                {
+                    title: '面积',
+                    align:"center",
+                    dataIndex: 'area',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割长度',
+                    align:"center",
+                    dataIndex: 'cuttingLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
+          ],
+          visible:false,
+          selectedRowKeys:[],
+          selectedRows:[]
+      }
+    },
+     props: {
+      
+    },
+  
+    created() {},
+    methods: {
+        handleOk(){
+            if(this.selectedRows.length==0){
+                this.$message.warning('请勾选数据')
+            }else{
+                this.loading =true
+                postAction('/productionOrder/madeProductionOrders/inMadeProductionOrdersOutList', {madeProductionOrdersInList:this.selectedRows}).then((res) => {
+                    if (res.success) {
+                        this.$emit('ok')
+                        this.handleCancel()
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                }).finally(() => {
+                    this.loading = false
+                })
+            }
+        },
+        handleCancel(){
+            this.visible = false
+        },
+        onSelectChange(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectedRows = selectionRows;
+        },
+    },
+  
+    computed: {
+      // 合计数据
+      // sumInfoSource() {}
+    }
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  /* @import '~@assets/less/common.less' */
+    /deep/.ant-input{
+        height:29px;
+    }
+    /deep/.ant-select-selection--single {
+        height: 29px;
+    }
+    /deep/.ant-select{
+        font-size: 12px;
+    }
+    /deep/.ant-form label{
+        font-size: 12px;
+    }
+    /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item{
+        margin-bottom:9px
+    }
+    /deep/.moddle>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.top>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.ant-btn{
+        height:28px
+    }
+    /deep/.ant-modal-body{
+        padding-bottom: 0px;
+        padding-top: 0px;
+    }
+    // /deep/.ant-modal-body{
+    //     background: #f0f2f5;
+    // }
+    /deep/.ant-modal-content{
+        background: #f0f2f5;
+    }
+    /deep/.ant-card-body .table-operator {
+        margin-bottom: 0px;
+    }
+    /deep/.three>.ant-card-body{
+        padding-bottom:12px;
+        padding-top: 12px;
+    }
+    /deep/.bottom>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+
+    /deep/.ant-calendar-picker{
+        min-width: 0px !important;  
+    }
+    /deep/.sonItem {
+        margin-bottom:0px !important
+    }
+    /deep/#KS>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
+        padding: 8px 8px !important;
+    }
+    .form-table-heard:before {
+    content:'*';
+    color:red
+   }
+   /deep/.ant-form-explain, .ant-form-split {
+        display: none;
+   }
+  </style>
+  

src/views/production/productionTotalOrder/modules/TemporaryStorage.vue

@@ -5,7 +5,7 @@
             ref="table"
             size="middle"
             bordered
-            id='sonList'
+            id='YL'
             :columns="columns"
             rowKey="rowNo"
             :dataSource="dataSource"
@@ -63,7 +63,6 @@
                     align:"center",
                     dataIndex: 'batch',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
                 },
                 {
                     title: '料品编码',
@@ -344,8 +343,8 @@
     /deep/.sonItem {
         margin-bottom:0px !important
     }
-    /deep/#sonList>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
-        padding: 0px 8px !important;
+    /deep/#YL>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
+        padding: 8px 8px !important;
     }
   </style>
   

src/views/production/productionTotalOrder/modules/productDetails.vue

@@ -308,7 +308,7 @@
                     align:"center",
                     dataIndex: 'quantityExecuteIn',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'quantityExecuteIn' } 
+                    // scopedSlots: { customRender: 'quantityExecuteIn' } 
                 },
                 {
                     // title: '框数量',
@@ -331,28 +331,28 @@
                     align:"center",
                     dataIndex: 'executeInLeaf',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeInLeaf' } ,
+                    // scopedSlots: { customRender: 'executeInLeaf' } ,
                 },
                 {
                     title: '已入库框数量',
                     align:"center",
                     dataIndex: 'executeInFrames',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeInFrames' } 
+                    // scopedSlots: { customRender: 'executeInFrames' } 
                 },
                 {
                     title: '已出库扇数量',
                     align:"center",
                     dataIndex: 'executeOutLeaf',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeOutLeaf' } 
+                    // scopedSlots: { customRender: 'executeOutLeaf' } 
                 },
                 {
                     title: '已出库框数量',
                     align:"center",
                     dataIndex: 'executeOutFrames',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'executeOutFrames' } 
+                    // scopedSlots: { customRender: 'executeOutFrames' } 
                 },
                 {
                     title: '规格',

src/views/production/productionTotalOrder/modules/productWarehousModel.vue

@@ -0,0 +1,439 @@
+<template>
+    <a-modal
+      title="产品入库"
+       width="95%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @cancel="handleCancel"
+      @ok='handleOk'
+      >
+      <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
+        <div >
+            <a-form-model ref="formRef" :model="form">
+                <a-table
+                    ref="table"
+                    size="middle"
+                    bordered
+                    id='sonList'
+                    :columns="columns"
+                    rowKey="rowNo"
+                    :dataSource="form.dataSource"
+                    :pagination="false"
+                    :scroll="{ x: 5500, y: 300 }"
+                    :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                >
+                    <span slot="productInQuantityTitle" class="form-table-heard">
+                        成品入库数量
+                    </span>
+                    <template slot="productInQuantity" slot-scope="text, record, index">
+                        <a-form-model-item :prop="'dataSource.'+index+'.productInQuantity'" class='sonItem' :rules="rules.productInQuantity">
+                            <a-input placeholder="请输入" v-model="record.productInQuantity" ></a-input>
+                        </a-form-model-item>
+                    </template> 
+                </a-table>
+            </a-form-model>
+        </div>
+    </a-card>
+    </a-modal>
+  </template>
+  
+  <script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
+  import moment from 'moment'
+  export default {
+    name: 'productWarehousModel', //  Tabs 详情
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      moment,
+    },
+    data() {
+      return {
+        form:{
+            dataSource:[],
+        },
+        loading:false,
+        columns: [
+                {
+                    title: '#',
+                    dataIndex: '',
+                    key: 'rowIndex',
+                    width: 60,
+                    align: "center",
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
+                {
+                    title: '开票类型',
+                    align:"center",
+                    dataIndex: 'billingType',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目编码',
+                    align:"center",
+                    dataIndex: 'projectCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目名称',
+                    align:"center",
+                    dataIndex: 'projectName',
+                    ellipsis: true,
+                },
+                {
+                    title: '批次',
+                    align:"center",
+                    dataIndex: 'batch',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品编码',
+                    align:"center",
+                    dataIndex: 'inventoryCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '料品名称',
+                    align:"center",
+                    dataIndex: 'inventoryName',
+                    ellipsis: true,
+                },
+                {
+                    // title: '成品入库数量',
+                    align:"center",
+                    dataIndex: 'productInQuantity',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'productInQuantity' } ,
+                    slots:{title:'productInQuantityTitle'},
+                },
+                {
+                    title: '成品计量单位',
+                    align:"center",
+                    dataIndex: 'unit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品辅数量',
+                    align:"center",
+                    dataIndex: 'unQuantity',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库成品数量',
+                    align:"center",
+                    dataIndex: 'quantityExecuteIn',
+                    ellipsis: true,
+                },
+                {
+                    title: '框数量',
+                    align:"center",
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                 },
+                {
+                    title: '扇数量',
+                    align:"center",
+                    dataIndex: 'leafCount',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库扇数量',
+                    align:"center",
+                    dataIndex: 'executeInLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已入库框数量',
+                    align:"center",
+                    dataIndex: 'executeInFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库扇数量',
+                    align:"center",
+                    dataIndex: 'executeOutLeaf',
+                    ellipsis: true,
+                },
+                {
+                    title: '已出库框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFrames',
+                    ellipsis: true,
+                },
+                {
+                    title: '规格',
+                    align:"center",
+                    dataIndex: 'specs',
+                    ellipsis: true,
+                },
+                {
+                    title: '型号',
+                    align:"center",
+                    dataIndex: 'model',
+                    ellipsis: true,
+                },
+                {
+                    title: '颜色',
+                    align:"center",
+                    dataIndex: 'color',
+                    ellipsis: true,
+
+                },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
+                {   
+                    title: '定尺',
+                    align:"center",
+                    dataIndex: 'fixedLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽/高',
+                    align:"center",
+                    dataIndex: 'widthHeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
+                    align:"center",
+                    dataIndex: 'remarks',
+                    ellipsis: true,
+                },
+                {
+                    title: '米重',
+                    align:"center",
+                    dataIndex: 'meterWeight',
+                    ellipsis: true,
+                },
+                {
+                    title: '装饰面周长',
+                    align:"center",
+                    dataIndex: 'decorationLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '窗号',
+                    align:"center",
+                    dataIndex: 'windowNo',
+                    ellipsis: true,
+                },
+                {
+                    title: '专用区',
+                    align:"center",
+                    dataIndex: 'exclusiveZone',
+                    ellipsis: true,
+                },
+                {
+                    title: '宽度/长度',
+                    align:"center",
+                    dataIndex: 'widthLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '高度',
+                    align:"center",
+                    dataIndex: 'height',
+                    ellipsis: true,
+                },
+                {
+                    title: '楼层楼号',
+                    align:"center",
+                    dataIndex: 'buildingNumber',
+                    ellipsis: true,
+                },
+                {
+                    title: '樘数(数量)',
+                    align:"center",
+                    dataIndex: 'framesTang',
+                    ellipsis: true,
+                },
+                
+                
+                {
+                    title: '半成品分类',
+                    align:"center",
+                    dataIndex: 'semiClass',
+                    ellipsis: true,
+                },
+                {
+                    title: '面积',
+                    align:"center",
+                    dataIndex: 'area',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割长度',
+                    align:"center",
+                    dataIndex: 'cuttingLength',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度左下',
+                    align:"center",
+                    dataIndex: 'cuttingLeftDown',
+                    ellipsis: true,
+                },
+                {
+                    title: '切割角度右上',
+                    align:"center",
+                    dataIndex: 'cuttingRightTop',
+                    ellipsis: true,
+                },
+                
+                {
+                    title: '系列',
+                    align:"center",
+                    dataIndex: 'series',
+                    ellipsis: true,
+                },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
+          ],
+          visible:false,
+        //   rules:{
+        //     productInQuantity:{required:true,message:"不可为空"},
+        // },
+      }
+    },
+     props: {
+      
+    },
+  
+    created() {},
+    methods: {
+        onSelectChange(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectedRows = selectionRows;
+        },
+        handleOk(){
+            // this.$refs.formRef.validate(success => {
+            //     if (success) {
+            //     }
+            // })
+            if(this.selectedRows.length==0){
+                this.$message.warning('请勾选数据')
+            }else{
+                postAction('/productionOrder/madeProductionOrders/syNcIn', {madeProductionOrdersFinishedList:this.selectedRows}).then((res) => {
+                    if (res.success) {
+                        this.visible = false
+                        this.$emit('ok')
+                    } else {
+                        this.$message.error(res.message);
+                    }
+                }).finally(() => {
+                    this.loading = false
+                })
+            }
+            
+        },
+        handleCancel(){
+            this.visible = false
+        }
+    },
+  
+    computed: {
+      // 合计数据
+      // sumInfoSource() {}
+    }
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  /* @import '~@assets/less/common.less' */
+    /deep/.ant-input{
+        height:29px;
+    }
+    /deep/.ant-select-selection--single {
+        height: 29px;
+    }
+    /deep/.ant-select{
+        font-size: 12px;
+    }
+    /deep/.ant-form label{
+        font-size: 12px;
+    }
+    /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item{
+        margin-bottom:9px
+    }
+    /deep/.moddle>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.top>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+    /deep/.ant-btn{
+        height:28px
+    }
+    /deep/.ant-modal-body{
+        padding-bottom: 0px;
+        padding-top: 0px;
+    }
+    // /deep/.ant-modal-body{
+    //     background: #f0f2f5;
+    // }
+    /deep/.ant-modal-content{
+        background: #f0f2f5;
+    }
+    /deep/.ant-card-body .table-operator {
+        margin-bottom: 0px;
+    }
+    /deep/.three>.ant-card-body{
+        padding-bottom:12px;
+        padding-top: 12px;
+    }
+    /deep/.bottom>.ant-card-body{
+        padding-bottom:0px;
+        padding-top: 12px;
+    }
+
+    /deep/.ant-calendar-picker{
+        min-width: 0px !important;  
+    }
+    /deep/.sonItem {
+        margin-bottom:0px !important
+    }
+    /deep/#sonList>.ant-spin-nested-loading>.ant-spin-container>.ant-table>.ant-table-content>.ant-table-scroll>.ant-table-body>.ant-table-fixed>.ant-table-tbody > tr > td {
+        padding: 0px 8px !important;
+    }
+    .form-table-heard:before {
+    content:'*';
+    color:red
+   }
+   /deep/.ant-form-explain, .ant-form-split {
+        display: none;
+   }
+  </style>
+  

src/views/production/productionTotalOrder/modules/productionTotalOrderAdd.vue

@@ -92,16 +92,9 @@
        <div class="table-operator">
             <a-button type="danger" size="small"  @click="addList" >增行</a-button>
             <a-button size="small" @click="delectRow" >删行</a-button>
-            <a-dropdown>
-                <a-button size="small"> 生单 <a-icon type="down" /> </a-button>
-                <a-menu slot="overlay" >
-                    <a-menu-item><a>材料出库</a></a-menu-item>
-                    <a-menu-item><a>产成品入库</a></a-menu-item>
-                    <a-menu-item><a>其他出库</a></a-menu-item>
-                    <a-menu-item><a>其他入库</a></a-menu-item>
-                    <a-menu-item><a>销售出库</a></a-menu-item>
-                </a-menu>
-            </a-dropdown>
+            <a-button size="small" @click="productWarehous" >成品入库</a-button>
+            <a-button size="small" @click="KSWarehousing" >框/扇入库</a-button>
+            <a-button size="small" @click="KSOutbound" >框/扇出库</a-button>
             <!-- <a-dropdown>
                 <a-button size="small"> 委外 <a-icon type="down" /> </a-button>
                 <a-menu slot="overlay" >
@@ -132,6 +125,9 @@
         </a-tabs>
        
     </a-card>
+    <productWarehousModel ref="productWarehousModel" @ok="RefreshList('product')"></productWarehousModel>
+    <KSOutbound ref="KSOutbound" @ok="RefreshList('out')"></KSOutbound>
+    <KSWarehousing ref="KSWarehousing" @ok="RefreshList('ware')"></KSWarehousing>
     <organizationPopup ref="organizationPopup" @okData="okDataOrganization"></organizationPopup>
     <OperatorsPopup ref="OperatorsPopup" @okData="okDataOperators"></OperatorsPopup>
     <deparmentPopup ref="deparmentPopup" @okData="okDataDeparment"></deparmentPopup>
@@ -146,6 +142,9 @@
       import material from './material'
       import TemporaryStorage from './TemporaryStorage'
       import SurplusMaterials from './SurplusMaterials'
+      import productWarehousModel from './productWarehousModel'
+      import KSOutbound from './KSOutbound'
+      import KSWarehousing from './KSWarehousing'
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
       import organizationPopup from '../../Popup/organizationPopup.vue'
@@ -163,7 +162,10 @@
             organizationPopup,
             OperatorsPopup,
             deparmentPopup,
-            projectPopup
+            projectPopup,
+            productWarehousModel,
+            KSOutbound,
+            KSWarehousing
         },
         data() {
           return {
@@ -493,7 +495,25 @@
                 this.$set(this.form,'planDept',data.Name)
                 this.$set(this.form,'planDeptId',data.ID)
             },
-
+            //成品入库
+            productWarehous(){
+                this.$refs.productWarehousModel.visible = true
+                this.$refs.productWarehousModel.form.dataSource = this.$refs.productDetails.form.dataSource
+            },
+            KSWarehousing(){
+                this.$refs.KSWarehousing.visible = true
+                this.$refs.KSWarehousing.form.dataSource = this.$refs.productDetails.form.dataSource
+            },
+            KSOutbound(){
+                this.$refs.KSOutbound.visible = true
+                this.$refs.KSOutbound.form.dataSource = this.$refs.productDetails.form.dataSource
+            },
+            RefreshList(data){
+                this.getProductData(this.form.id)
+                if(data!=='product'){
+                    this.getTemporaryStorageData(this.form.id)
+                }
+            }
         }
       }
   </script>