生产总订单-成品明细字段更改

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

@@ -16,17 +16,10 @@
             >
                 <template slot="billingType" slot-scope="text, record, index">
                     <a-form-model-item prop="billingType" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.billingType" :disabled="allowEdit=='no'"></a-input>
-                    </a-form-model-item>
-                </template>
-                <template slot="projectCode" slot-scope="text, record, index">
-                    <a-form-model-item prop="projectCode" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.projectCode" :disabled="allowEdit=='no'"></a-input>
-                    </a-form-model-item>
-                </template>
-                <template slot="projectName" slot-scope="text, record, index">
-                    <a-form-model-item prop="projectName" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.projectName" :disabled="allowEdit=='no'"></a-input>
+                        <a-select v-model="record.billingType"  style='width:100%'  :disabled="allowEdit=='no'">
+                            <a-select-option value='铝合金门窗'> 铝合金门窗</a-select-option>
+                            <a-select-option value='双开窗'> 双开窗</a-select-option>
+                        </a-select>
                     </a-form-model-item>
                 </template>
                 <template slot="batch" slot-scope="text, record, index">
@@ -39,54 +32,54 @@
                         <a-input-search placeholder="请输入" v-model="record.inventoryCode" @search="onSearchInven(record)" readOnly></a-input-search>
                     </a-form-model-item>
                 </template>
-                <template slot="inventoryName" slot-scope="text, record, index">
-                    <a-form-model-item prop="inventoryName" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.inventoryName" :disabled="allowEdit=='no'"></a-input>
+                <template slot="batch" slot-scope="text, record, index">
+                    <a-form-model-item prop="batch" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.batch" :disabled="allowEdit=='no'"></a-input>
                     </a-form-model-item>
-                </template>
-                <template slot="unit" slot-scope="text, record, index">
-                    <a-form-model-item prop="unit" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unit" :disabled="allowEdit=='no'"></a-input>
-                     </a-form-model-item>
-                </template>
+                </template> 
                 <template slot="quantity" slot-scope="text, record, index">
                     <a-form-model-item prop="quantity" class='sonItem'>
                         <a-input placeholder="请输入" v-model="record.quantity" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="auxiliaryUnit" slot-scope="text, record, index">
-                    <a-form-model-item prop="auxiliaryUnit" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.auxiliaryUnit" :disabled="allowEdit=='no'"></a-input>
-                     </a-form-model-item>
-                </template>
                 <template slot="unQuantity" slot-scope="text, record, index">
                     <a-form-model-item prop="unQuantity" class='sonItem'>
                         <a-input placeholder="请输入" v-model="record.unQuantity" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <!-- <template slot="unQuantityExecuteOut" slot-scope="text, record, index">
-                    <a-form-model-item prop="unQuantityExecuteOut" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unQuantityExecuteOut"></a-input>
+                <template slot="quantityExecuteIn" slot-scope="text, record, index">
+                    <a-form-model-item prop="quantityExecuteIn" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.quantityExecuteIn"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="quantityExecuteOut" slot-scope="text, record, index">
-                    <a-form-model-item prop="quantityExecuteOut" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.quantityExecuteOut"></a-input>
+                <template slot="framesCount" slot-scope="text, record, index">
+                    <a-form-model-item prop="framesCount" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.framesCount"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="quantityExecuteIn" slot-scope="text, record, index">
-                    <a-form-model-item prop="quantityExecuteIn" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.quantityExecuteIn"></a-input>
+                <template slot="leafCount" slot-scope="text, record, index">
+                    <a-form-model-item prop="leafCount" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.leafCount"></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="executeInLeaf" slot-scope="text, record, index">
+                    <a-form-model-item prop="executeInLeaf" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.executeInLeaf"></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="executeInFrames" slot-scope="text, record, index">
+                    <a-form-model-item prop="executeInFrames" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.executeInFrames"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="unQuantityExecuteIn" slot-scope="text, record, index">
-                    <a-form-model-item prop="unQuantityExecuteIn" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unQuantityExecuteIn"></a-input>
+                <template slot="executeOutLeaf" slot-scope="text, record, index">
+                    <a-form-model-item prop="executeOutLeaf" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.executeOutLeaf"></a-input>
                      </a-form-model-item>
-                </template> -->
-                <template slot="specs" slot-scope="text, record, index">
-                    <a-form-model-item prop="specs" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.specs" :disabled="allowEdit=='no'"></a-input>
+                </template>
+                <template slot="executeOutFrames" slot-scope="text, record, index">
+                    <a-form-model-item prop="executeOutFrames" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.executeOutFrames"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="model" slot-scope="text, record, index">
@@ -99,19 +92,29 @@
                         <a-input placeholder="请输入" v-model="record.color" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
+                <template slot="fixedNum" slot-scope="text, record, index">
+                    <a-form-model-item prop="fixedNum" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.fixedNum" :disabled="allowEdit=='no'"></a-input>
+                     </a-form-model-item>
+                </template>
                 <template slot="fixedLength" slot-scope="text, record, index">
                     <a-form-model-item prop="fixedLength" class='sonItem'>
                         <a-input placeholder="请输入" v-model="record.fixedLength" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="alloy" slot-scope="text, record, index">
-                    <a-form-model-item prop="alloy" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.alloy" :disabled="allowEdit=='no'"></a-input>
+                <template slot="widthHeight" slot-scope="text, record, index">
+                    <a-form-model-item prop="widthHeight" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.widthHeight" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="standard" slot-scope="text, record, index">
-                    <a-form-model-item prop="standard" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.standard" :disabled="allowEdit=='no'"></a-input>
+                <template slot="pieces" slot-scope="text, record, index">
+                    <a-form-model-item prop="pieces" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.pieces" :disabled="allowEdit=='no'"></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="remarks" slot-scope="text, record, index">
+                    <a-form-model-item prop="remarks" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.remarks" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="meterWeight" slot-scope="text, record, index">
@@ -154,16 +157,6 @@
                         <a-input placeholder="请输入" v-model="record.framesTang" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="framesCount" slot-scope="text, record, index">
-                    <a-form-model-item prop="framesCount" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.framesCount" :disabled="allowEdit=='no'"></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="leafCount" slot-scope="text, record, index">
-                    <a-form-model-item prop="leafCount" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.leafCount" :disabled="allowEdit=='no'"></a-input>
-                     </a-form-model-item>
-                </template>
                 <template slot="semiClass" slot-scope="text, record, index">
                     <a-form-model-item prop="semiClass" class='sonItem'>
                         <a-input placeholder="请输入" v-model="record.semiClass" :disabled="allowEdit=='no'"></a-input>
@@ -189,11 +182,6 @@
                         <a-input placeholder="请输入" v-model="record.cuttingRightTop" :disabled="allowEdit=='no'"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="remarks" slot-scope="text, record, index">
-                    <a-form-model-item prop="remarks" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.remarks" :disabled="allowEdit=='no'"></a-input>
-                     </a-form-model-item>
-                </template>
                 <template slot="series" slot-scope="text, record, index">
                     <a-form-model-item prop="series" class='sonItem'>
                         <a-input placeholder="请输入" v-model="record.series" :disabled="allowEdit=='no'"></a-input>
@@ -252,14 +240,12 @@
                     align:"center",
                     dataIndex: 'projectCode',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'projectCode' } 
                 },
                 {
                     title: '项目名称',
                     align:"center",
                     dataIndex: 'projectName',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'projectName' } 
                 },
                 {
                     title: '批次',
@@ -269,7 +255,7 @@
                     scopedSlots: { customRender: 'batch' } 
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
@@ -277,23 +263,25 @@
 
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'inventoryName' } 
-
                 },
                 {
-                    title: '计量单位',
+                    title: '成品计量单位',
                     align:"center",
                     dataIndex: 'unit',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'unit' } 
-
                 },
                 {
-                    title: '主数量',
+                    title: '成品辅计量单位',
+                    align:"center",
+                    dataIndex: 'auxiliaryUnit',
+                    ellipsis: true,
+                },
+                {
+                    title: '成品主数量',
                     align:"center",
                     dataIndex: 'quantity',
                     ellipsis: true,
@@ -301,53 +289,66 @@
 
                 },
                 {
-                    title: '辅计量单位',
+                    title: '成品辅数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'auxiliaryUnit' } 
+                    scopedSlots: { customRender: 'unQuantity' } 
                 },
                 {
-                    title: '辅数量',
+                    title: '已入库成品数量',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'quantityExecuteIn',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'unQuantity' } 
+                    scopedSlots: { customRender: 'quantityExecuteIn' } 
                 },
                 {
-                    title: '已执行辅数量(销售出库)',
+                    title: '框数量',
                     align:"center",
-                    dataIndex: 'unQuantityExecuteOut',
+                    dataIndex: 'framesCount',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'framesCount' } 
+                 },
+                {
+                    title: '扇数量',
+                    align:"center",
+                    dataIndex: 'leafCount',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'unQuantityExecuteOut' } 
+                    scopedSlots: { customRender: 'leafCount' } 
                 },
                 {
-                    title: '已执行主数量(销售出库)',
+                    title: '已入库扇数量',
                     align:"center",
-                    dataIndex: 'quantityExecuteOut',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'quantityExecuteOut' } 
+                    scopedSlots: { customRender: 'executeInLeaf' } 
                 },
                 {
-                    title: '已执行主数量(产成品入库)',
+                    title: '已入库框数量',
                     align:"center",
-                    dataIndex: 'quantityExecuteIn',
+                    dataIndex: 'executeInFrames',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'quantityExecuteIn' } 
+                    scopedSlots: { customRender: 'executeInFrames' } 
                 },
                 {
-                    title: '已执行辅数量(产成品入库)',
+                    title: '已出库扇数量',
                     align:"center",
-                    dataIndex: 'unQuantityExecuteIn',
+                    dataIndex: 'executeOutLeaf',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'unQuantityExecuteIn' } 
+                    scopedSlots: { customRender: 'executeOutLeaf' } 
+                },
+                {
+                    title: '已出库框数量',
+                    align:"center",
+                    dataIndex: 'executeOutFrames',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'executeOutFrames' } 
                 },
                 {
                     title: '规格',
                     align:"center",
                     dataIndex: 'specs',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'specs' } 
                 },
                 {
                     title: '型号',
@@ -364,6 +365,13 @@
                     scopedSlots: { customRender: 'color' } 
 
                 },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'fixedNum' } 
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -372,18 +380,25 @@
                     scopedSlots: { customRender: 'fixedLength' } 
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'alloy' } 
+                    scopedSlots: { customRender: 'widthHeight' } 
                 },
-                {   
-                    title: '标准',
+                {
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'pieces' } 
+                },
+                {
+                    title: '备注',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'remarks',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'standard' } 
+                    scopedSlots: { customRender: 'remarks' } 
                 },
                 {
                     title: '米重',
@@ -442,20 +457,7 @@
                     scopedSlots: { customRender: 'framesTang' } 
                 },
                 
-                {
-                    title: '框统计',
-                    align:"center",
-                    dataIndex: 'framesCount',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'framesCount' } 
-                 },
-                {
-                    title: '扇统计',
-                    align:"center",
-                    dataIndex: 'leafCount',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'leafCount' } 
-                },
+                
                 {
                     title: '半成品分类',
                     align:"center",
@@ -491,13 +493,7 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'cuttingRightTop' } 
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'remarks' } 
-                },
+                
                 {
                     title: '系列',
                     align:"center",
@@ -543,6 +539,7 @@
             this.$set(recoerd,'specs',data.SPECS)
             this.$set(recoerd,'unit',data.unit)
             this.$set(recoerd,'auxiliaryUnit',data.auxiliaryUnit )
+            this.$set(recoerd,'attribute',data.Code1 )
             this.$set(recoerd,'inventory',data.ID )
         },
         delectRow(){

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

@@ -37,7 +37,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -72,63 +72,82 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '成品计量单位',
                     align:"center",
                     dataIndex: 'unit',
                     ellipsis: true,
                 },
                 {
-                    title: '主数量',
+                    title: '成品辅计量单位',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
                 },
                 {
-                    title: '辅计量单位',
+                    title: '成品主数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'quantity',
                     ellipsis: true,
+
                 },
                 {
-                    title: '辅数量',
+                    title: '成品辅数量',
                     align:"center",
                     dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行辅数量(销售出库)',
+                    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: 'unQuantityExecuteOut',
+                    dataIndex: 'executeInLeaf',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行主数量(销售出库)',
+                    title: '已入库框数量',
                     align:"center",
-                    dataIndex: 'quantityExecuteOut',
+                    dataIndex: 'executeInFrames',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行主数量(产成品入库)',
+                    title: '已出库扇数量',
                     align:"center",
-                    dataIndex: 'quantityExecuteIn',
+                    dataIndex: 'executeOutLeaf',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行辅数量(产成品入库)',
+                    title: '已出库框数量',
                     align:"center",
-                    dataIndex: 'unQuantityExecuteIn',
+                    dataIndex: 'executeOutFrames',
                     ellipsis: true,
                 },
                 {
@@ -149,6 +168,12 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -156,15 +181,21 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
-                {   
-                    title: '标准',
+                {
+                    title: '片数',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
+                    align:"center",
+                    dataIndex: 'remarks',
                     ellipsis: true,
                 },
                 {
@@ -216,18 +247,7 @@
                     ellipsis: true,
                 },
                 
-                {
-                    title: '框统计',
-                    align:"center",
-                    dataIndex: 'framesCount',
-                    ellipsis: true,
-                 },
-                {
-                    title: '扇统计',
-                    align:"center",
-                    dataIndex: 'leafCount',
-                    ellipsis: true,
-                },
+                
                 {
                     title: '半成品分类',
                     align:"center",
@@ -258,12 +278,7 @@
                     dataIndex: 'cuttingRightTop',
                     ellipsis: true,
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                },
+                
                 {
                     title: '系列',
                     align:"center",
@@ -276,7 +291,7 @@
                     dataIndex: 'glassNumber',
                     ellipsis: true,
                 },
-          ],
+            ]
       }
     },
      props: {